From d42aa47809c97a77c49e9396201c2b5c3956bb54 Mon Sep 17 00:00:00 2001 From: tmk Date: Mon, 27 Oct 2014 21:39:02 +0900 Subject: Fix ibm4704 protocol with using interrupt --- tmk_core/protocol/ibm4704.c | 135 +++++++++++++++++++++++++------------------- 1 file changed, 78 insertions(+), 57 deletions(-) (limited to 'tmk_core/protocol') diff --git a/tmk_core/protocol/ibm4704.c b/tmk_core/protocol/ibm4704.c index 10e229fd1..152d7e61b 100644 --- a/tmk_core/protocol/ibm4704.c +++ b/tmk_core/protocol/ibm4704.c @@ -4,6 +4,7 @@ Copyright 2010,2011,2012,2013 Jun WAKO #include #include #include "debug.h" +#include "ring_buffer.h" #include "ibm4704.h" @@ -20,7 +21,9 @@ uint8_t ibm4704_error = 0; void ibm4704_init(void) { - inhibit(); + IBM4704_INT_INIT(); + IBM4704_INT_ON(); + idle(); } /* @@ -47,6 +50,8 @@ uint8_t ibm4704_send(uint8_t data) bool parity = true; // odd parity ibm4704_error = 0; + IBM4704_INT_OFF(); + /* Request to send */ idle(); clock_lo(); @@ -57,7 +62,6 @@ uint8_t ibm4704_send(uint8_t data) /* Data bit */ for (uint8_t i = 0; i < 8; i++) { WAIT(clock_hi, 100, 0x40+i); - //_delay_us(5); if (data&(1<= 0x30) { - xprintf("x%02X ", ibm4704_error); + idle(); + if (ibm4704_error > 0x30) { + xprintf("S:%02X ", ibm4704_error); } - _delay_us(200); // wait to recover clock to hi + IBM4704_INT_ON(); return -1; } -/* receive data when host want else inhibit communication */ +/* wait forever to receive data */ uint8_t ibm4704_recv_response(void) { - // 250 * 100us(wait start bit in ibm4704_recv) - uint8_t data = 0; - uint8_t try = 250; - do { - data = ibm4704_recv(); - } while (try-- && ibm4704_error); - return data; + while (!rbuf_has_data()) { + _delay_ms(1); + } + return rbuf_dequeue(); } /* @@ -121,49 +122,69 @@ Stop bit: Keyboard pulls down Data line to lo after 9th clock. */ uint8_t ibm4704_recv(void) { - uint8_t data = 0; - bool parity = true; // odd parity - ibm4704_error = IBM4704_ERR_NONE; - - idle(); - _delay_us(5); // wait for line settles - - /* start bit */ - WAIT(clock_lo, 100, 0x11); // wait for keyboard to send - WAIT(data_hi, 100, 0x12); // can be delayed that long - - WAIT(clock_hi, 100, 0x13); // first rising edge which can take longer - /* data */ - for (uint8_t i = 0; i < 8; i++) { - WAIT(clock_hi, 100, 0x20+i); - //_delay_us(5); - if (data_in()) { - parity = !parity; - data |= (1< 0x12) { - xprintf("x%02X ", ibm4704_error); + ibm4704_error = 0; + // return unless falling edge + if (clock_in()) { goto RETURN; } // why this occurs? + + state++; + switch (state) { + case START: + // Data:Low + WAIT(data_hi, 10, state); + break; + case BIT0: + case BIT1: + case BIT2: + case BIT3: + case BIT4: + case BIT5: + case BIT6: + case BIT7: + data >>= 1; + if (data_in()) { + data |= 0x80; + parity = !parity; + } + break; + case PARITY: + if (data_in()) { + parity = !parity; + } + if (!parity) + goto ERROR; + rbuf_enqueue(data); + ibm4704_error = IBM4704_ERR_NONE; + goto DONE; + break; + default: + goto ERROR; } - inhibit(); - _delay_us(200); // wait to recover clock to hi - return -1; + goto RETURN; +ERROR: + ibm4704_error = state; + while (ibm4704_send(0xFE)) _delay_ms(1); // resend + xprintf("R:%02X\n", data); +DONE: + state = INIT; + data = 0; + parity = false; +RETURN: + return; } -- cgit v1.2.3-70-g09d2 From d5482f29f46174bfa8854653f8a6cab5af97085e Mon Sep 17 00:00:00 2001 From: tmk Date: Tue, 28 Oct 2014 14:41:45 +0900 Subject: Fix debug print --- converter/ibm4704_usb/config.h | 21 +++++---------------- converter/ibm4704_usb/matrix.c | 2 +- tmk_core/protocol/ibm4704.c | 2 +- 3 files changed, 7 insertions(+), 18 deletions(-) (limited to 'tmk_core/protocol') diff --git a/converter/ibm4704_usb/config.h b/converter/ibm4704_usb/config.h index 812d95c67..4f267b3b7 100644 --- a/converter/ibm4704_usb/config.h +++ b/converter/ibm4704_usb/config.h @@ -41,9 +41,7 @@ along with this program. If not, see . -/* - * Busywait - */ +/* Pin configuration */ #define IBM4704_CLOCK_PORT PORTD #define IBM4704_CLOCK_PIN PIND #define IBM4704_CLOCK_DDR DDRD @@ -53,19 +51,10 @@ along with this program. If not, see . #define IBM4704_DATA_DDR DDRD #define IBM4704_DATA_BIT 0 -/* - * Pin interrupt - */ -#define IBM4704_INT_INIT() do { \ - EICRA |= ((1< Date: Wed, 13 May 2015 15:59:49 +0900 Subject: usb_usb: Change debug LED pin config --- converter/usb_usb/main.cpp | 23 ++++++++++++++++++++++- tmk_core/protocol/usb_hid/leonardo_led.h | 10 ---------- 2 files changed, 22 insertions(+), 11 deletions(-) delete mode 100644 tmk_core/protocol/usb_hid/leonardo_led.h (limited to 'tmk_core/protocol') diff --git a/converter/usb_usb/main.cpp b/converter/usb_usb/main.cpp index 011baf1d6..57a5de3d3 100644 --- a/converter/usb_usb/main.cpp +++ b/converter/usb_usb/main.cpp @@ -18,7 +18,28 @@ #include "debug.h" #include "keyboard.h" -#include "leonardo_led.h" + +/* LED ping configuration */ +#define TMK_LED +//#define LEONARDO_LED +#if defined(TMK_LED) +// For TMK converter and Teensy +#define LED_TX_INIT (DDRD |= (1<<6)) +#define LED_TX_ON (PORTD |= (1<<6)) +#define LED_TX_OFF (PORTD &= ~(1<<6)) +#define LED_TX_TOGGLE (PORTD ^= (1<<6)) +#elif defined(LEONARDO_LED) +// For Leonardo(TX LED) +#define LED_TX_INIT (DDRD |= (1<<5)) +#define LED_TX_ON (PORTD &= ~(1<<5)) +#define LED_TX_OFF (PORTD |= (1<<5)) +#define LED_TX_TOGGLE (PORTD ^= (1<<5)) +#else +#define LED_TX_INIT +#define LED_TX_ON +#define LED_TX_OFF +#define LED_TX_TOGGLE +#endif static USB usb_host; diff --git a/tmk_core/protocol/usb_hid/leonardo_led.h b/tmk_core/protocol/usb_hid/leonardo_led.h deleted file mode 100644 index 6f67a88f5..000000000 --- a/tmk_core/protocol/usb_hid/leonardo_led.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef LEONARDO_LED_H -#define LEONARDO_LED_H - -// Leonardo "TX" LED for debug -#define LED_TX_INIT (DDRD |= (1<<5)) -#define LED_TX_ON (PORTD &= ~(1<<5)) -#define LED_TX_OFF (PORTD |= (1<<5)) -#define LED_TX_TOGGLE (PORTD ^= (1<<5)) - -#endif -- cgit v1.2.3-70-g09d2 From 9a2282157fbdf57ef0a50d4fea7da72505906588 Mon Sep 17 00:00:00 2001 From: tmk Date: Thu, 14 May 2015 15:38:15 +0900 Subject: ibm4704_usb: Fix interrupt of clock(rising edge) --- converter/ibm4704_usb/config.h | 4 ++-- converter/ibm4704_usb/ibm4704.txt | 6 +++--- tmk_core/protocol/ibm4704.c | 39 ++++++++++++++++++--------------------- 3 files changed, 23 insertions(+), 26 deletions(-) (limited to 'tmk_core/protocol') diff --git a/converter/ibm4704_usb/config.h b/converter/ibm4704_usb/config.h index 4f267b3b7..d9d8d39bc 100644 --- a/converter/ibm4704_usb/config.h +++ b/converter/ibm4704_usb/config.h @@ -51,8 +51,8 @@ along with this program. If not, see . #define IBM4704_DATA_DDR DDRD #define IBM4704_DATA_BIT 0 -/* Pin interrupt on rising edge */ -#define IBM4704_INT_INIT() do { EICRA |= ((1< Date: Sun, 17 May 2015 19:34:34 +0900 Subject: Add keyboard_setup() and matrix_setup() --- tmk_core/common/avr/suspend.c | 2 ++ tmk_core/common/keyboard.c | 6 ++++++ tmk_core/common/keyboard.h | 8 +++++--- tmk_core/common/matrix.h | 4 +++- tmk_core/protocol/lufa/lufa.c | 9 +++++++-- tmk_core/protocol/pjrc/main.c | 2 ++ 6 files changed, 25 insertions(+), 6 deletions(-) (limited to 'tmk_core/protocol') diff --git a/tmk_core/common/avr/suspend.c b/tmk_core/common/avr/suspend.c index 80243f02b..af99f52b5 100644 --- a/tmk_core/common/avr/suspend.c +++ b/tmk_core/common/avr/suspend.c @@ -85,6 +85,8 @@ void suspend_power_down(void) power_down(WDTO_15MS); } +__attribute__ ((weak)) void matrix_power_up(void) {} +__attribute__ ((weak)) void matrix_power_down(void) {} bool suspend_wakeup_condition(void) { matrix_power_up(); diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c index b03b124d7..eb7b096be 100644 --- a/tmk_core/common/keyboard.c +++ b/tmk_core/common/keyboard.c @@ -62,6 +62,12 @@ static bool has_ghost_in_row(uint8_t row) #endif +__attribute__ ((weak)) void matrix_setup(void) {} +void keyboard_setup(void) +{ + matrix_setup(); +} + void keyboard_init(void) { timer_init(); diff --git a/tmk_core/common/keyboard.h b/tmk_core/common/keyboard.h index 6442716fc..7738251b6 100644 --- a/tmk_core/common/keyboard.h +++ b/tmk_core/common/keyboard.h @@ -58,13 +58,15 @@ static inline bool IS_RELEASED(keyevent_t event) { return (!IS_NOEVENT(event) && } +/* it runs once at early stage of startup before keyboard_init. */ +void keyboard_setup(void); +/* it runs once after initializing host side protocol, debug and MCU peripherals. */ void keyboard_init(void); +/* it runs repeatedly in main loop */ void keyboard_task(void); +/* it runs when host LED status is updated */ void keyboard_set_leds(uint8_t leds); -__attribute__ ((weak)) void matrix_power_up(void) {} -__attribute__ ((weak)) void matrix_power_down(void) {} - #ifdef __cplusplus } #endif diff --git a/tmk_core/common/matrix.h b/tmk_core/common/matrix.h index 107ee7265..ec6f8cd43 100644 --- a/tmk_core/common/matrix.h +++ b/tmk_core/common/matrix.h @@ -43,7 +43,9 @@ extern "C" { uint8_t matrix_rows(void); /* number of matrix columns */ uint8_t matrix_cols(void); -/* intialize matrix for scaning. should be called once. */ +/* should be called at early stage of startup before matrix_init.(optional) */ +void matrix_setup(void); +/* intialize matrix for scaning. */ void matrix_init(void); /* scan all key states on matrix */ uint8_t matrix_scan(void); diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c index cdfc7bc6a..391064c9b 100644 --- a/tmk_core/protocol/lufa/lufa.c +++ b/tmk_core/protocol/lufa/lufa.c @@ -544,7 +544,7 @@ int8_t sendchar(uint8_t c) /******************************************************************************* * main ******************************************************************************/ -static void SetupHardware(void) +static void setup_mcu(void) { /* Disable watchdog if enabled by bootloader/fuses */ MCUSR &= ~(1 << WDRF); @@ -552,7 +552,10 @@ static void SetupHardware(void) /* Disable clock division */ clock_prescale_set(clock_div_1); +} +static void setup_usb(void) +{ // Leonardo needs. Without this USB device is not recognized. USB_Disable(); @@ -566,7 +569,9 @@ static void SetupHardware(void) int main(void) __attribute__ ((weak)); int main(void) { - SetupHardware(); + setup_mcu(); + keyboard_setup(); + setup_usb(); sei(); /* wait for USB startup & debug output */ diff --git a/tmk_core/protocol/pjrc/main.c b/tmk_core/protocol/pjrc/main.c index e7bdcc059..45eb17d4c 100644 --- a/tmk_core/protocol/pjrc/main.c +++ b/tmk_core/protocol/pjrc/main.c @@ -46,6 +46,8 @@ int main(void) // set for 16 MHz clock CPU_PRESCALE(0); + keyboard_setup(); + // Initialize the USB, and then wait for the host to set configuration. // If the Teensy is powered without a PC connected to the USB port, // this will wait forever. -- cgit v1.2.3-70-g09d2 From 80fd3b0b240a8840fbca1cc3cc70e76f5b52b888 Mon Sep 17 00:00:00 2001 From: tmk Date: Tue, 19 May 2015 00:32:58 +0900 Subject: ibm4704_usb: Fix protocol handling --- converter/ibm4704_usb/README.md | 1 + converter/ibm4704_usb/config.h | 2 +- converter/ibm4704_usb/ibm4704.txt | 5 +++-- converter/ibm4704_usb/matrix.c | 30 +++++++++++++----------------- tmk_core/protocol/ibm4704.c | 20 +++++++++++--------- 5 files changed, 29 insertions(+), 29 deletions(-) (limited to 'tmk_core/protocol') diff --git a/converter/ibm4704_usb/README.md b/converter/ibm4704_usb/README.md index 25b72ba67..15c826ab8 100644 --- a/converter/ibm4704_usb/README.md +++ b/converter/ibm4704_usb/README.md @@ -8,6 +8,7 @@ Keyboard initialization process takes a few seconds at start up. During that you Update ------ 2015/05/05 Added keymaps for 107-key, 77-key and 50-key. Thanks, orihalcon @ geekhack! +2015/05/19 Fixed a protocol handling bug. diff --git a/converter/ibm4704_usb/config.h b/converter/ibm4704_usb/config.h index d9d8d39bc..2fee10fd6 100644 --- a/converter/ibm4704_usb/config.h +++ b/converter/ibm4704_usb/config.h @@ -53,7 +53,7 @@ along with this program. If not, see . /* Pin interrupt on rising edge of clock */ #define IBM4704_INT_INIT() do { EICRA |= ((1< Date: Fri, 22 May 2015 18:10:28 +0900 Subject: lufa: Fix console flush #223 Old console sent unneeded empty data every one milli sencond. After this fix console flushes endpoint data bank every 50ms only when needed. --- tmk_core/protocol/lufa/lufa.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'tmk_core/protocol') diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c index 391064c9b..85fdeabdd 100644 --- a/tmk_core/protocol/lufa/lufa.c +++ b/tmk_core/protocol/lufa/lufa.c @@ -197,10 +197,24 @@ void EVENT_USB_Device_WakeUp() #endif } +#ifdef CONSOLE_ENABLE +static bool console_flush = false; +#define CONSOLE_FLUSH_SET(b) do { \ + uint8_t sreg = SREG; cli(); console_flush = b; SREG = sreg; \ +} while (0) + +// called every 1ms void EVENT_USB_Device_StartOfFrame(void) { + static uint8_t count; + if (++count % 50) return; + count = 0; + + if (!console_flush) return; Console_Task(); + console_flush = false; } +#endif /** Event handler for the USB_ConfigurationChanged event. * This is fired when the host sets the current configuration of the USB device after enumeration. @@ -491,6 +505,10 @@ int8_t sendchar(uint8_t c) // Because sendchar() is called so many times, waiting each call causes big lag. static bool timeouted = false; + // prevents Console_Task() from running during sendchar() runs. + // or char will be lost. These two function is mutually exclusive. + CONSOLE_FLUSH_SET(false); + if (USB_DeviceState != DEVICE_STATE_Configured) return -1; @@ -524,8 +542,12 @@ int8_t sendchar(uint8_t c) Endpoint_Write_8(c); // send when bank is full - if (!Endpoint_IsReadWriteAllowed()) + if (!Endpoint_IsReadWriteAllowed()) { + while (!(Endpoint_IsINReady())); Endpoint_ClearIN(); + } else { + CONSOLE_FLUSH_SET(true); + } Endpoint_SelectEndpoint(ep); return 0; -- cgit v1.2.3-70-g09d2 From 1efdd867c8f88ad779ad82e1b22df62bf6be8fe9 Mon Sep 17 00:00:00 2001 From: tmk Date: Wed, 15 Jul 2015 16:02:20 +0900 Subject: usb_usb: Ignore error usage(0x01-03) report --- tmk_core/protocol/usb_hid/parser.cpp | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'tmk_core/protocol') diff --git a/tmk_core/protocol/usb_hid/parser.cpp b/tmk_core/protocol/usb_hid/parser.cpp index 28151f9d5..1a152ff3f 100644 --- a/tmk_core/protocol/usb_hid/parser.cpp +++ b/tmk_core/protocol/usb_hid/parser.cpp @@ -10,15 +10,24 @@ uint16_t usb_hid_time_stamp; void KBDReportParser::Parse(HID *hid, bool is_rpt_id, uint8_t len, uint8_t *buf) { - ::memcpy(&usb_hid_keyboard_report, buf, sizeof(report_keyboard_t)); - usb_hid_time_stamp = millis(); + bool is_error = false; + report_keyboard_t *report = (report_keyboard_t *)buf; + + dprintf("KBDReport: %02X %02X", report->mods, report->reserved); + for (uint8_t i = 0; i < KEYBOARD_REPORT_KEYS; i++) { + if (IS_ERROR(report->keys[i])) { + is_error = true; + } + dprintf(" %02X", report->keys[i]); + } + dprint("\r\n"); - debug("KBDReport: "); - debug_hex(usb_hid_keyboard_report.mods); - debug(" --"); - for (uint8_t i = 0; i < 6; i++) { - debug(" "); - debug_hex(usb_hid_keyboard_report.keys[i]); + // ignore error and not send report to computer + if (is_error) { + dprint("Error usage! \r\n"); + return; } - debug("\r\n"); + + ::memcpy(&usb_hid_keyboard_report, buf, sizeof(report_keyboard_t)); + usb_hid_time_stamp = millis(); } -- cgit v1.2.3-70-g09d2 From 35203cad6ad4294409bd39dd85ff7858b353570d Mon Sep 17 00:00:00 2001 From: tmk Date: Thu, 23 Jul 2015 11:58:15 +0900 Subject: core: Fix lufa suspend callback(#234) With matrix_power_down() in suspend event HHKB JP doesn't start up for some reason. It is unneeded in actual and removed. --- tmk_core/protocol/lufa/lufa.c | 1 - 1 file changed, 1 deletion(-) (limited to 'tmk_core/protocol') diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c index 85fdeabdd..65c215bf8 100644 --- a/tmk_core/protocol/lufa/lufa.c +++ b/tmk_core/protocol/lufa/lufa.c @@ -179,7 +179,6 @@ void EVENT_USB_Device_Reset(void) void EVENT_USB_Device_Suspend() { print("[S]"); - matrix_power_down(); #ifdef SLEEP_LED_ENABLE sleep_led_enable(); #endif -- cgit v1.2.3-70-g09d2 From 9b99f8f8649c25b5efa92c9fd49b7f4c0ce60a76 Mon Sep 17 00:00:00 2001 From: tmk Date: Sun, 20 Sep 2015 10:33:25 +0900 Subject: next_usb: Fix next_kbd_set_leds() --- tmk_core/protocol/next_kbd.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'tmk_core/protocol') diff --git a/tmk_core/protocol/next_kbd.c b/tmk_core/protocol/next_kbd.c index a5a07a7a8..fa3034b3f 100644 --- a/tmk_core/protocol/next_kbd.c +++ b/tmk_core/protocol/next_kbd.c @@ -59,10 +59,16 @@ static inline void query(void); static inline void reset(void); static inline uint32_t response(void); -#define out_hi_delay(intervals) do { out_hi(); _delay_us(NEXT_KBD_TIMING * intervals); } while (0); -#define out_lo_delay(intervals) do { out_lo(); _delay_us(NEXT_KBD_TIMING * intervals); } while (0); -#define query_delay(intervals) do { query(); _delay_us(NEXT_KBD_TIMING * intervals); } while (0); -#define reset_delay(intervals) do { reset(); _delay_us(NEXT_KBD_TIMING * intervals); } while (0); +/* The keyboard sends signal with 50us pulse width on OUT line + * while it seems to miss the 50us pulse on In line. + * next_kbd_set_leds() often fails to sync LED status with 50us + * but it works well with 51us(+1us) on TMK converter(ATMeaga32u2) at least. + * TODO: test on Teensy and Pro Micro configuration + */ +#define out_hi_delay(intervals) do { out_hi(); _delay_us((NEXT_KBD_TIMING+1) * intervals); } while (0); +#define out_lo_delay(intervals) do { out_lo(); _delay_us((NEXT_KBD_TIMING+1) * intervals); } while (0); +#define query_delay(intervals) do { query(); _delay_us((NEXT_KBD_TIMING+1) * intervals); } while (0); +#define reset_delay(intervals) do { reset(); _delay_us((NEXT_KBD_TIMING+1) * intervals); } while (0); void next_kbd_init(void) { @@ -79,6 +85,7 @@ void next_kbd_init(void) void next_kbd_set_leds(bool left, bool right) { + cli(); out_lo_delay(9); out_hi_delay(3); @@ -98,6 +105,7 @@ void next_kbd_set_leds(bool left, bool right) out_lo_delay(7); out_hi(); + sei(); } #define NEXT_KBD_READ (NEXT_KBD_IN_PIN&(1< Date: Sun, 20 Sep 2015 10:48:47 +0900 Subject: lufa: Fix endpoint bank mode for ATMega32u2 --- tmk_core/protocol/lufa/lufa.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tmk_core/protocol') diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c index 65c215bf8..188fb7b89 100644 --- a/tmk_core/protocol/lufa/lufa.c +++ b/tmk_core/protocol/lufa/lufa.c @@ -217,6 +217,9 @@ void EVENT_USB_Device_StartOfFrame(void) /** Event handler for the USB_ConfigurationChanged event. * This is fired when the host sets the current configuration of the USB device after enumeration. + * + * ATMega32u2 supports dual bank(ping-pong mode) only on endpoint 3 and 4, + * it is safe to use singl bank for all endpoints. */ void EVENT_USB_Device_ConfigurationChanged(void) { @@ -241,7 +244,7 @@ void EVENT_USB_Device_ConfigurationChanged(void) #ifdef CONSOLE_ENABLE /* Setup Console HID Report Endpoints */ ConfigSuccess &= ENDPOINT_CONFIG(CONSOLE_IN_EPNUM, EP_TYPE_INTERRUPT, ENDPOINT_DIR_IN, - CONSOLE_EPSIZE, ENDPOINT_BANK_DOUBLE); + CONSOLE_EPSIZE, ENDPOINT_BANK_SINGLE); #if 0 ConfigSuccess &= ENDPOINT_CONFIG(CONSOLE_OUT_EPNUM, EP_TYPE_INTERRUPT, ENDPOINT_DIR_OUT, CONSOLE_EPSIZE, ENDPOINT_BANK_SINGLE); -- cgit v1.2.3-70-g09d2 From ed9766a7d44cd727dbd59008eff4258745ff87cf Mon Sep 17 00:00:00 2001 From: tmk Date: Sun, 20 Sep 2015 14:34:13 +0900 Subject: core: Fix for disabling NKRO in Boot protocol --- tmk_core/common/action_util.c | 6 +++--- tmk_core/common/command.c | 1 + tmk_core/protocol/lufa/lufa.c | 8 +++----- 3 files changed, 7 insertions(+), 8 deletions(-) (limited to 'tmk_core/protocol') diff --git a/tmk_core/common/action_util.c b/tmk_core/common/action_util.c index dbee630d1..f81877dd9 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 a53cac614..420e7eb9b 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 188fb7b89..345630aa9 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); -- cgit v1.2.3-70-g09d2