From 29da47a155de54bafe95247475d2a24f3788f299 Mon Sep 17 00:00:00 2001 From: Michael Richters Date: Mon, 28 Mar 2022 23:43:36 -0500 Subject: [PATCH] Update testing infrastructure for new keyboardiohid driver Signed-off-by: Michael Richters --- testing/AbsoluteMouseReport.cpp | 2 +- testing/AbsoluteMouseReport.h | 4 ++-- testing/ConsumerControlReport.h | 4 ++-- testing/KeyboardReport.h | 4 ++-- testing/MouseReport.h | 6 +++--- testing/SystemControlReport.h | 4 ++-- testing/VirtualDeviceTest.cpp | 2 +- testing/makefiles/shared.mk | 1 - 8 files changed, 13 insertions(+), 14 deletions(-) diff --git a/testing/AbsoluteMouseReport.cpp b/testing/AbsoluteMouseReport.cpp index 33f9e485..863dd20b 100644 --- a/testing/AbsoluteMouseReport.cpp +++ b/testing/AbsoluteMouseReport.cpp @@ -19,7 +19,7 @@ #include // for memcpy #include // for vector -#include "MouseButtons.h" // for MOUSE_LEFT, MOUSE_MIDDLE, MOUSE_NEXT, MOUSE_PREV, MOUS... +#include "kaleidoscope/driver/hid/keyboardio/usb/MouseButtons.h" #include "kaleidoscope/Runtime.h" // for Runtime, Runtime_ namespace kaleidoscope { diff --git a/testing/AbsoluteMouseReport.h b/testing/AbsoluteMouseReport.h index cc204aa3..81c8fa13 100644 --- a/testing/AbsoluteMouseReport.h +++ b/testing/AbsoluteMouseReport.h @@ -19,8 +19,8 @@ #include // for uint16_t, uint32_t, uint8_t, int8_t #include // for vector -#include "DeviceAPIs/AbsoluteMouseAPI.h" // for HID_MouseAbsoluteReport_Data_t -#include "HID-Settings.h" // for HID_REPORTID_MOUSE_ABSOLUTE +#include "kaleidoscope/driver/hid/keyboardio/usb/DeviceAPIs/AbsoluteMouseAPI.h" +#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h" namespace kaleidoscope { namespace testing { diff --git a/testing/ConsumerControlReport.h b/testing/ConsumerControlReport.h index 93ca97d9..4a93a674 100644 --- a/testing/ConsumerControlReport.h +++ b/testing/ConsumerControlReport.h @@ -19,8 +19,8 @@ #include // for uint32_t, uint16_t, uint8_t #include // for vector -#include "HID-Settings.h" // for HID_REPORTID_CONSUMERCONTROL -#include "MultiReport/ConsumerControl.h" // for HID_ConsumerControlReport_Data_t +#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h" +#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/ConsumerControl.h" namespace kaleidoscope { namespace testing { diff --git a/testing/KeyboardReport.h b/testing/KeyboardReport.h index 47d06e77..52a4f782 100644 --- a/testing/KeyboardReport.h +++ b/testing/KeyboardReport.h @@ -19,8 +19,8 @@ #include // for uint8_t, uint32_t #include // for vector -#include "HID-Settings.h" // for HID_REPORTID_NKRO_KEYBOARD -#include "MultiReport/Keyboard.h" // for HID_KeyboardReport_Data_t +#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h" +#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Keyboard.h" namespace kaleidoscope { namespace testing { diff --git a/testing/MouseReport.h b/testing/MouseReport.h index aa0f9333..ae84d460 100644 --- a/testing/MouseReport.h +++ b/testing/MouseReport.h @@ -18,9 +18,9 @@ #include // for uint8_t, int8_t, uint32_t -#include "HID-Settings.h" // for HID_REPORTID_MOUSE -#include "MouseButtons.h" // for MOUSE_LEFT, MOUSE_MIDDLE, MOUSE_NEXT, MOUSE_PREV, MOUSE_R... -#include "MultiReport/Mouse.h" // for HID_MouseReport_Data_t +#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h" // for HID_REPORTID_MOUSE +#include "kaleidoscope/driver/hid/keyboardio/usb/MouseButtons.h" // for MOUSE_LEFT, MOUSE_MIDDLE, MOUSE_NEXT, MOUSE_PREV, MOUSE_R... +#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Mouse.h" // for HID_MouseReport_Data_t namespace kaleidoscope { namespace testing { diff --git a/testing/SystemControlReport.h b/testing/SystemControlReport.h index 741c565e..9fa7989b 100644 --- a/testing/SystemControlReport.h +++ b/testing/SystemControlReport.h @@ -19,8 +19,8 @@ #include // for uint8_t, uint32_t #include // for vector -#include "HID-Settings.h" // for HID_REPORTID_SYSTEMCONTROL -#include "MultiReport/SystemControl.h" // for HID_SystemControlReport_Data_t +#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h" // for HID_REPORTID_SYSTEMCONTROL +#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/SystemControl.h" // for HID_SystemControlReport_Data_t namespace kaleidoscope { namespace testing { diff --git a/testing/VirtualDeviceTest.cpp b/testing/VirtualDeviceTest.cpp index 0bf3282e..b0c6717f 100644 --- a/testing/VirtualDeviceTest.cpp +++ b/testing/VirtualDeviceTest.cpp @@ -22,8 +22,8 @@ #include // for bitset #include // for vector -#include "HIDReportObserver.h" // for HIDReportObserver #include "kaleidoscope/Runtime.h" // for Runtime, Runtime_ +#include "kaleidoscope/driver/hid/keyboardio/usb/HIDReportObserver.h" // for HIDReportObserver #include "testing/HIDState.h" // for HIDState, HIDStateBuilder #include "testing/KeyboardReport.h" // for KeyboardReport #include "testing/MouseReport.h" // for MouseReport diff --git a/testing/makefiles/shared.mk b/testing/makefiles/shared.mk index ee75c244..44e5497d 100644 --- a/testing/makefiles/shared.mk +++ b/testing/makefiles/shared.mk @@ -16,7 +16,6 @@ shared_includes := \ -I${top_dir}/src \ -I${top_dir}/plugins/Kaleidoscope-Hardware-Keyboardio-Model01/src \ -I${arduino_platform_path}/cores/arduino \ - -I${arduino_platform_path}/libraries/KeyboardioHID/src \ -I${top_dir}/testing/googletest/googlemock/include \ -I${top_dir}/testing/googletest/googletest/include \