From b3aaffb792aed373fecd4af16478cb3c2b8c2a8f Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Thu, 29 Mar 2012 19:41:05 +0000 Subject: Removed variable axis support from the HID_DESCRIPTOR_JOYSTICK() macro due to OS incompatibilities, replaced with fixed 3-axis joystick report structure. --- Demos/Device/LowLevel/Joystick/Descriptors.c | 3 ++- Demos/Device/LowLevel/Joystick/Joystick.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'Demos/Device/LowLevel/Joystick') 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; -- cgit v1.2.3