X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=tmk_core%2Fprotocol%2Fusb_hid%2Fparser.cpp;h=81a5bfa6515d6cda19f2b93adfc16e142ea246d4;hb=feebc2356304ef45ed12924673bd09ae20acb113;hp=fe002c0d961d75fb72da070e5b8d959ca8ebd967;hpb=aa44c779ecec4ca569b2fa11ed41413515f62755;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..81a5bfa6 100644 --- a/tmk_core/protocol/usb_hid/parser.cpp +++ b/tmk_core/protocol/usb_hid/parser.cpp @@ -4,30 +4,21 @@ #include "debug.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]); + dprintf("input %d:", hid->GetAddress()); + for (uint8_t i = 0; i < len; i++) { + dprintf(" %02X", buf[i]); } dprint("\r\n"); - // ignore error and not send report to computer - if (is_error) { - dprint("Error usage! \r\n"); - return; + // ignore Cherry 0101010101010101 bug report + // https://geekhack.org/index.php?topic=69169.msg2638223#msg2638223 + if (buf[1] == 0x01) { + dprint("Cherry bug: 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(); }