Fix TeensyHID bootloader for the largest AVRs - only the ATMEGA128x needs the alterna...

[pub/lufa.git] / Bootloaders / TeensyHID / Descriptors.h

diff --git a/Bootloaders/TeensyHID/Descriptors.h b/Bootloaders/TeensyHID/Descriptors.h
index f72dec2..8ef964d 100644 (file)
--- a/Bootloaders/TeensyHID/Descriptors.h
+++ b/Bootloaders/TeensyHID/Descriptors.h
@@ -96,15 +96,16 @@
                /** Vendor usage page for the Teensy++ 2.0 board */\r
                #define TEENSY_USAGEPAGE_20PP     0x1C\r
                \r
                /** Vendor usage page for the Teensy++ 2.0 board */\r
                #define TEENSY_USAGEPAGE_20PP     0x1C\r
                \r

-               #if defined(USB_SERIES_2_AVR)\r
+               #if (defined(__AVR_AT90USB162__) || defined(__AVR_ATmega16U2__))\r

                        #define TEENSY_USAGEPAGE      TEENSY_USAGEPAGE_10\r
                        #define TEENSY_USAGEPAGE      TEENSY_USAGEPAGE_10\r

-               #elif defined(USB_SERIES_4_AVR)\r
+               #elif defined(__AVR_ATmega32U4__)\r

                        #define TEENSY_USAGEPAGE      TEENSY_USAGEPAGE_20\r
                        #define TEENSY_USAGEPAGE      TEENSY_USAGEPAGE_20\r

-                       #define TEENSY_USAGE          TEENSY_USAGE_20\r
-               #elif defined(USB_SERIES_6_AVR)\r
+               #elif (defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__))\r

                        #define TEENSY_USAGEPAGE      TEENSY_USAGEPAGE_10PP\r
                        #define TEENSY_USAGEPAGE      TEENSY_USAGEPAGE_10PP\r

-               #elif defined(USB_SERIES_7_AVR)\r
+               #elif (defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__))\r

                        #define TEENSY_USAGEPAGE      TEENSY_USAGEPAGE_20PP\r
                        #define TEENSY_USAGEPAGE      TEENSY_USAGEPAGE_20PP\r

+               #else\r
+                       #error The selected AVR model is not currently supported by the TeensyHID bootloader.\r

                #endif\r
 \r
        /* Function Prototypes: */\r
                #endif\r
 \r
        /* Function Prototypes: */\r