Update testing infrastructure for new keyboardiohid driver

Signed-off-by: Michael Richters <gedankenexperimenter@gmail.com>

testing/AbsoluteMouseReport.cpp

@@ -19,7 +19,7 @@
 #include <cstring>  // for memcpy
 #include <vector>   // 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 {

testing/AbsoluteMouseReport.h

@@ -19,8 +19,8 @@
 #include <cstdint>  // for uint16_t, uint32_t, uint8_t, int8_t
 #include <vector>   // 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 {

testing/ConsumerControlReport.h

@@ -19,8 +19,8 @@
 #include <cstdint>  // for uint32_t, uint16_t, uint8_t
 #include <vector>   // 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 {

testing/KeyboardReport.h

@@ -19,8 +19,8 @@
 #include <cstdint>  // for uint8_t, uint32_t
 #include <vector>   // 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 {

testing/MouseReport.h

@@ -18,9 +18,9 @@
 
 #include <cstdint>  // 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 {

testing/SystemControlReport.h

@@ -19,8 +19,8 @@
 #include <cstdint>  // for uint8_t, uint32_t
 #include <vector>   // 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 {

testing/VirtualDeviceTest.cpp

@@ -22,8 +22,8 @@
 #include <bitset>  // for bitset
 #include <vector>  // 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

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 \