Abuse the the C preprocessor so that the HID macros can automatically encode data...

[pub/USBasp.git] / Demos / Device / ClassDriver / Joystick / Descriptors.c

diff --git a/Demos/Device/ClassDriver/Joystick/Descriptors.c b/Demos/Device/ClassDriver/Joystick/Descriptors.c
index e2b528e..17c1495 100644 (file)
--- a/Demos/Device/ClassDriver/Joystick/Descriptors.c
+++ b/Demos/Device/ClassDriver/Joystick/Descriptors.c
@@ -45,30 +45,30 @@
  */ 
 USB_Descriptor_HIDReport_Datatype_t PROGMEM JoystickReport[] =
 {
-       HID_RI_USAGE_PAGE(8),                0x01, /* Generic Desktop */
-       HID_RI_USAGE(8),                     0x04, /* Joystick */
-       HID_RI_COLLECTION(8),                0x01, /* Application */
-           HID_RI_USAGE(8),                 0x01, /* Pointer */
-           HID_RI_COLLECTION(8),            0x00, /* Physical */
-               HID_RI_USAGE(8),             0x30, /* Usage X */
-               HID_RI_USAGE(8),             0x31, /* Usage Y */
-               HID_RI_LOGICAL_MINIMUM(8),   -100,
-               HID_RI_LOGICAL_MAXIMUM(8),   100,
-               HID_RI_REPORT_SIZE(8),       8,
-               HID_RI_REPORT_COUNT(8),      2,
-               HID_RI_INPUT(8),             (HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE),
+       HID_RI_USAGE_PAGE(8, 0x01), /* Generic Desktop */
+       HID_RI_USAGE(8, 0x04), /* Joystick */
+       HID_RI_COLLECTION(8, 0x01), /* Application */
+           HID_RI_USAGE(8, 0x01), /* Pointer */
+           HID_RI_COLLECTION(8, 0x00), /* Physical */
+               HID_RI_USAGE(8, 0x30), /* Usage X */
+               HID_RI_USAGE(8, 0x31), /* Usage Y */
+               HID_RI_LOGICAL_MINIMUM(8, -100),
+               HID_RI_LOGICAL_MAXIMUM(8, 100),
+               HID_RI_REPORT_SIZE(8, 0x08),
+               HID_RI_REPORT_COUNT(8, 0x02),
+               HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE),
            HID_RI_END_COLLECTION(0),
-           HID_RI_USAGE_PAGE(8),            0x09, /* Button */
-           HID_RI_USAGE(8),                 0x02, /* Button 1 */
-           HID_RI_USAGE(8),                 0x01, /* Button 2 */
-           HID_RI_LOGICAL_MINIMUM(8),       0,
-           HID_RI_LOGICAL_MAXIMUM(8),       1,
-           HID_RI_REPORT_SIZE(8),           1,
-           HID_RI_REPORT_COUNT(8),          2,
-           HID_RI_INPUT(8),                 (HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE),
-           HID_RI_REPORT_SIZE(8),           6,
-           HID_RI_REPORT_COUNT(8),          1,
-           HID_RI_INPUT(8),                 HID_IOF_CONSTANT,
+           HID_RI_USAGE_PAGE(8, 0x09), /* Button */
+           HID_RI_USAGE(8, 0x02), /* Button 1 */
+           HID_RI_USAGE(8, 0x01), /* Button 2 */
+           HID_RI_LOGICAL_MINIMUM(8, 0x00),
+           HID_RI_LOGICAL_MAXIMUM(8, 0x01),
+           HID_RI_REPORT_SIZE(8, 0x01),
+           HID_RI_REPORT_COUNT(8, 0x02),
+           HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE),
+           HID_RI_REPORT_SIZE(8, 0x06),
+           HID_RI_REPORT_COUNT(8, 0x01),
+           HID_RI_INPUT(8, HID_IOF_CONSTANT),
        HID_RI_END_COLLECTION(0),
 };