X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=tmk_core%2Fprotocol%2Fusb_hid%2Fparser.cpp;h=bc2744d0f5e451fc75199327b6f9a1e4b10676eb;hb=12e5a3a13eb86852ad58c131e28ba29c5f09bb2d;hp=fe002c0d961d75fb72da070e5b8d959ca8ebd967;hpb=b47a88f4a5c3e054539f4113cdf13cf8d2c65545;p=max%2Ftmk_keyboard.git

diff --git a/tmk_core/protocol/usb_hid/parser.cpp b/tmk_core/protocol/usb_hid/parser.cpp
index fe002c0d..bc2744d0 100644
--- a/tmk_core/protocol/usb_hid/parser.cpp
+++ b/tmk_core/protocol/usb_hid/parser.cpp
@@ -1,33 +1,27 @@
 #include "parser.h"
 #include "usb_hid.h"
 
-#include "debug.h"
+#include "print.h"
 
 
-report_keyboard_t usb_hid_keyboard_report;
-uint16_t usb_hid_time_stamp;
-
-
-void KBDReportParser::Parse(HID *hid, bool is_rpt_id, uint8_t len, uint8_t *buf)
+void KBDReportParser::Parse(USBHID *hid, bool is_rpt_id, uint8_t len, uint8_t *buf)
 {
-    bool is_error = false;
-    report_keyboard_t *report = (report_keyboard_t *)buf;
-
-    dprintf("keyboard input:  %02X %02X", report->mods, report->reserved);
-    for (uint8_t i = 0; i < KEYBOARD_REPORT_KEYS; i++) {
-        if (IS_ERROR(report->keys[i])) {
-            is_error = true;
-        }
-        dprintf(" %02X", report->keys[i]);
+    xprintf("input %d:", hid->GetAddress());
+    for (uint8_t i = 0; i < len; i++) {
+        xprintf(" %02X", buf[i]);
     }
-    dprint("\r\n");
-
-    // ignore error and not send report to computer
-    if (is_error) {
-        dprint("Error usage! \r\n");
-        return;
+    xprintf("\r\n");
+
+    // Rollover error
+    // Cherry: 0101010101010101
+    // https://geekhack.org/index.php?topic=69169.msg2638223#msg2638223
+    // Apple:  0000010101010101
+    // https://geekhack.org/index.php?topic=69169.msg2760969#msg2760969
+    if (buf[2] == 0x01) {
+       xprintf("Rollover error: ignored\r\n");
+       return;
     }
 
-    ::memcpy(&usb_hid_keyboard_report, buf, sizeof(report_keyboard_t));
-    usb_hid_time_stamp = millis();
+    ::memcpy(&report, buf, sizeof(report_keyboard_t));
+    time_stamp = millis();
 }