Fixed incorrect definition of the HID_KEYBOARD_SC_RIGHT_ARROW constant in the HID...

[pub/USBasp.git] / Projects / TempDataLogger / Descriptors.c

diff --git a/Projects/TempDataLogger/Descriptors.c b/Projects/TempDataLogger/Descriptors.c
index 5dde04c..1e61df1 100644 (file)
--- a/Projects/TempDataLogger/Descriptors.c
+++ b/Projects/TempDataLogger/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


@@ -57,22 +57,22 @@
  */
 USB_Descriptor_HIDReport_Datatype_t PROGMEM GenericReport[] =
 {
  */
 USB_Descriptor_HIDReport_Datatype_t PROGMEM GenericReport[] =
 {

-       0x06, 0x9c, 0xff,     /* Usage Page (Vendor Defined)                     */
-       0x09, 0x01,           /* Usage (Vendor Defined)                          */
-       0xa1, 0x01,           /* Collection (Vendor Defined)                     */
-       0x09, 0x02,           /*   Usage (Vendor Defined)                        */
-       0x75, 0x08,           /*   Report Size (8)                               */
-       0x95, GENERIC_REPORT_SIZE, /*   Report Count (GENERIC_REPORT_SIZE)       */
-       0x15, 0x80,           /*   Logical Minimum (-128)                        */
-       0x25, 0x7F,           /*   Logical Maximum (127)                         */
-       0x81, 0x02,           /*   Input (Data, Variable, Absolute)              */
-       0x09, 0x03,           /*   Usage (Vendor Defined)                        */
-       0x75, 0x08,           /*   Report Size (8)                               */
-       0x95, GENERIC_REPORT_SIZE, /*   Report Count (GENERIC_REPORT_SIZE)       */
-       0x15, 0x00,           /*   Logical Minimum (0)                           */
-       0x25, 0xff,           /*   Logical Maximum (255)                         */
-       0x91, 0x02,           /*   Output (Data, Variable, Absolute)             */
-       0xc0                  /* End Collection                                  */
+       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),

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


@@ -85,9 +85,9 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
        .Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
 
        .USBSpecification       = VERSION_BCD(01.10),
        .Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
 
        .USBSpecification       = VERSION_BCD(01.10),

-       .Class                  = 0x00,
-       .SubClass               = 0x00,
-       .Protocol               = 0x00,
+       .Class                  = USB_CSCP_NoDeviceClass,
+       .SubClass               = USB_CSCP_NoDeviceSubclass,
+       .Protocol               = USB_CSCP_NoDeviceProtocol,

 
        .Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,
 
 
        .Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,
 


@@ -133,9 +133,9 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
                        .TotalEndpoints         = 2,
 
 
                        .TotalEndpoints         = 2,
 

-                       .Class                  = 0x08,
-                       .SubClass               = 0x06,
-                       .Protocol               = 0x50,
+                       .Class                  = MS_CSCP_MassStorageClass,
+                       .SubClass               = MS_CSCP_SCSITransparentSubclass,
+                       .Protocol               = MS_CSCP_BulkOnlyTransportProtocol,

 
                        .InterfaceStrIndex      = NO_DESCRIPTOR
                },
 
                        .InterfaceStrIndex      = NO_DESCRIPTOR
                },


@@ -147,7 +147,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | MASS_STORAGE_IN_EPNUM),
                        .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
                        .EndpointSize           = MASS_STORAGE_IO_EPSIZE,
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | MASS_STORAGE_IN_EPNUM),
                        .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
                        .EndpointSize           = MASS_STORAGE_IO_EPSIZE,

-                       .PollingIntervalMS      = 0x00
+                       .PollingIntervalMS      = 0x01

                },
 
        .MS_DataOutEndpoint =
                },
 
        .MS_DataOutEndpoint =


@@ -157,7 +157,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_OUT | MASS_STORAGE_OUT_EPNUM),
                        .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
                        .EndpointSize           = MASS_STORAGE_IO_EPSIZE,
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_OUT | MASS_STORAGE_OUT_EPNUM),
                        .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
                        .EndpointSize           = MASS_STORAGE_IO_EPSIZE,

-                       .PollingIntervalMS      = 0x00
+                       .PollingIntervalMS      = 0x01

                },
 
        .HID_Interface =
                },
 
        .HID_Interface =


@@ -169,9 +169,9 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
                        .TotalEndpoints         = 1,
 
 
                        .TotalEndpoints         = 1,
 

-                       .Class                  = 0x03,
-                       .SubClass               = 0x00,
-                       .Protocol               = HID_BOOTP_NonBootProtocol,
+                       .Class                  = HID_CSCP_HIDClass,
+                       .SubClass               = HID_CSCP_NonBootSubclass,
+                       .Protocol               = HID_CSCP_NonBootProtocol,

 
                        .InterfaceStrIndex      = NO_DESCRIPTOR
                },
 
                        .InterfaceStrIndex      = NO_DESCRIPTOR
                },


@@ -194,7 +194,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | GENERIC_IN_EPNUM),
                        .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
                        .EndpointSize           = GENERIC_EPSIZE,
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | GENERIC_IN_EPNUM),
                        .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
                        .EndpointSize           = GENERIC_EPSIZE,

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

                },
 };
 
                },
 };