max/tmk_keyboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lufa: usb-usb: Use LUFA startup instead of cusotom

Browse source 
- 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
This commit is contained in:
tmk 2018-10-28 13:43:59 +09:00
parent a159172951
commit aa5dd8fccf
4 changed files with 5 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
converter/usb_usb/Makefile
View file

@ -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

102
converter/usb_usb/main.cpp
View file

@ -1,102 +0,0 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/power.h>
#include <util/delay.h>
// 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;
}

1
converter/usb_usb/usb_usb.cpp
View file

@ -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);

5
tmk_core/protocol/lufa/lufa.c
View file

@ -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");