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

Merge pull request #2834 from haslinghuis/show_firmware_loaded

Browse source 
Show firmware loaded in firmware flasher tab
This commit is contained in:
haslinghuis 2022-02-27 01:30:00 +01:00 • committed by GitHub
commit 623537277a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
locales/en/messages.json
View file

@ -3242,10 +3242,10 @@
"message": "Firmware not loaded" "message": "Firmware not loaded"
}, },
"firmwareFlasherFirmwareLocalLoaded": { "firmwareFlasherFirmwareLocalLoaded": {
"message": "Loaded Local Firmware: ($1 bytes)" "message": "Loaded Local Firmware: {{filename}} ({{bytes}} bytes)"
}, },
"firmwareFlasherFirmwareOnlineLoaded": { "firmwareFlasherFirmwareOnlineLoaded": {
"message": "Loaded Online Firmware: ($1 bytes)" "message": "Loaded Online Firmware: {{filename}} ({{bytes}} bytes)"
}, },
"firmwareFlasherHexCorrupted": { "firmwareFlasherHexCorrupted": {
"message": "HEX file appears to be corrupted" "message": "HEX file appears to be corrupted"

15
src/js/tabs/firmware_flasher.js
View file

@ -59,9 +59,8 @@ firmware_flasher.initialize = function (callback) {
} }
function show_loaded_hex(summary) { function show_loaded_hex(summary) {
self.flashingMessage(`<a class="save_firmware" href="#" title="Save Firmware">${i18n.getMessage('firmwareFlasherFirmwareOnlineLoaded', self.parsed_hex.bytes_total)}</a>`, self.flashingMessage(`<a class="save_firmware" href="#" title="Save Firmware">${i18n.getMessage('firmwareFlasherFirmwareOnlineLoaded', { filename: summary.file, bytes: self.parsed_hex.bytes_total })}</a>`,
self.FLASH_MESSAGE_TYPES.NEUTRAL); self.FLASH_MESSAGE_TYPES.NEUTRAL);
self.enableFlashing(true); self.enableFlashing(true);
if (self.unifiedTarget.manufacturerId) { if (self.unifiedTarget.manufacturerId) {
@ -703,18 +702,20 @@ firmware_flasher.initialize = function (callback) {
GUI.log(i18n.getMessage('firmwareFlasherFailedToLoadUnifiedConfig', { remote_file: downloadUrl })); GUI.log(i18n.getMessage('firmwareFlasherFailedToLoadUnifiedConfig', { remote_file: downloadUrl }));
} }
function flashingMessageLocal() { function flashingMessageLocal(fileName) {
// used by the a.load_file hook, evaluate the loaded information, and enable flashing if suitable // used by the a.load_file hook, evaluate the loaded information, and enable flashing if suitable
if (self.isConfigLocal && !self.parsed_hex) { if (self.isConfigLocal && !self.parsed_hex) {
self.flashingMessage(i18n.getMessage('firmwareFlasherLoadedConfig'), self.FLASH_MESSAGE_TYPES.NEUTRAL); self.flashingMessage(i18n.getMessage('firmwareFlasherLoadedConfig'), self.FLASH_MESSAGE_TYPES.NEUTRAL);
} }
if (self.isConfigLocal && self.parsed_hex && !self.localFirmwareLoaded) { if (self.isConfigLocal && self.parsed_hex && !self.localFirmwareLoaded) {
self.enableFlashing(true); self.enableFlashing(true);
self.flashingMessage(i18n.getMessage('firmwareFlasherFirmwareLocalLoaded', self.parsed_hex.bytes_total), self.FLASH_MESSAGE_TYPES.NEUTRAL); self.flashingMessage(i18n.getMessage('firmwareFlasherFirmwareLocalLoaded', { filename: fileName, bytes: self.parsed_hex.bytes_total }), self.FLASH_MESSAGE_TYPES.NEUTRAL);
} }
if (self.localFirmwareLoaded) { if (self.localFirmwareLoaded) {
self.enableFlashing(true); self.enableFlashing(true);
self.flashingMessage(i18n.getMessage('firmwareFlasherFirmwareLocalLoaded', self.parsed_hex.bytes_total), self.FLASH_MESSAGE_TYPES.NEUTRAL); self.flashingMessage(i18n.getMessage('firmwareFlasherFirmwareLocalLoaded', { filename: fileName, bytes: self.parsed_hex.bytes_total }), self.FLASH_MESSAGE_TYPES.NEUTRAL);
} }
} }
@ -1018,7 +1019,7 @@ firmware_flasher.initialize = function (callback) {
analytics.setFirmwareData(analytics.DATA.FIRMWARE_SIZE, self.parsed_hex.bytes_total); analytics.setFirmwareData(analytics.DATA.FIRMWARE_SIZE, self.parsed_hex.bytes_total);
self.localFirmwareLoaded = true; self.localFirmwareLoaded = true;
flashingMessageLocal(); flashingMessageLocal(file.name);
} else { } else {
self.flashingMessage(i18n.getMessage('firmwareFlasherHexCorrupted'), self.FLASH_MESSAGE_TYPES.INVALID); self.flashingMessage(i18n.getMessage('firmwareFlasherHexCorrupted'), self.FLASH_MESSAGE_TYPES.INVALID);
} }
@ -1032,7 +1033,7 @@ firmware_flasher.initialize = function (callback) {
self.unifiedTarget.config = config; self.unifiedTarget.config = config;
self.unifiedTarget.fileName = file.name; self.unifiedTarget.fileName = file.name;
self.isConfigLocal = true; self.isConfigLocal = true;
flashingMessageLocal(); flashingMessageLocal(file.name);
} }
} }
} }