Altered DFU bootloader to use the signature byte constants located in the avr-libc...

diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c
index a997b20..704133f 100644 (file)
--- a/Bootloaders/DFU/BootloaderDFU.c
+++ b/Bootloaders/DFU/BootloaderDFU.c
@@ -677,7 +677,7 @@ static void ProcessWriteCommand(void)
 static void ProcessReadCommand(void)\r
 {\r
        const uint8_t BootloaderInfo[3] = {BOOTLOADER_VERSION, BOOTLOADER_ID_BYTE1, BOOTLOADER_ID_BYTE2};\r
 static void ProcessReadCommand(void)\r
 {\r
        const uint8_t BootloaderInfo[3] = {BOOTLOADER_VERSION, BOOTLOADER_ID_BYTE1, BOOTLOADER_ID_BYTE2};\r

-       const uint8_t SignatureInfo[3]  = {SIGNATURE_BYTE_1, SIGNATURE_BYTE_2, SIGNATURE_BYTE_3};\r
+       const uint8_t SignatureInfo[3]  = {SIGNATURE_0, SIGNATURE_1, SIGNATURE_2};\r

 \r
        uint8_t DataIndexToRead = SentCommand.Data[1];\r
 \r
 \r
        uint8_t DataIndexToRead = SentCommand.Data[1];\r
 \r

diff --git a/Bootloaders/DFU/BootloaderDFU.h b/Bootloaders/DFU/BootloaderDFU.h
index e5c680d..b90fee1 100644 (file)
--- a/Bootloaders/DFU/BootloaderDFU.h
+++ b/Bootloaders/DFU/BootloaderDFU.h
@@ -40,6 +40,7 @@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/boot.h>\r
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/boot.h>\r

+               #include <avr/pgmspace.h>\r

                #include <avr/eeprom.h>\r
                #include <stdbool.h>\r
        \r
                #include <avr/eeprom.h>\r
                #include <stdbool.h>\r
        \r

diff --git a/Bootloaders/DFU/Descriptors.h b/Bootloaders/DFU/Descriptors.h
index b6d1a2a..7765981 100644 (file)
--- a/Bootloaders/DFU/Descriptors.h
+++ b/Bootloaders/DFU/Descriptors.h
@@ -65,58 +65,22 @@
 \r
                #if defined(__AVR_AT90USB1286__)\r
                        #define PRODUCT_ID_CODE               0x2FFB\r
 \r
                #if defined(__AVR_AT90USB1286__)\r
                        #define PRODUCT_ID_CODE               0x2FFB\r

-\r
-                       #define SIGNATURE_BYTE_1              0x1E\r
-                       #define SIGNATURE_BYTE_2              0x97\r
-                       #define SIGNATURE_BYTE_3              0x82\r

                #elif defined(__AVR_AT90USB1287__)\r
                        #define PRODUCT_ID_CODE               0x2FFB\r
                #elif defined(__AVR_AT90USB1287__)\r
                        #define PRODUCT_ID_CODE               0x2FFB\r

-                       \r
-                       #define SIGNATURE_BYTE_1              0x1E\r
-                       #define SIGNATURE_BYTE_2              0x97\r
-                       #define SIGNATURE_BYTE_3              0x82\r

                #elif defined(__AVR_AT90USB646__)\r
                        #define PRODUCT_ID_CODE               0x2FF9\r
                #elif defined(__AVR_AT90USB646__)\r
                        #define PRODUCT_ID_CODE               0x2FF9\r

-\r
-                       #define SIGNATURE_BYTE_1              0x1E\r
-                       #define SIGNATURE_BYTE_2              0x96\r
-                       #define SIGNATURE_BYTE_3              0x82\r

                #elif defined(__AVR_AT90USB647__)\r
                        #define PRODUCT_ID_CODE               0x2FF9\r
                #elif defined(__AVR_AT90USB647__)\r
                        #define PRODUCT_ID_CODE               0x2FF9\r

-\r
-                       #define SIGNATURE_BYTE_1              0x1E\r
-                       #define SIGNATURE_BYTE_2              0x96\r
-                       #define SIGNATURE_BYTE_3              0x82\r

                #elif defined(__AVR_AT90USB162__)\r
                        #define PRODUCT_ID_CODE               0x2FFA\r
                #elif defined(__AVR_AT90USB162__)\r
                        #define PRODUCT_ID_CODE               0x2FFA\r

-\r
-                       #define SIGNATURE_BYTE_1              0x1E\r
-                       #define SIGNATURE_BYTE_2              0x94\r
-                       #define SIGNATURE_BYTE_3              0x82\r

                #elif defined(__AVR_AT90USB82__)\r
                        #define PRODUCT_ID_CODE               0x2FF7\r
                #elif defined(__AVR_AT90USB82__)\r
                        #define PRODUCT_ID_CODE               0x2FF7\r

-\r
-                       #define SIGNATURE_BYTE_1              0x1E\r
-                       #define SIGNATURE_BYTE_2              0x94\r
-                       #define SIGNATURE_BYTE_3              0x82\r

                #elif defined(__AVR_ATmega32U6__)\r
                        #define PRODUCT_ID_CODE               0x2FFB\r
                #elif defined(__AVR_ATmega32U6__)\r
                        #define PRODUCT_ID_CODE               0x2FFB\r

-\r
-                       #define SIGNATURE_BYTE_1              0x1E\r
-                       #define SIGNATURE_BYTE_2              0x95\r
-                       #define SIGNATURE_BYTE_3              0x88\r

                #elif defined(__AVR_ATmega32U4__)\r
                        #define PRODUCT_ID_CODE               0x2FF4\r
                #elif defined(__AVR_ATmega32U4__)\r
                        #define PRODUCT_ID_CODE               0x2FF4\r

-\r
-                       #define SIGNATURE_BYTE_1              0x1E\r
-                       #define SIGNATURE_BYTE_2              0x95\r
-                       #define SIGNATURE_BYTE_3              0x87      \r

                #elif defined(__AVR_ATmega16U4__)\r
                        #define PRODUCT_ID_CODE               0x2FF3\r
                #elif defined(__AVR_ATmega16U4__)\r
                        #define PRODUCT_ID_CODE               0x2FF3\r

-\r
-                       #define SIGNATURE_BYTE_1              0x1E\r
-                       #define SIGNATURE_BYTE_2              0x94\r
-                       #define SIGNATURE_BYTE_3              0x88\r

                #else\r
                        #error The selected AVR part is not currently supported by this bootloader.\r
                #endif\r
                #else\r
                        #error The selected AVR part is not currently supported by this bootloader.\r
                #endif\r