diff --git a/hardware/arduino/avr/libraries/HID/HID.cpp b/hardware/arduino/avr/libraries/HID/HID.cpp index e75a6f53d..f18e069d7 100644 --- a/hardware/arduino/avr/libraries/HID/HID.cpp +++ b/hardware/arduino/avr/libraries/HID/HID.cpp @@ -66,7 +66,7 @@ int HID_GetDescriptor(int8_t t) } } -void HID_SendReport(u8 id, const void* data, int len) +void HID_::SendReport(u8 id, const void* data, int len) { USB_Send(HID_TX, &id, 1); USB_Send(HID_TX | TRANSFER_RELEASE,data,len); diff --git a/hardware/arduino/avr/libraries/HID/HID.h b/hardware/arduino/avr/libraries/HID/HID.h index 5bd137cd6..d3a998255 100644 --- a/hardware/arduino/avr/libraries/HID/HID.h +++ b/hardware/arduino/avr/libraries/HID/HID.h @@ -47,14 +47,9 @@ class HID_ public: HID_(void); int begin(void); + void SendReport(uint8_t id, const void* data, int len); }; -int8_t HID_Plug(void); -int HID_GetInterface(u8* interfaceNum); -int HID_GetDescriptor(int8_t t); -bool HID_Setup(Setup& setup, u8 i); -void HID_SendReport(uint8_t id, const void* data, int len); - extern HID_ HID; typedef struct diff --git a/libraries/Keyboard/Keyboard.cpp b/libraries/Keyboard/Keyboard.cpp index a331d75da..26772a45b 100644 --- a/libraries/Keyboard/Keyboard.cpp +++ b/libraries/Keyboard/Keyboard.cpp @@ -44,7 +44,7 @@ void Keyboard_::end(void) void Keyboard_::sendReport(KeyReport* keys) { - HID_SendReport(2,keys,sizeof(KeyReport)); + HID.SendReport(2,keys,sizeof(KeyReport)); } const u8 _hidReportDescriptor[] PROGMEM = { diff --git a/libraries/Keyboard/Keyboard.h b/libraries/Keyboard/Keyboard.h index 475b3c168..daa3d8019 100644 --- a/libraries/Keyboard/Keyboard.h +++ b/libraries/Keyboard/Keyboard.h @@ -96,5 +96,6 @@ public: virtual void releaseAll(void); }; extern Keyboard_ Keyboard; +extern HID_ HID; #endif diff --git a/libraries/Mouse/Mouse.cpp b/libraries/Mouse/Mouse.cpp index aeeaae5dc..55dec7f91 100644 --- a/libraries/Mouse/Mouse.cpp +++ b/libraries/Mouse/Mouse.cpp @@ -93,7 +93,7 @@ void Mouse_::move(signed char x, signed char y, signed char wheel) m[1] = x; m[2] = y; m[3] = wheel; - HID_SendReport(1,m,4); + HID.SendReport(1,m,4); } void Mouse_::buttons(uint8_t b) diff --git a/libraries/Mouse/Mouse.h b/libraries/Mouse/Mouse.h index 50f00a548..73ca429b8 100644 --- a/libraries/Mouse/Mouse.h +++ b/libraries/Mouse/Mouse.h @@ -56,6 +56,7 @@ public: bool isPressed(uint8_t b = MOUSE_LEFT); // check LEFT by default }; extern Mouse_ Mouse; +extern HID_ HID; #endif #endif \ No newline at end of file