X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=converter%2Fusb_usb%2Fmain.cpp;h=30fd3348a344b14c948374d41b08881890956a36;hb=b47450da9ffc1c296b3ba6ecd189fced0b7b8ed9;hp=00d2d59b6a4903a2a35a3ae61b6c7280802576fc;hpb=e7c030375ac76907206db7f09cf9208b0c7c6e66;p=max%2Ftmk_keyboard.git

diff --git a/converter/usb_usb/main.cpp b/converter/usb_usb/main.cpp
index 00d2d59b..30fd3348 100644
--- a/converter/usb_usb/main.cpp
+++ b/converter/usb_usb/main.cpp
@@ -2,17 +2,19 @@
 #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"
+#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()
@@ -59,11 +71,12 @@ 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();
@@ -71,19 +84,31 @@ int main(void)
     LUFA_setup();
     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 (;;) {
-        keyboard_proc();
+PORTF ^= (1<<7);
+        keyboard_task();
 
+timer = timer_read();
         usb_host.Task();
+timer = timer_elapsed(timer);
+if (timer > 100) {
+    debug("host.Task: "); debug_hex16(timer);  debug("\n");
+}
 
 #if !defined(INTERRUPT_CONTROL_ENDPOINT)
         // LUFA Task for control request