gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-06-12 11:54:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix signature bytes in the DFU class bootloader.

Browse Source
This commit is contained in:
Dean Camera 2013-11-03 15:44:55 +01:00
parent bcd07f4f8a
commit 6b214472b7
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Bootloaders/DFU/BootloaderDFU.c
View File

@ -785,13 +785,20 @@ static void ProcessWriteCommand(void)
static void ProcessReadCommand(void) static void ProcessReadCommand(void)
{ {
const uint8_t BootloaderInfo[3] = {BOOTLOADER_VERSION, BOOTLOADER_ID_BYTE1, BOOTLOADER_ID_BYTE2}; const uint8_t BootloaderInfo[3] = {BOOTLOADER_VERSION, BOOTLOADER_ID_BYTE1, BOOTLOADER_ID_BYTE2};
const uint8_t SignatureInfo[3] = {AVR_SIGNATURE_1, AVR_SIGNATURE_2, AVR_SIGNATURE_3}; const uint8_t SignatureInfo[4] = {0x58, AVR_SIGNATURE_1, AVR_SIGNATURE_2, AVR_SIGNATURE_3};
uint8_t DataIndexToRead = SentCommand.Data[1]; uint8_t DataIndexToRead = SentCommand.Data[1];
if (IS_ONEBYTE_COMMAND(SentCommand.Data, 0x00)) // Read bootloader info if (IS_ONEBYTE_COMMAND(SentCommand.Data, 0x00)) // Read bootloader info
ResponseByte = BootloaderInfo[DataIndexToRead]; {
ResponseByte = BootloaderInfo[DataIndexToRead];
}
else if (IS_ONEBYTE_COMMAND(SentCommand.Data, 0x01)) // Read signature byte else if (IS_ONEBYTE_COMMAND(SentCommand.Data, 0x01)) // Read signature byte
ResponseByte = SignatureInfo[DataIndexToRead - 0x30]; {
if (DataIndexToRead < 0x60)
ResponseByte = SignatureInfo[DataIndexToRead - 0x30];
else
ResponseByte = SignatureInfo[DataIndexToRead - 0x60 + 3];
}
} }

1
LUFA/DoxygenPages/ChangeLog.txt
View File

@ -15,6 +15,7 @@
* - Library Applications: * - Library Applications:
* - Refactored out USB interface IDs in the demo applications into enums (thanks to Laszlo Monda) * - Refactored out USB interface IDs in the demo applications into enums (thanks to Laszlo Monda)
* - AVRISP-MKII Clone Project PDI/TPI frequency increased from 250KHz to 2MHz as it is now stable * - AVRISP-MKII Clone Project PDI/TPI frequency increased from 250KHz to 2MHz as it is now stable
* - Fixed incorrect signature bytes returned in the DFU bootloader
* *
* \section Sec_ChangeLog130901 Version 130901 * \section Sec_ChangeLog130901 Version 130901
* <b>New:</b> * <b>New:</b>