Merge pull request #757 from iNavFlight/dzikuvx-min-max-firmware-changes

Set min and max supported firmware

2 files changed, 4 insertions, 3 deletions

diff --git a/js/data_storage.js b/js/data_storage.js
index 4b3a0a20..fa9a1e9c 100755
--- a/js/data_storage.js
+++ b/js/data_storage.js
@@ -2,7 +2,8 @@
 
 var CONFIGURATOR = {
      // all versions are specified and compared using semantic versioning http://semver.org/
-    'firmwareVersionAccepted': '2.0.0',
+    'minfirmwareVersionAccepted': '2.1.0',
+    'maxFirmwareVersionAccepted': '2.3.0', // COndition is < (lt) so we accept all in 2.2 branch, not 2.3 actualy
     'connectionValid': false,
     'connectionValidCliOnly': false,
     'cliActive': false,
diff --git a/js/serial_backend.js b/js/serial_backend.js
index 4305f4d5..717f8268 100755
--- a/js/serial_backend.js
+++ b/js/serial_backend.js
@@ -216,7 +216,7 @@ function onInvalidFirmwareVariant()
 
 function onInvalidFirmwareVersion()
 {
-    GUI.log(chrome.i18n.getMessage('firmwareVersionNotSupported', [CONFIGURATOR.firmwareVersionAccepted]));
+    GUI.log(chrome.i18n.getMessage('firmwareVersionNotSupported', [CONFIGURATOR.minfirmwareVersionAccepted], [CONFIGURATOR.maxFirmwareVersionAccepted]));
     CONFIGURATOR.connectionValid = true; // making it possible to open the CLI tab
     GUI.allowedTabs = ['cli'];
     onConnect();
@@ -276,7 +276,7 @@ function onOpen(openInfo) {
                     MSP.send_message(MSPCodes.MSP_FC_VERSION, false, false, function () {
                         googleAnalytics.sendEvent('Firmware', 'Variant', CONFIG.flightControllerIdentifier + ',' + CONFIG.flightControllerVersion);
                         GUI.log(chrome.i18n.getMessage('fcInfoReceived', [CONFIG.flightControllerIdentifier, CONFIG.flightControllerVersion]));
-                        if (semver.gte(CONFIG.flightControllerVersion, CONFIGURATOR.firmwareVersionAccepted)) {
+                        if (semver.gte(CONFIG.flightControllerVersion, CONFIGURATOR.minfirmwareVersionAccepted) && semver.lt(CONFIG.flightControllerVersion, CONFIGURATOR.maxfirmwareVersionAccepted)) {
                             mspHelper.getCraftName(function(name) {
                                 if (name) {
                                     CONFIG.name = name;