diff options
author | Jack Humbert <jack.humb@gmail.com> | 2015-01-14 22:48:54 -0500 |
---|---|---|
committer | Jack Humbert <jack.humb@gmail.com> | 2015-01-14 22:48:54 -0500 |
commit | a54da1b92663606f5e5c18bc1eaec30c06847da1 (patch) | |
tree | a1b7485debf62a8c52d1db3199436cac2f3ce346 /converter/usb_usb/main.cpp | |
parent | 4225f0353c2eb85fbd8ca0622eb89757975093e4 (diff) | |
parent | 10a6b2c7d8bc9c5d2657acdeefa1102be5035280 (diff) | |
download | firmware-a54da1b92663606f5e5c18bc1eaec30c06847da1.tar.gz firmware-a54da1b92663606f5e5c18bc1eaec30c06847da1.tar.bz2 firmware-a54da1b92663606f5e5c18bc1eaec30c06847da1.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'converter/usb_usb/main.cpp')
-rw-r--r-- | converter/usb_usb/main.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/converter/usb_usb/main.cpp b/converter/usb_usb/main.cpp index 20b7af66a..30fd3348a 100644 --- a/converter/usb_usb/main.cpp +++ b/converter/usb_usb/main.cpp @@ -8,11 +8,13 @@ #include "hid.h" #include "hidboot.h" #include "parser.h" +#include "usbhub.h" // LUFA #include "lufa.h" #include "timer.h" +#include "sendchar.h" #include "debug.h" #include "keyboard.h" @@ -22,6 +24,15 @@ static USB usb_host; static HIDBoot<HID_PROTOCOL_KEYBOARD> kbd(&usb_host); static KBDReportParser kbd_parser; +static USBHub hub1(&usb_host); // one hub is enough for HHKB pro2 +/* may be needed for other device with more hub +static USBHub hub2(&usb_host); +static USBHub hub3(&usb_host); +static USBHub hub4(&usb_host); +static USBHub hub5(&usb_host); +static USBHub hub6(&usb_host); +static USBHub hub7(&usb_host); +*/ static void LUFA_setup(void) { @@ -39,6 +50,7 @@ static void LUFA_setup(void) // for Console_Task USB_Device_EnableSOFEvents(); + print_set_sendchar(sendchar); } static void HID_setup() @@ -60,9 +72,11 @@ 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(); |