X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/039a714ee46268c07928c79b30403f29d4040fe8..a95d2241851a4877189b11854f25ff65b6a2b411:/Demos/Device/LowLevel/Joystick/Descriptors.c

diff --git a/Demos/Device/LowLevel/Joystick/Descriptors.c b/Demos/Device/LowLevel/Joystick/Descriptors.c
index bc0b430b3..5db6b0d28 100644
--- a/Demos/Device/LowLevel/Joystick/Descriptors.c
+++ b/Demos/Device/LowLevel/Joystick/Descriptors.c
@@ -45,30 +45,32 @@
  */
 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_PHYSICAL_MINIMUM(8, -1),
+	        HID_RI_PHYSICAL_MAXIMUM(8, 1),
+	        HID_RI_REPORT_COUNT(8, 0x02),
+	        HID_RI_REPORT_SIZE(8, 0x08),
+	        HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
 	    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_MINIMUM(8, 0x01),
+	    HID_RI_USAGE_MAXIMUM(8, 0x02),
+	    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_RI_REPORT_SIZE(8, 0x06),
+	    HID_RI_REPORT_COUNT(8, 0x01),
+	    HID_RI_INPUT(8, HID_IOF_CONSTANT),
 	HID_RI_END_COLLECTION(0),
 };