From 77dda302acb0402a27565e12f98ffc56c1a86389 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Fri, 15 Jan 2010 02:42:54 +0000 Subject: Fixed invalid USB controller PLL prescaler values for the ATMEGAxxU2 controllers Fixed lack of support for the ATMEGA32U2 in the DFU and CDC class bootloaders Changed incomplete Webserver project over to using the uIP timer library. --- Bootloaders/CDC/Descriptors.h | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) (limited to 'Bootloaders/CDC/Descriptors.h') diff --git a/Bootloaders/CDC/Descriptors.h b/Bootloaders/CDC/Descriptors.h index 94883be20..ac02ff652 100644 --- a/Bootloaders/CDC/Descriptors.h +++ b/Bootloaders/CDC/Descriptors.h @@ -40,29 +40,21 @@ #include /* Macros: */ - #if defined(__AVR_AT90USB1286__) + #if defined(__AVR_AT90USB1287__) #define AVR_SIGNATURE_1 0x1E #define AVR_SIGNATURE_2 0x97 #define AVR_SIGNATURE_3 0x82 - #elif defined(__AVR_AT90USB1287__) - #define AVR_SIGNATURE_1 0x1E - #define AVR_SIGNATURE_2 0x97 - #define AVR_SIGNATURE_3 0x82 - #elif defined(__AVR_AT90USB646__) - #define AVR_SIGNATURE_1 0x1E - #define AVR_SIGNATURE_2 0x96 - #define AVR_SIGNATURE_3 0x82 #elif defined(__AVR_AT90USB647__) #define AVR_SIGNATURE_1 0x1E #define AVR_SIGNATURE_2 0x96 #define AVR_SIGNATURE_3 0x82 - #elif defined(__AVR_AT90USB162__) + #elif defined(__AVR_AT90USB1286__) #define AVR_SIGNATURE_1 0x1E - #define AVR_SIGNATURE_2 0x94 + #define AVR_SIGNATURE_2 0x97 #define AVR_SIGNATURE_3 0x82 - #elif defined(__AVR_AT90USB82__) + #elif defined(__AVR_AT90USB646__) #define AVR_SIGNATURE_1 0x1E - #define AVR_SIGNATURE_2 0x94 + #define AVR_SIGNATURE_2 0x96 #define AVR_SIGNATURE_3 0x82 #elif defined(__AVR_ATmega32U6__) #define AVR_SIGNATURE_1 0x1E @@ -76,6 +68,26 @@ #define AVR_SIGNATURE_1 0x1E #define AVR_SIGNATURE_2 0x94 #define AVR_SIGNATURE_3 0x88 + #elif defined(__AVR_ATmega32U2__) + #define AVR_SIGNATURE_1 0x1E + #define AVR_SIGNATURE_2 0x94 + #define AVR_SIGNATURE_3 0x82 + #elif defined(__AVR_ATmega16U2__) + #define AVR_SIGNATURE_1 0x1E + #define AVR_SIGNATURE_2 0x94 + #define AVR_SIGNATURE_3 0x89 + #elif defined(__AVR_AT90USB162__) + #define AVR_SIGNATURE_1 0x1E + #define AVR_SIGNATURE_2 0x94 + #define AVR_SIGNATURE_3 0x82 + #elif defined(__AVR_ATmega8U2__) + #define AVR_SIGNATURE_1 0x1E + #define AVR_SIGNATURE_2 0x93 + #define AVR_SIGNATURE_3 0x82 + #elif defined(__AVR_AT90USB82__) + #define AVR_SIGNATURE_1 0x1E + #define AVR_SIGNATURE_2 0x93 + #define AVR_SIGNATURE_3 0x89 #else #error The selected AVR part is not currently supported by this bootloader. #endif -- cgit v1.2.3