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/ClassDriver | |
| 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/ClassDriver')
| -rw-r--r-- | Demos/Device/ClassDriver/Joystick/Descriptors.c | 11 | ||||
| -rw-r--r-- | Demos/Device/ClassDriver/Joystick/Joystick.h | 1 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Demos/Device/ClassDriver/Joystick/Descriptors.c b/Demos/Device/ClassDriver/Joystick/Descriptors.c index 2e8390075..da6fc3d09 100644 --- a/Demos/Device/ClassDriver/Joystick/Descriptors.c +++ b/Demos/Device/ClassDriver/Joystick/Descriptors.c @@ -46,14 +46,13 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM JoystickReport[] = { /* Use the HID class driver's standard Joystick report. - * Number of Axis: 2 (X/Y) - * 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 + * Min X/Y/Z Axis values: -100 + * Max X/Y/Z Axis values: 100 + * Min physical X/Y/Z Axis values (used to determine resolution): -1 + * Max physical X/Y/Z Axis values (used to determine resolution): 1 * Buttons: 2 */ - HID_DESCRIPTOR_JOYSTICK(2, -100, 100, -1, 1, 2) + HID_DESCRIPTOR_JOYSTICK(-100, 100, -1, 1, 2) }; /** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall diff --git a/Demos/Device/ClassDriver/Joystick/Joystick.h b/Demos/Device/ClassDriver/Joystick/Joystick.h index ab1503809..4bc505654 100644 --- a/Demos/Device/ClassDriver/Joystick/Joystick.h +++ b/Demos/Device/ClassDriver/Joystick/Joystick.h @@ -59,6 +59,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; |