From 7e6ed71583d58a47d9a6b17950620a3931bce08b Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Thu, 21 Oct 2021 11:59:45 +0200 Subject: [PATCH] Revert "wip for macOS testing" This reverts commit 8292a2d92f41765a8be75b63693bd27aebfcf457. --- src/kaleidoscope/driver/hid/RCMComposite.cpp | 2 +- src/kaleidoscope/driver/hid/RCMComposite.h | 2 +- src/kaleidoscope/driver/hid/rcmcomposite/Keyboard.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/kaleidoscope/driver/hid/RCMComposite.cpp b/src/kaleidoscope/driver/hid/RCMComposite.cpp index 213cfe06..2d1b2271 100644 --- a/src/kaleidoscope/driver/hid/RCMComposite.cpp +++ b/src/kaleidoscope/driver/hid/RCMComposite.cpp @@ -23,7 +23,7 @@ namespace hid { namespace rcmcomposite { USBHID RCMHID; -HIDKeyboard RCMBootKeyboard(RCMHID); +HIDKeyboard RCMBootKeyboard(RCMHID, 1); HIDConsumer RCMConsumer(RCMHID); HIDMouse RCMMouse(RCMHID); USBCompositeSerial CompositeSerial; diff --git a/src/kaleidoscope/driver/hid/RCMComposite.h b/src/kaleidoscope/driver/hid/RCMComposite.h index 7b501648..8ce637d2 100644 --- a/src/kaleidoscope/driver/hid/RCMComposite.h +++ b/src/kaleidoscope/driver/hid/RCMComposite.h @@ -35,7 +35,7 @@ extern USBHID RCMHID; extern USBCompositeSerial CompositeSerial; const uint8_t report_description_[] = { - HID_KEYBOARD_REPORT_DESCRIPTOR(), + HID_BOOT_KEYBOARD_REPORT_DESCRIPTOR(), HID_CONSUMER_REPORT_DESCRIPTOR(), HID_MOUSE_REPORT_DESCRIPTOR() }; diff --git a/src/kaleidoscope/driver/hid/rcmcomposite/Keyboard.h b/src/kaleidoscope/driver/hid/rcmcomposite/Keyboard.h index 380f1e07..27f278e6 100644 --- a/src/kaleidoscope/driver/hid/rcmcomposite/Keyboard.h +++ b/src/kaleidoscope/driver/hid/rcmcomposite/Keyboard.h @@ -37,7 +37,7 @@ class BootKeyboardWrapper { void begin() {} uint8_t getProtocol() { - return 1; + return 0; } void setProtocol(uint8_t protocol) {} void setDefaultProtocol(uint8_t protocol) {}