Updated USBComposite library. Thanks to @arpruss

Author: rogerclarkmelbourne

STM32F1/libraries/USBComposite/AbsMouse.cpp

@@ -1,56 +1,56 @@
-#include "USBHID.h"
-
-//================================================================================
-//================================================================================
-//	Mouse
-
-void HIDAbsMouse::begin(void){
-}
-
-void HIDAbsMouse::end(void){
-}
-
-void HIDAbsMouse::click(uint8_t b)
-{
-    report.wheel = 0;
-	report.buttons = b;
-    sendReport();
-	report.buttons = 0;
-    sendReport();
-}
-
-void HIDAbsMouse::move(int16 x, int16 y, int8 wheel)
-{
-    report.x = x;
-    report.y = y;
-    report.wheel = wheel;
-
-    sendReport();
-}
-
-void HIDAbsMouse::buttons(uint8_t b)
-{
-	if (b != report.buttons)
-	{
-        report.wheel = 0;
-        report.buttons = b;
-        sendReport();
-	}
-}
-
-void HIDAbsMouse::press(uint8_t b)
-{
-	buttons(report.buttons | b);
-}
-
-void HIDAbsMouse::release(uint8_t b)
-{
-	buttons(report.buttons & ~b);
-}
-
-bool HIDAbsMouse::isPressed(uint8_t b)
-{
-	if ((b & report.buttons) != 0)
-		return true;
-	return false;
-}
+#include "USBComposite.h"
+
+//================================================================================
+//================================================================================
+//	Mouse
+
+void HIDAbsMouse::begin(void){
+}
+
+void HIDAbsMouse::end(void){
+}
+
+void HIDAbsMouse::click(uint8_t b)
+{
+    report.wheel = 0;
+	report.buttons = b;
+    sendReport();
+	report.buttons = 0;
+    sendReport();
+}
+
+void HIDAbsMouse::move(int16 x, int16 y, int8 wheel)
+{
+    report.x = x;
+    report.y = y;
+    report.wheel = wheel;
+
+    sendReport();
+}
+
+void HIDAbsMouse::buttons(uint8_t b)
+{
+	if (b != report.buttons)
+	{
+        report.wheel = 0;
+        report.buttons = b;
+        sendReport();
+	}
+}
+
+void HIDAbsMouse::press(uint8_t b)
+{
+	buttons(report.buttons | b);
+}
+
+void HIDAbsMouse::release(uint8_t b)
+{
+	buttons(report.buttons & ~b);
+}
+
+bool HIDAbsMouse::isPressed(uint8_t b)
+{
+	if ((b & report.buttons) != 0)
+		return true;
+	return false;
+}

STM32F1/libraries/USBComposite/BootKeyboard.cpp

@@ -1,13 +1,13 @@
-#include "USBHID.h"
-
-void HIDConsumer::begin(void) {}
-void HIDConsumer::end(void) {}
-void HIDConsumer::press(uint16_t button) {
-    report.button = button;
-    sendReport();
-}
-
-void HIDConsumer::release() {
-    report.button = 0;
-    sendReport();
-}
+#include "USBComposite.h" 
+
+void HIDConsumer::begin(void) {}
+void HIDConsumer::end(void) {}
+void HIDConsumer::press(uint16_t button) {
+    report.button = button;
+    sendReport();
+}
+
+void HIDConsumer::release() {
+    report.button = 0;
+    sendReport();
+}

STM32F1/libraries/USBComposite/Consumer.cpp

@@ -1,14 +1,14 @@
-#include "USBHID.h"
-
-#define REPORT(name, ...) \
-    static uint8_t raw_ ## name[] = { __VA_ARGS__ }; \
-    static const HIDReportDescriptor desc_ ## name = { raw_ ##name, sizeof(raw_ ##name) }; \
-    const HIDReportDescriptor* hidReport ## name = & desc_ ## name;
-
-REPORT(KeyboardMouseJoystick, HID_MOUSE_REPORT_DESCRIPTOR(), HID_KEYBOARD_REPORT_DESCRIPTOR(), HID_JOYSTICK_REPORT_DESCRIPTOR());
-REPORT(KeyboardMouse, HID_MOUSE_REPORT_DESCRIPTOR(), HID_KEYBOARD_REPORT_DESCRIPTOR());
-REPORT(Keyboard, HID_KEYBOARD_REPORT_DESCRIPTOR());
-REPORT(Mouse, HID_MOUSE_REPORT_DESCRIPTOR());
-REPORT(KeyboardJoystick, HID_KEYBOARD_REPORT_DESCRIPTOR(), HID_JOYSTICK_REPORT_DESCRIPTOR());
-REPORT(Joystick, HID_JOYSTICK_REPORT_DESCRIPTOR());
-REPORT(BootKeyboard, HID_BOOT_KEYBOARD_REPORT_DESCRIPTOR());
+#include "USBComposite.h" 
+
+#define REPORT(name, ...) \
+    static uint8_t raw_ ## name[] = { __VA_ARGS__ }; \
+    static const HIDReportDescriptor desc_ ## name = { raw_ ##name, sizeof(raw_ ##name) }; \
+    const HIDReportDescriptor* hidReport ## name = & desc_ ## name;
+
+REPORT(KeyboardMouseJoystick, HID_MOUSE_REPORT_DESCRIPTOR(), HID_KEYBOARD_REPORT_DESCRIPTOR(), HID_JOYSTICK_REPORT_DESCRIPTOR());
+REPORT(KeyboardMouse, HID_MOUSE_REPORT_DESCRIPTOR(), HID_KEYBOARD_REPORT_DESCRIPTOR());
+REPORT(Keyboard, HID_KEYBOARD_REPORT_DESCRIPTOR());
+REPORT(Mouse, HID_MOUSE_REPORT_DESCRIPTOR());
+REPORT(KeyboardJoystick, HID_KEYBOARD_REPORT_DESCRIPTOR(), HID_JOYSTICK_REPORT_DESCRIPTOR());
+REPORT(Joystick, HID_JOYSTICK_REPORT_DESCRIPTOR());
+REPORT(BootKeyboard, HID_BOOT_KEYBOARD_REPORT_DESCRIPTOR());