Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-25 17:25:16 +03:00
Code Issues Wiki Activity

Initial support for flashing EXST .hex files to External Flash. (#1565)

Browse source 
Initial support for flashing EXST .hex files to External Flash.
This commit is contained in:
Michael Keller 2019-08-12 02:41:31 +12:00 • committed by GitHub
commit 7189363f98
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 77 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

3
locales/en/messages.json
View file

@ -386,6 +386,9 @@
"stm32LocalErase": { "stm32LocalErase": {
"message": "Executing local erase ..." "message": "Executing local erase ..."
}, },
"stm32InvalidHex": {
"message": "Invalid hex"
},
"stm32Erase": { "stm32Erase": {
"message": "Erasing ..." "message": "Erasing ..."
}, },

93
src/js/protocols/stm32usbdfu.js
View file

@ -337,6 +337,15 @@ STM32DFU_protocol.prototype.getChipInfo = function (_interface, callback) {
// F40x: "@Internal Flash /0x08000000/04*016Kg,01*064Kg,07*128Kg" // F40x: "@Internal Flash /0x08000000/04*016Kg,01*064Kg,07*128Kg"
// F72x: "@Internal Flash /0x08000000/04*016Kg,01*64Kg,03*128Kg" // F72x: "@Internal Flash /0x08000000/04*016Kg,01*64Kg,03*128Kg"
// F74x: "@Internal Flash /0x08000000/04*032Kg,01*128Kg,03*256Kg" // F74x: "@Internal Flash /0x08000000/04*032Kg,01*128Kg,03*256Kg"
// H750 SPRacing H7 EXST: "@External Flash /0x90000000/998*128Kg,1*128Kg,4*128Kg,21*128Ka"
// H750 SPRacing H7 EXST: "@External Flash /0x90000000/1001*128Kg,3*128Kg,20*128Ka" - Early BL firmware with incorrect string, treat as above.
// H750 Partitions: Flash, Config, Firmware, 1x BB Management block + x BB Replacement blocks)
if (str == "@External Flash /0x90000000/1001*128Kg,3*128Kg,20*128Ka") {
str = "@External Flash /0x90000000/998*128Kg,1*128Kg,4*128Kg,21*128Ka"
}
// split main into [location, start_addr, sectors] // split main into [location, start_addr, sectors]
var tmp0 = str.replace(/[^\x20-\x7E]+/g, ""); var tmp0 = str.replace(/[^\x20-\x7E]+/g, "");
@ -507,7 +516,7 @@ STM32DFU_protocol.prototype.clearStatus = function (callback) {
STM32DFU_protocol.prototype.loadAddress = function (address, callback, abort) { STM32DFU_protocol.prototype.loadAddress = function (address, callback, abort) {
var self = this; var self = this;
self.controlTransfer('out', self.request.DNLOAD, 0, 0, 0, [0x21, address, (address >> 8), (address >> 16), (address >> 24)], function () { self.controlTransfer('out', self.request.DNLOAD, 0, 0, 0, [0x21, address & 0xff, (address >> 8) & 0xff, (address >> 16) & 0xff, (address >> 24) & 0xff], function () {
self.controlTransfer('in', self.request.GETSTATUS, 0, 0, 6, 0, function (data) { self.controlTransfer('in', self.request.GETSTATUS, 0, 0, 6, 0, function (data) {
if (data[4] == self.state.dfuDNBUSY) { if (data[4] == self.state.dfuDNBUSY) {
var delay = data[1] | (data[2] << 8) | (data[3] << 16); var delay = data[1] | (data[2] << 8) | (data[3] << 16);
@ -560,31 +569,59 @@ STM32DFU_protocol.prototype.upload_procedure = function (step) {
console.log('Failed to detect chip info, resultCode: ' + resultCode); console.log('Failed to detect chip info, resultCode: ' + resultCode);
self.upload_procedure(99); self.upload_procedure(99);
} else { } else {
if (typeof chipInfo.internal_flash === "undefined") { if (typeof chipInfo.internal_flash !== "undefined") {
console.log('Failed to detect internal flash'); // internal flash
self.upload_procedure(99); self.chipInfo = chipInfo;
}
self.chipInfo = chipInfo; self.flash_layout = chipInfo.internal_flash;
self.available_flash_size = self.flash_layout.total_size - (self.hex.start_linear_address - self.flash_layout.start_address);
self.flash_layout = chipInfo.internal_flash; GUI.log(i18n.getMessage('dfu_device_flash_info', (self.flash_layout.total_size / 1024).toString()));
self.available_flash_size = self.flash_layout.total_size - (self.hex.start_linear_address - self.flash_layout.start_address);
GUI.log(i18n.getMessage('dfu_device_flash_info', (self.flash_layout.total_size / 1024).toString())); if (self.hex.bytes_total > self.available_flash_size) {
GUI.log(i18n.getMessage('dfu_error_image_size',
if (self.hex.bytes_total > self.available_flash_size) { [(self.hex.bytes_total / 1024.0).toFixed(1),
GUI.log(i18n.getMessage('dfu_error_image_size', (self.available_flash_size / 1024.0).toFixed(1)]));
[(self.hex.bytes_total / 1024.0).toFixed(1), self.upload_procedure(99);
(self.available_flash_size / 1024.0).toFixed(1)])); } else {
self.upload_procedure(99); self.getFunctionalDescriptor(0, function (descriptor, resultCode) {
} else { self.transferSize = resultCode ? 2048 : descriptor.wTransferSize;
self.getFunctionalDescriptor(0, function (descriptor, resultCode) { console.log('Using transfer size: ' + self.transferSize);
self.transferSize = resultCode ? 2048 : descriptor.wTransferSize; self.clearStatus(function () {
console.log('Using transfer size: ' + self.transferSize); self.upload_procedure(1);
self.clearStatus(function () { });
self.upload_procedure(1);
}); });
}); }
} else if (typeof chipInfo.external_flash !== "undefined") {
// external flash, flash to the 3rd partition.
self.chipInfo = chipInfo;
self.flash_layout = chipInfo.external_flash;
var firmware_partition_index = 2;
var firmware_sectors = self.flash_layout.sectors[firmware_partition_index];
var firmware_partition_size = firmware_sectors.total_size;
self.available_flash_size = firmware_partition_size;
GUI.log(i18n.getMessage('dfu_device_flash_info', (self.flash_layout.total_size / 1024).toString()));
if (self.hex.bytes_total > self.available_flash_size) {
GUI.log(i18n.getMessage('dfu_error_image_size',
[(self.hex.bytes_total / 1024.0).toFixed(1),
(self.available_flash_size / 1024.0).toFixed(1)]));
self.upload_procedure(99);
} else {
self.getFunctionalDescriptor(0, function (descriptor, resultCode) {
self.transferSize = resultCode ? 2048 : descriptor.wTransferSize;
console.log('Using transfer size: ' + self.transferSize);
self.clearStatus(function () {
self.upload_procedure(2); // no option bytes to deal with
});
});
}
} else {
console.log('Failed to detect internal or external flash');
self.upload_procedure(99);
} }
} }
}); });
@ -607,7 +644,7 @@ STM32DFU_protocol.prototype.upload_procedure = function (step) {
var delay = data[1] | (data[2] << 8) | (data[3] << 16); var delay = data[1] | (data[2] << 8) | (data[3] << 16);
var total_delay = delay + 20000; // wait at least 20 seconds to make sure the user does not disconnect the board while erasing the memory var total_delay = delay + 20000; // wait at least 20 seconds to make sure the user does not disconnect the board while erasing the memory
var timeSpentWaiting = 0; var timeSpentWaiting = 0;
var incr = 1000; // one sec incements var incr = 1000; // one sec increments
var waitForErase = setInterval(function () { var waitForErase = setInterval(function () {
TABS.firmware_flasher.flashProgress(Math.min(timeSpentWaiting / total_delay, 1) * 100); TABS.firmware_flasher.flashProgress(Math.min(timeSpentWaiting / total_delay, 1) * 100);
@ -759,8 +796,16 @@ STM32DFU_protocol.prototype.upload_procedure = function (step) {
} }
} }
if (erase_pages.length === 0) {
console.log('Aborting, No flash pages to erase');
TABS.firmware_flasher.flashingMessage(i18n.getMessage('stm32InvalidHex'), TABS.firmware_flasher.FLASH_MESSAGE_TYPES.INVALID);
self.upload_procedure(99);
break;
}
TABS.firmware_flasher.flashingMessage(i18n.getMessage('stm32Erase'), TABS.firmware_flasher.FLASH_MESSAGE_TYPES.NEUTRAL); TABS.firmware_flasher.flashingMessage(i18n.getMessage('stm32Erase'), TABS.firmware_flasher.FLASH_MESSAGE_TYPES.NEUTRAL);
console.log('Executing local chip erase'); console.log('Executing local chip erase', erase_pages);
var page = 0; var page = 0;
var total_erased = 0; // bytes var total_erased = 0; // bytes

3
src/js/workers/hex_parser.js
View file

@ -77,7 +77,8 @@ function read_hex_file(data) {
} }
break; break;
case 0x04: // extended linear address record case 0x04: // extended linear address record
extended_linear_address = (parseInt(content.substr(0, 2), 16) << 24) | parseInt(content.substr(2, 2), 16) << 16; // input address is UNSIGNED
extended_linear_address = ((parseInt(content.substr(0, 2), 16) << 24) | parseInt(content.substr(2, 2), 16) << 16) >>> 0;
break; break;
case 0x05: // start linear address record case 0x05: // start linear address record
result.start_linear_address = parseInt(content, 16) result.start_linear_address = parseInt(content, 16)