Adapt KeyboardioHID as a Kaleidoscope driver

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

src/kaleidoscope/driver/hid/keyboardio/Keyboard.h

@@ -17,11 +17,13 @@
 
 #pragma once
 
-#include <KeyboardioHID.h>  // for BootKeyboard, BootKeyboard_, Keyboard
 #include <stdint.h>         // for uint8_t, uint16_t
 
-// From Kaleidoscope:
-#include "kaleidoscope/driver/hid/base/Keyboard.h"  // for Keyboard, KeyboardProps
+#include "kaleidoscope/driver/hid/base/Keyboard.h"  // for Keyboard, Keyboar...
+#include "kaleidoscope/driver/hid/keyboardio/usb/BootKeyboard/BootKeyboard.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/ConsumerControl.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Keyboard.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/SystemControl.h"
 
 namespace kaleidoscope {
 namespace driver {

src/kaleidoscope/driver/hid/keyboardio/Mouse.h

@@ -17,11 +17,10 @@
 
 #pragma once
 
-#include <KeyboardioHID.h>  // for HID_MouseReport_Data_t, (anonymous union...
 #include <stdint.h>         // for int8_t, uint8_t
 
-// From Kaleidoscope:
 #include "kaleidoscope/driver/hid/base/Mouse.h"  // for Mouse, MouseProps
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Mouse.h"
 
 namespace kaleidoscope {
 namespace driver {

src/kaleidoscope/driver/hid/keyboardio/usb/BootKeyboard/BootKeyboard.cpp

@@ -23,9 +23,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "BootKeyboard.h"
-#include "DescriptorPrimitives.h"
-#include "HIDReportObserver.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/BootKeyboard/BootKeyboard.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HIDReportObserver.h"
 
 // See Appendix B of USB HID spec
 static const uint8_t boot_keyboard_hid_descriptor_[] PROGMEM = {

src/kaleidoscope/driver/hid/keyboardio/usb/BootKeyboard/BootKeyboard.h

@@ -27,9 +27,10 @@ THE SOFTWARE.
 #pragma once
 
 #include <Arduino.h>
-#include "HID.h"
-#include "HIDTables.h"
-#include "HIDAliases.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HIDAliases.h"
+#include "kaleidoscope/HIDTables.h"
 
 typedef union {
   // Low level key report: up to 6 keys and shift, ctrl etc at once

src/kaleidoscope/driver/hid/keyboardio/usb/DeviceAPIs/AbsoluteMouseAPI.h

@@ -27,10 +27,10 @@ THE SOFTWARE.
 #pragma once
 
 #include <Arduino.h>
-#include "HID.h"
-#include "HID-Settings.h"
-#include "MouseButtons.h"
-#include "DescriptorPrimitives.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MouseButtons.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h"
 
 
 #define DESCRIPTOR_ABS_MOUSE_BUTTONS \

src/kaleidoscope/driver/hid/keyboardio/usb/HIDAliases.h

@@ -25,7 +25,7 @@ THE SOFTWARE.
 
 #pragma once
 
-#include "HIDTables.h"
+#include "kaleidoscope/HIDTables.h"
 
 #define HID_FIRST_KEY HID_KEYBOARD_NO_EVENT
 #define HID_LAST_KEY HID_KEYPAD_HEXADECIMAL

src/kaleidoscope/driver/hid/keyboardio/usb/HIDReportObserver.cpp

@@ -22,6 +22,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "HIDReportObserver.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HIDReportObserver.h"
 
 HIDReportObserver::SendReportHook HIDReportObserver::send_report_hook_ = nullptr;

src/kaleidoscope/driver/hid/keyboardio/usb/HID_.cpp

@@ -18,8 +18,8 @@
 
 #ifndef KEYBOARDIOHID_BUILD_WITHOUT_HID
 
-#include "HID.h"
-#include "HIDReportObserver.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HIDReportObserver.h"
 
 #if defined(USBCON)
 

src/kaleidoscope/driver/hid/keyboardio/usb/HID_.h

@@ -21,7 +21,7 @@
 
 #include <stdint.h>
 #include <Arduino.h>
-#include "HID-Settings.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
 
 #if defined(USBCON)
 

src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/AbsoluteMouse.cpp

@@ -23,8 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "AbsoluteMouse.h"
-#include "DescriptorPrimitives.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/AbsoluteMouse.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h"
 
 static const uint8_t absolute_mouse_hid_descriptor_[] PROGMEM = {
   /*  Mouse absolute */

src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/AbsoluteMouse.h

@@ -27,9 +27,9 @@ THE SOFTWARE.
 #pragma once
 
 #include <Arduino.h>
-#include "HID.h"
-#include "HID-Settings.h"
-#include "../DeviceAPIs/AbsoluteMouseAPI.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/DeviceAPIs/AbsoluteMouseAPI.h"
 
 class AbsoluteMouse_ : public AbsoluteMouseAPI {
  public:

src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/ConsumerControl.cpp

@@ -23,8 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "ConsumerControl.h"
-#include "DescriptorPrimitives.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/ConsumerControl.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h"
 
 static const uint8_t consumer_control_hid_descriptor_[] PROGMEM = {
   /* Consumer Control (Sound/Media keys) */

src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/ConsumerControl.h

@@ -27,8 +27,8 @@ THE SOFTWARE.
 #pragma once
 
 #include <Arduino.h>
-#include "HID.h"
-#include "HID-Settings.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
 
 typedef union {
   // Every usable Consumer key possible, up to 4 keys presses possible

src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Gamepad.cpp

@@ -23,8 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "Gamepad.h"
-#include "DescriptorPrimitives.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Gamepad.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h"
 
 static const uint8_t gamepad_hid_descriptor_[] PROGMEM = {
   /* Gamepad with 32 buttons and 6 axis*/

src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Gamepad.h

@@ -27,8 +27,8 @@ THE SOFTWARE.
 #pragma once
 
 #include <Arduino.h>
-#include "HID.h"
-#include "HID-Settings.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
 
 // Dpad directions
 #define GAMEPAD_DPAD_CENTERED 0

src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Keyboard.cpp

@@ -23,8 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "Keyboard.h"
-#include "DescriptorPrimitives.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Keyboard.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h"
 
 static const uint8_t nkro_keyboard_hid_descriptor_[] PROGMEM = {
   //  NKRO Keyboard

src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Keyboard.h

@@ -27,11 +27,11 @@ THE SOFTWARE.
 #pragma once
 
 #include <Arduino.h>
-#include "HID.h"
-#include "HID-Settings.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
 
-#include "HIDTables.h"
-#include "HIDAliases.h"
+#include "kaleidoscope/HIDTables.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HIDAliases.h"
 
 #define KEY_BYTES 28
 

src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Mouse.cpp

@@ -23,8 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "Mouse.h"
-#include "DescriptorPrimitives.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Mouse.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h"
 
 static const uint8_t mouse_hid_descriptor_[] PROGMEM = {
   /*  Mouse relative */

src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/Mouse.h

@@ -27,9 +27,9 @@ THE SOFTWARE.
 #pragma once
 
 #include <Arduino.h>
-#include "HID.h"
-#include "HID-Settings.h"
-#include "../MouseButtons.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MouseButtons.h"
 
 typedef union {
   // Mouse report: 8 buttons, position, wheel

src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/SystemControl.cpp

@@ -23,8 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "SystemControl.h"
-#include "DescriptorPrimitives.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/MultiReport/SystemControl.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/DescriptorPrimitives.h"
 
 static const uint8_t system_control_hid_descriptor_[] PROGMEM = {
   //TODO limit to system keys only?

src/kaleidoscope/driver/hid/keyboardio/usb/MultiReport/SystemControl.h

@@ -27,9 +27,9 @@ THE SOFTWARE.
 #pragma once
 
 #include <Arduino.h>
-#include "HID.h"
-#include "HID-Settings.h"
-#include "HIDTables.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
+#include "kaleidoscope/HIDTables.h"
 
 typedef union {
   // Every usable system control key possible

src/kaleidoscope/driver/hid/keyboardio/usb/SingleReport/SingleAbsoluteMouse.cpp

@@ -23,9 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "SingleAbsoluteMouse.h"
-#include "HIDReportObserver.h"
-#include "HID-Settings.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/SingleReport/SingleAbsoluteMouse.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HIDReportObserver.h"
 
 static const uint8_t _hidSingleReportDescriptorAbsoluteMouse[] PROGMEM = {
   D_USAGE_PAGE, D_PAGE_GENERIC_DESKTOP,         /* USAGE_PAGE (Generic Desktop)         54 */

src/kaleidoscope/driver/hid/keyboardio/usb/SingleReport/SingleAbsoluteMouse.h

@@ -27,9 +27,9 @@ THE SOFTWARE.
 #pragma once
 
 #include <Arduino.h>
-#include "HID.h"
-#include "HID-Settings.h"
-#include "../DeviceAPIs/AbsoluteMouseAPI.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID_.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/HID-Settings.h"
+#include "kaleidoscope/driver/hid/keyboardio/usb/DeviceAPIs/AbsoluteMouseAPI.h"
 
 
 class SingleAbsoluteMouse_ : public PluggableUSBModule, public AbsoluteMouseAPI {