Fixed programming errors in the AVRISP-MKII project when the programming packet is...

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

diff --git a/Projects/TempDataLogger/Descriptors.c b/Projects/TempDataLogger/Descriptors.c
index 64efef5..44873f1 100644 (file)
--- a/Projects/TempDataLogger/Descriptors.c
+++ b/Projects/TempDataLogger/Descriptors.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2011.
 
   dean [at] fourwalledcubicle [dot] 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
@@ -57,22 +57,14 @@
  */
 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                                  */
+       /* Use the HID class driver's standard Vendor HID report.
+        *  Vendor Usage Page: 1
+        *  Vendor Collection Usage: 1
+        *  Vendor Report IN Usage: 2
+        *  Vendor Report OUT Usage: 3
+        *  Vendor Report Size: GENERIC_REPORT_SIZE
+        */
+       HID_DESCRIPTOR_VENDOR(0x00, 0x01, 0x02, 0x03, GENERIC_REPORT_SIZE)
 };
 
 /** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall
@@ -147,7 +139,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,
-                       .PollingIntervalMS      = 0x00
+                       .PollingIntervalMS      = 0x01
                },
 
        .MS_DataOutEndpoint =
@@ -157,7 +149,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,
-                       .PollingIntervalMS      = 0x00
+                       .PollingIntervalMS      = 0x01
                },
 
        .HID_Interface =
@@ -194,7 +186,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,
-                       .PollingIntervalMS      = 0x0A
+                       .PollingIntervalMS      = 0x01
                },
 };