From 0fdf9d2741db20e719186e739c12d9a69069e9ec Mon Sep 17 00:00:00 2001 From: Darren Lines Date: Sat, 29 Oct 2022 21:33:49 +0100 Subject: Fix issue with older firmware --- _locales/en/messages.json | 3 +-- tabs/firmware_flasher.js | 25 +++++++++++-------------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 3d8c802b..846b3695 100755 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -2125,8 +2125,7 @@ "message": "No reboot sequence" }, "firmwareFlasherOnlineSelectBoardDescription": { - - "message": "Select your board to see available online firmware releases - Select the correct firmware appropriate for your board." + "message": "Select your board to see available online firmware releases - Select the correct firmware appropriate for your board. Please note that Auto-select Target will only work for INAV firmwares 5.0 and newer." }, "firmwareFlasherOnlineSelectFirmwareVersionDescription": { "message": "Select firmware version for your board." diff --git a/tabs/firmware_flasher.js b/tabs/firmware_flasher.js index 485a6753..93cc5b80 100755 --- a/tabs/firmware_flasher.js +++ b/tabs/firmware_flasher.js @@ -708,24 +708,21 @@ TABS.firmware_flasher.onOpen = function(openInfo) { MSP.send_message(MSPCodes.MSP_FC_VARIANT, false, false, function () { if (CONFIG.flightControllerIdentifier == 'INAV') { MSP.send_message(MSPCodes.MSP_FC_VERSION, false, false, function () { - if (semver.gte(CONFIG.flightControllerVersion, CONFIGURATOR.minfirmwareVersionAccepted) && semver.lt(CONFIG.flightControllerVersion, CONFIGURATOR.maxFirmwareVersionAccepted)) { - if (CONFIGURATOR.connection.type == ConnectionType.BLE && semver.lt(CONFIG.flightControllerVersion, "5.0.0")) { - onBleNotSupported(); - } else { - mspHelper.getCraftName(function(name) { - if (name) { - CONFIG.name = name; - } - TABS.firmware_flasher.onValidFirmware(); - }); - } - } else { - onInvalidFirmwareVersion(); + if (semver.lt(CONFIG.flightControllerVersion, "5.0.0")) { + GUI.log("Cannot prefetch target: INAV Firmware too old"); + TABS.firmware_flasher.closeTempConnection(); + } else { + mspHelper.getCraftName(function(name) { + if (name) { + CONFIG.name = name; + } + TABS.firmware_flasher.onValidFirmware(); + }); } }); } else { GUI.log("Cannot prefetch target: Non-INAV Firmware"); - onInvalidFirmwareVariant(); + TABS.firmware_flasher.closeTempConnection(); } }); }); -- cgit v1.2.3