From e521af69ca05107ef10649b9d865645a53549f3a Mon Sep 17 00:00:00 2001 From: NicoHood Date: Sat, 10 Oct 2015 19:37:58 +0200 Subject: [PATCH] Made SendReport() capaital --- src/HID-APIs/KeyboardAPI.cpp | 2 +- src/HID-APIs/KeyboardAPI.h | 2 +- src/HID-APIs/MouseAPI.cpp | 2 +- src/HID-APIs/MouseAPI.h | 2 +- src/MultiReport/ImprovedKeyboard.cpp | 2 +- src/MultiReport/ImprovedKeyboard.h | 2 +- src/MultiReport/ImprovedMouse.cpp | 37 +++++++++++++++++++++++++++- src/MultiReport/ImprovedMouse.h | 2 +- src/SingleReport/BootKeyboard.cpp | 2 +- src/SingleReport/BootKeyboard.h | 2 +- src/SingleReport/BootMouse.cpp | 2 +- src/SingleReport/BootMouse.h | 2 +- 12 files changed, 47 insertions(+), 12 deletions(-) diff --git a/src/HID-APIs/KeyboardAPI.cpp b/src/HID-APIs/KeyboardAPI.cpp index 1bc6715..ccaf140 100644 --- a/src/HID-APIs/KeyboardAPI.cpp +++ b/src/HID-APIs/KeyboardAPI.cpp @@ -37,7 +37,7 @@ void KeyboardAPI::end(void) void KeyboardAPI::send_now(void){ - sendReport(&_keyReport, sizeof(_keyReport)); + SendReport(&_keyReport, sizeof(_keyReport)); } diff --git a/src/HID-APIs/KeyboardAPI.h b/src/HID-APIs/KeyboardAPI.h index 5af6677..788eb63 100644 --- a/src/HID-APIs/KeyboardAPI.h +++ b/src/HID-APIs/KeyboardAPI.h @@ -63,7 +63,7 @@ public: size_t removeKeycodeFromReport(uint8_t k); // Sending is public in the base class for advanced users. - virtual void sendReport(void* data, int length) = 0; + virtual void SendReport(void* data, int length) = 0; protected: HID_KeyboardReport_Data_t _keyReport; diff --git a/src/HID-APIs/MouseAPI.cpp b/src/HID-APIs/MouseAPI.cpp index 02b0bcd..6f5a46b 100644 --- a/src/HID-APIs/MouseAPI.cpp +++ b/src/HID-APIs/MouseAPI.cpp @@ -54,7 +54,7 @@ void MouseAPI::move(signed char x, signed char y, signed char wheel) report.xAxis = x; report.yAxis = y; report.wheel = wheel; - sendReport(&report, sizeof(report)); + SendReport(&report, sizeof(report)); } void MouseAPI::buttons(uint8_t b) diff --git a/src/HID-APIs/MouseAPI.h b/src/HID-APIs/MouseAPI.h index d193fd9..8318aea 100644 --- a/src/HID-APIs/MouseAPI.h +++ b/src/HID-APIs/MouseAPI.h @@ -138,7 +138,7 @@ public: bool isPressed(uint8_t b = MOUSE_LEFT); // check LEFT by default // Sending is public in the base class for advanced users. - virtual void sendReport(void* data, int length) = 0; + virtual void SendReport(void* data, int length) = 0; private: uint8_t _buttons; diff --git a/src/MultiReport/ImprovedKeyboard.cpp b/src/MultiReport/ImprovedKeyboard.cpp index ff4fecb..1e9c060 100644 --- a/src/MultiReport/ImprovedKeyboard.cpp +++ b/src/MultiReport/ImprovedKeyboard.cpp @@ -65,7 +65,7 @@ Keyboard_::Keyboard_(void) HID().AppendDescriptor(&node); } -void Keyboard_::sendReport(void* data, int length) +void Keyboard_::SendReport(void* data, int length) { HID().SendReport(HID_REPORTID_KEYBOARD, data, length); } diff --git a/src/MultiReport/ImprovedKeyboard.h b/src/MultiReport/ImprovedKeyboard.h index 3e024d8..7feca85 100644 --- a/src/MultiReport/ImprovedKeyboard.h +++ b/src/MultiReport/ImprovedKeyboard.h @@ -37,7 +37,7 @@ public: Keyboard_(void); protected: - virtual inline void sendReport(void* data, int length) override; + virtual inline void SendReport(void* data, int length) override; }; extern Keyboard_ Keyboard; diff --git a/src/MultiReport/ImprovedMouse.cpp b/src/MultiReport/ImprovedMouse.cpp index d142355..c3b8e5a 100644 --- a/src/MultiReport/ImprovedMouse.cpp +++ b/src/MultiReport/ImprovedMouse.cpp @@ -23,13 +23,48 @@ THE SOFTWARE. #include "ImprovedMouse.h" + +static const uint8_t _hidMultiReportDescriptorMouse[] PROGMEM = { + /* Mouse relative */ + 0x05, 0x01, /* USAGE_PAGE (Generic Desktop) 54 */ + 0x09, 0x02, /* USAGE (Mouse) */ + 0xa1, 0x01, /* COLLECTION (Application) */ + 0x85, HID_REPORTID_MOUSE, /* REPORT_ID */ + + /* 8 Buttons */ + 0x05, 0x09, /* USAGE_PAGE (Button) */ + 0x19, 0x01, /* USAGE_MINIMUM (Button 1) */ + 0x29, 0x08, /* USAGE_MAXIMUM (Button 8) */ + 0x15, 0x00, /* LOGICAL_MINIMUM (0) */ + 0x25, 0x01, /* LOGICAL_MAXIMUM (1) */ + 0x95, 0x08, /* REPORT_COUNT (8) */ + 0x75, 0x01, /* REPORT_SIZE (1) */ + 0x81, 0x02, /* INPUT (Data,Var,Abs) */ + + /* X, Y, Wheel */ + 0x05, 0x01, /* USAGE_PAGE (Generic Desktop) */ + 0x09, 0x30, /* USAGE (X) */ + 0x09, 0x31, /* USAGE (Y) */ + 0x09, 0x38, /* USAGE (Wheel) */ + 0x15, 0x81, /* LOGICAL_MINIMUM (-127) */ + 0x25, 0x7f, /* LOGICAL_MAXIMUM (127) */ + 0x75, 0x08, /* REPORT_SIZE (8) */ + 0x95, 0x03, /* REPORT_COUNT (3) */ + 0x81, 0x06, /* INPUT (Data,Var,Rel) */ + + /* End */ + 0xc0 /* END_COLLECTION */ +}; + + Mouse_::Mouse_(void) { static HIDDescriptorListNode node(_hidMultiReportDescriptorMouse, sizeof(_hidMultiReportDescriptorMouse)); HID().AppendDescriptor(&node); } -void Mouse_::sendReport(void* data, int length) + +void Mouse_::SendReport(void* data, int length) { HID().SendReport(HID_REPORTID_MOUSE, data, length); } diff --git a/src/MultiReport/ImprovedMouse.h b/src/MultiReport/ImprovedMouse.h index c8209eb..14d83a0 100644 --- a/src/MultiReport/ImprovedMouse.h +++ b/src/MultiReport/ImprovedMouse.h @@ -37,7 +37,7 @@ public: Mouse_(void); protected: - virtual inline void sendReport(void* data, int length) override; + virtual inline void SendReport(void* data, int length) override; }; extern Mouse_ Mouse; diff --git a/src/SingleReport/BootKeyboard.cpp b/src/SingleReport/BootKeyboard.cpp index ee5edf2..393d730 100644 --- a/src/SingleReport/BootKeyboard.cpp +++ b/src/SingleReport/BootKeyboard.cpp @@ -151,7 +151,7 @@ uint8_t BootKeyboard_::getProtocol(void){ return protocol; } -void BootKeyboard_::sendReport(void* data, int length){ +void BootKeyboard_::SendReport(void* data, int length){ USB_Send(pluggedEndpoint | TRANSFER_RELEASE, data, length); } diff --git a/src/SingleReport/BootKeyboard.h b/src/SingleReport/BootKeyboard.h index 8f2ebdd..f360d93 100644 --- a/src/SingleReport/BootKeyboard.h +++ b/src/SingleReport/BootKeyboard.h @@ -50,7 +50,7 @@ protected: uint8_t leds; - virtual void sendReport(void* data, int length) override; + virtual void SendReport(void* data, int length) override; }; extern BootKeyboard_ BootKeyboard; diff --git a/src/SingleReport/BootMouse.cpp b/src/SingleReport/BootMouse.cpp index 64030d8..0760446 100644 --- a/src/SingleReport/BootMouse.cpp +++ b/src/SingleReport/BootMouse.cpp @@ -95,7 +95,7 @@ uint8_t BootMouse_::getProtocol(void){ return protocol; } -void BootMouse_::sendReport(void* data, int length){ +void BootMouse_::SendReport(void* data, int length){ if(protocol == HID_BOOT_PROTOCOL){ USB_Send(pluggedEndpoint | TRANSFER_RELEASE, data, sizeof(HID_BootMouseReport_Data_t)); } diff --git a/src/SingleReport/BootMouse.h b/src/SingleReport/BootMouse.h index ff4096d..00462b0 100644 --- a/src/SingleReport/BootMouse.h +++ b/src/SingleReport/BootMouse.h @@ -47,7 +47,7 @@ protected: uint8_t protocol; uint8_t idle; - virtual void sendReport(void* data, int length) override; + virtual void SendReport(void* data, int length) override; }; extern BootMouse_ BootMouse;