Merge pull request #74 from pennam/fw-version-usb

USB/HID allow featureReport reads from browser using HID API

Author: facchinm

UNOR4USBBridge/DAP.h

@@ -10,9 +10,38 @@ extern "C" {
 
 extern USBHID HID;
 
+#define TUD_HID_REPORT_DESC_R4_INOUT_FEATURE(report_size, ...) \
+    HID_USAGE_PAGE_N ( HID_USAGE_PAGE_VENDOR, 2   ),\
+    HID_USAGE        ( 0x01                       ),\
+    HID_COLLECTION   ( HID_COLLECTION_APPLICATION ),\
+      /* Report ID if any */\
+      __VA_ARGS__ \
+      /* Input */ \
+      HID_USAGE       ( 0x02                                   ),\
+      HID_LOGICAL_MIN ( 0x00                                   ),\
+      HID_LOGICAL_MAX_N ( 0xff, 2                              ),\
+      HID_REPORT_SIZE ( 8                                      ),\
+      HID_REPORT_COUNT( report_size                            ),\
+      HID_INPUT       ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE ),\
+      /* Output */ \
+      HID_USAGE       ( 0x03                                    ),\
+      HID_LOGICAL_MIN ( 0x00                                    ),\
+      HID_LOGICAL_MAX_N ( 0xff, 2                               ),\
+      HID_REPORT_SIZE ( 8                                       ),\
+      HID_REPORT_COUNT( report_size                             ),\
+      HID_OUTPUT      ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE  ),\
+      /* Feature */ \
+      HID_USAGE       ( 0x04),\
+      HID_LOGICAL_MIN ( 0x00),\
+      HID_LOGICAL_MAX_N ( 0xff, 2),\
+      HID_REPORT_SIZE (8),\
+      HID_REPORT_COUNT(report_size),\
+      HID_FEATURE     (HID_DATA | HID_VARIABLE | HID_ABSOLUTE),\
+    HID_COLLECTION_END \
+
 static uint8_t const report_descriptor[] =
 {
-  TUD_HID_REPORT_DESC_GENERIC_INOUT(CFG_TUD_HID_EP_BUFSIZE)
+  TUD_HID_REPORT_DESC_R4_INOUT_FEATURE(CFG_TUD_HID_EP_BUFSIZE)
 };
 
 class DAPHIDDevice: public USBHIDDevice {

UNOR4USBBridge/UNOR4USBBridge.ino

@@ -144,6 +144,7 @@ void setup() {
   USB.PID(0x1002);
   USB.manufacturerName("Arduino");
   USB.productName("UNO WiFi R4 CMSIS-DAP");
+  USB.firmwareVersion(U8TOBCD(FIRMWARE_MAJOR) << 8 | U8TOBCD(FIRMWARE_MINOR));
   //USB.enableDFU();
   DAP.begin();
   SERIAL_USER.onEvent(usbEventCallback);

UNOR4USBBridge/at_handler.h

@@ -20,6 +20,8 @@
 #define FIRMWARE_MINOR    5
 #define FIRMWARE_PATCH    2
 
+#define U8TOBCD(u) ((((u/10)%10)<<4)|(u%10))
+
 #define GPIO_BOOT   9
 #define GPIO_RST    4