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

Fix initialization of build options when MSP timeout occurs (#4400)

Browse source 
* Fix init in case of timeout

* Experiment

* Remove experiment

* Move processing

* Tidy up
This commit is contained in:
Mark Haslinghuis 2025-03-27 21:07:48 +01:00 • committed by GitHub
parent cdd721de34
commit 96a82d77f0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/js/msp/MSPHelper.js
View file

@ -824,11 +824,13 @@ MspHelper.prototype.process_data = function (dataHandler) {
console.log("Fw git rev:", FC.CONFIG.gitRevision); console.log("Fw git rev:", FC.CONFIG.gitRevision);
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_46)) { if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_46)) {
let option = data.readU16(); FC.CONFIG.buildOptions = [];
while (option) { let option;
while ((option = data.readU16())) {
FC.CONFIG.buildOptions.push(option); FC.CONFIG.buildOptions.push(option);
option = data.readU16();
} }
// Humanize the build options
FC.processBuildOptions();
} }
break; break;

10
src/js/serial_backend.js
View file

@ -323,11 +323,6 @@ function onOpen(openInfo) {
MSP.send_message(MSPCodes.MSP_BUILD_INFO, false, false, function () { MSP.send_message(MSPCodes.MSP_BUILD_INFO, false, false, function () {
gui_log(i18n.getMessage("buildInfoReceived", [FC.CONFIG.buildInfo])); gui_log(i18n.getMessage("buildInfoReceived", [FC.CONFIG.buildInfo]));
// retrieve build options from the flight controller
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_46)) {
FC.processBuildOptions();
}
MSP.send_message(MSPCodes.MSP_BOARD_INFO, false, false, processBoardInfo); MSP.send_message(MSPCodes.MSP_BOARD_INFO, false, false, processBoardInfo);
}); });
}); });
@ -634,7 +629,10 @@ function connectCli() {
} }
function onConnect() { function onConnect() {
if ($("a.firmware_flasher_button__label").hasClass("active") || $("a.firmware_flasher_button__link").hasClass("active")) { if (
$("a.firmware_flasher_button__label").hasClass("active") ||
$("a.firmware_flasher_button__link").hasClass("active")
) {
$("a.firmware_flasher_button__label").removeClass("active"); $("a.firmware_flasher_button__label").removeClass("active");
$("a.firmware_flasher_button__link").removeClass("active"); $("a.firmware_flasher_button__link").removeClass("active");
} }