Add consumer/system control feature to LUFA.
This commit is contained in:
parent
0551eae5a9
commit
89928728a2
@ -49,6 +49,7 @@ void keyboard_proc(void)
|
|||||||
uint8_t fn_bits = 0;
|
uint8_t fn_bits = 0;
|
||||||
#ifdef EXTRAKEY_ENABLE
|
#ifdef EXTRAKEY_ENABLE
|
||||||
uint16_t consumer_code = 0;
|
uint16_t consumer_code = 0;
|
||||||
|
uint16_t system_code = 0;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
matrix_scan();
|
matrix_scan();
|
||||||
@ -89,22 +90,13 @@ void keyboard_proc(void)
|
|||||||
#ifdef HOST_PJRC
|
#ifdef HOST_PJRC
|
||||||
if (suspend && remote_wakeup) {
|
if (suspend && remote_wakeup) {
|
||||||
usb_remote_wakeup();
|
usb_remote_wakeup();
|
||||||
} else {
|
|
||||||
host_system_send(SYSTEM_POWER_DOWN);
|
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
host_system_send(SYSTEM_POWER_DOWN);
|
|
||||||
#endif
|
#endif
|
||||||
host_system_send(0);
|
system_code = SYSTEM_POWER_DOWN;
|
||||||
_delay_ms(500);
|
|
||||||
} else if (code == KB_SYSTEM_SLEEP) {
|
} else if (code == KB_SYSTEM_SLEEP) {
|
||||||
host_system_send(SYSTEM_SLEEP);
|
system_code = SYSTEM_SLEEP;
|
||||||
host_system_send(0);
|
|
||||||
_delay_ms(500);
|
|
||||||
} else if (code == KB_SYSTEM_WAKE) {
|
} else if (code == KB_SYSTEM_WAKE) {
|
||||||
host_system_send(SYSTEM_WAKE_UP);
|
system_code = SYSTEM_WAKE_UP;
|
||||||
host_system_send(0);
|
|
||||||
_delay_ms(500);
|
|
||||||
}
|
}
|
||||||
// Consumer Page
|
// Consumer Page
|
||||||
else if (code == KB_AUDIO_MUTE) {
|
else if (code == KB_AUDIO_MUTE) {
|
||||||
@ -173,6 +165,7 @@ void keyboard_proc(void)
|
|||||||
host_send_keyboard_report();
|
host_send_keyboard_report();
|
||||||
#ifdef EXTRAKEY_ENABLE
|
#ifdef EXTRAKEY_ENABLE
|
||||||
host_consumer_send(consumer_code);
|
host_consumer_send(consumer_code);
|
||||||
|
host_system_send(system_code);
|
||||||
#endif
|
#endif
|
||||||
#ifdef DEBUG_LED
|
#ifdef DEBUG_LED
|
||||||
// LED flash for debug
|
// LED flash for debug
|
||||||
|
@ -121,12 +121,12 @@ void mousekey_clear_report(void)
|
|||||||
static void mousekey_debug(void)
|
static void mousekey_debug(void)
|
||||||
{
|
{
|
||||||
if (!debug_mouse) return;
|
if (!debug_mouse) return;
|
||||||
print("mousekey[btn|x y v h]: ");
|
print("mousekey [btn|x y v h]rep: [");
|
||||||
phex(report.buttons); print("|");
|
phex(report.buttons); print("|");
|
||||||
phex(report.x); print(" ");
|
phex(report.x); print(" ");
|
||||||
phex(report.y); print(" ");
|
phex(report.y); print(" ");
|
||||||
phex(report.v); print(" ");
|
phex(report.v); print(" ");
|
||||||
phex(report.h);
|
phex(report.h); print("]");
|
||||||
phex(mousekey_repeat);
|
phex(mousekey_repeat);
|
||||||
print("\n");
|
print("\n");
|
||||||
}
|
}
|
||||||
|
@ -62,11 +62,6 @@ int main(void)
|
|||||||
|
|
||||||
debug("initForUsbConnectivity()\n");
|
debug("initForUsbConnectivity()\n");
|
||||||
initForUsbConnectivity();
|
initForUsbConnectivity();
|
||||||
int i;
|
|
||||||
while(--i){ /* To configured */
|
|
||||||
usbPoll();
|
|
||||||
_delay_ms(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
debug("main loop\n");
|
debug("main loop\n");
|
||||||
while (1) {
|
while (1) {
|
||||||
|
@ -107,32 +107,25 @@ static void send_mouse(report_mouse_t *report)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
uint8_t report_id;
|
uint8_t report_id;
|
||||||
uint8_t data0;
|
uint16_t usage;
|
||||||
uint8_t data1;
|
} __attribute__ ((packed)) report_extra_t;
|
||||||
} __attribute__ ((packed)) vusb_system_report_t;
|
|
||||||
*/
|
|
||||||
|
|
||||||
static void send_system(uint16_t data)
|
static void send_system(uint16_t data)
|
||||||
{
|
{
|
||||||
/*
|
static uint16_t last_data = 0;
|
||||||
// Not need static?
|
if (data == last_data) return;
|
||||||
static uint8_t report[] = { REPORT_ID_SYSTEM, 0, 0 };
|
last_data = data;
|
||||||
report[1] = data&0xFF;
|
|
||||||
report[2] = (data>>8)&0xFF;
|
report_extra_t report = {
|
||||||
*/
|
|
||||||
/*
|
|
||||||
vusb_system_report_t r = {
|
|
||||||
.report_id = REPORT_ID_SYSTEM,
|
.report_id = REPORT_ID_SYSTEM,
|
||||||
.data0 = data&0xFF,
|
.usage = data
|
||||||
.data1 = (data>>8)&0xFF
|
|
||||||
};
|
};
|
||||||
if (usbInterruptIsReady3()) {
|
if (usbInterruptIsReady3()) {
|
||||||
usbSetInterrupt3((void *)&r, sizeof(vusb_system_report_t));
|
usbSetInterrupt3((void *)&report, sizeof(report));
|
||||||
}
|
}
|
||||||
*/
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void send_consumer(uint16_t data)
|
static void send_consumer(uint16_t data)
|
||||||
@ -141,10 +134,10 @@ static void send_consumer(uint16_t data)
|
|||||||
if (data == last_data) return;
|
if (data == last_data) return;
|
||||||
last_data = data;
|
last_data = data;
|
||||||
|
|
||||||
// Not need static?
|
report_extra_t report = {
|
||||||
static uint8_t report[] = { REPORT_ID_CONSUMER, 0, 0 };
|
.report_id = REPORT_ID_CONSUMER,
|
||||||
report[1] = data&0xFF;
|
.usage = data
|
||||||
report[2] = (data>>8)&0xFF;
|
};
|
||||||
if (usbInterruptIsReady3()) {
|
if (usbInterruptIsReady3()) {
|
||||||
usbSetInterrupt3((void *)&report, sizeof(report));
|
usbSetInterrupt3((void *)&report, sizeof(report));
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user