diff --git a/js/fc.js b/js/fc.js
index 79851c8f..f49d22b6 100644
--- a/js/fc.js
+++ b/js/fc.js
@@ -558,27 +558,10 @@ var FC = {
);
}
- if (semver.lt(CONFIG.flightControllerVersion, "1.6.0")) {
- features.push(
- {bit: 2, group: 'other', name: 'INFLIGHT_ACC_CAL', showNameInTip: true},
- {bit: 9, group: 'other', name: 'SONAR', showNameInTip: true},
- {bit: 8, group: 'rxFailsafe', name: 'FAILSAFE'}
- );
- }
-
features.push(
{bit: 28, group: 'esc-priority', name: 'PWM_OUTPUT_ENABLE', haveTip: true}
);
- /*
- * Transponder disabled until not implemented in firmware
- */
- if (false && semver.gte(CONFIG.apiVersion, "1.16.0")) {
- features.push(
- {bit: 21, group: 'other', name: 'TRANSPONDER', haveTip: true, showNameInTip: true}
- );
- }
-
if (semver.gte(CONFIG.apiVersion, "1.21.0")) {
features.push(
{bit: 26, group: 'other', name: 'SOFTSPI'}
@@ -589,11 +572,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(
@@ -836,14 +817,11 @@ var FC = {
'SUMH',
'XBUS_MODE_B',
'XBUS_MODE_B_RJ01',
- 'IBUS'
+ 'IBUS',
+ 'JETI EXBUS',
+ 'TBS Crossfire'
];
- if (semver.gte(CONFIG.flightControllerVersion, "1.6.0")) {
- data.push('JETI EXBUS');
- data.push('TBS Crossfire');
- }
-
if (semver.gte(CONFIG.flightControllerVersion, "1.9.1")) {
data.push('FPort');
}
@@ -1075,23 +1053,18 @@ var FC = {
]
},
getPidNames: function () {
-
- if (semver.lt(CONFIG.flightControllerVersion, "1.6.0")) {
- return PID_names;
- } else {
- return [
- 'Roll',
- 'Pitch',
- 'Yaw',
- 'Position Z',
- 'Position XY',
- 'Velocity XY',
- 'Surface',
- 'Level',
- 'Heading',
- 'Velocity Z'
- ];
- }
+ return [
+ 'Roll',
+ 'Pitch',
+ 'Yaw',
+ 'Position Z',
+ 'Position XY',
+ 'Velocity XY',
+ 'Surface',
+ 'Level',
+ 'Heading',
+ 'Velocity Z'
+ ];
},
getRthAltControlMode: function () {
return ["Current", "Extra", "Fixed", "Max", "At Least"];
diff --git a/js/msp/MSPHelper.js b/js/msp/MSPHelper.js
index b1428016..20d8f3b0 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:
@@ -234,10 +216,7 @@ var mspHelper = (function (gui) {
break;
case MSPCodes.MSP_ALTITUDE:
SENSOR_DATA.altitude = parseFloat((data.getInt32(0, true) / 100.0).toFixed(2)); // correct scale factor
- // On 1.6 and above this provides also baro raw altitude
- if (semver.gte(CONFIG.flightControllerVersion, "1.6.0")) {
- SENSOR_DATA.barometer = parseFloat((data.getInt32(6, true) / 100.0).toFixed(2)); // correct scale factor
- }
+ SENSOR_DATA.barometer = parseFloat((data.getInt32(6, true) / 100.0).toFixed(2)); // correct scale factor
break;
case MSPCodes.MSP_SONAR:
SENSOR_DATA.sonar = data.getInt32(0, true);
@@ -1208,12 +1187,8 @@ var mspHelper = (function (gui) {
PID_ADVANCED.rollPitchItermIgnoreRate = data.getUint16(0, true);
PID_ADVANCED.yawItermIgnoreRate = data.getUint16(2, true);
PID_ADVANCED.yawPLimit = data.getUint16(4, true);
-
- if (semver.gte(CONFIG.flightControllerVersion, "1.6.0")) {
- PID_ADVANCED.dtermSetpointWeight = data.getUint8(9);
- PID_ADVANCED.pidSumLimit = data.getUint16(10, true);
- }
-
+ PID_ADVANCED.dtermSetpointWeight = data.getUint8(9);
+ PID_ADVANCED.pidSumLimit = data.getUint16(10, true);
PID_ADVANCED.axisAccelerationLimitRollPitch = data.getUint16(13, true);
PID_ADVANCED.axisAccelerationLimitYaw = data.getUint16(15, true);
break;
@@ -2063,15 +2038,9 @@ var mspHelper = (function (gui) {
buffer.push(0); //BF: currentProfile->pidProfile.vbatPidCompensation
buffer.push(0); //BF: currentProfile->pidProfile.setpointRelaxRatio
- if (semver.gte(CONFIG.flightControllerVersion, "1.6.0")) {
- buffer.push(PID_ADVANCED.dtermSetpointWeight);
- buffer.push(lowByte(PID_ADVANCED.pidSumLimit));
- buffer.push(highByte(PID_ADVANCED.pidSumLimit));
- } else {
- buffer.push(0);
- buffer.push(0); // reserved
- buffer.push(0); // reserved
- }
+ buffer.push(PID_ADVANCED.dtermSetpointWeight);
+ buffer.push(lowByte(PID_ADVANCED.pidSumLimit));
+ buffer.push(highByte(PID_ADVANCED.pidSumLimit));
buffer.push(0); //BF: currentProfile->pidProfile.itermThrottleGain
@@ -2788,19 +2757,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) {
@@ -2900,43 +2861,23 @@ 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) {
- if (semver.gte(CONFIG.flightControllerVersion, "1.6.0")) {
- MSP.send_message(MSPCodes.MSP_NAV_POSHOLD, false, false, callback);
- } else {
- callback();
- }
+ MSP.send_message(MSPCodes.MSP_NAV_POSHOLD, false, false, callback);
};
self.saveNavPosholdConfig = function (callback) {
- if (semver.gte(CONFIG.flightControllerVersion, "1.6.0")) {
- MSP.send_message(MSPCodes.MSP_SET_NAV_POSHOLD, mspHelper.crunch(MSPCodes.MSP_SET_NAV_POSHOLD), false, callback);
- } else {
- callback();
- }
+ MSP.send_message(MSPCodes.MSP_SET_NAV_POSHOLD, mspHelper.crunch(MSPCodes.MSP_SET_NAV_POSHOLD), false, callback);
};
self.loadPositionEstimationConfig = function (callback) {
- if (semver.gte(CONFIG.flightControllerVersion, "1.6.0")) {
- MSP.send_message(MSPCodes.MSP_POSITION_ESTIMATION_CONFIG, false, false, callback);
- } else {
- callback();
- }
+ MSP.send_message(MSPCodes.MSP_POSITION_ESTIMATION_CONFIG, false, false, callback);
};
self.savePositionEstimationConfig = function (callback) {
- if (semver.gte(CONFIG.flightControllerVersion, "1.6.0")) {
- MSP.send_message(MSPCodes.MSP_SET_POSITION_ESTIMATION_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_POSITION_ESTIMATION_CONFIG), false, callback);
- } else {
- callback();
- }
+ MSP.send_message(MSPCodes.MSP_SET_POSITION_ESTIMATION_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_POSITION_ESTIMATION_CONFIG), false, callback);
};
self.loadCalibrationData = function (callback) {
diff --git a/js/periodicStatusUpdater.js b/js/periodicStatusUpdater.js
index 950fa5dd..7768a0fc 100644
--- a/js/periodicStatusUpdater.js
+++ b/js/periodicStatusUpdater.js
@@ -115,9 +115,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
new file mode 100644
index 00000000..9a53d0ba
--- /dev/null
+++ b/js/tasks.js
@@ -0,0 +1,25 @@
+'use strict';
+
+var helper = helper || {};
+
+helper.task = (function () {
+
+ var publicScope = {},
+ privateScope = {};
+
+ privateScope.getStatusPullInterval = function () {
+ //TODO use serial connection speed to determine update interval
+ return 250;
+ };
+
+ publicScope.statusPullStart = function () {
+ helper.interval.add('status_pull', function () {
+ MSP.send_message(MSPCodes.MSP_STATUS, false, false, function () {
+ MSP.send_message(MSPCodes.MSP_SENSOR_STATUS);
+ });
+
+ }, privateScope.getStatusPullInterval(), true);
+ };
+
+ return publicScope;
+})();
\ No newline at end of file
diff --git a/tabs/configuration.html b/tabs/configuration.html
index 6a23bbe7..6fb625ea 100644
--- a/tabs/configuration.html
+++ b/tabs/configuration.html
@@ -25,7 +25,7 @@
-
+
diff --git a/tabs/configuration.js b/tabs/configuration.js
index db9adb66..6036673f 100644
--- a/tabs/configuration.js
+++ b/tabs/configuration.js
@@ -691,56 +691,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');
-
- GUI.fillSelect($sensorAcc, FC.getAccelerometerNames());
- $sensorAcc.val(SENSOR_CONFIG.accelerometer);
- $sensorAcc.change(function () {
- SENSOR_CONFIG.accelerometer = $sensorAcc.val();
- });
+ 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($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($sensorMag, FC.getMagnetometerNames());
+ $sensorMag.val(SENSOR_CONFIG.magnetometer);
+ $sensorMag.change(function () {
+ SENSOR_CONFIG.magnetometer = $sensorMag.val();
+ });
- GUI.fillSelect($sensorPitot, FC.getPitotNames());
- $sensorPitot.val(SENSOR_CONFIG.pitot);
- $sensorPitot.change(function () {
- SENSOR_CONFIG.pitot = $sensorPitot.val();
- });
+ GUI.fillSelect($sensorBaro, FC.getBarometerNames());
+ $sensorBaro.val(SENSOR_CONFIG.barometer);
+ $sensorBaro.change(function () {
+ SENSOR_CONFIG.barometer = $sensorBaro.val();
+ });
- GUI.fillSelect($sensorRangefinder, FC.getRangefinderNames());
- $sensorRangefinder.val(SENSOR_CONFIG.rangefinder);
- $sensorRangefinder.change(function () {
- SENSOR_CONFIG.rangefinder = $sensorRangefinder.val();
- });
+ GUI.fillSelect($sensorPitot, FC.getPitotNames());
+ $sensorPitot.val(SENSOR_CONFIG.pitot);
+ $sensorPitot.change(function () {
+ SENSOR_CONFIG.pitot = $sensorPitot.val();
+ });
- GUI.fillSelect($sensorOpflow, FC.getOpticalFlowNames());
- $sensorOpflow.val(SENSOR_CONFIG.opflow);
- $sensorOpflow.change(function () {
- SENSOR_CONFIG.opflow = $sensorOpflow.val();
- });
+ GUI.fillSelect($sensorRangefinder, FC.getRangefinderNames());
+ $sensorRangefinder.val(SENSOR_CONFIG.rangefinder);
+ $sensorRangefinder.change(function () {
+ SENSOR_CONFIG.rangefinder = $sensorRangefinder.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();
@@ -896,15 +890,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('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('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]);
for (var i = 0; i < features.length; i++) {
var featureName = features[i].name;
diff --git a/tabs/failsafe.html b/tabs/failsafe.html
index 47c2010f..e86e2c85 100644
--- a/tabs/failsafe.html
+++ b/tabs/failsafe.html
@@ -4,11 +4,6 @@
-
-
-
-
+
diff --git a/tabs/failsafe.js b/tabs/failsafe.js
index 8a648bc8..a4b5ce60 100644
--- a/tabs/failsafe.js
+++ b/tabs/failsafe.js
@@ -14,31 +14,7 @@ TABS.failsafe.initialize = function (callback, scrollPosition) {
}
function load_failssafe_config() {
- MSP.send_message(MSPCodes.MSP_FAILSAFE_CONFIG, false, false, load_rxfail_config);
- }
-
- function load_rxfail_config() {
- if (semver.lt(CONFIG.flightControllerVersion, "1.6.0")) {
- MSP.send_message(MSPCodes.MSP_RXFAIL_CONFIG, false, false, get_box_names);
- } else {
- get_box_names();
- }
- }
-
- function get_box_names() {
- if (semver.lt(CONFIG.flightControllerVersion, "1.6.0")) {
- MSP.send_message(MSPCodes.MSP_BOXNAMES, false, false, get_mode_ranges);
- } else {
- get_mode_ranges();
- }
- }
-
- function get_mode_ranges() {
- if (semver.lt(CONFIG.flightControllerVersion, "1.6.0")) {
- MSP.send_message(MSPCodes.MSP_MODE_RANGES, false, false, get_box_ids);
- } else {
- get_box_ids();
- }
+ MSP.send_message(MSPCodes.MSP_FAILSAFE_CONFIG, false, false, get_box_ids);
}
function get_box_ids() {
@@ -65,11 +41,6 @@ TABS.failsafe.initialize = function (callback, scrollPosition) {
function process_html() {
- if (semver.gte(CONFIG.flightControllerVersion, "1.6.0")) {
- $('.pre-v1_6').hide();
- $('.requires-v1_6').show();
- }
-
var failsafeFeature;
// translate to user-selected language
@@ -206,13 +177,7 @@ TABS.failsafe.initialize = function (callback, scrollPosition) {
channel_mode_array[i].change();
}
- var isFailsafeEnabled;
-
- if (semver.gte(CONFIG.flightControllerVersion, "1.6.0")) {
- isFailsafeEnabled = true;
- } else {
- isFailsafeEnabled = bit_check(BF_CONFIG.features, 8);
- }
+ var isFailsafeEnabled = true;
// fill stage 2 fields
failsafeFeature = $('input[name="failsafe_feature_new"]');
@@ -327,14 +292,6 @@ TABS.failsafe.initialize = function (callback, scrollPosition) {
RX_CONFIG.rx_min_usec = parseInt($('input[name="rx_min_usec"]').val());
RX_CONFIG.rx_max_usec = parseInt($('input[name="rx_max_usec"]').val());
- if (semver.lt(CONFIG.flightControllerVersion, "1.6.0")) {
- if ($('input[name="failsafe_feature_new"]').is(':checked')) {
- BF_CONFIG.features = bit_set(BF_CONFIG.features, 8);
- } else {
- BF_CONFIG.features = bit_clear(BF_CONFIG.features, 8);
- }
- }
-
FAILSAFE_CONFIG.failsafe_throttle = parseInt($('input[name="failsafe_throttle"]').val());
FAILSAFE_CONFIG.failsafe_off_delay = parseInt($('input[name="failsafe_off_delay"]').val());
FAILSAFE_CONFIG.failsafe_throttle_low_delay = parseInt($('input[name="failsafe_throttle_low_delay"]').val());
@@ -356,15 +313,7 @@ TABS.failsafe.initialize = function (callback, scrollPosition) {
FAILSAFE_CONFIG.failsafe_kill_switch = $('input[name="failsafe_kill_switch"]').is(':checked') ? 1 : 0;
function save_failssafe_config() {
- MSP.send_message(MSPCodes.MSP_SET_FAILSAFE_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_FAILSAFE_CONFIG), false, save_rxfail_config);
- }
-
- function save_rxfail_config() {
- if (semver.lt(CONFIG.flightControllerVersion, "1.6.0")) {
- mspHelper.sendRxFailConfig(save_bf_config);
- } else {
- save_bf_config();
- }
+ MSP.send_message(MSPCodes.MSP_SET_FAILSAFE_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_FAILSAFE_CONFIG), false, save_bf_config);
}
function save_bf_config() {
diff --git a/tabs/onboard_logging.js b/tabs/onboard_logging.js
index 38767dfd..8e6dc3a1 100644
--- a/tabs/onboard_logging.js
+++ b/tabs/onboard_logging.js
@@ -64,16 +64,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';
}
@@ -84,9 +76,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) {
diff --git a/tabs/osd.js b/tabs/osd.js
index bf0167d2..79a5721a 100644
--- a/tabs/osd.js
+++ b/tabs/osd.js
@@ -629,7 +629,6 @@ OSD.constants = {
{
name: 'HEADING',
id: 24,
- min_version: '1.6.0',
preview: FONT.symbol(SYM.HEADING) + '175' + FONT.symbol(SYM.DEGREES)
},
{
@@ -828,7 +827,6 @@ OSD.constants = {
{
name: 'VARIO',
id: 25,
- min_version: '1.6.0',
preview: FONT.symbol(SYM.VARIO_UP_2A) + '\n' +
FONT.symbol(SYM.VARIO_UP_2A) + '\n' +
FONT.symbol(SYM.VARIO_UP_2A) + '\n' +
@@ -838,7 +836,6 @@ OSD.constants = {
{
name: 'VARIO_NUM',
id: 26,
- min_version: '1.6.0',
preview: function(osd_data) {
if (OSD.data.preferences.units === 0) {
// Imperial
@@ -931,7 +928,6 @@ OSD.constants = {
{
name: 'POWER',
id: 19,
- min_version: '1.6.0',
preview: FONT.symbol(SYM.WATT) + '50 ' // 3 chars
},
{
@@ -1004,13 +1000,11 @@ OSD.constants = {
{
name: 'LONGITUDE',
id: 20,
- min_version: '1.6.0',
preview: osdCoordinatePreview(SYM.LON, -114.7652134),
},
{
name: 'LATITUDE',
id: 21,
- min_version: '1.6.0',
preview: osdCoordinatePreview(SYM.LAT, 52.9872367),
},
{
@@ -1026,7 +1020,6 @@ OSD.constants = {
{
name: 'DIRECTION_TO_HOME',
id: 22,
- min_version: '1.6.0',
preview: FONT.symbol(SYM.DIR_TO_HOME)
},
{
@@ -1038,7 +1031,6 @@ OSD.constants = {
{
name: 'DISTANCE_TO_HOME',
id: 23,
- min_version: '1.6.0',
preview: function(osd_data) {
if (OSD.data.preferences.units === 0) {
// Imperial
@@ -1153,7 +1145,6 @@ OSD.constants = {
},
{
name: 'osdGroupPIDs',
- min_version: '1.6.0',
items: [
{
name: 'ROLL_PIDS',
diff --git a/tabs/pid_tuning.html b/tabs/pid_tuning.html
index efea282b..df0ed85a 100755
--- a/tabs/pid_tuning.html
+++ b/tabs/pid_tuning.html
@@ -238,28 +238,28 @@
-
+
|
Hz
|
-
+
|
Hz
|
-
+
|
Hz
|
-
+
|
Hz
@@ -287,14 +287,14 @@
|
-
+
|
Hz
|
-
+
|
Hz
diff --git a/tabs/pid_tuning.js b/tabs/pid_tuning.js
index 4e24c32d..6b101060 100755
--- a/tabs/pid_tuning.js
+++ b/tabs/pid_tuning.js
@@ -201,12 +201,6 @@ TABS.pid_tuning.initialize = function (callback) {
PID_ADVANCED.axisAccelerationLimitYaw = Math.round(parseInt($axisAccelerationLimitYaw.val(), 10) / 10);
});
- if (semver.gte(CONFIG.flightControllerVersion, "1.6.0")) {
- $('.requires-v1_6').show();
- } else {
- $('.requires-v1_6').hide();
- }
-
if (semver.gte(CONFIG.flightControllerVersion, "2.0.0")) {
$('.deprecated-v2_0').hide();
} else {
diff --git a/tabs/sensors.js b/tabs/sensors.js
index 6000696d..fba31373 100644
--- a/tabs/sensors.js
+++ b/tabs/sensors.js
@@ -289,7 +289,7 @@ TABS.sensors.initialize = function (callback) {
gyro_data = initDataArray(3),
accel_data = initDataArray(3),
mag_data = initDataArray(3),
- altitude_data = (semver.gte(CONFIG.flightControllerVersion, "1.6.0")) ? initDataArray(2) : initDataArray(1),
+ altitude_data = initDataArray(2),
sonar_data = initDataArray(1),
airspeed_data = initDataArray(1),
temperature_data = [
@@ -554,13 +554,7 @@ TABS.sensors.initialize = function (callback) {
function update_altitude_graph() {
updateGraphHelperSize(altitudeHelpers);
-
- if (semver.gte(CONFIG.flightControllerVersion, "1.6.0")) {
- samples_altitude_i = addSampleToData(altitude_data, samples_altitude_i, [SENSOR_DATA.altitude, SENSOR_DATA.barometer]);
- }
- else {
- samples_altitude_i = addSampleToData(altitude_data, samples_altitude_i, [SENSOR_DATA.altitude]);
- }
+ samples_altitude_i = addSampleToData(altitude_data, samples_altitude_i, [SENSOR_DATA.altitude, SENSOR_DATA.barometer]);
drawGraph(altitudeHelpers, altitude_data, samples_altitude_i);
raw_data_text_ements.x[3].text(SENSOR_DATA.altitude.toFixed(2));
raw_data_text_ements.y[3].text(SENSOR_DATA.barometer.toFixed(2));
|