Fixed ISR definition conflict in the XPLAIN bridge between the software UART and...

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

diff --git a/Projects/TempDataLogger/Descriptors.c b/Projects/TempDataLogger/Descriptors.c
index d6e8960..16a6581 100644 (file)
--- a/Projects/TempDataLogger/Descriptors.c
+++ b/Projects/TempDataLogger/Descriptors.c
@@ -93,7 +93,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
                
        .VendorID               = 0x03EB,
        .ProductID              = 0x2063,
                
        .VendorID               = 0x03EB,
        .ProductID              = 0x2063,

-       .ReleaseNumber          = 0x0000,
+       .ReleaseNumber          = VERSION_BCD(00.01),

                
        .ManufacturerStrIndex   = 0x01,
        .ProductStrIndex        = 0x02,
                
        .ManufacturerStrIndex   = 0x01,
        .ProductStrIndex        = 0x02,


@@ -171,19 +171,19 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                                
                        .Class                  = 0x03,
                        .SubClass               = 0x00,
                                
                        .Class                  = 0x03,
                        .SubClass               = 0x00,

-                       .Protocol               = HID_NON_BOOT_PROTOCOL,
+                       .Protocol               = HID_BOOTP_NonBootProtocol,

                                
                        .InterfaceStrIndex      = NO_DESCRIPTOR
                },
 
        .HID_GenericHID = 
                {
                                
                        .InterfaceStrIndex      = NO_DESCRIPTOR
                },
 
        .HID_GenericHID = 
                {

-                       .Header                 = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},
+                       .Header                 = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID},

                                                                         
                        .HIDSpec                = VERSION_BCD(01.11),
                        .CountryCode            = 0x00,
                        .TotalReportDescriptors = 1,
                                                                         
                        .HIDSpec                = VERSION_BCD(01.11),
                        .CountryCode            = 0x00,
                        .TotalReportDescriptors = 1,

-                       .HIDReportType          = DTYPE_Report,
+                       .HIDReportType          = HID_DTYPE_Report,

                        .HIDReportLength        = sizeof(GenericReport)
                },
 
                        .HIDReportLength        = sizeof(GenericReport)
                },
 


@@ -275,11 +275,11 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
                        }
                        
                        break;
                        }
                        
                        break;

-               case DTYPE_HID: 
+               case HID_DTYPE_HID: 

                        Address = &ConfigurationDescriptor.HID_GenericHID;
                        Address = &ConfigurationDescriptor.HID_GenericHID;

-                       Size    = sizeof(USB_HID_Descriptor_t);
+                       Size    = sizeof(USB_HID_Descriptor_HID_t);

                        break;
                        break;

-               case DTYPE_Report: 
+               case HID_DTYPE_Report: 

                        Address = &GenericReport;
                        Size    = sizeof(GenericReport);
                        break;
                        Address = &GenericReport;
                        Size    = sizeof(GenericReport);
                        break;