X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=converter%2Fusb_usb%2Fmain.cpp;h=652c80573466b3498d29b41b2dfbef72a35d0c33;hb=6f5e8ce17e89005130cd0f9ecc6e346a77bb624b;hp=20b7af66a25a56b61f2db2f320a9383e3a872aaf;hpb=dd3ab65ec348370e789f4136af2c6cdb95c2532c;p=max%2Ftmk_keyboard.git

diff --git a/converter/usb_usb/main.cpp b/converter/usb_usb/main.cpp
index 20b7af66..652c8057 100644
--- a/converter/usb_usb/main.cpp
+++ b/converter/usb_usb/main.cpp
@@ -5,6 +5,7 @@
 
 // USB HID host
 #include "Usb.h"
+#include "usbhub.h"
 #include "hid.h"
 #include "hidboot.h"
 #include "parser.h"
@@ -13,15 +14,34 @@
 #include "lufa.h"
 
 #include "timer.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
 
-#include "leonardo_led.h"
-
-
-static USB     usb_host;
-static HIDBoot<HID_PROTOCOL_KEYBOARD>    kbd(&usb_host);
-static KBDReportParser kbd_parser;
 
 static void LUFA_setup(void)
 {
@@ -39,20 +59,27 @@ static void LUFA_setup(void)
 
     // for Console_Task
     USB_Device_EnableSOFEvents();
+    print_set_sendchar(sendchar);
 }
 
-static void HID_setup()
+
+
+/*
+ * 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)
 {
-    if (usb_host.Init() == -1) {
-        debug("HID init: failed\n");
-        LED_TX_OFF;
-    }
-  
-    _delay_ms(200);
-      
-    kbd.SetReportParser(0, (HIDReportParser*)&kbd_parser);
+    kbd.SetReport(0, 0, 2, 0, 1, &usb_led);
 }
 
+
+
 int main(void)
 {
     // LED for debug
@@ -60,33 +87,32 @@ 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();
+
+    // 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).
+     */
     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();
@@ -101,6 +127,6 @@ if (timer > 100) {
         USB_USBTask();
 #endif
     }
-        
+
     return 0;
 }