aboutsummaryrefslogtreecommitdiffstats
path: root/Demos/Device
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2009-07-23 08:00:12 +0000
committerDean Camera <dean@fourwalledcubicle.com>2009-07-23 08:00:12 +0000
commit5dbfdaa17dc4cb35783ec121453c7dfaca9874f3 (patch)
treee03f9d794664c1042e30406f37e4b244ce1bf1b5 /Demos/Device
parent7a5d045987f1d42b73a4291a9cd7ac25dc3b8c1a (diff)
downloadlufa-5dbfdaa17dc4cb35783ec121453c7dfaca9874f3.tar.gz
lufa-5dbfdaa17dc4cb35783ec121453c7dfaca9874f3.tar.bz2
lufa-5dbfdaa17dc4cb35783ec121453c7dfaca9874f3.zip
Ensure that the USB_DeviceState variable is properly set upon wakeup events, to the Addressed or Configured state as needed.
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.
Diffstat (limited to 'Demos/Device')
-rw-r--r--Demos/Device/ClassDriver/CDC/CDC.c2
-rw-r--r--Demos/Device/ClassDriver/DualCDC/DualCDC.c2
-rw-r--r--Demos/Device/Incomplete/Sideshow/Descriptors.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/Demos/Device/ClassDriver/CDC/CDC.c b/Demos/Device/ClassDriver/CDC/CDC.c
index 8ecfb7b37..cc8abe416 100644
--- a/Demos/Device/ClassDriver/CDC/CDC.c
+++ b/Demos/Device/ClassDriver/CDC/CDC.c
@@ -107,7 +107,7 @@ void CheckJoystickMovement(void)
char* ReportString = NULL;
static bool ActionSent = false;
- char* JoystickStrings[] =
+ char* const JoystickStrings[] =
{
"Joystick Up\r\n",
"Joystick Down\r\n",
diff --git a/Demos/Device/ClassDriver/DualCDC/DualCDC.c b/Demos/Device/ClassDriver/DualCDC/DualCDC.c
index 82bfdc8f7..adc17aed3 100644
--- a/Demos/Device/ClassDriver/DualCDC/DualCDC.c
+++ b/Demos/Device/ClassDriver/DualCDC/DualCDC.c
@@ -144,7 +144,7 @@ void CheckJoystickMovement(void)
char* ReportString = NULL;
static bool ActionSent = false;
- char* JoystickStrings[] =
+ char* const JoystickStrings[] =
{
"Joystick Up\r\n",
"Joystick Down\r\n",
diff --git a/Demos/Device/Incomplete/Sideshow/Descriptors.c b/Demos/Device/Incomplete/Sideshow/Descriptors.c
index 3aaaa8031..275892b9b 100644
--- 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,
VendorID: 0x03EB,
- ProductID: 0xDC03,
+ ProductID: 0x2060,
ReleaseNumber: 0x0000,
ManufacturerStrIndex: 0x01,