Instead of including the KeyboardioHID facade, include the base class…

…es instead while we add the TinyUSB port. TODO: this probably breaks everything
keyboardio · Nov 14, 2023 · 82f8692 · 82f8692
1 parent cc92a64
commit 82f8692
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/plugins/Kaleidoscope-HardwareTestMode/src/kaleidoscope/plugin/HardwareTestMode.cpp b/plugins/Kaleidoscope-HardwareTestMode/src/kaleidoscope/plugin/HardwareTestMode.cpp
@@ -21,7 +21,7 @@
 #include "kaleidoscope/KeyAddr.h"                         // for MatrixAddr, MatrixAddr<>::Range
 #include "kaleidoscope/Runtime.h"                         // for Runtime, Runtime_
 #include "kaleidoscope/device/device.h"                   // for Device, cRGB, CRGB, Base<>::HID
-#include "kaleidoscope/driver/hid/keyboardio/Keyboard.h"  // for Keyboard
+#include "kaleidoscope/driver/hid/base/Keyboard.h"  // for Keyboard
 #include "kaleidoscope/plugin/LEDControl.h"               // for LEDControl
 #include "kaleidoscope/plugin/LEDControl/LEDUtils.h"      // for hsvToRgb
 

diff --git a/plugins/Kaleidoscope-MouseKeys/src/kaleidoscope/plugin/MouseKeys.cpp b/plugins/Kaleidoscope-MouseKeys/src/kaleidoscope/plugin/MouseKeys.cpp
@@ -23,8 +23,8 @@
 #include "kaleidoscope/KeyEvent.h"                             // for KeyEvent
 #include "kaleidoscope/Runtime.h"                              // for Runtime, Runtime_
 #include "kaleidoscope/device/device.h"                        // for Base<>::HID, VirtualProps:...
-#include "kaleidoscope/driver/hid/keyboardio/AbsoluteMouse.h"  // for AbsoluteMouse
-#include "kaleidoscope/driver/hid/keyboardio/Mouse.h"          // for Mouse
+#include "kaleidoscope/driver/hid/base/AbsoluteMouse.h"  // for AbsoluteMouse
+#include "kaleidoscope/driver/hid/base/Mouse.h"          // for Mouse
 #include "kaleidoscope/event_handler_result.h"                 // for EventHandlerResult, EventH...
 #include "kaleidoscope/key_defs.h"                             // for Key, SYNTHETIC
 #include "kaleidoscope/keyswitch_state.h"                      // for keyToggledOn

diff --git a/plugins/Kaleidoscope-MouseKeys/src/kaleidoscope/plugin/mousekeys/MouseWrapper.cpp b/plugins/Kaleidoscope-MouseKeys/src/kaleidoscope/plugin/mousekeys/MouseWrapper.cpp
@@ -21,7 +21,7 @@
 
 #include "kaleidoscope/Runtime.h"                              // for Runtime, Runtime_
 #include "kaleidoscope/device/device.h"                        // for Base<>::HID, VirtualProps:...
-#include "kaleidoscope/driver/hid/keyboardio/AbsoluteMouse.h"  // for AbsoluteMouse
+#include "kaleidoscope/driver/hid/base/AbsoluteMouse.h"  // for AbsoluteMouse
 
 namespace kaleidoscope {
 namespace plugin {

diff --git a/plugins/Kaleidoscope-USB-Quirks/src/kaleidoscope/plugin/USB-Quirks.cpp b/plugins/Kaleidoscope-USB-Quirks/src/kaleidoscope/plugin/USB-Quirks.cpp
@@ -22,7 +22,7 @@
 
 #include "kaleidoscope/Runtime.h"                         // for Runtime, Runtime_
 #include "kaleidoscope/device/device.h"                   // for Base<>::HID, VirtualProps::HID
-#include "kaleidoscope/driver/hid/keyboardio/Keyboard.h"  // for Keyboard
+#include "kaleidoscope/driver/hid/base/Keyboard.h"  // for Keyboard
 
 namespace kaleidoscope {
 namespace plugin {

diff --git a/src/kaleidoscope/Runtime.cpp b/src/kaleidoscope/Runtime.cpp
@@ -23,7 +23,7 @@
 #include "kaleidoscope/KeyEvent.h"                        // for KeyEvent
 #include "kaleidoscope/LiveKeys.h"                        // for LiveKeys, live_keys
 #include "kaleidoscope/device/device.h"                   // for Base<>::HID, VirtualProps::HID
-#include "kaleidoscope/driver/hid/keyboardio/Keyboard.h"  // for Keyboard
+#include "kaleidoscope/driver/hid/base/Keyboard.h"  // for Keyboard
 #include "kaleidoscope/keyswitch_state.h"                 // for keyToggledOff, keyToggledOn
 #include "kaleidoscope/layers.h"                          // for Layer, Layer_