Ensure that the USB_DeviceState variable is properly set upon wakeup events, to the...

Add explicit support for the AT90USB646 to the Teensy bootloader now that PJRC have released the Teensy++ board.

Ensure unfinished SideShow demo uses an unallocated PID value within the LUFA range.

diff --git a/Bootloaders/TeensyHID/TeensyHID.h b/Bootloaders/TeensyHID/TeensyHID.h
index 484fb6b..3c59605 100644 (file)
--- a/Bootloaders/TeensyHID/TeensyHID.h
+++ b/Bootloaders/TeensyHID/TeensyHID.h
@@ -50,7 +50,7 @@
                #include <LUFA/Drivers/USB/USB.h>\r
                \r
        /* Preprocessor Checks: */\r
-               #if !defined(__AVR_AT90USB162__)\r
+               #if !defined(__AVR_AT90USB162__) && !defined(__AVR_AT90USB646__)\r
                        #error This bootloader is not compatible with the selected AVR model.\r
                #endif\r
 \r

diff --git a/Demos/Device/ClassDriver/CDC/CDC.c b/Demos/Device/ClassDriver/CDC/CDC.c
index 8ecfb7b..cc8abe4 100644 (file)
--- a/Demos/Device/ClassDriver/CDC/CDC.c
+++ b/Demos/Device/ClassDriver/CDC/CDC.c
@@ -107,7 +107,7 @@ void CheckJoystickMovement(void)
        char*       ReportString  = NULL;\r
        static bool ActionSent    = false;\r
        \r
-       char* JoystickStrings[] =\r
+       char* const JoystickStrings[] =\r
                {\r
                        "Joystick Up\r\n",\r
                        "Joystick Down\r\n",\r

diff --git a/Demos/Device/ClassDriver/DualCDC/DualCDC.c b/Demos/Device/ClassDriver/DualCDC/DualCDC.c
index 82bfdc8..adc17ae 100644 (file)
--- a/Demos/Device/ClassDriver/DualCDC/DualCDC.c
+++ b/Demos/Device/ClassDriver/DualCDC/DualCDC.c
@@ -144,7 +144,7 @@ void CheckJoystickMovement(void)
        char*       ReportString  = NULL;\r
        static bool ActionSent = false;\r
 \r
-       char* JoystickStrings[] =\r
+       char* const JoystickStrings[] =\r
                {\r
                        "Joystick Up\r\n",\r
                        "Joystick Down\r\n",\r

diff --git a/Demos/Device/Incomplete/Sideshow/Descriptors.c b/Demos/Device/Incomplete/Sideshow/Descriptors.c
index 3aaaa80..275892b 100644 (file)
--- a/Demos/Device/Incomplete/Sideshow/Descriptors.c
+++ b/Demos/Device/Incomplete/Sideshow/Descriptors.c
@@ -42,7 +42,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
        Endpoint0Size:          8,\r
                \r
        VendorID:               0x03EB,\r
-       ProductID:              0xDC03,\r
+       ProductID:              0x2060,\r
        ReleaseNumber:          0x0000,\r
                \r
        ManufacturerStrIndex:   0x01,\r

diff --git a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c b/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
index 5edefa9..20545a4 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
+++ b/LUFA/Drivers/USB/HighLevel/USBInterrupt.c
@@ -143,7 +143,7 @@ ISR(USB_GEN_vect, ISR_BLOCK)
                USB_DeviceState = DEVICE_STATE_Powered;\r
                EVENT_USB_Connect();\r
                #else\r
-               USB_DeviceState = DEVICE_STATE_Configured;\r
+               USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Addressed;\r
                EVENT_USB_WakeUp();             \r
                #endif\r
        }\r