]> git.friedersdorff.com Git - max/tmk_keyboard.git/commitdiff
usb_usb: Ignore error usage(0x01-03) report
authortmk <hasu@tmk-kbd.com>
Wed, 15 Jul 2015 07:02:20 +0000 (16:02 +0900)
committertmk <hasu@tmk-kbd.com>
Wed, 15 Jul 2015 07:02:20 +0000 (16:02 +0900)
tmk_core/protocol/usb_hid/parser.cpp

index 28151f9d59369e5192129f249bc892db62c3a8f1..1a152ff3f2a1a7f82fb3cd300d21ae5e20b8070c 100644 (file)
@@ -10,15 +10,24 @@ uint16_t usb_hid_time_stamp;
 
 void KBDReportParser::Parse(HID *hid, bool is_rpt_id, uint8_t len, uint8_t *buf)
 {
-    ::memcpy(&usb_hid_keyboard_report, buf, sizeof(report_keyboard_t));
-    usb_hid_time_stamp = millis();
+    bool is_error = false;
+    report_keyboard_t *report = (report_keyboard_t *)buf;
+
+    dprintf("KBDReport: %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]);
+    }
+    dprint("\r\n");
 
-    debug("KBDReport: ");
-    debug_hex(usb_hid_keyboard_report.mods);
-    debug(" --");
-    for (uint8_t i = 0; i < 6; i++) {
-        debug(" ");
-        debug_hex(usb_hid_keyboard_report.keys[i]);
+    // ignore error and not send report to computer
+    if (is_error) {
+        dprint("Error usage! \r\n");
+        return;
     }
-    debug("\r\n");
+
+    ::memcpy(&usb_hid_keyboard_report, buf, sizeof(report_keyboard_t));
+    usb_hid_time_stamp = millis();
 }