X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=tmk_core%2Fprotocol%2Fusb_hid%2Fparser.cpp;h=bc2744d0f5e451fc75199327b6f9a1e4b10676eb;hb=9bb5b42a460f71c469cbfd1c591f3bf8c9de3269;hp=94e747ca4b8313f9e17a3a523c531b103151aef7;hpb=34f376868e97c017628dc7513f5bac5fcb1ee00e;p=max%2Ftmk_keyboard.git diff --git a/tmk_core/protocol/usb_hid/parser.cpp b/tmk_core/protocol/usb_hid/parser.cpp index 94e747ca..bc2744d0 100644 --- a/tmk_core/protocol/usb_hid/parser.cpp +++ b/tmk_core/protocol/usb_hid/parser.cpp @@ -1,17 +1,27 @@ #include "parser.h" #include "usb_hid.h" -#include "debug.h" +#include "print.h" -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) { - ::memcpy(&report, buf, sizeof(report_keyboard_t)); - time_stamp = millis(); + xprintf("input %d:", hid->GetAddress()); + for (uint8_t i = 0; i < len; i++) { + xprintf(" %02X", buf[i]); + } + xprintf("\r\n"); - dprintf("input %d: %02X %02X", hid->GetAddress(), report.mods, report.reserved); - for (uint8_t i = 0; i < KEYBOARD_REPORT_KEYS; i++) { - dprintf(" %02X", report.keys[i]); + // 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; } - dprint("\r\n"); + + ::memcpy(&report, buf, sizeof(report_keyboard_t)); + time_stamp = millis(); }