Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-20 23:05:15 +03:00
Code Issues Wiki Activity

Merge pull request #2043 from mikeller/add_local_file_header_injection

Browse source 
Added injection of custom defaults header when flashing local file.
This commit is contained in:
Michael Keller 2020-06-03 07:09:08 +12:00 • committed by GitHub
commit fb8e66b7a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -508,7 +508,7 @@ TABS.firmware_flasher.initialize = function (callback) {
function setUnifiedConfig(target, bareBoard, targetConfig, manufacturerId, fileName, fileUrl, date) { function setUnifiedConfig(target, bareBoard, targetConfig, manufacturerId, fileName, fileUrl, date) {
// a target might request a firmware with the same name, remove configuration in this case. // a target might request a firmware with the same name, remove configuration in this case.
if (bareBoard == target) { if (bareBoard === target) {
self.unifiedTarget = {}; self.unifiedTarget = {};
} else { } else {
self.unifiedTarget.config = targetConfig; self.unifiedTarget.config = targetConfig;
@ -610,13 +610,15 @@ TABS.firmware_flasher.initialize = function (callback) {
$.get(unifiedConfig.download_url, function(targetConfig) { $.get(unifiedConfig.download_url, function(targetConfig) {
console.log('got unified config'); console.log('got unified config');
const bareBoard = grabBuildNameFromConfig(targetConfig); let config = cleanUnifiedConfigFile(targetConfig);
if (config !== null) {
const bareBoard = grabBuildNameFromConfig(config);
TABS.firmware_flasher.bareBoard = bareBoard; TABS.firmware_flasher.bareBoard = bareBoard;
self.gitHubApi.getFileLastCommitInfo('betaflight/unified-targets', 'master', unifiedConfig.path, function (commitInfo) { self.gitHubApi.getFileLastCommitInfo('betaflight/unified-targets', 'master', unifiedConfig.path, function (commitInfo) {
targetConfig = self.injectTargetInfo(targetConfig, target, manufacturerId, commitInfo); config = self.injectTargetInfo(config, target, manufacturerId, commitInfo);
setUnifiedConfig(target, bareBoard, targetConfig, manufacturerId, unifiedConfig.name, unifiedConfig.download_url, commitInfo.date); setUnifiedConfig(target, bareBoard, config, manufacturerId, unifiedConfig.name, unifiedConfig.download_url, commitInfo.date);
// cache it for later // cache it for later
let newStorageObj = {}; let newStorageObj = {};
@ -629,12 +631,11 @@ TABS.firmware_flasher.initialize = function (callback) {
populateBuilds(builds, target, manufacturerId, duplicateName, TABS.firmware_flasher.releases[bareBoard], processNext); populateBuilds(builds, target, manufacturerId, duplicateName, TABS.firmware_flasher.releases[bareBoard], processNext);
}); });
} else {
failLoading(unifiedConfig.download_url);
}
}).fail(xhr => { }).fail(xhr => {
//TODO error, populate nothing? failLoading(unifiedConfig.download_url);
self.unifiedTarget = {};
self.isConfigLocal = false;
const baseFileName = unifiedConfig.download_url;
GUI.log(i18n.getMessage('firmwareFlasherFailedToLoadUnifiedConfig', { remote_file: baseFileName }));
}); });
} else { } else {
console.log('We have the config cached for', targetId); console.log('We have the config cached for', targetId);
@ -663,6 +664,14 @@ TABS.firmware_flasher.initialize = function (callback) {
} }
}); });
function failLoading(downloadUrl) {
//TODO error, populate nothing?
self.unifiedTarget = {};
self.isConfigLocal = false;
GUI.log(i18n.getMessage('firmwareFlasherFailedToLoadUnifiedConfig', { remote_file: downloadUrl }));
}
function flashingMessageLocal() { function flashingMessageLocal() {
// 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) {
@ -689,8 +698,9 @@ TABS.firmware_flasher.initialize = function (callback) {
inComment = true; inComment = true;
} }
if (!inComment && input.charCodeAt(i) > 255) { if (!inComment && input.charCodeAt(i) > 255) {
// Note: we're not showing this error in betaflight-configurator self.flashingMessage(i18n.getMessage('firmwareFlasherConfigCorrupted'), self.FLASH_MESSAGE_TYPES.INVALID);
throw new Error('commands are limited to characters 0-255, comments have no limitation'); GUI.log(i18n.getMessage('firmwareFlasherConfigCorruptedLogMessage'));
return null;
} }
if (input.charCodeAt(i) > 255) { if (input.charCodeAt(i) > 255) {
output.push('_'); output.push('_');
@ -875,14 +885,14 @@ TABS.firmware_flasher.initialize = function (callback) {
}); });
} else { } else {
clearBufferedFirmware(); clearBufferedFirmware();
try {
self.unifiedTarget.config = cleanUnifiedConfigFile(e.target.result); let config = cleanUnifiedConfigFile(e.target.result);
if (config !== null) {
config = self.injectTargetInfo(config, file.name, 'UNKN', { commitHash: 'unknown', date: file.lastModifiedDate.toISOString() });
self.unifiedTarget.config = config;
self.unifiedTarget.fileName = file.name; self.unifiedTarget.fileName = file.name;
self.isConfigLocal = true; self.isConfigLocal = true;
flashingMessageLocal(); flashingMessageLocal();
} catch(err) {
self.flashingMessage(i18n.getMessage('firmwareFlasherConfigCorrupted'), self.FLASH_MESSAGE_TYPES.INVALID);
GUI.log(i18n.getMessage('firmwareFlasherConfigCorruptedLogMessage'));
} }
} }
} }