Update projects using FatFS and PetiteFatFS to the latest library versions.

[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 4a86e17..5adac0f 100644 (file)
--- a/Demos/Device/ClassDriver/Joystick/Descriptors.c
+++ b/Demos/Device/ClassDriver/Joystick/Descriptors.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2011.

 
   dean [at] fourwalledcubicle [dot] com
 
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -42,35 +42,17 @@
  *  descriptor is parsed by the host and its contents used to determine what data (and in what encoding)
  *  the device will send, and what it may be sent back from the host. Refer to the HID specification for
  *  more details on HID report descriptors.
  *  descriptor is parsed by the host and its contents used to determine what data (and in what encoding)
  *  the device will send, and what it may be sent back from the host. Refer to the HID specification for
  *  more details on HID report descriptors.

- */
+ */ 

 USB_Descriptor_HIDReport_Datatype_t PROGMEM JoystickReport[] =
 {
 USB_Descriptor_HIDReport_Datatype_t PROGMEM JoystickReport[] =
 {

-       0x05, 0x01,          /* Usage Page (Generic Desktop)                       */
-       0x09, 0x04,          /* Usage (Joystick)                                   */
-       0xa1, 0x01,          /* Collection (Application)                           */
-       0x09, 0x01,          /*   Usage (Pointer)                                  */
-       0xa1, 0x00,          /*   Collection (Physical)                            */
-       0x05, 0x01,          /*     Usage Page (Generic Desktop)                   */
-       0x09, 0x30,          /*     Usage (X)                                      */
-       0x09, 0x31,          /*     Usage (Y)                                      */
-       0x15, 0x9c,          /*     Logical Minimum (-100)                         */
-       0x25, 0x64,          /*     Logical Maximum (100)                          */
-       0x75, 0x08,          /*     Report Size (8)                                */
-       0x95, 0x02,          /*     Report Count (2)                               */
-       0x81, 0x82,          /*     Input (Data, Variable, Absolute, Volatile)     */
-       0xc0,                /*   End Collection                                   */
-       0x05, 0x09,          /*   Usage Page (Button)                              */
-       0x09, 0x02,          /*   Usage (Button 2)                                 */
-       0x09, 0x01,          /*   Usage (Button 1)                                 */
-       0x15, 0x00,          /*   Logical Minimum (0)                              */
-       0x25, 0x01,          /*   Logical Maximum (1)                              */
-       0x75, 0x01,          /*   Report Size (1)                                  */
-       0x95, 0x02,          /*   Report Count (2)                                 */
-       0x81, 0x02,          /*   Input (Data, Variable, Absolute)                 */
-       0x75, 0x06,          /*   Report Size (6)                                  */
-       0x95, 0x01,          /*   Report Count (1)                                 */
-       0x81, 0x01,          /*   Input (Constant)                                 */
-       0xc0                 /* End Collection                                     */
+       /* Use the HID class driver's standard Joystick report.
+        *   Min X/Y Axis values: -100
+        *   Max X/Y Axis values:  100
+        *   Min physical X/Y Axis values (used to determine resolution): -1
+        *   Max physical X/Y Axis values (used to determine resolution):  1
+        *   Buttons: 2
+        */
+       HID_DESCRIPTOR_JOYSTICK(-100, 100, -1, 1, 2)

 };
 
 /** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall
 };
 
 /** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall


@@ -156,7 +138,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | JOYSTICK_EPNUM),
                        .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
                        .EndpointSize           = JOYSTICK_EPSIZE,
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | JOYSTICK_EPNUM),
                        .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
                        .EndpointSize           = JOYSTICK_EPSIZE,

-                       .PollingIntervalMS      = 0x0A
+                       .PollingIntervalMS      = 0x01

                }
 };
 
                }
 };