From: tmk Date: Sun, 28 Oct 2018 04:43:59 +0000 (+0900) Subject: lufa: usb-usb: Use LUFA startup instead of cusotom X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=aa5dd8fccfa372caf926aa8ef826380005b47609;p=max%2Ftmk_keyboard.git lufa: usb-usb: Use LUFA startup instead of cusotom - Change keyboard_init() timing and matrix_scan() is called in USB startup wait loop for FC660C - FC660C startup seems to be faster and it doesn't work without this fix when plugin the keyboard and converter at same time --- diff --git a/converter/usb_usb/Makefile b/converter/usb_usb/Makefile index 1f09f87a..65b6d949 100644 --- a/converter/usb_usb/Makefile +++ b/converter/usb_usb/Makefile @@ -108,8 +108,7 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096 #OPT_DEFS += -DNO_ACTION_LAYER #OPT_DEFS += -DNO_ACTION_MACRO -SRC ?= usb_usb.cpp \ - main.cpp +SRC ?= usb_usb.cpp # # Keymap file diff --git a/converter/usb_usb/main.cpp b/converter/usb_usb/main.cpp deleted file mode 100644 index 76e88922..00000000 --- a/converter/usb_usb/main.cpp +++ /dev/null @@ -1,102 +0,0 @@ -#include -#include -#include -#include - -// LUFA -#include "lufa.h" - -#include "sendchar.h" -#include "debug.h" -#include "keyboard.h" -#include "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 void LUFA_setup(void) -{ - /* Disable watchdog if enabled by bootloader/fuses */ - MCUSR &= ~(1 << WDRF); - wdt_disable(); - - /* Disable clock division */ -#if (F_CPU == 8000000) - clock_prescale_set(clock_div_2); // 16MHz crystal divided by 2 -#else - clock_prescale_set(clock_div_1); -#endif - - // Leonardo needs. Without this USB device is not recognized. - USB_Disable(); - - USB_Init(); - - // for Console_Task - USB_Device_EnableSOFEvents(); - print_set_sendchar(sendchar); -} - - - -int main(void) -{ - // LED for debug - LED_TX_INIT; - LED_TX_ON; - - debug_enable = true; - debug_keyboard = true; - - host_set_driver(&lufa_driver); - keyboard_init(); - - LUFA_setup(); - - /* NOTE: Don't insert time consuming job here. - * It'll cause unclear initialization failure when DFU reset(worm start). - */ - sei(); - -/* Some keyboards bootup quickly and cannot be initialized with this startup wait. - // wait for startup of sendchar routine - while (USB_DeviceState != DEVICE_STATE_Configured) ; - if (debug_enable) { - _delay_ms(1000); - } -*/ - - debug("init: done\n"); - - for (;;) { - keyboard_task(); - -#if !defined(INTERRUPT_CONTROL_ENDPOINT) - // LUFA Task for control request - USB_USBTask(); -#endif - } - - return 0; -} diff --git a/converter/usb_usb/usb_usb.cpp b/converter/usb_usb/usb_usb.cpp index fac513bb..46765845 100644 --- a/converter/usb_usb/usb_usb.cpp +++ b/converter/usb_usb/usb_usb.cpp @@ -87,6 +87,7 @@ uint8_t matrix_rows(void) { return MATRIX_ROWS; } uint8_t matrix_cols(void) { return MATRIX_COLS; } bool matrix_has_ghost(void) { return false; } void matrix_init(void) { + debug_enable = true; // USB Host Shield setup usb_host.Init(); kbd1.SetReportParser(0, (HIDReportParser*)&kbd_parser1); diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c index a709d1f1..4a42f789 100644 --- a/tmk_core/protocol/lufa/lufa.c +++ b/tmk_core/protocol/lufa/lufa.c @@ -643,6 +643,8 @@ int main(void) sei(); + keyboard_init(); + /* wait for USB startup */ while (USB_DeviceState != DEVICE_STATE_Configured) { #if defined(INTERRUPT_CONTROL_ENDPOINT) @@ -650,10 +652,9 @@ int main(void) #else USB_USBTask(); #endif + matrix_scan(); } - keyboard_init(); - hook_late_init(); print("\nKeyboard start.\n");