Fixed TeensyHID bootloader so that it works with the official TeensyLoader GUI applic...

[pub/USBasp.git] / Bootloaders / TeensyHID / Descriptors.c

diff --git a/Bootloaders/TeensyHID/Descriptors.c b/Bootloaders/TeensyHID/Descriptors.c
index 9cd987c..d421d90 100644 (file)
--- a/Bootloaders/TeensyHID/Descriptors.c
+++ b/Bootloaders/TeensyHID/Descriptors.c
@@ -45,16 +45,20 @@
  */\r
 USB_Descriptor_HIDReport_Datatype_t HIDReport[] =\r
 {\r
-       0x06, 0x9c, 0xff,     /* Usage Page (Vendor Defined)                     */\r
-       0x09, 0x1B,           /* Usage (Vendor Defined)                          */\r
-       0xa1, 0x01,           /* Collection (Vendor Defined)                     */\r
-       0x0a, 0x19, 0x00,     /*   Usage (Vendor Defined)                        */\r
-       0x75, 0x08,           /*   Report Size (8)                               */\r
-       0x95, 0x82,           /*   Report Count (130)                            */\r
-       0x15, 0x00,           /*   Logical Minimum (0)                           */\r
-       0x25, 0xff,           /*   Logical Maximum (255)                         */\r
-       0x91, 0x02,           /*   Output (Data, Variable, Absolute)             */\r
-       0xc0                  /* End Collection                                  */\r
+       0x06, 0x9c, 0xff,        /* Usage Page (Vendor Defined)                     */\r
+       0x09, TEENSY_USAGEPAGE,  /* Usage (Vendor Defined)                          */\r
+       0xa1, 0x01,              /* Collection (Vendor Defined)                     */\r
+       0x0a, 0x19, 0x00,        /*   Usage (Vendor Defined)                        */\r
+       0x75, 0x08,              /*   Report Size (8)                               */\r
+#if (SPM_PAGESIZE == 128)    /*   Report Count (SPM_PAGESIZE + 2)               */\r
+       0x95, (SPM_PAGESIZE + 2)\r
+#else\r
+       0x96, ((SPM_PAGESIZE + 2) & 0xFF), ((SPM_PAGESIZE + 2) >> 8),\r
+#endif\r
+       0x15, 0x00,              /*   Logical Minimum (0)                           */\r
+       0x25, 0xff,              /*   Logical Maximum (255)                         */\r
+       0x91, 0x02,              /*   Output (Data, Variable, Absolute)             */\r
+       0xc0                     /* End Collection                                  */\r
 };\r
 \r
 /** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall\r