From fe91906163678c1cff564d8151612af0379c64e3 Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Fri, 15 Oct 2021 21:04:40 +0200 Subject: [PATCH] wip Signed-off-by: Gergely Nagy --- .../src/kaleidoscope/device/keyboardio/Model100.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/plugins/Kaleidoscope-Hardware-Keyboardio-Model100/src/kaleidoscope/device/keyboardio/Model100.h b/plugins/Kaleidoscope-Hardware-Keyboardio-Model100/src/kaleidoscope/device/keyboardio/Model100.h index 92531a9d..cb83fd69 100644 --- a/plugins/Kaleidoscope-Hardware-Keyboardio-Model100/src/kaleidoscope/device/keyboardio/Model100.h +++ b/plugins/Kaleidoscope-Hardware-Keyboardio-Model100/src/kaleidoscope/device/keyboardio/Model100.h @@ -37,11 +37,10 @@ struct cRGB { #include "kaleidoscope/driver/keyscanner/Base.h" -#include "kaleidoscope/driver/storage/GD32Flash.h" +#include "kaleidoscope/driver/hid/RCMComposite.h" #include "kaleidoscope/driver/keyboardio/Model100Side.h" #include "kaleidoscope/driver/led/Base.h" #include "kaleidoscope/device/Base.h" -#include "kaleidoscope/driver/bootloader/gd32/Base.h" namespace kaleidoscope { namespace device { @@ -124,9 +123,8 @@ struct Model100Props : public kaleidoscope::device::BaseProps { typedef Model100KeyScannerProps KeyScannerProps; typedef Model100KeyScanner KeyScanner; typedef Model100StorageProps StorageProps; - typedef kaleidoscope::driver::storage::GD32Flash Storage; - - typedef kaleidoscope::driver::bootloader::gd32::Base BootLoader; + typedef kaleidoscope::driver::hid::RCMCompositeProps HIDProps; + typedef kaleidoscope::driver::hid::RCMComposite HID; static constexpr const char *short_name = "kbio100"; }; @@ -136,6 +134,10 @@ class Model100 : public kaleidoscope::device::Base { public: void setup(); + auto serialPort() -> decltype(kaleidoscope::driver::hid::rcmcomposite::CompositeSerial) & { + return kaleidoscope::driver::hid::rcmcomposite::CompositeSerial; + } + static void enableHardwareTestMode(); };