diff --git a/js/data_storage.js b/js/data_storage.js index 09fdbed1..ae454037 100755 --- a/js/data_storage.js +++ b/js/data_storage.js @@ -2,7 +2,7 @@ var CONFIGURATOR = { // all versions are specified and compared using semantic versioning http://semver.org/ - 'firmwareVersionAccepted': '1.6.0', + 'firmwareVersionAccepted': '1.9.0', 'connectionValid': false, 'connectionValidCliOnly': false, 'cliActive': false, diff --git a/js/fc.js b/js/fc.js index 426b098a..ae6ce673 100644 --- a/js/fc.js +++ b/js/fc.js @@ -588,11 +588,9 @@ var FC = { {bit: 27, group: 'other', name: 'PWM_SERVO_DRIVER', haveTip: true, showNameInTip: true} ); - if (semver.gte(CONFIG.flightControllerVersion, '1.5.0')) { - features.push( - {bit: 29, group: 'other', name: 'OSD', haveTip: false, showNameInTip: false} - ); - } + features.push( + {bit: 29, group: 'other', name: 'OSD', haveTip: false, showNameInTip: false} + ); if (semver.gte(CONFIG.flightControllerVersion, '1.7.3')) { features.push( diff --git a/js/msp/MSPHelper.js b/js/msp/MSPHelper.js index 95916703..12ac55de 100644 --- a/js/msp/MSPHelper.js +++ b/js/msp/MSPHelper.js @@ -88,15 +88,6 @@ var mspHelper = (function (gui) { CONFIG.profile = data.getUint8(10); gui.updateProfileChange(); gui.updateStatusBar(); - - /* - * Update sensor status only for older firmwares - * Newer firmwares use MSP_SENSOR_STATUS instead - */ - if (semver.lt(CONFIG.flightControllerVersion, "1.5.0")) { - sensor_status(CONFIG.activeSensors); - } - break; case MSPCodes.MSP_STATUS_EX: CONFIG.cycleTime = data.getUint16(0, true); @@ -110,14 +101,7 @@ var mspHelper = (function (gui) { CONFIG.profile = data.getUint8(10); CONFIG.cpuload = data.getUint16(11, true); - - if (semver.gte(CONFIG.flightControllerVersion, "1.5.0")) { - CONFIG.armingFlags = data.getUint16(13, true); - } - - if (semver.lt(CONFIG.flightControllerVersion, "1.5.0")) { - sensor_status(CONFIG.activeSensors); - } + CONFIG.armingFlags = data.getUint16(13, true); gui.updateStatusBar(); gui.updateProfileChange(); break; @@ -158,9 +142,7 @@ var mspHelper = (function (gui) { SENSOR_STATUS.rangeHwStatus = data.getUint8(6); SENSOR_STATUS.speedHwStatus = data.getUint8(7); SENSOR_STATUS.flowHwStatus = data.getUint8(8); - if (semver.gte(CONFIG.flightControllerVersion, "1.5.0")) { - sensor_status_ex(SENSOR_STATUS); - } + sensor_status_ex(SENSOR_STATUS); break; case MSPCodes.MSP_RAW_IMU: @@ -2747,19 +2729,11 @@ var mspHelper = (function (gui) { }; self.loadSensorConfig = function (callback) { - if (semver.gte(CONFIG.flightControllerVersion, "1.5.0")) { - MSP.send_message(MSPCodes.MSP_SENSOR_CONFIG, false, false, callback); - } else { - callback(); - } + MSP.send_message(MSPCodes.MSP_SENSOR_CONFIG, false, false, callback); }; self.loadSensorStatus = function (callback) { - if (semver.gte(CONFIG.flightControllerVersion, "1.5.0")) { - MSP.send_message(MSPCodes.MSP_SENSOR_STATUS, false, false, callback); - } else { - callback(); - } + MSP.send_message(MSPCodes.MSP_SENSOR_STATUS, false, false, callback); }; self.loadRcDeadband = function (callback) { @@ -2859,11 +2833,7 @@ var mspHelper = (function (gui) { }; self.saveSensorConfig = function (callback) { - if (semver.gte(CONFIG.flightControllerVersion, "1.5.0")) { - MSP.send_message(MSPCodes.MSP_SET_SENSOR_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_SENSOR_CONFIG), false, callback); - } else { - callback(); - } + MSP.send_message(MSPCodes.MSP_SET_SENSOR_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_SENSOR_CONFIG), false, callback); }; self.loadNavPosholdConfig = function (callback) { diff --git a/js/periodicStatusUpdater.js b/js/periodicStatusUpdater.js index f2e2f1b6..750de1d6 100644 --- a/js/periodicStatusUpdater.js +++ b/js/periodicStatusUpdater.js @@ -119,9 +119,7 @@ helper.periodicStatusUpdater = (function () { return; } - if (semver.gte(CONFIG.flightControllerVersion, "1.5.0")) { - MSP.send_message(MSPCodes.MSP_SENSOR_STATUS, false, false); - } + MSP.send_message(MSPCodes.MSP_SENSOR_STATUS, false, false); if (semver.gte(CONFIG.flightControllerVersion, "2.0.0")) { MSP.send_message(MSPCodes.MSPV2_INAV_STATUS, false, false); diff --git a/js/tasks.js b/js/tasks.js index 580e43af..9a53d0ba 100644 --- a/js/tasks.js +++ b/js/tasks.js @@ -15,9 +15,7 @@ helper.task = (function () { publicScope.statusPullStart = function () { helper.interval.add('status_pull', function () { MSP.send_message(MSPCodes.MSP_STATUS, false, false, function () { - if (semver.gte(CONFIG.flightControllerVersion, "1.5.0")) { - MSP.send_message(MSPCodes.MSP_SENSOR_STATUS); - } + MSP.send_message(MSPCodes.MSP_SENSOR_STATUS); }); }, privateScope.getStatusPullInterval(), true); diff --git a/tabs/configuration.html b/tabs/configuration.html index 42cb1dc4..a5baac2f 100644 --- a/tabs/configuration.html +++ b/tabs/configuration.html @@ -25,7 +25,7 @@ -
+
diff --git a/tabs/configuration.js b/tabs/configuration.js index ed4ba11a..a780621c 100644 --- a/tabs/configuration.js +++ b/tabs/configuration.js @@ -650,56 +650,50 @@ TABS.configuration.initialize = function (callback, scrollPosition) { INAV_PID_CONFIG.attitudeTaskFrequency = $attitudeFrequency.val(); }); - if (semver.gte(CONFIG.flightControllerVersion, "1.5.0")) { - var $sensorAcc = $('#sensor-acc'), - $sensorMag = $('#sensor-mag'), - $sensorBaro = $('#sensor-baro'), - $sensorPitot = $('#sensor-pitot'), - $sensorRangefinder = $('#sensor-rangefinder'), - $sensorOpflow = $('#sensor-opflow'); + var $sensorAcc = $('#sensor-acc'), + $sensorMag = $('#sensor-mag'), + $sensorBaro = $('#sensor-baro'), + $sensorPitot = $('#sensor-pitot'), + $sensorRangefinder = $('#sensor-rangefinder'), + $sensorOpflow = $('#sensor-opflow'); - GUI.fillSelect($sensorAcc, FC.getAccelerometerNames()); - $sensorAcc.val(SENSOR_CONFIG.accelerometer); - $sensorAcc.change(function () { - SENSOR_CONFIG.accelerometer = $sensorAcc.val(); - }); + GUI.fillSelect($sensorAcc, FC.getAccelerometerNames()); + $sensorAcc.val(SENSOR_CONFIG.accelerometer); + $sensorAcc.change(function () { + SENSOR_CONFIG.accelerometer = $sensorAcc.val(); + }); - GUI.fillSelect($sensorMag, FC.getMagnetometerNames()); - $sensorMag.val(SENSOR_CONFIG.magnetometer); - $sensorMag.change(function () { - SENSOR_CONFIG.magnetometer = $sensorMag.val(); - }); + GUI.fillSelect($sensorMag, FC.getMagnetometerNames()); + $sensorMag.val(SENSOR_CONFIG.magnetometer); + $sensorMag.change(function () { + SENSOR_CONFIG.magnetometer = $sensorMag.val(); + }); - GUI.fillSelect($sensorBaro, FC.getBarometerNames()); - $sensorBaro.val(SENSOR_CONFIG.barometer); - $sensorBaro.change(function () { - SENSOR_CONFIG.barometer = $sensorBaro.val(); - }); + GUI.fillSelect($sensorBaro, FC.getBarometerNames()); + $sensorBaro.val(SENSOR_CONFIG.barometer); + $sensorBaro.change(function () { + SENSOR_CONFIG.barometer = $sensorBaro.val(); + }); - GUI.fillSelect($sensorPitot, FC.getPitotNames()); - $sensorPitot.val(SENSOR_CONFIG.pitot); - $sensorPitot.change(function () { - SENSOR_CONFIG.pitot = $sensorPitot.val(); - }); + GUI.fillSelect($sensorPitot, FC.getPitotNames()); + $sensorPitot.val(SENSOR_CONFIG.pitot); + $sensorPitot.change(function () { + SENSOR_CONFIG.pitot = $sensorPitot.val(); + }); - GUI.fillSelect($sensorRangefinder, FC.getRangefinderNames()); - $sensorRangefinder.val(SENSOR_CONFIG.rangefinder); - $sensorRangefinder.change(function () { - SENSOR_CONFIG.rangefinder = $sensorRangefinder.val(); - }); + GUI.fillSelect($sensorRangefinder, FC.getRangefinderNames()); + $sensorRangefinder.val(SENSOR_CONFIG.rangefinder); + $sensorRangefinder.change(function () { + SENSOR_CONFIG.rangefinder = $sensorRangefinder.val(); + }); - GUI.fillSelect($sensorOpflow, FC.getOpticalFlowNames()); - $sensorOpflow.val(SENSOR_CONFIG.opflow); - $sensorOpflow.change(function () { - SENSOR_CONFIG.opflow = $sensorOpflow.val(); - }); - - $(".requires-v1_5").show(); - } else { - $(".requires-v1_5").hide(); - } + GUI.fillSelect($sensorOpflow, FC.getOpticalFlowNames()); + $sensorOpflow.val(SENSOR_CONFIG.opflow); + $sensorOpflow.change(function () { + SENSOR_CONFIG.opflow = $sensorOpflow.val(); + }); if (semver.gte(CONFIG.flightControllerVersion, "1.7.0")) { $(".requires-v1_7").show(); @@ -855,15 +849,13 @@ TABS.configuration.initialize = function (callback, scrollPosition) { /* * send gyro LPF and async_mode tracking */ - if (semver.gte(CONFIG.flightControllerVersion, "1.5.0")) { - googleAnalytics.sendEvent('Setting', 'GyroLpf', FC.getGyroLpfValues()[INAV_PID_CONFIG.gyroscopeLpf].label); - googleAnalytics.sendEvent('Setting', 'AsyncMode', FC.getAsyncModes()[INAV_PID_CONFIG.asynchronousMode]); + googleAnalytics.sendEvent('Setting', 'GyroLpf', FC.getGyroLpfValues()[INAV_PID_CONFIG.gyroscopeLpf].label); + googleAnalytics.sendEvent('Setting', 'AsyncMode', FC.getAsyncModes()[INAV_PID_CONFIG.asynchronousMode]); - googleAnalytics.sendEvent('Board', 'Accelerometer', FC.getAccelerometerNames()[SENSOR_CONFIG.accelerometer]); - googleAnalytics.sendEvent('Board', 'Magnetometer', FC.getMagnetometerNames()[SENSOR_CONFIG.magnetometer]); - googleAnalytics.sendEvent('Board', 'Barometer', FC.getBarometerNames()[SENSOR_CONFIG.barometer]); - googleAnalytics.sendEvent('Board', 'Pitot', FC.getPitotNames()[SENSOR_CONFIG.pitot]); - } + googleAnalytics.sendEvent('Board', 'Accelerometer', FC.getAccelerometerNames()[SENSOR_CONFIG.accelerometer]); + googleAnalytics.sendEvent('Board', 'Magnetometer', FC.getMagnetometerNames()[SENSOR_CONFIG.magnetometer]); + googleAnalytics.sendEvent('Board', 'Barometer', FC.getBarometerNames()[SENSOR_CONFIG.barometer]); + googleAnalytics.sendEvent('Board', 'Pitot', FC.getPitotNames()[SENSOR_CONFIG.pitot]); for (var i = 0; i < features.length; i++) { var featureName = features[i].name; diff --git a/tabs/onboard_logging.js b/tabs/onboard_logging.js index ed595b55..18b3b227 100644 --- a/tabs/onboard_logging.js +++ b/tabs/onboard_logging.js @@ -60,16 +60,8 @@ TABS.onboard_logging.initialize = function (callback) { dataflashPresent = DATAFLASH.totalSize > 0, blackboxSupport; - /* - * Pre-1.11.0 firmware supported DATAFLASH API (on targets with SPI flash) but not the BLACKBOX config API. - * - * The best we can do on those targets is check the BLACKBOX feature bit to identify support for Blackbox instead. - */ - if (BLACKBOX.supported || DATAFLASH.supported - || semver.gte(CONFIG.flightControllerVersion, "1.5.0") && semver.lte(CONFIG.flightControllerVersion, "1.10.0") && bit_check(BF_CONFIG.features, 19)) { + if ((BLACKBOX.supported || DATAFLASH.supported) && bit_check(BF_CONFIG.features, 19)) { blackboxSupport = 'yes'; - } else if (semver.gte(CONFIG.flightControllerVersion, "1.5.0") && semver.lte(CONFIG.flightControllerVersion, "1.10.0")) { - blackboxSupport = 'maybe'; } else { blackboxSupport = 'no'; } @@ -80,9 +72,7 @@ TABS.onboard_logging.initialize = function (callback) { .toggleClass("dataflash-present", dataflashPresent) .toggleClass("sdcard-supported", SDCARD.supported) .toggleClass("blackbox-config-supported", BLACKBOX.supported) - .toggleClass("blackbox-supported", blackboxSupport == 'yes') - .toggleClass("blackbox-maybe-supported", blackboxSupport == 'maybe') .toggleClass("blackbox-unsupported", blackboxSupport == 'no'); if (dataflashPresent) {