Skip to content

GitLab

Commit d711e37d authored by Dean Camera's avatar Dean Camera
Browse files

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

Altered DFU bootloader to use the signature byte constants located in the avr-libc part headers, rather than redefining them in Descriptors.h.
parent 7e7124e4
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 37 deletions
Bootloaders/DFU/BootloaderDFU.c
View file @ d711e37d
......@@ -677,7 +677,7 @@ static void ProcessWriteCommand(void)
static void ProcessReadCommand(void)
{
const uint8_t BootloaderInfo[3] = {BOOTLOADER_VERSION, BOOTLOADER_ID_BYTE1, BOOTLOADER_ID_BYTE2};
const uint8_t SignatureInfo[3] = {SIGNATURE_BYTE_1, SIGNATURE_BYTE_2, SIGNATURE_BYTE_3};
const uint8_t SignatureInfo[3] = {SIGNATURE_0, SIGNATURE_1, SIGNATURE_2};
uint8_t DataIndexToRead = SentCommand.Data[1];
......
Bootloaders/DFU/BootloaderDFU.h
View file @ d711e37d
......@@ -40,6 +40,7 @@
#include <avr/io.h>
#include <avr/wdt.h>
#include <avr/boot.h>
#include <avr/pgmspace.h>
#include <avr/eeprom.h>
#include <stdbool.h>
......
Bootloaders/DFU/Descriptors.h
View file @ d711e37d
......@@ -65,58 +65,22 @@
#if defined(__AVR_AT90USB1286__)
#define PRODUCT_ID_CODE 0x2FFB
#define SIGNATURE_BYTE_1 0x1E
#define SIGNATURE_BYTE_2 0x97
#define SIGNATURE_BYTE_3 0x82
#elif defined(__AVR_AT90USB1287__)
#define PRODUCT_ID_CODE 0x2FFB
#define SIGNATURE_BYTE_1 0x1E
#define SIGNATURE_BYTE_2 0x97
#define SIGNATURE_BYTE_3 0x82
#elif defined(__AVR_AT90USB646__)
#define PRODUCT_ID_CODE 0x2FF9
#define SIGNATURE_BYTE_1 0x1E
#define SIGNATURE_BYTE_2 0x96
#define SIGNATURE_BYTE_3 0x82
#elif defined(__AVR_AT90USB647__)
#define PRODUCT_ID_CODE 0x2FF9
#define SIGNATURE_BYTE_1 0x1E
#define SIGNATURE_BYTE_2 0x96
#define SIGNATURE_BYTE_3 0x82
#elif defined(__AVR_AT90USB162__)
#define PRODUCT_ID_CODE 0x2FFA
#define SIGNATURE_BYTE_1 0x1E
#define SIGNATURE_BYTE_2 0x94
#define SIGNATURE_BYTE_3 0x82
#elif defined(__AVR_AT90USB82__)
#define PRODUCT_ID_CODE 0x2FF7
#define SIGNATURE_BYTE_1 0x1E
#define SIGNATURE_BYTE_2 0x94
#define SIGNATURE_BYTE_3 0x82
#elif defined(__AVR_ATmega32U6__)
#define PRODUCT_ID_CODE 0x2FFB
#define SIGNATURE_BYTE_1 0x1E
#define SIGNATURE_BYTE_2 0x95
#define SIGNATURE_BYTE_3 0x88
#elif defined(__AVR_ATmega32U4__)
#define PRODUCT_ID_CODE 0x2FF4
#define SIGNATURE_BYTE_1 0x1E
#define SIGNATURE_BYTE_2 0x95
#define SIGNATURE_BYTE_3 0x87
#elif defined(__AVR_ATmega16U4__)
#define PRODUCT_ID_CODE 0x2FF3
#define SIGNATURE_BYTE_1 0x1E
#define SIGNATURE_BYTE_2 0x94
#define SIGNATURE_BYTE_3 0x88
#else
#error The selected AVR part is not currently supported by this bootloader.
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment