diff options
| -rw-r--r-- | converter/usb_usb/Makefile | 1 | ||||
| -rw-r--r-- | converter/usb_usb/led.c | 24 | ||||
| -rw-r--r-- | converter/usb_usb/main.cpp | 44 | ||||
| -rw-r--r-- | tmk_core/common/led.h | 8 |
4 files changed, 30 insertions, 47 deletions
diff --git a/converter/usb_usb/Makefile b/converter/usb_usb/Makefile index f1a1c24d36..0f25232b25 100644 --- a/converter/usb_usb/Makefile +++ b/converter/usb_usb/Makefile @@ -111,7 +111,6 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096 SRC = \ keymap_common.c \ matrix.c \ - led.c \ main.cpp ifdef KEYMAP diff --git a/converter/usb_usb/led.c b/converter/usb_usb/led.c deleted file mode 100644 index fc0eeb0ff7..0000000000 --- a/converter/usb_usb/led.c +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include "stdint.h" -#include "led.h" - - -void led_set(uint8_t usb_led) -{ -} diff --git a/converter/usb_usb/main.cpp b/converter/usb_usb/main.cpp index 57a5de3d35..652c805734 100644 --- a/converter/usb_usb/main.cpp +++ b/converter/usb_usb/main.cpp @@ -5,10 +5,10 @@ // USB HID host #include "Usb.h" +#include "usbhub.h" #include "hid.h" #include "hidboot.h" #include "parser.h" -#include "usbhub.h" // LUFA #include "lufa.h" @@ -17,6 +17,7 @@ #include "sendchar.h" #include "debug.h" #include "keyboard.h" +#include "led.h" /* LED ping configuration */ @@ -42,19 +43,6 @@ #endif -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) { /* Disable watchdog if enabled by bootloader/fuses */ @@ -74,17 +62,24 @@ static void LUFA_setup(void) print_set_sendchar(sendchar); } -static void HID_setup() -{ - if (usb_host.Init() == -1) { - LED_TX_OFF; - } - _delay_ms(200); - kbd.SetReportParser(0, (HIDReportParser*)&kbd_parser); +/* + * USB Host Shield HID keyboard + */ +USB usb_host; +USBHub hub1(&usb_host); +HIDBoot<HID_PROTOCOL_KEYBOARD> kbd(&usb_host); +KBDReportParser kbd_parser; + + +void led_set(uint8_t usb_led) +{ + kbd.SetReport(0, 0, 2, 0, 1, &usb_led); } + + int main(void) { // LED for debug @@ -92,12 +87,17 @@ int main(void) LED_TX_ON; debug_enable = true; + debug_keyboard = true; host_set_driver(&lufa_driver); keyboard_init(); LUFA_setup(); - HID_setup(); + + // USB Host Shield setup + usb_host.Init(); + kbd.SetReportParser(0, (HIDReportParser*)&kbd_parser); + /* NOTE: Don't insert time consuming job here. * It'll cause unclear initialization failure when DFU reset(worm start). */ diff --git a/tmk_core/common/led.h b/tmk_core/common/led.h index 402a247b9a..d5fc051bf5 100644 --- a/tmk_core/common/led.h +++ b/tmk_core/common/led.h @@ -28,6 +28,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define USB_LED_KANA 4 +#ifdef __cplusplus +extern "C" { +#endif + void led_set(uint8_t usb_led); +#ifdef __cplusplus +} +#endif + #endif |