diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2012-03-29 19:41:05 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2012-03-29 19:41:05 +0000 |
| commit | b3aaffb792aed373fecd4af16478cb3c2b8c2a8f (patch) | |
| tree | 9870c34d551aeb43adec1b49ce465537abd160ac /Demos/Device/LowLevel/Joystick | |
| parent | 7cac5e22d7fae140b3ae4167a706d0dc07b9cf3b (diff) | |
| download | lufa-b3aaffb792aed373fecd4af16478cb3c2b8c2a8f.tar.gz lufa-b3aaffb792aed373fecd4af16478cb3c2b8c2a8f.tar.bz2 lufa-b3aaffb792aed373fecd4af16478cb3c2b8c2a8f.zip | |
Removed variable axis support from the HID_DESCRIPTOR_JOYSTICK() macro due to OS incompatibilities, replaced with fixed 3-axis joystick report structure.
Diffstat (limited to 'Demos/Device/LowLevel/Joystick')
| -rw-r--r-- | Demos/Device/LowLevel/Joystick/Descriptors.c | 3 | ||||
| -rw-r--r-- | Demos/Device/LowLevel/Joystick/Joystick.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Demos/Device/LowLevel/Joystick/Descriptors.c b/Demos/Device/LowLevel/Joystick/Descriptors.c index e380c6933..272595d99 100644 --- a/Demos/Device/LowLevel/Joystick/Descriptors.c +++ b/Demos/Device/LowLevel/Joystick/Descriptors.c @@ -52,11 +52,12 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM JoystickReport[] = HID_RI_COLLECTION(8, 0x00), /* Physical */ HID_RI_USAGE(8, 0x30), /* Usage X */ HID_RI_USAGE(8, 0x31), /* Usage Y */ + HID_RI_USAGE(8, 0x32), /* Usage Z */ 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_COUNT(8, 0x03), HID_RI_REPORT_SIZE(8, 0x08), HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE), HID_RI_END_COLLECTION(0), diff --git a/Demos/Device/LowLevel/Joystick/Joystick.h b/Demos/Device/LowLevel/Joystick/Joystick.h index a76ab5106..f3cdf36b7 100644 --- a/Demos/Device/LowLevel/Joystick/Joystick.h +++ b/Demos/Device/LowLevel/Joystick/Joystick.h @@ -72,6 +72,7 @@ { int8_t X; /**< Current absolute joystick X position, as a signed 8-bit integer */ int8_t Y; /**< Current absolute joystick Y position, as a signed 8-bit integer */ + int8_t Z; /**< Current absolute joystick Z position, as a signed 8-bit integer */ uint8_t Button; /**< Bit mask of the currently pressed joystick buttons */ } USB_JoystickReport_Data_t; |