diff options
| author | tmk <hasu@tmk-kbd.com> | 2015-09-20 14:34:13 +0900 |
|---|---|---|
| committer | tmk <hasu@tmk-kbd.com> | 2015-09-20 14:34:13 +0900 |
| commit | ed9766a7d44cd727dbd59008eff4258745ff87cf (patch) | |
| tree | 27c19156051b82a3b558e2f234799d57e205a671 | |
| parent | e8a4a63ec45cf5052d8a054182ab83fdbafc3ff6 (diff) | |
core: Fix for disabling NKRO in Boot protocol
| -rw-r--r-- | tmk_core/common/action_util.c | 6 | ||||
| -rw-r--r-- | tmk_core/common/command.c | 1 | ||||
| -rw-r--r-- | tmk_core/protocol/lufa/lufa.c | 8 |
3 files changed, 7 insertions, 8 deletions
diff --git a/tmk_core/common/action_util.c b/tmk_core/common/action_util.c index dbee630d18..f81877dd9f 100644 --- a/tmk_core/common/action_util.c +++ b/tmk_core/common/action_util.c @@ -76,7 +76,7 @@ void send_keyboard_report(void) { void add_key(uint8_t key) { #ifdef NKRO_ENABLE - if (keyboard_nkro) { + if (keyboard_protocol && keyboard_nkro) { add_key_bit(key); return; } @@ -87,7 +87,7 @@ void add_key(uint8_t key) void del_key(uint8_t key) { #ifdef NKRO_ENABLE - if (keyboard_nkro) { + if (keyboard_protocol && keyboard_nkro) { del_key_bit(key); return; } @@ -160,7 +160,7 @@ uint8_t has_anymod(void) uint8_t get_first_key(void) { #ifdef NKRO_ENABLE - if (keyboard_nkro) { + if (keyboard_protocol && keyboard_nkro) { uint8_t i = 0; for (; i < KEYBOARD_REPORT_BITS && !keyboard_report->nkro.bits[i]; i++) ; diff --git a/tmk_core/common/command.c b/tmk_core/common/command.c index a53cac6148..420e7eb9b4 100644 --- a/tmk_core/common/command.c +++ b/tmk_core/common/command.c @@ -315,6 +315,7 @@ static bool command_common(uint8_t code) print_val_hex8(host_keyboard_leds()); print_val_hex8(keyboard_protocol); print_val_hex8(keyboard_idle); + print_val_hex8(keyboard_nkro); print_val_hex32(timer_count); #ifdef PROTOCOL_PJRC diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c index 188fb7b89b..345630aa90 100644 --- a/tmk_core/protocol/lufa/lufa.c +++ b/tmk_core/protocol/lufa/lufa.c @@ -53,6 +53,7 @@ #include "lufa.h" uint8_t keyboard_idle = 0; +/* 0: Boot Protocol, 1: Report Protocol(default) */ uint8_t keyboard_protocol = 1; static uint8_t keyboard_led_stats = 0; @@ -349,10 +350,7 @@ void EVENT_USB_Device_ControlRequest(void) Endpoint_ClearSETUP(); Endpoint_ClearStatusStage(); - keyboard_protocol = ((USB_ControlRequest.wValue & 0xFF) != 0x00); -#ifdef NKRO_ENABLE - keyboard_nkro = !!keyboard_protocol; -#endif + keyboard_protocol = (USB_ControlRequest.wValue & 0xFF); clear_keyboard(); } } @@ -399,7 +397,7 @@ static void send_keyboard(report_keyboard_t *report) /* Select the Keyboard Report Endpoint */ #ifdef NKRO_ENABLE - if (keyboard_nkro) { + if (keyboard_protocol && keyboard_nkro) { /* Report protocol - NKRO */ Endpoint_SelectEndpoint(NKRO_IN_EPNUM); |