X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=converter%2Fusb_usb%2Fusb_usb.cpp;h=625a3b827993b3beb6431f264e1dee0c628eb1f8;hb=3e8289b53ce929484651fc065fb5f718e4e3ae21;hp=969e89f357673feb4c9b7d12a7625426bc179234;hpb=148c6a517549973a622f7df91f95e525550cd520;p=max%2Ftmk_keyboard.git

diff --git a/converter/usb_usb/usb_usb.cpp b/converter/usb_usb/usb_usb.cpp
index 969e89f3..625a3b82 100644
--- a/converter/usb_usb/usb_usb.cpp
+++ b/converter/usb_usb/usb_usb.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // USB HID host
 #include "Usb.h"
 #include "usbhub.h"
-#include "hid.h"
+#include "usbhid.h"
 #include "hidboot.h"
 #include "parser.h"
 
@@ -32,6 +32,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "timer.h"
 #include "matrix.h"
 #include "led.h"
+#include "host.h"
+#include "keyboard.h"
+
+#include "hook.h"
+#include "suspend.h"
+#include "lufa.h"
 
 
 /* KEY CODE to Matrix
@@ -69,22 +75,23 @@ static bool matrix_is_mod =false;
  * This supports two cascaded hubs and four keyboards
  */
 USB usb_host;
-USBHub hub1(&usb_host);
-USBHub hub2(&usb_host);
-HIDBoot<HID_PROTOCOL_KEYBOARD>    kbd1(&usb_host);
-HIDBoot<HID_PROTOCOL_KEYBOARD>    kbd2(&usb_host);
-HIDBoot<HID_PROTOCOL_KEYBOARD>    kbd3(&usb_host);
-HIDBoot<HID_PROTOCOL_KEYBOARD>    kbd4(&usb_host);
+HIDBoot<USB_HID_PROTOCOL_KEYBOARD>    kbd1(&usb_host);
+HIDBoot<USB_HID_PROTOCOL_KEYBOARD>    kbd2(&usb_host);
+HIDBoot<USB_HID_PROTOCOL_KEYBOARD>    kbd3(&usb_host);
+HIDBoot<USB_HID_PROTOCOL_KEYBOARD>    kbd4(&usb_host);
 KBDReportParser kbd_parser1;
 KBDReportParser kbd_parser2;
 KBDReportParser kbd_parser3;
 KBDReportParser kbd_parser4;
+USBHub hub1(&usb_host);
+USBHub hub2(&usb_host);
 
 
 uint8_t matrix_rows(void) { return MATRIX_ROWS; }
 uint8_t matrix_cols(void) { return MATRIX_COLS; }
 bool matrix_has_ghost(void) { return false; }
 void matrix_init(void) {
+    debug_enable = true;
     // USB Host Shield setup
     usb_host.Init();
     kbd1.SetReportParser(0, (HIDReportParser*)&kbd_parser1);
@@ -133,12 +140,6 @@ uint8_t matrix_scan(void) {
         or_report(kbd_parser4.report);
 
         matrix_is_mod = true;
-
-        dprintf("state:  %02X %02X", keyboard_report.mods, keyboard_report.reserved);
-        for (uint8_t i = 0; i < KEYBOARD_REPORT_KEYS; i++) {
-            dprintf(" %02X", keyboard_report.keys[i]);
-        }
-        dprint("\r\n");
     } else {
         matrix_is_mod = false;
     }
@@ -148,9 +149,20 @@ uint8_t matrix_scan(void) {
     usb_host.Task();
     timer = timer_elapsed(timer);
     if (timer > 100) {
-        dprintf("host.Task: %d\n", timer);
+        xprintf("host.Task: %d\n", timer);
     }
 
+    static uint8_t usb_state = 0;
+    if (usb_state != usb_host.getUsbTaskState()) {
+        usb_state = usb_host.getUsbTaskState();
+        xprintf("usb_state: %02X\n", usb_state);
+
+        // restore LED state when keyboard comes up
+        if (usb_state == USB_STATE_RUNNING) {
+            xprintf("speed: %s\n", usb_host.getVbusState()==FSHOST ? "full" : "low");
+            keyboard_set_leds(host_keyboard_leds());
+        }
+    }
     return 1;
 }
 
@@ -204,18 +216,30 @@ uint8_t matrix_key_count(void) {
 }
 
 void matrix_print(void) {
-    print("\nr/c 0123456789ABCDEF\n");
-    for (uint8_t row = 0; row < matrix_rows(); row++) {
-        xprintf("%02d: ", row);
-        print_bin_reverse16(matrix_get_row(row));
-        print("\n");
-    }
 }
 
 void led_set(uint8_t usb_led)
 {
-    kbd1.SetReport(0, 0, 2, 0, 1, &usb_led);
-    kbd2.SetReport(0, 0, 2, 0, 1, &usb_led);
-    kbd3.SetReport(0, 0, 2, 0, 1, &usb_led);
-    kbd4.SetReport(0, 0, 2, 0, 1, &usb_led);
+    if (kbd1.isReady()) kbd1.SetReport(0, 0, 2, 0, 1, &usb_led);
+    if (kbd2.isReady()) kbd2.SetReport(0, 0, 2, 0, 1, &usb_led);
+    if (kbd3.isReady()) kbd3.SetReport(0, 0, 2, 0, 1, &usb_led);
+    if (kbd4.isReady()) kbd4.SetReport(0, 0, 2, 0, 1, &usb_led);
+}
+
+// We need to keep doing UHS2 USB::Task() to initialize keyboard
+// even during USB bus is suspended and remote wakeup is not enabled yet on LUFA side.
+// This situation can happen just after pluging converter into USB port.
+void hook_usb_suspend_loop(void)
+{
+#ifndef TMK_LUFA_DEBUG_UART
+    // This corrupts debug print when suspend
+    suspend_power_down();
+#endif
+    if (USB_Device_RemoteWakeupEnabled) {
+        if (suspend_wakeup_condition()) {
+            USB_Device_SendRemoteWakeup();
+        }
+    } else {
+        matrix_scan();
+    }
 }