aboutsummaryrefslogtreecommitdiffstats
path: root/Projects/TempDataLogger/Descriptors.c
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2011-01-17 19:44:48 +0000
committerDean Camera <dean@fourwalledcubicle.com>2011-01-17 19:44:48 +0000
commitefd57cfe51ec0501d4378d01e019f3e23b989274 (patch)
treee2e60d4ba5a72c56012b2a6426849e28d762c53e /Projects/TempDataLogger/Descriptors.c
parent47fec03694c933a388eadf3242a6e40177b57d74 (diff)
downloadlufa-efd57cfe51ec0501d4378d01e019f3e23b989274.tar.gz
lufa-efd57cfe51ec0501d4378d01e019f3e23b989274.tar.bz2
lufa-efd57cfe51ec0501d4378d01e019f3e23b989274.zip
Abuse the the C preprocessor so that the HID macros can automatically encode data into the array from the HID macros automagically, by specifying the bit-width of the data, and the data itself as a single integer value of that width.
Diffstat (limited to 'Projects/TempDataLogger/Descriptors.c')
-rw-r--r--Projects/TempDataLogger/Descriptors.c31
1 files changed, 15 insertions, 16 deletions
diff --git a/Projects/TempDataLogger/Descriptors.c b/Projects/TempDataLogger/Descriptors.c
index a0252be56..1e61df117 100644
--- a/Projects/TempDataLogger/Descriptors.c
+++ b/Projects/TempDataLogger/Descriptors.c
@@ -57,22 +57,21 @@
*/
USB_Descriptor_HIDReport_Datatype_t PROGMEM GenericReport[] =
{
- HID_RI_USAGE_PAGE(16), 0x00, 0xFF, /* Vendor Page 1 */
- HID_RI_USAGE(8), 0x01, /* Vendor Usage 1 */
- HID_RI_COLLECTION(8), 0x01, /* Vendor Usage 1 */
- HID_RI_USAGE(8), 0x02, /* Vendor Usage 2 */
- HID_RI_LOGICAL_MINIMUM(8), 0x00,
- HID_RI_LOGICAL_MAXIMUM(8), 0xFF,
- HID_RI_REPORT_SIZE(8), 8,
- HID_RI_REPORT_COUNT(8), GENERIC_REPORT_SIZE,
- HID_RI_INPUT(8), (HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_VOLATILE),
-
- HID_RI_USAGE(8), 0x03, /* Vendor Usage 3 */
- HID_RI_LOGICAL_MINIMUM(8), 0x00,
- HID_RI_LOGICAL_MAXIMUM(8), 0xFF,
- HID_RI_REPORT_SIZE(8), 8,
- HID_RI_REPORT_COUNT(8), GENERIC_REPORT_SIZE,
- HID_RI_OUTPUT(8), (HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_VOLATILE),
+ HID_RI_USAGE_PAGE(16, 0x00FF), /* Vendor Page 1 */
+ HID_RI_USAGE(8, 0x01), /* Vendor Usage 1 */
+ HID_RI_COLLECTION(8, 0x01), /* Vendor Usage 1 */
+ HID_RI_USAGE(8, 0x02), /* Vendor Usage 2 */
+ HID_RI_LOGICAL_MINIMUM(8, 0x00),
+ HID_RI_LOGICAL_MAXIMUM(8, 0xFF),
+ HID_RI_REPORT_SIZE(8, 0x08),
+ HID_RI_REPORT_COUNT(8, GENERIC_REPORT_SIZE),
+ HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_VOLATILE),
+ HID_RI_USAGE(8, 0x03), /* Vendor Usage 3 */
+ HID_RI_LOGICAL_MINIMUM(8, 0x00),
+ HID_RI_LOGICAL_MAXIMUM(8, 0xFF),
+ HID_RI_REPORT_SIZE(8, 0x08),
+ HID_RI_REPORT_COUNT(8, GENERIC_REPORT_SIZE),
+ HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_VOLATILE),
HID_RI_END_COLLECTION(0),
};