Fix swapped product IDs for the ATMEGA8U2 and AT90USB82 in the DFU class bootloader.

diff --git a/Bootloaders/DFU/Descriptors.h b/Bootloaders/DFU/Descriptors.h
index b40e0b3..71ae30a 100644 (file)
--- a/Bootloaders/DFU/Descriptors.h
+++ b/Bootloaders/DFU/Descriptors.h
@@ -111,12 +111,12 @@
                        #define AVR_SIGNATURE_2               0x94
                        #define AVR_SIGNATURE_3               0x82
                #elif defined(__AVR_ATmega8U2__)
                        #define AVR_SIGNATURE_2               0x94
                        #define AVR_SIGNATURE_3               0x82
                #elif defined(__AVR_ATmega8U2__)

-                       #define PRODUCT_ID_CODE               0x2FF7
+                       #define PRODUCT_ID_CODE               0x2FEE

                        #define AVR_SIGNATURE_1               0x1E
                        #define AVR_SIGNATURE_2               0x93
                        #define AVR_SIGNATURE_3               0x89
                #elif defined(__AVR_AT90USB82__)
                        #define AVR_SIGNATURE_1               0x1E
                        #define AVR_SIGNATURE_2               0x93
                        #define AVR_SIGNATURE_3               0x89
                #elif defined(__AVR_AT90USB82__)

-                       #define PRODUCT_ID_CODE               0x2FEE
+                       #define PRODUCT_ID_CODE               0x2FF7

                        #define AVR_SIGNATURE_1               0x1E
                        #define AVR_SIGNATURE_2               0x94
                        #define AVR_SIGNATURE_3               0x82
                        #define AVR_SIGNATURE_1               0x1E
                        #define AVR_SIGNATURE_2               0x94
                        #define AVR_SIGNATURE_3               0x82

diff --git a/LUFA/StudioIntegration/lufa.xml b/LUFA/StudioIntegration/lufa.xml
index d9570f5..8b0a60d 100644 (file)
--- a/LUFA/StudioIntegration/lufa.xml
+++ b/LUFA/StudioIntegration/lufa.xml
@@ -58,7 +58,7 @@
                        <device-support value="atxmega128b1"/>\r
                        <device-support value="atxmega64c3"/>\r
                        <device-support value="atxmega128c3"/>\r
                        <device-support value="atxmega128b1"/>\r
                        <device-support value="atxmega64c3"/>\r
                        <device-support value="atxmega128c3"/>\r

-                       <!-- <device-support value="atxmega192c3"/> NOT SUPPORTED IN ASF -->\r
+                       <!-- <device-support value="atxmega192c3"/> Wait for ASFP-3339 merge and release before enabling -->\r

                        <device-support value="atxmega256c3"/>\r
                        <device-support value="atxmega384c3"/>\r
                        <device-support value="atxmega16c4"/>\r
                        <device-support value="atxmega256c3"/>\r
                        <device-support value="atxmega384c3"/>\r
                        <device-support value="atxmega16c4"/>\r