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

Fix invalid version (#3449)

Browse source
This commit is contained in:
Mark Haslinghuis 2023-05-12 21:44:01 +02:00 • committed by GitHub
parent c5ddfa4555
commit 99730ef531
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/js/serial_backend.js
View file

@ -239,6 +239,26 @@ function setConnectionTimeout() {
}, 10000);
}
function abortConnection() {
GUI.timeout_remove('connecting'); // kill connecting timer
GUI.connected_to = false;
GUI.connecting_to = false;
tracking.sendEvent(tracking.EVENT_CATEGORIES.FLIGHT_CONTROLLER, 'SerialPortFailed');
gui_log(i18n.getMessage('serialPortOpenFail'));
$('div#connectbutton div.connect_state').text(i18n.getMessage('connect'));
$('div#connectbutton a.connect').removeClass('active');
// unlock port select & baud
$('div#port-picker #port, div#port-picker #baud, div#port-picker #delay').prop('disabled', false);
// reset data
clicks = false;
}
function onOpen(openInfo) {
if (openInfo) {
CONFIGURATOR.virtualMode = false;
@ -275,12 +295,16 @@ function onOpen(openInfo) {
console.log(`Requesting configuration data`);
MSP.send_message(MSPCodes.MSP_API_VERSION, false, false, function () {
gui_log(i18n.getMessage('apiVersionReceived', FC.CONFIG.apiVersion));
if (FC.CONFIG.apiVersion.includes('null')) {
abortConnection();
return;
}
tracking.setFlightControllerData(tracking.DATA.API_VERSION, FC.CONFIG.apiVersion);
gui_log(i18n.getMessage('apiVersionReceived', [FC.CONFIG.apiVersion]));
if (semver.gte(FC.CONFIG.apiVersion, CONFIGURATOR.API_VERSION_ACCEPTED)) {
MSP.send_message(MSPCodes.MSP_FC_VARIANT, false, false, function () {
tracking.setFlightControllerData(tracking.DATA.FIRMWARE_TYPE, FC.CONFIG.flightControllerIdentifier);
if (FC.CONFIG.flightControllerIdentifier === 'BTFL') {
@ -329,12 +353,7 @@ function onOpen(openInfo) {
}
});
} else {
tracking.sendEvent(tracking.EVENT_CATEGORIES.FLIGHT_CONTROLLER, 'SerialPortFailed');
console.log('Failed to open serial port');
gui_log(i18n.getMessage('serialPortOpenFail'));
abortConnect();
abortConnection();
}
}
@ -355,17 +374,6 @@ function onOpenVirtual() {
updateTabList(FC.FEATURE_CONFIG.features);
}
function abortConnect() {
$('div#connectbutton div.connect_state').text(i18n.getMessage('connect'));
$('div#connectbutton a.connect').removeClass('active');
// unlock port select & baud
$('div#port-picker #port, div#port-picker #baud, div#port-picker #delay').prop('disabled', false);
// reset data
clicks = false;
}
function processCustomDefaults() {
if (bit_check(FC.CONFIG.targetCapabilities, FC.TARGET_CAPABILITIES_FLAGS.SUPPORTS_CUSTOM_DEFAULTS) && bit_check(FC.CONFIG.targetCapabilities, FC.TARGET_CAPABILITIES_FLAGS.HAS_CUSTOM_DEFAULTS) && FC.CONFIG.configurationState === FC.CONFIGURATION_STATES.DEFAULTS_BARE) {
const dialog = $('#dialogResetToCustomDefaults')[0];