summary refs log tree commit diff
path: root/tmk_core/protocol/usb_hid/parser.cpp
diff options
context:
space:
mode:
authortmk <hasu@tmk-kbd.com>2015-07-15 16:02:20 +0900
committertmk <hasu@tmk-kbd.com>2015-07-15 16:02:20 +0900
commit1efdd867c8f88ad779ad82e1b22df62bf6be8fe9 (patch)
tree6ad07603ccc864eccba4eec5848ea49a114b1e5f /tmk_core/protocol/usb_hid/parser.cpp
parent6f5e8ce17e89005130cd0f9ecc6e346a77bb624b (diff)
usb_usb: Ignore error usage(0x01-03) report
Diffstat (limited to 'tmk_core/protocol/usb_hid/parser.cpp')
-rw-r--r--tmk_core/protocol/usb_hid/parser.cpp27
1 files changed, 18 insertions, 9 deletions
diff --git a/tmk_core/protocol/usb_hid/parser.cpp b/tmk_core/protocol/usb_hid/parser.cpp
index 28151f9d59..1a152ff3f2 100644
--- a/tmk_core/protocol/usb_hid/parser.cpp
+++ b/tmk_core/protocol/usb_hid/parser.cpp
@@ -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();
 }