The simulator hadn't been updated for these changes

4 years ago · 290a4db2d4
parent cacca53496
commit 290a4db2d4
8 changed files with 7 additions and 13 deletions
--- a/src/kaleidoscope/device/virtual/DefaultHIDReportConsumer.cpp
+++ b/src/kaleidoscope/device/virtual/DefaultHIDReportConsumer.cpp
@ -17,7 +17,7 @@
 #ifdef KALEIDOSCOPE_VIRTUAL_BUILD

 #include "DefaultHIDReportConsumer.h"
-#include "MultiReport/Keyboard.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Keyboard.h"
 #include "Logging.h"

 #include "virtual_io.h"
--- a/testing/AbsoluteMouseReport.cpp
+++ b/testing/AbsoluteMouseReport.cpp
@ -21,7 +21,8 @@

 #include <cstring>

-#include "MouseButtons.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MouseButtons.h"
+

 namespace kaleidoscope {
 namespace testing {
--- a/testing/AbsoluteMouseReport.h
+++ b/testing/AbsoluteMouseReport.h
@ -19,8 +19,7 @@
 #include <cstdint>
 #include <vector>

-#include "DeviceAPIs/AbsoluteMouseAPI.h"
-#include "HID-Settings.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/DeviceAPIs/AbsoluteMouseAPI.h"

 namespace kaleidoscope {
 namespace testing {
--- a/testing/ConsumerControlReport.h
+++ b/testing/ConsumerControlReport.h
@ -19,8 +19,7 @@
 #include <cstdint>
 #include <vector>

-#include "HID-Settings.h"
-#include "MultiReport/ConsumerControl.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/ConsumerControl.h"

 namespace kaleidoscope {
 namespace testing {
--- a/testing/HIDState.cpp
+++ b/testing/HIDState.cpp
@ -16,8 +16,6 @@

 #include "testing/HIDState.h"

-#include "HID-Settings.h"
-
 #include "testing/fix-macros.h"

 // TODO(epan): Add proper logging.
--- a/testing/KeyboardReport.h
+++ b/testing/KeyboardReport.h
@ -19,8 +19,7 @@
 #include <cstdint>
 #include <vector>

-#include "HID-Settings.h"
-#include "MultiReport/Keyboard.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Keyboard.h"

 namespace kaleidoscope {
 namespace testing {
--- a/testing/SystemControlReport.h
+++ b/testing/SystemControlReport.h
@ -19,8 +19,7 @@
 #include <cstdint>
 #include <vector>

-#include "HID-Settings.h"
-#include "MultiReport/SystemControl.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/SystemControl.h"

 namespace kaleidoscope {
 namespace testing {
--- a/testing/makefiles/shared.mk
+++ b/testing/makefiles/shared.mk
@ -15,7 +15,6 @@ shared_includes := \
 		-I${top_dir} \
 		-I${top_dir}/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 \