darkkirb/qmk_firmware
1
0
Fork 0
forked from mirrors/qmk_firmware
Code Issues Pull requests Projects Releases Packages Wiki Activity

usb_usb: Fix initialize procedure

Browse source
This commit is contained in:
tmk 2015-05-13 13:55:11 +09:00
parent f1f2066657
commit 6057e915b5
2 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
converter/usb_usb/Makefile
View file

@ -27,7 +27,7 @@
# make flip-ee = Download the eeprom file to the device, using Atmel FLIP
# (must have Atmel FLIP installed).
#
# make debug = Start either simulavr or avarice as specified for debugging,
# make debug = Start either simulavr or avarice as specified for debugging,
# with avr-gdb or avr-insight as the front end for debugging.
#
# make filename.s = Just compile filename.c into the assembler code only.
@ -93,6 +93,7 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Media control and System control
CONSOLE_ENABLE = yes # Console for debug
#COMMAND_ENABLE = yes # Commands for debug and configuration
#NKRO_ENABLE = yes # USB Nkey Rollover
# Boot Section Size in bytes
@ -101,7 +102,11 @@ CONSOLE_ENABLE = yes # Console for debug
# LUFA bootloader 4096
OPT_DEFS += -DBOOTLOADER_SIZE=4096
#LDFLAGS += -Wl,--relax
#OPT_DEFS += -DNO_ACTION_TAPPING
#OPT_DEFS += -DNO_ACTION_LAYER
#OPT_DEFS += -DNO_ACTION_MACRO
SRC = \
keymap_common.c \

23
converter/usb_usb/main.cpp
View file

@ -56,12 +56,11 @@ static void LUFA_setup(void)
static void HID_setup()
{
if (usb_host.Init() == -1) {
debug("HID init: failed\n");
LED_TX_OFF;
}
_delay_ms(200);
kbd.SetReportParser(0, (HIDReportParser*)&kbd_parser);
}
@ -72,35 +71,27 @@ int main(void)
LED_TX_ON;
debug_enable = true;
/*
debug_matrix = true;
debug_keyboard = true;
debug_mouse = true;
*/
host_set_driver(&lufa_driver);
keyboard_init();
LUFA_setup();
HID_setup();
/* NOTE: Don't insert time consuming job here.
* It'll cause unclear initialization failure when DFU reset(worm start).
*/
sei();
uint8_t ret;
// wait for startup of sendchar routine
while (USB_DeviceState != DEVICE_STATE_Configured) ;
if (debug_enable) {
_delay_ms(1000);
}
debug("init: start\n");
HID_setup();
debug("init: done\n");
uint16_t timer;
// to see loop pulse with oscillo scope
DDRF = (1<<7);
for (;;) {
PORTF ^= (1<<7);
keyboard_task();
timer = timer_read();
@ -115,6 +106,6 @@ if (timer > 100) {
USB_USBTask();
#endif
}
return 0;
}