Fix header guard in tmk_core/common/command.h (#581)

[max/tmk_keyboard.git] / converter / usb_usb / main.cpp

diff --git a/converter/usb_usb/main.cpp b/converter/usb_usb/main.cpp
index 00d2d59b6a4903a2a35a3ae61b6c7280802576fc..76e88922cb41205243ce78da89263033ca48cc0b 100644 (file)
--- a/converter/usb_usb/main.cpp
+++ b/converter/usb_usb/main.cpp
@@ -2,26 +2,38 @@
 #include <avr/wdt.h>
 #include <avr/power.h>
 #include <util/delay.h>
-#include <Arduino.h>
-
-// USB HID host
-#include "Usb.h"
-#include "hid.h"
-#include "hidboot.h"
-#include "parser.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
 
-#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)
 {
@@ -30,7 +42,11 @@ static void LUFA_setup(void)
     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();
@@ -39,19 +55,10 @@ static void LUFA_setup(void)
 
     // for Console_Task
     USB_Device_EnableSOFEvents();
+    print_set_sendchar(sendchar);
 }
 
-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);
-}
+
 
 int main(void)
 {
@@ -59,37 +66,37 @@ int main(void)
     LED_TX_INIT;
     LED_TX_ON;
 
-    print_enable = true;
     debug_enable = true;
-    debug_matrix = true;
     debug_keyboard = true;
-    debug_mouse = 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);
     }
+*/
 
-    HID_setup();
-    
     debug("init: done\n");
-    for (;;) {
-        keyboard_proc();
 
-        usb_host.Task();
+    for (;;) {
+        keyboard_task();
 
 #if !defined(INTERRUPT_CONTROL_ENDPOINT)
         // LUFA Task for control request
         USB_USBTask();
 #endif
     }
-        
+
     return 0;
 }