From e6783cb5e4b7e1dc8abc4932b3e3543ad793c6ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20K=C3=B6ckerbauer?= <tkoecker@gmx.net>
Date: Wed, 5 Feb 2020 01:00:55 +0100
Subject: [PATCH] changed usb core to use low-speed usb, changed hid code to
 provide boot protocol keyboard only

---
 hardware/arduino/avr/cores/arduino/HID.cpp    | 39 +++----------------
 .../arduino/avr/cores/arduino/USBCore.cpp     | 17 ++++++++
 hardware/arduino/avr/cores/arduino/USBCore.h  |  9 ++++-
 hardware/arduino/avr/cores/arduino/USBDesc.h  |  2 +-
 4 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/hardware/arduino/avr/cores/arduino/HID.cpp b/hardware/arduino/avr/cores/arduino/HID.cpp
index 75c37b24b2f..7419d2725ca 100644
--- a/hardware/arduino/avr/cores/arduino/HID.cpp
+++ b/hardware/arduino/avr/cores/arduino/HID.cpp
@@ -43,42 +43,12 @@ Keyboard_ Keyboard;
 
 extern const u8 _hidReportDescriptor[] PROGMEM;
 const u8 _hidReportDescriptor[] = {
-	
-	//	Mouse
-    0x05, 0x01,                    // USAGE_PAGE (Generic Desktop)	// 54
-    0x09, 0x02,                    // USAGE (Mouse)
-    0xa1, 0x01,                    // COLLECTION (Application)
-    0x09, 0x01,                    //   USAGE (Pointer)
-    0xa1, 0x00,                    //   COLLECTION (Physical)
-    0x85, 0x01,                    //     REPORT_ID (1)
-    0x05, 0x09,                    //     USAGE_PAGE (Button)
-    0x19, 0x01,                    //     USAGE_MINIMUM (Button 1)
-    0x29, 0x03,                    //     USAGE_MAXIMUM (Button 3)
-    0x15, 0x00,                    //     LOGICAL_MINIMUM (0)
-    0x25, 0x01,                    //     LOGICAL_MAXIMUM (1)
-    0x95, 0x03,                    //     REPORT_COUNT (3)
-    0x75, 0x01,                    //     REPORT_SIZE (1)
-    0x81, 0x02,                    //     INPUT (Data,Var,Abs)
-    0x95, 0x01,                    //     REPORT_COUNT (1)
-    0x75, 0x05,                    //     REPORT_SIZE (5)
-    0x81, 0x03,                    //     INPUT (Cnst,Var,Abs)
-    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)
-    0xc0,                          //   END_COLLECTION
-    0xc0,                          // END_COLLECTION
 
 	//	Keyboard
     0x05, 0x01,                    // USAGE_PAGE (Generic Desktop)	// 47
     0x09, 0x06,                    // USAGE (Keyboard)
     0xa1, 0x01,                    // COLLECTION (Application)
-    0x85, 0x02,                    //   REPORT_ID (2)
+//    0x85, 0x02,                    //   REPORT_ID (2)
     0x05, 0x07,                    //   USAGE_PAGE (Keyboard)
    
 	0x19, 0xe0,                    //   USAGE_MINIMUM (Keyboard LeftControl)
@@ -124,14 +94,15 @@ const u8 _hidReportDescriptor[] = {
 	0x91, 0x02,				// Output (array)
 	0xC0					// end collection
 #endif
+
 };
 
 extern const HIDDescriptor _hidInterface PROGMEM;
 const HIDDescriptor _hidInterface =
 {
-	D_INTERFACE(HID_INTERFACE,1,3,0,0),
+	D_INTERFACE(HID_INTERFACE,1,3,1,1),
 	D_HIDREPORT(sizeof(_hidReportDescriptor)),
-	D_ENDPOINT(USB_ENDPOINT_IN (HID_ENDPOINT_INT),USB_ENDPOINT_TYPE_INTERRUPT,0x40,0x01)
+	D_ENDPOINT(USB_ENDPOINT_IN (HID_ENDPOINT_INT),USB_ENDPOINT_TYPE_INTERRUPT,8,10)
 };
 
 //================================================================================
@@ -156,7 +127,7 @@ int WEAK HID_GetDescriptor(int /* i */)
 
 void WEAK HID_SendReport(u8 id, const void* data, int len)
 {
-	USB_Send(HID_TX, &id, 1);
+//	USB_Send(HID_TX, &id, 1);
 	USB_Send(HID_TX | TRANSFER_RELEASE,data,len);
 }
 
diff --git a/hardware/arduino/avr/cores/arduino/USBCore.cpp b/hardware/arduino/avr/cores/arduino/USBCore.cpp
index b4f7bed7e86..a8666a40bf3 100644
--- a/hardware/arduino/avr/cores/arduino/USBCore.cpp
+++ b/hardware/arduino/avr/cores/arduino/USBCore.cpp
@@ -78,12 +78,21 @@ const u8 STRING_MANUFACTURER[] PROGMEM = USB_MANUFACTURER;
 #define DEVICE_CLASS 0x00
 #endif
 
+#if defined(LOW_SPEED_USB)
+//	DEVICE DESCRIPTOR
+const DeviceDescriptor USB_DeviceDescriptor =
+	D_DEVICE(0x00,0x00,0x00,8,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);
+
+const DeviceDescriptor USB_DeviceDescriptorA =
+	D_DEVICE(DEVICE_CLASS,0x00,0x00,8,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);
+#else
 //	DEVICE DESCRIPTOR
 const DeviceDescriptor USB_DeviceDescriptor =
 	D_DEVICE(0x00,0x00,0x00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);
 
 const DeviceDescriptor USB_DeviceDescriptorA =
 	D_DEVICE(DEVICE_CLASS,0x00,0x00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);
+#endif
 
 //==================================================================
 //==================================================================
@@ -394,7 +403,11 @@ bool SendControl(u8 d)
 		if (!WaitForINOrOUT())
 			return false;
 		Send8(d);
+#if defined(LOW_SPEED_USB)
+		if (!((_cmark + 1) & 0x07))
+#else
 		if (!((_cmark + 1) & 0x3F))
+#endif
 			ClearIN();	// Fifo is full, release this packet
 	}
 	_cmark++;
@@ -676,7 +689,11 @@ void USBDevice_::attach()
 
 	USBCON = ((1<<USBE)|(1<<OTGPADE));	// start USB clock
 	UDIEN = (1<<EORSTE)|(1<<SOFE);		// Enable interrupts for EOR (End of Reset) and SOF (start of frame)
+#if defined(LOW_SPEED_USB)
+	UDCON = (1<<LSM);							// enable attach resistor
+#else
 	UDCON = 0;							// enable attach resistor
+#endif
 	
 	TX_RX_LED_INIT;
 }
diff --git a/hardware/arduino/avr/cores/arduino/USBCore.h b/hardware/arduino/avr/cores/arduino/USBCore.h
index 8d13806896f..a018bc14a8d 100644
--- a/hardware/arduino/avr/cores/arduino/USBCore.h
+++ b/hardware/arduino/avr/cores/arduino/USBCore.h
@@ -18,6 +18,8 @@
 #ifndef __USBCORE_H__
 #define __USBCORE_H__
 
+#define LOW_SPEED_USB
+
 //	Standard requests
 #define GET_STATUS			0
 #define CLEAR_FEATURE		1
@@ -278,11 +280,16 @@ typedef struct
 } HIDDescriptor;
 
 
+#if defined(LOW_SPEED_USB)
+#define D_DEVICE(_class,_subClass,_proto,_packetSize0,_vid,_pid,_version,_im,_ip,_is,_configs) \
+	{ 18, 1, 0x110, _class,_subClass,_proto,_packetSize0,_vid,_pid,_version,_im,_ip,_is,_configs }
+#else
 #define D_DEVICE(_class,_subClass,_proto,_packetSize0,_vid,_pid,_version,_im,_ip,_is,_configs) \
 	{ 18, 1, 0x200, _class,_subClass,_proto,_packetSize0,_vid,_pid,_version,_im,_ip,_is,_configs }
+#endif
 
 #define D_CONFIG(_totalLength,_interfaces) \
-	{ 9, 2, _totalLength,_interfaces, 1, 0, USB_CONFIG_BUS_POWERED, USB_CONFIG_POWER_MA(500) }
+	{ 9, 2, _totalLength,_interfaces, 1, 0, USB_CONFIG_BUS_POWERED, USB_CONFIG_POWER_MA(100) }
 
 #define D_INTERFACE(_n,_numEndpoints,_class,_subClass,_protocol) \
 	{ 9, 4, _n, 0, _numEndpoints, _class,_subClass, _protocol, 0 }
diff --git a/hardware/arduino/avr/cores/arduino/USBDesc.h b/hardware/arduino/avr/cores/arduino/USBDesc.h
index 900713e0f92..f511546d571 100644
--- a/hardware/arduino/avr/cores/arduino/USBDesc.h
+++ b/hardware/arduino/avr/cores/arduino/USBDesc.h
@@ -16,7 +16,7 @@
 ** SOFTWARE.  
 */
 
-#define CDC_ENABLED
+//#define CDC_ENABLED
 #define HID_ENABLED