aboutsummaryrefslogtreecommitdiffstats
path: root/Bootloaders
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 /Bootloaders
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 'Bootloaders')
-rw-r--r--Bootloaders/TeensyHID/TeensyHID.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Bootloaders/TeensyHID/TeensyHID.h b/Bootloaders/TeensyHID/TeensyHID.h
index 484fb6b3a..3c5960595 100644
--- a/Bootloaders/TeensyHID/TeensyHID.h
+++ b/Bootloaders/TeensyHID/TeensyHID.h
@@ -50,7 +50,7 @@
#include <LUFA/Drivers/USB/USB.h>
/* Preprocessor Checks: */
- #if !defined(__AVR_AT90USB162__)
+ #if !defined(__AVR_AT90USB162__) && !defined(__AVR_AT90USB646__)
#error This bootloader is not compatible with the selected AVR model.
#endif