\
+
\
+ ${channelNames[i]}\
\
- `);
- } else {
- fullChannels_e.append(`\
-
\
-
\
- ${channelNames[i]}\
-
\
-
\
- \
-
\
-
\
+
\
+ \
\
- `);
- }
+
\
+
\
+ `);
} else {
const messageKey = `controlAxisAux${aux_index++}`;
fullChannels_e.append(`\
@@ -231,16 +214,8 @@ failsafe.initialize = function (callback) {
FC.FEATURE_CONFIG.features.generateElements($('.tab-failsafe .featuresNew'));
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_36)) {
- $('tbody.rxFailsafe').hide();
- toggleStage2(true);
- } else {
- const failsafeFeature = $('input[name="FAILSAFE"]');
- failsafeFeature.change(function () {
- toggleStage2($(this).is(':checked'));
- });
- toggleStage2(FC.FEATURE_CONFIG.features.isEnabled('FAILSAFE'));
- }
+ $('tbody.rxFailsafe').hide();
+ toggleStage2(true);
$('input[name="failsafe_throttle"]').val(FC.FAILSAFE_CONFIG.failsafe_throttle);
$('input[name="failsafe_off_delay"]').val((FC.FAILSAFE_CONFIG.failsafe_off_delay / 10.0).toFixed(1));
@@ -273,66 +248,45 @@ failsafe.initialize = function (callback) {
break;
}
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_39)) {
- // `failsafe_kill_switch` has been renamed to `failsafe_switch_mode`.
- // It is backwards compatible with `failsafe_kill_switch`
- $('select[name="failsafe_switch_mode"]').val(FC.FAILSAFE_CONFIG.failsafe_switch_mode);
- $('div.kill_switch').hide();
- }
- else {
- $('input[name="failsafe_kill_switch"]').prop('checked', FC.FAILSAFE_CONFIG.failsafe_switch_mode);
- $('div.failsafe_switch').hide();
- }
+ // `failsafe_kill_switch` has been renamed to `failsafe_switch_mode`.
+ // It is backwards compatible with `failsafe_kill_switch`
+ $('select[name="failsafe_switch_mode"]').val(FC.FAILSAFE_CONFIG.failsafe_switch_mode);
+ $('div.kill_switch').hide();
// The GPS Rescue tab is only available for 1.40 or later, and the parameters for 1.41
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_40)) {
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_41)) {
- // Load GPS Rescue parameters
- $('input[name="gps_rescue_angle"]').val(FC.GPS_RESCUE.angle);
- $('input[name="gps_rescue_initial_altitude"]').val(FC.GPS_RESCUE.initialAltitudeM);
- $('input[name="gps_rescue_descent_distance"]').val(FC.GPS_RESCUE.descentDistanceM);
- $('input[name="gps_rescue_ground_speed"]').val((FC.GPS_RESCUE.rescueGroundspeed / 100).toFixed(2));
- $('input[name="gps_rescue_throttle_min"]').val(FC.GPS_RESCUE.throttleMin);
- $('input[name="gps_rescue_throttle_max"]').val(FC.GPS_RESCUE.throttleMax);
- $('input[name="gps_rescue_throttle_hover"]').val(FC.GPS_RESCUE.throttleHover);
- $('input[name="gps_rescue_min_sats"]').val(FC.GPS_RESCUE.minSats);
- $('select[name="gps_rescue_sanity_checks"]').val(FC.GPS_RESCUE.sanityChecks);
-
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_43)) {
- $('input[name="gps_rescue_ascend_rate"]').val((FC.GPS_RESCUE.ascendRate / 100).toFixed(2));
- $('input[name="gps_rescue_descend_rate"]').val((FC.GPS_RESCUE.descendRate / 100).toFixed(2));
- $('input[name="gps_rescue_allow_arming_without_fix"]').prop('checked', FC.GPS_RESCUE.allowArmingWithoutFix > 0);
- $('select[name="gps_rescue_altitude_mode"]').val(FC.GPS_RESCUE.altitudeMode);
- } else {
- $('input[name="gps_rescue_ascend_rate"]').closest('.number').hide();
- $('input[name="gps_rescue_descend_rate"]').closest('.number').hide();
- $('input[name="gps_rescue_allow_arming_without_fix"]').closest('.number').hide();
- $('select[name="gps_rescue_altitude_mode"]').closest('.number').hide();
- }
-
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
- $('input[name="gps_rescue_min_dth"]').val(FC.GPS_RESCUE.minRescueDth);
- } else {
- $('input[name="gps_rescue_min_dth"]').closest('.number').hide();
- }
-
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
- $('input[name="gps_rescue_min_dth"]').attr("min", 20);
- }
-
- } else {
- // GPS Rescue Parameters not available
- $('.pro4 > .proceduresettings').hide();
- }
+ // Load GPS Rescue parameters
+ $('input[name="gps_rescue_angle"]').val(FC.GPS_RESCUE.angle);
+ $('input[name="gps_rescue_initial_altitude"]').val(FC.GPS_RESCUE.initialAltitudeM);
+ $('input[name="gps_rescue_descent_distance"]').val(FC.GPS_RESCUE.descentDistanceM);
+ $('input[name="gps_rescue_ground_speed"]').val((FC.GPS_RESCUE.rescueGroundspeed / 100).toFixed(2));
+ $('input[name="gps_rescue_throttle_min"]').val(FC.GPS_RESCUE.throttleMin);
+ $('input[name="gps_rescue_throttle_max"]').val(FC.GPS_RESCUE.throttleMax);
+ $('input[name="gps_rescue_throttle_hover"]').val(FC.GPS_RESCUE.throttleHover);
+ $('input[name="gps_rescue_min_sats"]').val(FC.GPS_RESCUE.minSats);
+ $('select[name="gps_rescue_sanity_checks"]').val(FC.GPS_RESCUE.sanityChecks);
+ if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_43)) {
+ $('input[name="gps_rescue_ascend_rate"]').val((FC.GPS_RESCUE.ascendRate / 100).toFixed(2));
+ $('input[name="gps_rescue_descend_rate"]').val((FC.GPS_RESCUE.descendRate / 100).toFixed(2));
+ $('input[name="gps_rescue_allow_arming_without_fix"]').prop('checked', FC.GPS_RESCUE.allowArmingWithoutFix > 0);
+ $('select[name="gps_rescue_altitude_mode"]').val(FC.GPS_RESCUE.altitudeMode);
} else {
- // GPS Rescue option not available
- $('.pro4').hide();
+ $('input[name="gps_rescue_ascend_rate"]').closest('.number').hide();
+ $('input[name="gps_rescue_descend_rate"]').closest('.number').hide();
+ $('input[name="gps_rescue_allow_arming_without_fix"]').closest('.number').hide();
+ $('select[name="gps_rescue_altitude_mode"]').closest('.number').hide();
}
+ if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
+ $('input[name="gps_rescue_min_dth"]').val(FC.GPS_RESCUE.minRescueDth);
+ } else {
+ $('input[name="gps_rescue_min_dth"]').closest('.number').hide();
+ }
-
+ if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
+ $('input[name="gps_rescue_min_dth"]').attr("min", 20);
+ }
$('a.save').click(function () {
// gather data that doesn't have automatic change event bound
@@ -355,25 +309,18 @@ failsafe.initialize = function (callback) {
FC.FAILSAFE_CONFIG.failsafe_procedure = 2;
}
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_39)) {
- FC.FAILSAFE_CONFIG.failsafe_switch_mode = $('select[name="failsafe_switch_mode"]').val();
- }
- else {
- FC.FAILSAFE_CONFIG.failsafe_switch_mode = $('input[name="failsafe_kill_switch"]').is(':checked') ? 1 : 0;
- }
+ FC.FAILSAFE_CONFIG.failsafe_switch_mode = $('select[name="failsafe_switch_mode"]').val();
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_41)) {
- // Load GPS Rescue parameters
- FC.GPS_RESCUE.angle = $('input[name="gps_rescue_angle"]').val();
- FC.GPS_RESCUE.initialAltitudeM = $('input[name="gps_rescue_initial_altitude"]').val();
- FC.GPS_RESCUE.descentDistanceM = $('input[name="gps_rescue_descent_distance"]').val();
- FC.GPS_RESCUE.rescueGroundspeed = $('input[name="gps_rescue_ground_speed"]').val() * 100;
- FC.GPS_RESCUE.throttleMin = $('input[name="gps_rescue_throttle_min"]').val();
- FC.GPS_RESCUE.throttleMax = $('input[name="gps_rescue_throttle_max"]').val();
- FC.GPS_RESCUE.throttleHover = $('input[name="gps_rescue_throttle_hover"]').val();
- FC.GPS_RESCUE.minSats = $('input[name="gps_rescue_min_sats"]').val();
- FC.GPS_RESCUE.sanityChecks = $('select[name="gps_rescue_sanity_checks"]').val();
- }
+ // Load GPS Rescue parameters
+ FC.GPS_RESCUE.angle = $('input[name="gps_rescue_angle"]').val();
+ FC.GPS_RESCUE.initialAltitudeM = $('input[name="gps_rescue_initial_altitude"]').val();
+ FC.GPS_RESCUE.descentDistanceM = $('input[name="gps_rescue_descent_distance"]').val();
+ FC.GPS_RESCUE.rescueGroundspeed = $('input[name="gps_rescue_ground_speed"]').val() * 100;
+ FC.GPS_RESCUE.throttleMin = $('input[name="gps_rescue_throttle_min"]').val();
+ FC.GPS_RESCUE.throttleMax = $('input[name="gps_rescue_throttle_max"]').val();
+ FC.GPS_RESCUE.throttleHover = $('input[name="gps_rescue_throttle_hover"]').val();
+ FC.GPS_RESCUE.minSats = $('input[name="gps_rescue_min_sats"]').val();
+ FC.GPS_RESCUE.sanityChecks = $('select[name="gps_rescue_sanity_checks"]').val();
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_43)) {
FC.GPS_RESCUE.ascendRate = $('input[name="gps_rescue_ascend_rate"]').val() * 100;
@@ -395,8 +342,7 @@ failsafe.initialize = function (callback) {
}
function save_feature_config() {
- MSP.send_message(MSPCodes.MSP_SET_FEATURE_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_FEATURE_CONFIG), false,
- semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_41) ? save_gps_rescue : save_to_eeprom);
+ MSP.send_message(MSPCodes.MSP_SET_FEATURE_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_FEATURE_CONFIG), false, save_gps_rescue);
}
function save_gps_rescue() {
diff --git a/src/js/tabs/gps.js b/src/js/tabs/gps.js
index 13c45158..578942d1 100644
--- a/src/js/tabs/gps.js
+++ b/src/js/tabs/gps.js
@@ -54,9 +54,6 @@ gps.initialize = function (callback) {
const usedArray = ['gnssUsedUnused', 'gnssUsedUsed'];
const healthyArray = ['gnssHealthyUnknown', 'gnssHealthyHealthy', 'gnssHealthyUnhealthy', 'gnssHealthyUnknown'];
let alt = FC.GPS_DATA.alt;
- if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_39)) {
- alt = alt / 10;
- }
$('.GPS_info td.fix').html((FC.GPS_DATA.fix) ? i18n.getMessage('gpsFixTrue') : i18n.getMessage('gpsFixFalse'));
$('.GPS_info td.alt').text(`${alt} m`);
diff --git a/src/js/tabs/led_strip.js b/src/js/tabs/led_strip.js
index fc956acd..fddfc65c 100644
--- a/src/js/tabs/led_strip.js
+++ b/src/js/tabs/led_strip.js
@@ -11,19 +11,9 @@ led_strip.initialize = function (callback, scrollPosition) {
let selectedModeColor = null;
const functionTag = '.function-';
- if (semver.lt(FC.CONFIG.apiVersion, "1.20.0")) {
- TABS.led_strip.functions = ['i', 'w', 'f', 'a', 't', 'r', 'c', 'g', 's', 'b'];
- TABS.led_strip.baseFuncs = ['c', 'f', 'a', 'b', 'g', 'r'];
- TABS.led_strip.overlays = ['t', 's', 'i', 'w'];
- } else {
- TABS.led_strip.functions = ['i', 'w', 'f', 'a', 't', 'r', 'c', 'g', 's', 'b', 'l', 'o', 'n'];
- TABS.led_strip.baseFuncs = ['c', 'f', 'a', 'l', 's', 'g', 'r'];
- if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_36)) {
- TABS.led_strip.overlays = ['t', 'o', 'b', 'n', 'i', 'w'];
- } else {
- TABS.led_strip.overlays = ['t', 'o', 'b', 'v', 'i', 'w'];
- }
- }
+ TABS.led_strip.functions = ['i', 'w', 'f', 'a', 't', 'r', 'c', 'g', 's', 'b', 'l', 'o', 'n'];
+ TABS.led_strip.baseFuncs = ['c', 'f', 'a', 'l', 's', 'g', 'r'];
+ TABS.led_strip.overlays = ['t', 'o', 'b', 'v', 'i', 'w'];
TABS.led_strip.wireMode = false;
@@ -40,10 +30,7 @@ led_strip.initialize = function (callback, scrollPosition) {
}
function load_led_mode_colors() {
- if (semver.gte(FC.CONFIG.apiVersion, "1.19.0"))
- MSP.send_message(MSPCodes.MSP_LED_STRIP_MODECOLOR, false, false, load_html);
- else
- load_html();
+ MSP.send_message(MSPCodes.MSP_LED_STRIP_MODECOLOR, false, false, load_html);
}
@@ -73,13 +60,7 @@ led_strip.initialize = function (callback, scrollPosition) {
const theHTML = [];
let theHTMLlength = 0;
for (let i = 0; i < 256; i++) {
- if (semver.lte(FC.CONFIG.apiVersion, "1.19.0")) {
- theHTML[theHTMLlength++] = ('
');
- } else if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_36)) {
- theHTML[theHTMLlength++] = ('
');
- } else {
- theHTML[theHTMLlength++] = ('
');
- }
+ theHTML[theHTMLlength++] = ('
');
}
$('.mainGrid').html(theHTML.join(''));
@@ -88,31 +69,20 @@ led_strip.initialize = function (callback, scrollPosition) {
});
// Aux channel drop-down
- if (semver.lte(FC.CONFIG.apiVersion, "1.20.0")) {
- $('.auxSelect').hide();
- $('.labelSelect').show();
- } else {
- $('.auxSelect').show();
- $('.labelSelect').hide();
+ $('.auxSelect').show();
+ $('.labelSelect').hide();
- const AuxMode = 7;
- const AuxDir = 0;
+ const AuxMode = 7;
+ const AuxDir = 0;
- $('.auxSelect').val(getModeColor(AuxMode, AuxDir));
+ $('.auxSelect').val(getModeColor(AuxMode, AuxDir));
- $('.auxSelect').on('change', function() {
- setModeColor(AuxMode, AuxDir, $('.auxSelect').val());
- });
- }
+ $('.auxSelect').on('change', function() {
+ setModeColor(AuxMode, AuxDir, $('.auxSelect').val());
+ });
- if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_36)) {
- $('.vtxOverlay').hide();
- $('.landingBlinkOverlay').show();
- }
- else {
- $('.landingBlinkOverlay').css("visibility", "hidden");
- $('.vtxOverlay').show();
- }
+ $('.landingBlinkOverlay').css("visibility", "hidden");
+ $('.vtxOverlay').show();
// Clear button
$('.funcClear').click(function() {
@@ -603,10 +573,7 @@ led_strip.initialize = function (callback, scrollPosition) {
}
function send_led_strip_mode_colors() {
- if (semver.gte(FC.CONFIG.apiVersion, "1.19.0"))
- mspHelper.sendLedStripModeColors(save_to_eeprom);
- else
- save_to_eeprom();
+ mspHelper.sendLedStripModeColors(save_to_eeprom);
}
function save_to_eeprom() {
@@ -727,19 +694,17 @@ led_strip.initialize = function (callback, scrollPosition) {
// refresh mode color buttons
function setModeBackgroundColor(element) {
- if (semver.gte(FC.CONFIG.apiVersion, "1.19.0")) {
- element.find('[class*="mode_color"]').each(function() {
- let m = 0;
- let d = 0;
+ element.find('[class*="mode_color"]').each(function() {
+ let m = 0;
+ let d = 0;
- const match = $(this).attr("class").match(/(^|\s)mode_color-([0-9]+)-([0-9]+)(\s|$)/);
- if (match) {
- m = Number(match[2]);
- d = Number(match[3]);
- $(this).css('background-color', HsvToColor(FC.LED_COLORS[getModeColor(m, d)]));
- }
- });
- }
+ const match = $(this).attr("class").match(/(^|\s)mode_color-([0-9]+)-([0-9]+)(\s|$)/);
+ if (match) {
+ m = Number(match[2]);
+ d = Number(match[3]);
+ $(this).css('background-color', HsvToColor(FC.LED_COLORS[getModeColor(m, d)]));
+ }
+ });
}
function setBackgroundColor(element) {
@@ -767,45 +732,31 @@ led_strip.initialize = function (callback, scrollPosition) {
}
function areOverlaysActive(activeFunction) {
- if (semver.lt(FC.CONFIG.apiVersion, "1.20.0")) {
- switch (activeFunction) {
- case "function-c":
- case "function-a":
- case "function-f":
- case "function-g":
- return true;
- default:
- break;
- }
- } else {
- switch (activeFunction) {
- case "":
- case "function-c":
- case "function-a":
- case "function-f":
- case "function-s":
- case "function-l":
- case "function-r":
- case "function-o":
- case "function-g":
- return true;
- default:
- break;
- }
+ switch (activeFunction) {
+ case "":
+ case "function-c":
+ case "function-a":
+ case "function-f":
+ case "function-s":
+ case "function-l":
+ case "function-r":
+ case "function-o":
+ case "function-g":
+ return true;
+ default:
+ break;
}
return false;
}
function areBlinkersActive(activeFunction) {
- if (semver.gte(FC.CONFIG.apiVersion, "1.20.0")) {
- switch (activeFunction) {
- case "function-c":
- case "function-a":
- case "function-f":
- return true;
- default:
- break;
- }
+ switch (activeFunction) {
+ case "function-c":
+ case "function-a":
+ case "function-f":
+ return true;
+ default:
+ break;
}
return false;
}
@@ -818,26 +769,20 @@ led_strip.initialize = function (callback, scrollPosition) {
return false;
case "function-r":
case "function-b":
- if (semver.lt(FC.CONFIG.apiVersion, "1.20.0")) {
- return false;
- }
- break;
default:
return true;
}
}
function isVtxActive(activeFunction) {
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_36)) {
- switch (activeFunction) {
- case "function-v":
- case "function-c":
- case "function-a":
- case "function-f":
- return true;
- default:
- return false;
- }
+ switch (activeFunction) {
+ case "function-v":
+ case "function-c":
+ case "function-a":
+ case "function-f":
+ return true;
+ default:
+ return false;
}
}
@@ -846,23 +791,12 @@ led_strip.initialize = function (callback, scrollPosition) {
const activeFunction = $('select.functionSelect').val();
$('select.functionSelect').addClass(activeFunction);
-
- if (semver.lte(FC.CONFIG.apiVersion, "1.18.0")) {
- // <= 18
- // Hide GPS (Func)
- // Hide RSSI (O/L), Blink (Func)
- // Hide Battery, RSSI (Func), Larson (O/L), Blink (O/L), Landing (O/L)
- $(".extra_functions20").hide();
- $(".mode_colors").hide();
- } else {
- // >= 20
- // Show GPS (Func)
- // Hide RSSI (O/L), Blink (Func)
- // Show Battery, RSSI (Func), Larson (O/L), Blink (O/L), Landing (O/L)
- $(".extra_functions20").show();
- $(".mode_colors").show();
- }
-
+ // >= 20
+ // Show GPS (Func)
+ // Hide RSSI (O/L), Blink (Func)
+ // Show Battery, RSSI (Func), Larson (O/L), Blink (O/L), Landing (O/L)
+ $(".extra_functions20").show();
+ $(".mode_colors").show();
// set color modifiers (check-boxes) visibility
$('.overlays').toggle(areOverlaysActive(activeFunction));
@@ -875,67 +809,50 @@ led_strip.initialize = function (callback, scrollPosition) {
$('.vtxOverlay').toggle(isVtxActive(activeFunction));
- // set directions visibility
- if (semver.lt(FC.CONFIG.apiVersion, "1.20.0")) {
- switch (activeFunction) {
- case "function-r":
- $('.indicatorOverlay').hide();
- $('.directions').hide();
- break;
- default:
- $('.indicatorOverlay').show();
- $('.directions').show();
- break;
- }
+ $('.mode_colors').hide();
+
+ // set mode colors visibility
+
+ if (activeFunction === "function-f") {
+ $('.mode_colors').show();
}
- $('.mode_colors').hide();
- if (semver.gte(FC.CONFIG.apiVersion, "1.19.0")) {
- // set mode colors visibility
+ // set special colors visibility
+ $('.special_colors').show();
+ $('.mode_color-6-0').hide();
+ $('.mode_color-6-1').hide();
+ $('.mode_color-6-2').hide();
+ $('.mode_color-6-3').hide();
+ $('.mode_color-6-4').hide();
+ $('.mode_color-6-5').hide();
+ $('.mode_color-6-6').hide();
+ $('.mode_color-6-7').hide();
- if (semver.gte(FC.CONFIG.apiVersion, "1.20.0")) {
- if (activeFunction === "function-f") {
- $('.mode_colors').show();
- }
- }
-
- // set special colors visibility
- $('.special_colors').show();
- $('.mode_color-6-0').hide();
- $('.mode_color-6-1').hide();
- $('.mode_color-6-2').hide();
- $('.mode_color-6-3').hide();
- $('.mode_color-6-4').hide();
- $('.mode_color-6-5').hide();
- $('.mode_color-6-6').hide();
- $('.mode_color-6-7').hide();
-
- switch (activeFunction) {
- case "": // none
- case "function-f": // Modes & Orientation
- case "function-l": // Battery
- // $('.mode_color-6-3').show(); // background
- $('.special_colors').hide();
- break;
- case "function-g": // GPS
- $('.mode_color-6-5').show(); // no sats
- $('.mode_color-6-6').show(); // no lock
- $('.mode_color-6-7').show(); // locked
- // $('.mode_color-6-3').show(); // background
- break;
- case "function-b": // Blink
- $('.mode_color-6-4').show(); // blink background
- break;
- case "function-a": // Arm state
- $('.mode_color-6-0').show(); // disarmed
- $('.mode_color-6-1').show(); // armed
- break;
-
- case "function-r": // Ring
- default:
- $('.special_colors').hide();
+ switch (activeFunction) {
+ case "": // none
+ case "function-f": // Modes & Orientation
+ case "function-l": // Battery
+ // $('.mode_color-6-3').show(); // background
+ $('.special_colors').hide();
break;
- }
+ case "function-g": // GPS
+ $('.mode_color-6-5').show(); // no sats
+ $('.mode_color-6-6').show(); // no lock
+ $('.mode_color-6-7').show(); // locked
+ // $('.mode_color-6-3').show(); // background
+ break;
+ case "function-b": // Blink
+ $('.mode_color-6-4').show(); // blink background
+ break;
+ case "function-a": // Arm state
+ $('.mode_color-6-0').show(); // disarmed
+ $('.mode_color-6-1').show(); // armed
+ break;
+
+ case "function-r": // Ring
+ default:
+ $('.special_colors').hide();
+ break;
}
}
@@ -966,32 +883,20 @@ led_strip.initialize = function (callback, scrollPosition) {
}
function unselectOverlays(letter) {
- if (semver.lt(FC.CONFIG.apiVersion, "1.20.0")) {
- if (letter == 'b' || letter == 'r') {
- unselectOverlay(letter, 'i');
- }
- if (letter == 'b' || letter == 'r' || letter == 'l' || letter == 'g') {
- unselectOverlay(letter, 'w');
- unselectOverlay(letter, 'v');
- unselectOverlay(letter, 't');
- unselectOverlay(letter, 's');
- }
- } else {
- // MSP 1.20
- if (letter == 'r' || letter == '') {
- unselectOverlay(letter, 'o');
- unselectOverlay(letter, 'b');
- unselectOverlay(letter, 'n');
- unselectOverlay(letter, 't');
- }
- if (letter == 'l' || letter == 'g' || letter == 's') {
- unselectOverlay(letter, 'w');
- unselectOverlay(letter, 'v');
- unselectOverlay(letter, 't');
- unselectOverlay(letter, 'o');
- unselectOverlay(letter, 'b');
- unselectOverlay(letter, 'n');
- }
+ // MSP 1.20
+ if (letter == 'r' || letter == '') {
+ unselectOverlay(letter, 'o');
+ unselectOverlay(letter, 'b');
+ unselectOverlay(letter, 'n');
+ unselectOverlay(letter, 't');
+ }
+ if (letter == 'l' || letter == 'g' || letter == 's') {
+ unselectOverlay(letter, 'w');
+ unselectOverlay(letter, 'v');
+ unselectOverlay(letter, 't');
+ unselectOverlay(letter, 'o');
+ unselectOverlay(letter, 'b');
+ unselectOverlay(letter, 'n');
}
}
diff --git a/src/js/tabs/motors.js b/src/js/tabs/motors.js
index 7b4d0ae8..b6e9344f 100644
--- a/src/js/tabs/motors.js
+++ b/src/js/tabs/motors.js
@@ -76,9 +76,7 @@ motors.initialize = async function (callback) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_42)) {
await MSP.promise(MSPCodes.MSP_FILTER_CONFIG);
}
- if (semver.gte(FC.CONFIG.apiVersion, "1.8.0")) {
- await MSP.promise(MSPCodes.MSP_ARMING_CONFIG);
- }
+ await MSP.promise(MSPCodes.MSP_ARMING_CONFIG);
load_html();
@@ -1128,10 +1126,6 @@ motors.initialize = async function (callback) {
FC.PID_ADVANCED_CONFIG.motor_pwm_rate = parseInt($('input[name="unsyncedpwmfreq"]').val());
FC.PID_ADVANCED_CONFIG.digitalIdlePercent = parseFloat($('input[name="digitalIdlePercent"]').val());
- if (semver.gte(FC.CONFIG.apiVersion, "1.25.0") && semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_41)) {
- FC.PID_ADVANCED_CONFIG.gyroUse32kHz = $('input[id="gyroUse32kHz"]').is(':checked') ? 1 : 0;
- }
-
await MSP.promise(MSPCodes.MSP_SET_FEATURE_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_FEATURE_CONFIG));
await MSP.promise(MSPCodes.MSP_SET_MIXER_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_MIXER_CONFIG));
await MSP.promise(MSPCodes.MSP_SET_MOTOR_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_MOTOR_CONFIG));
diff --git a/src/js/tabs/onboard_logging.js b/src/js/tabs/onboard_logging.js
index aaea97fd..11fd87dd 100644
--- a/src/js/tabs/onboard_logging.js
+++ b/src/js/tabs/onboard_logging.js
@@ -70,7 +70,7 @@ onboard_logging.initialize = function (callback) {
*
* The best we can do on those targets is check the BLACKBOX feature bit to identify support for Blackbox instead.
*/
- if ((FC.BLACKBOX.supported || FC.DATAFLASH.supported) && (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_33) || FC.FEATURE_CONFIG.features.isEnabled('BLACKBOX'))) {
+ if ((FC.BLACKBOX.supported || FC.DATAFLASH.supported) || FC.FEATURE_CONFIG.features.isEnabled('BLACKBOX')) {
blackboxSupport = 'yes';
} else {
blackboxSupport = 'no';
@@ -107,12 +107,7 @@ onboard_logging.initialize = function (callback) {
$(".tab-onboard_logging a.save-settings").click(function() {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
FC.BLACKBOX.blackboxSampleRate = parseInt(loggingRatesSelect.val(), 10);
- } else if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_36)) {
FC.BLACKBOX.blackboxPDenom = parseInt(loggingRatesSelect.val(), 10);
- } else {
- const rate = loggingRatesSelect.val().split('/');
- FC.BLACKBOX.blackboxRateNum = parseInt(rate[0], 10);
- FC.BLACKBOX.blackboxRateDenom = parseInt(rate[1], 10);
}
FC.BLACKBOX.blackboxDevice = parseInt(deviceSelect.val(), 10);
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_42)) {
@@ -135,30 +130,24 @@ onboard_logging.initialize = function (callback) {
}
}).change();
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_40)) {
- if ((FC.SDCARD.supported && deviceSelect.val() == 2) || (FC.DATAFLASH.supported && deviceSelect.val() == 1)) {
+ if ((FC.SDCARD.supported && deviceSelect.val() == 2) || (FC.DATAFLASH.supported && deviceSelect.val() == 1)) {
- $(".tab-onboard_logging")
- .toggleClass("msc-supported", true);
+ $(".tab-onboard_logging")
+ .toggleClass("msc-supported", true);
- $('a.onboardLoggingRebootMsc').click(function () {
- analytics.sendEvent(analytics.EVENT_CATEGORIES.FLIGHT_CONTROLLER, 'RebootMsc');
+ $('a.onboardLoggingRebootMsc').click(function () {
+ analytics.sendEvent(analytics.EVENT_CATEGORIES.FLIGHT_CONTROLLER, 'RebootMsc');
- const buffer = [];
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_41)) {
- if (GUI.operating_system === "Linux") {
- // Reboot into MSC using UTC time offset instead of user timezone
- // Linux seems to expect that the FAT file system timestamps are UTC based
- buffer.push(mspHelper.REBOOT_TYPES.MSC_UTC);
- } else {
- buffer.push(mspHelper.REBOOT_TYPES.MSC);
- }
- } else {
- buffer.push(mspHelper.REBOOT_TYPES.MSC);
- }
- MSP.send_message(MSPCodes.MSP_SET_REBOOT, buffer, false);
- });
- }
+ const buffer = [];
+ if (GUI.operating_system === "Linux") {
+ // Reboot into MSC using UTC time offset instead of user timezone
+ // Linux seems to expect that the FAT file system timestamps are UTC based
+ buffer.push(mspHelper.REBOOT_TYPES.MSC_UTC);
+ } else {
+ buffer.push(mspHelper.REBOOT_TYPES.MSC);
+ }
+ MSP.send_message(MSPCodes.MSP_SET_REBOOT, buffer, false);
+ });
}
update_html();
@@ -170,24 +159,14 @@ onboard_logging.initialize = function (callback) {
function populateDevices(deviceSelect) {
deviceSelect.empty();
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_33)) {
- deviceSelect.append(`
`);
- if (FC.DATAFLASH.supported) {
- deviceSelect.append(`
`);
- }
- if (FC.SDCARD.supported) {
- deviceSelect.append(`
`);
- }
- deviceSelect.append(`
`);
- } else {
- deviceSelect.append(`
`);
- if (FC.DATAFLASH.ready) {
- deviceSelect.append(`
`);
- }
- if (FC.SDCARD.supported) {
- deviceSelect.append(`
`);
- }
+ deviceSelect.append(`
`);
+ if (FC.DATAFLASH.supported) {
+ deviceSelect.append(`
`);
}
+ if (FC.SDCARD.supported) {
+ deviceSelect.append(`
`);
+ }
+ deviceSelect.append(`
`);
deviceSelect.val(FC.BLACKBOX.blackboxDevice);
}
@@ -205,9 +184,6 @@ onboard_logging.initialize = function (callback) {
let pidRateBase = 8000;
- if (semver.gte(FC.CONFIG.apiVersion, "1.25.0") && semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_41) && FC.PID_ADVANCED_CONFIG.gyroUse32kHz !== 0) {
- pidRateBase = 32000;
- }
pidRate = pidRateBase / FC.PID_ADVANCED_CONFIG.gyro_sync_denom / FC.PID_ADVANCED_CONFIG.pid_process_denom;
}
@@ -223,7 +199,7 @@ onboard_logging.initialize = function (callback) {
loggingRatesSelect.append(`
`);
}
loggingRatesSelect.val(FC.BLACKBOX.blackboxSampleRate);
- } else if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_36)) {
+ } else {
loggingRates = [
{text: "Disabled", hz: 0, p_denom: 0},
{text: "500 Hz", hz: 500, p_denom: 16},
@@ -244,36 +220,6 @@ onboard_logging.initialize = function (callback) {
loggingRatesSelect.val(FC.BLACKBOX.blackboxPDenom);
}
- else {
- loggingRates = [
- {num: 1, denom: 1},
- {num: 1, denom: 2},
- {num: 1, denom: 3},
- {num: 1, denom: 4},
- {num: 1, denom: 5},
- {num: 1, denom: 6},
- {num: 1, denom: 7},
- {num: 1, denom: 8},
- {num: 1, denom: 16},
- {num: 1, denom: 32},
- ];
-
-
- for (let i = 0; i < loggingRates.length; i++) {
- let loggingRate = Math.round(pidRate / loggingRates[i].denom);
- let loggingRateUnit = " Hz";
- if (loggingRate !== Infinity) {
- if (gcd(loggingRate, 1000) === 1000) {
- loggingRate /= 1000;
- loggingRateUnit = " kHz";
- }
- }
- loggingRatesSelect.append(`
`);
-
- }
- loggingRatesSelect.val(`${FC.BLACKBOX.blackboxRateNum}/${FC.BLACKBOX.blackboxRateDenom}`);
- }
}
function populateDebugModes(debugModeSelect) {
@@ -448,16 +394,14 @@ onboard_logging.initialize = function (callback) {
.toggleClass("sdcard-initializing", FC.SDCARD.state === MSP.SDCARD_STATE_CARD_INIT || FC.SDCARD.state === MSP.SDCARD_STATE_FS_INIT)
.toggleClass("sdcard-ready", FC.SDCARD.state === MSP.SDCARD_STATE_READY);
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_40)) {
- const mscIsReady = dataflashPresent || (FC.SDCARD.state === MSP.SDCARD_STATE_READY);
- $(".tab-onboard_logging")
- .toggleClass("msc-not-ready", !mscIsReady);
+ const mscIsReady = dataflashPresent || (FC.SDCARD.state === MSP.SDCARD_STATE_READY);
+ $(".tab-onboard_logging")
+ .toggleClass("msc-not-ready", !mscIsReady);
- if (!mscIsReady) {
- $('a.onboardLoggingRebootMsc').addClass('disabled');
- } else {
- $('a.onboardLoggingRebootMsc').removeClass('disabled');
- }
+ if (!mscIsReady) {
+ $('a.onboardLoggingRebootMsc').addClass('disabled');
+ } else {
+ $('a.onboardLoggingRebootMsc').removeClass('disabled');
}
let loggingStatus;
@@ -548,11 +492,7 @@ onboard_logging.initialize = function (callback) {
function flash_save_begin() {
if (GUI.connected_to) {
if (FC.boardHasVcp()) {
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_31)) {
- self.blockSize = self.VCP_BLOCK_SIZE;
- } else {
- self.blockSize = self.VCP_BLOCK_SIZE_3_0;
- }
+ self.blockSize = self.VCP_BLOCK_SIZE;
} else {
self.blockSize = self.BLOCK_SIZE;
}
diff --git a/src/js/tabs/pid_tuning.js b/src/js/tabs/pid_tuning.js
index f1780a14..4dc38360 100644
--- a/src/js/tabs/pid_tuning.js
+++ b/src/js/tabs/pid_tuning.js
@@ -40,48 +40,34 @@ pid_tuning.initialize = function (callback) {
const PID_DEFAULT = FC.getPidDefaults();
// requesting MSP_STATUS manually because it contains FC.CONFIG.profile
- MSP.promise(MSPCodes.MSP_STATUS).then(function() {
- if (semver.gte(FC.CONFIG.apiVersion, CONFIGURATOR.API_VERSION_MIN_SUPPORTED_PID_CONTROLLER_CHANGE)) {
- return MSP.promise(MSPCodes.MSP_PID_CONTROLLER);
- }
- }).then(function() {
- return MSP.promise(MSPCodes.MSP_PIDNAMES);
- }).then(function() {
- return MSP.promise(MSPCodes.MSP_PID);
- }).then(function() {
- if (semver.gte(FC.CONFIG.apiVersion, "1.16.0")) {
- return MSP.promise(MSPCodes.MSP_PID_ADVANCED);
- }
- }).then(function() {
- return MSP.promise(MSPCodes.MSP_RC_TUNING);
- }).then(function() {
- return MSP.promise(MSPCodes.MSP_FILTER_CONFIG);
- }).then(function() {
- return MSP.promise(MSPCodes.MSP_RC_DEADBAND);
- }).then(function() {
- return MSP.promise(MSPCodes.MSP_MOTOR_CONFIG);
- }).then(function() {
- let promise;
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
- promise = MSP.promise(MSPCodes.MSP_SIMPLIFIED_TUNING);
- }
+ MSP.promise(MSPCodes.MSP_STATUS)
+ .then(() => MSP.promise(MSPCodes.MSP_PID_CONTROLLER))
+ .then(() => MSP.promise(MSPCodes.MSP_PIDNAMES))
+ .then(() => MSP.promise(MSPCodes.MSP_PID))
+ .then(() => MSP.promise(MSPCodes.MSP_PID_ADVANCED))
+ .then(() => MSP.promise(MSPCodes.MSP_RC_TUNING))
+ .then(() => MSP.promise(MSPCodes.MSP_FILTER_CONFIG))
+ .then(() => MSP.promise(MSPCodes.MSP_RC_DEADBAND))
+ .then(() => MSP.promise(MSPCodes.MSP_MOTOR_CONFIG))
+ .then(() => {
+ let promise;
+ if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
+ promise = MSP.promise(MSPCodes.MSP_SIMPLIFIED_TUNING);
+ }
- return promise;
- }).then(function() {
- MSP.send_message(MSPCodes.MSP_MIXER_CONFIG, false, false, load_html);
- });
+ return promise;
+ })
+ .then(() => MSP.send_message(MSPCodes.MSP_MIXER_CONFIG, false, false, load_html));
function load_html() {
$('#content').load("./tabs/pid_tuning.html", process_html);
}
- const vbatpidcompensationIsUsed = semver.gte(FC.CONFIG.apiVersion, "1.16.0") && semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_44);
+ const vbatpidcompensationIsUsed = semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_44);
function pid_and_rc_to_form() {
self.setProfile();
- if (semver.gte(FC.CONFIG.apiVersion, "1.20.0")) {
- self.setRateProfile();
- }
+ self.setRateProfile();
// Fill in the data from PIDs array for each pid name
FC.PID_NAMES.forEach(function(elementPid, indexPid) {
@@ -119,287 +105,208 @@ pid_tuning.initialize = function (callback) {
$('.tpa-old input[name="tpa-breakpoint"]').val(FC.RC_TUNING.dynamic_THR_breakpoint);
}
- if (semver.lt(FC.CONFIG.apiVersion, "1.10.0")) {
- $('.pid_tuning input[name="rc_yaw_expo"]').hide();
- $('.pid_tuning input[name="rc_expo"]').attr("rowspan", "3");
- }
+ $('.pid_tuning input[name="rc_yaw_expo"]').hide();
+ $('.pid_tuning input[name="rc_expo"]').attr("rowspan", "3");
$('.vbatpidcompensation').toggle(vbatpidcompensationIsUsed);
$('input[id="vbatpidcompensation"]').prop('checked', FC.ADVANCED_TUNING.vbatPidCompensation !== 0);
- if (semver.gte(FC.CONFIG.apiVersion, "1.16.0")) {
- $('#pid-tuning .delta select').val(FC.ADVANCED_TUNING.deltaMethod);
- }
+ $('#pid-tuning .delta select').val(FC.ADVANCED_TUNING.deltaMethod);
- if (semver.gte(FC.CONFIG.apiVersion, "1.16.0")) {
- $('.pid_tuning input[name="rc_rate_yaw"]').val(FC.RC_TUNING.rcYawRate.toFixed(2));
- $('.pid_filter input[name="gyroLowpassFrequency"]').val(FC.FILTER_CONFIG.gyro_lowpass_hz);
- $('.pid_filter input[name="dtermLowpassFrequency"]').val(FC.FILTER_CONFIG.dterm_lowpass_hz);
- $('.pid_filter input[name="yawLowpassFrequency"]').val(FC.FILTER_CONFIG.yaw_lowpass_hz);
- } else {
- $('.tab-pid_tuning .subtab-filter').hide();
- $('.tab-pid_tuning .tab-container').hide();
- $('.pid_tuning input[name="rc_rate_yaw"]').hide();
- }
+ $('.pid_tuning input[name="rc_rate_yaw"]').val(FC.RC_TUNING.rcYawRate.toFixed(2));
+ $('.pid_filter input[name="gyroLowpassFrequency"]').val(FC.FILTER_CONFIG.gyro_lowpass_hz);
+ $('.pid_filter input[name="dtermLowpassFrequency"]').val(FC.FILTER_CONFIG.dterm_lowpass_hz);
+ $('.pid_filter input[name="yawLowpassFrequency"]').val(FC.FILTER_CONFIG.yaw_lowpass_hz);
- if (semver.gte(FC.CONFIG.apiVersion, "1.20.0")
- || semver.gte(FC.CONFIG.apiVersion, "1.16.0") && FC.FEATURE_CONFIG.features.isEnabled('SUPEREXPO_RATES')) {
+ if (FC.FEATURE_CONFIG.features.isEnabled('SUPEREXPO_RATES')) {
$('#pid-tuning .rate').text(i18n.getMessage("pidTuningSuperRate"));
} else {
$('#pid-tuning .rate').text(i18n.getMessage("pidTuningRate"));
}
- if (semver.gte(FC.CONFIG.apiVersion, "1.20.0")) {
- $('.pid_filter input[name="gyroNotch1Frequency"]').val(FC.FILTER_CONFIG.gyro_notch_hz);
- $('.pid_filter input[name="gyroNotch1Cutoff"]').val(FC.FILTER_CONFIG.gyro_notch_cutoff);
- $('.pid_filter input[name="dTermNotchFrequency"]').val(FC.FILTER_CONFIG.dterm_notch_hz);
- $('.pid_filter input[name="dTermNotchCutoff"]').val(FC.FILTER_CONFIG.dterm_notch_cutoff);
+ $('.pid_filter input[name="gyroNotch1Frequency"]').val(FC.FILTER_CONFIG.gyro_notch_hz);
+ $('.pid_filter input[name="gyroNotch1Cutoff"]').val(FC.FILTER_CONFIG.gyro_notch_cutoff);
+ $('.pid_filter input[name="dTermNotchFrequency"]').val(FC.FILTER_CONFIG.dterm_notch_hz);
+ $('.pid_filter input[name="dTermNotchCutoff"]').val(FC.FILTER_CONFIG.dterm_notch_cutoff);
- const dtermSetpointTransitionNumberElement = $('input[name="dtermSetpointTransition-number"]');
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_38)) {
- dtermSetpointTransitionNumberElement.attr('min', 0.00);
- } else {
- dtermSetpointTransitionNumberElement.attr('min', 0.01);
- }
+ const dtermSetpointTransitionNumberElement = $('input[name="dtermSetpointTransition-number"]');
+ dtermSetpointTransitionNumberElement.attr('min', 0.00);
+ dtermSetpointTransitionNumberElement.val(FC.ADVANCED_TUNING.dtermSetpointTransition / 100);
- dtermSetpointTransitionNumberElement.val(FC.ADVANCED_TUNING.dtermSetpointTransition / 100);
+ $('input[name="dtermSetpoint-number"]').val(FC.ADVANCED_TUNING.dtermSetpointWeight / 100);
- $('input[name="dtermSetpoint-number"]').val(FC.ADVANCED_TUNING.dtermSetpointWeight / 100);
- } else {
- $('.pid_filter .newFilter').hide();
- }
+ $('.pid_filter input[name="gyroNotch2Frequency"]').val(FC.FILTER_CONFIG.gyro_notch2_hz);
+ $('.pid_filter input[name="gyroNotch2Cutoff"]').val(FC.FILTER_CONFIG.gyro_notch2_cutoff);
- if (semver.gte(FC.CONFIG.apiVersion, "1.21.0")) {
- $('.pid_filter input[name="gyroNotch2Frequency"]').val(FC.FILTER_CONFIG.gyro_notch2_hz);
- $('.pid_filter input[name="gyroNotch2Cutoff"]').val(FC.FILTER_CONFIG.gyro_notch2_cutoff);
- } else {
- $('.pid_filter .gyroNotch2').hide();
- }
+ $('.pid_tuning input[name="angleLimit"]').val(FC.ADVANCED_TUNING.levelAngleLimit);
- if (semver.gte(FC.CONFIG.apiVersion, "1.24.0")) {
- $('.pid_tuning input[name="angleLimit"]').val(FC.ADVANCED_TUNING.levelAngleLimit);
-
- if (semver.lte(FC.CONFIG.apiVersion, API_VERSION_1_36)) {
- $('.pid_tuning input[name="sensitivity"]').val(FC.ADVANCED_TUNING.levelSensitivity);
- } else {
- $('.pid_tuning input[name="sensitivity"]').hide();
- $('.pid_tuning .levelSensitivityHeader').empty();
- }
- } else {
- $('.pid_sensitivity').hide();
- }
+ $('.pid_tuning input[name="sensitivity"]').hide();
+ $('.pid_tuning .levelSensitivityHeader').empty();
const antiGravitySwitch = $('#antiGravitySwitch');
const antiGravityGain = $('.antigravity input[name="itermAcceleratorGain"]');
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_36)) {
- $('.pid_filter select[name="dtermLowpassType"]').val(FC.FILTER_CONFIG.dterm_lowpass_type);
+ $('.pid_filter select[name="dtermLowpassType"]').val(FC.FILTER_CONFIG.dterm_lowpass_type);
- const ITERM_ACCELERATOR_GAIN_OFF = semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44) ? 0 : 1000;
+ const ITERM_ACCELERATOR_GAIN_OFF = semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44) ? 0 : 1000;
+ if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
+ // we keep the same name in html - just switching variable.
+ antiGravityGain.val(FC.ADVANCED_TUNING.antiGravityGain / 10);
+ antiGravitySwitch.prop('checked', FC.ADVANCED_TUNING.antiGravityGain !== ITERM_ACCELERATOR_GAIN_OFF);
+ } else {
+ $('.antigravity input[name="itermThrottleThreshold"]').val(FC.ADVANCED_TUNING.itermThrottleThreshold);
+ antiGravityGain.val(FC.ADVANCED_TUNING.itermAcceleratorGain / 1000);
+ antiGravitySwitch.prop('checked', FC.ADVANCED_TUNING.itermAcceleratorGain !== ITERM_ACCELERATOR_GAIN_OFF);
+ }
+
+ if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
+ antiGravityGain.attr("min", "0.1");
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
- // we keep the same name in html - just switching variable.
- antiGravityGain.val(FC.ADVANCED_TUNING.antiGravityGain / 10);
- antiGravitySwitch.prop('checked', FC.ADVANCED_TUNING.antiGravityGain !== ITERM_ACCELERATOR_GAIN_OFF);
- } else {
- $('.antigravity input[name="itermThrottleThreshold"]').val(FC.ADVANCED_TUNING.itermThrottleThreshold);
- antiGravityGain.val(FC.ADVANCED_TUNING.itermAcceleratorGain / 1000);
- antiGravitySwitch.prop('checked', FC.ADVANCED_TUNING.itermAcceleratorGain !== ITERM_ACCELERATOR_GAIN_OFF);
+ antiGravityGain.attr({ "min": "0.1", "max": "25.0", "step": "0.1" });
}
+ }
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
- antiGravityGain.attr("min", "0.1");
+ antiGravitySwitch.on("change", function() {
+ if (antiGravitySwitch.is(':checked')) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
- antiGravityGain.attr({ "min": "0.1", "max": "25.0", "step": "0.1" });
- }
- }
-
- antiGravitySwitch.on("change", function() {
- if (antiGravitySwitch.is(':checked')) {
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
- antiGravityGain.val(Number.parseFloat(FC.ADVANCED_TUNING.antiGravityGain / 10 || 8).toFixed(1));
- } else {
- const DEFAULT_ACCELERATOR_GAIN = semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_43) ? 3.5 : 1.1;
-
- if (FC.ADVANCED_TUNING.itermAcceleratorGain === ITERM_ACCELERATOR_GAIN_OFF) {
- antiGravityGain.val(DEFAULT_ACCELERATOR_GAIN);
- } else {
- const itermAcceleratorGain = (FC.ADVANCED_TUNING.itermAcceleratorGain / 1000);
- antiGravityGain.val(itermAcceleratorGain);
- }
- }
-
- $('.antigravity .suboption').show();
- $('.antigravity .antiGravityThres').toggle(semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_45) && FC.ADVANCED_TUNING.itermAcceleratorGain === 0);
- $('.antigravity .antiGravityMode').toggle(semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_40) && semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_45));
+ antiGravityGain.val(Number.parseFloat(FC.ADVANCED_TUNING.antiGravityGain / 10 || 8).toFixed(1));
} else {
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
- antiGravityGain.val(ITERM_ACCELERATOR_GAIN_OFF / 1000);
- } else {
- $('.antigravity select[id="antiGravityMode"]').val(0);
- antiGravityGain.val(ITERM_ACCELERATOR_GAIN_OFF);
- }
+ const DEFAULT_ACCELERATOR_GAIN = semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_43) ? 3.5 : 1.1;
- $('.antigravity .suboption').hide();
+ if (FC.ADVANCED_TUNING.itermAcceleratorGain === ITERM_ACCELERATOR_GAIN_OFF) {
+ antiGravityGain.val(DEFAULT_ACCELERATOR_GAIN);
+ } else {
+ const itermAcceleratorGain = (FC.ADVANCED_TUNING.itermAcceleratorGain / 1000);
+ antiGravityGain.val(itermAcceleratorGain);
+ }
}
- });
- antiGravitySwitch.trigger("change");
- } else {
- $('.dtermLowpassType').hide();
- $('.antigravity').hide();
- }
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_37)) {
- $('.pid_tuning input[name="rc_rate_pitch"]').val(FC.RC_TUNING.rcPitchRate.toFixed(2));
- $('.pid_tuning input[name="rc_pitch_expo"]').val(FC.RC_TUNING.RC_PITCH_EXPO.toFixed(2));
- }
-
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_39)) {
-
- $('.pid_filter input[name="gyroLowpass2Frequency"]').val(FC.FILTER_CONFIG.gyro_lowpass2_hz);
- $('.pid_filter select[name="gyroLowpassType"]').val(FC.FILTER_CONFIG.gyro_lowpass_type);
- $('.pid_filter select[name="gyroLowpass2Type"]').val(FC.FILTER_CONFIG.gyro_lowpass2_type);
- $('.pid_filter input[name="dtermLowpass2Frequency"]').val(FC.FILTER_CONFIG.dterm_lowpass2_hz);
- $('.pid_filter select[name="dtermLowpass2Type"]').val(FC.FILTER_CONFIG.dterm_lowpass2_type);
-
- // We load it again because the limits are now bigger than in 1.16.0
- $('.pid_filter input[name="gyroLowpassFrequency"]').attr("max","16000");
- $('.pid_filter input[name="gyroLowpassFrequency"]').val(FC.FILTER_CONFIG.gyro_lowpass_hz);
- //removes 5th column which is Feedforward
- $('#pid_main .pid_titlebar2 th').attr('colspan', 4);
- } else {
- $('.gyroLowpass2').hide();
- $('.gyroLowpass2Type').hide();
- $('.dtermLowpass2').hide();
- $('#pid_main .pid_titlebar2 th').attr('colspan', 4);
- }
-
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_40)) {
-
- // I Term Rotation
- $('input[id="itermrotation"]').prop('checked', FC.ADVANCED_TUNING.itermRotation !== 0);
-
- // Smart Feed Forward
- $('input[id="smartfeedforward"]').prop('checked', FC.ADVANCED_TUNING.smartFeedforward !== 0);
-
- // I Term Relax
- const itermRelaxCheck = $('input[id="itermrelax"]');
-
- itermRelaxCheck.prop('checked', FC.ADVANCED_TUNING.itermRelax !== 0);
- $('select[id="itermrelaxAxes"]').val(FC.ADVANCED_TUNING.itermRelax > 0 ? FC.ADVANCED_TUNING.itermRelax : 1);
- $('select[id="itermrelaxType"]').val(FC.ADVANCED_TUNING.itermRelaxType);
- $('input[name="itermRelaxCutoff"]').val(FC.ADVANCED_TUNING.itermRelaxCutoff);
-
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_43)) {
- $('.itermrelax input[name="itermRelaxCutoff"]').attr("max","50");
- }
-
- itermRelaxCheck.change(function() {
- const checked = $(this).is(':checked');
-
- if (checked) {
- $('.itermrelax .suboption').show();
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_42)) {
- $('.itermRelaxCutoff').show();
- } else {
- $('.itermRelaxCutoff').hide();
- }
+ $('.antigravity .suboption').show();
+ $('.antigravity .antiGravityThres').toggle(semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_45) && FC.ADVANCED_TUNING.itermAcceleratorGain === 0);
+ $('.antigravity .antiGravityMode').toggle(semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_45));
+ } else {
+ if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
+ antiGravityGain.val(ITERM_ACCELERATOR_GAIN_OFF / 1000);
} else {
- $('.itermrelax .suboption').hide();
+ $('.antigravity select[id="antiGravityMode"]').val(0);
+ antiGravityGain.val(ITERM_ACCELERATOR_GAIN_OFF);
}
- });
- itermRelaxCheck.change();
- // Absolute Control
- const absoluteControlGainNumberElement = $('input[name="absoluteControlGain-number"]');
- absoluteControlGainNumberElement.val(FC.ADVANCED_TUNING.absoluteControlGain).trigger('input');
-
- // Throttle Boost
- const throttleBoostNumberElement = $('input[name="throttleBoost-number"]');
- throttleBoostNumberElement.val(FC.ADVANCED_TUNING.throttleBoost).trigger('input');
-
- // Acro Trainer
- const acroTrainerAngleLimitNumberElement = $('input[name="acroTrainerAngleLimit-number"]');
- acroTrainerAngleLimitNumberElement.val(FC.ADVANCED_TUNING.acroTrainerAngleLimit).trigger('input');
-
- // Yaw D
- $('.pid_tuning .YAW input[name="d"]').val(FC.PIDS[2][2]); // PID Yaw D
-
- // Feedforward
- $('.pid_tuning .ROLL input[name="f"]').val(FC.ADVANCED_TUNING.feedforwardRoll);
- $('.pid_tuning .PITCH input[name="f"]').val(FC.ADVANCED_TUNING.feedforwardPitch);
- $('.pid_tuning .YAW input[name="f"]').val(FC.ADVANCED_TUNING.feedforwardYaw);
- $('#pid_main .pid_titlebar2 th').attr('colspan', 5);
-
- const feedforwardTransitionNumberElement = $('input[name="feedforwardTransition-number"]');
- feedforwardTransitionNumberElement.val(Number.parseFloat(FC.ADVANCED_TUNING.feedforwardTransition / 100).toFixed(2));
-
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_40) && semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
- // AntiGravity Mode
- const antiGravityModeSelect = $('.antigravity select[id="antiGravityMode"]');
-
- antiGravityModeSelect.on('change', function () {
- const antiGravityModeValue = antiGravityModeSelect.val();
-
- // Smooth removes threshold
- $('.antiGravityThres').toggle(antiGravityModeValue !== 0);
- });
-
- antiGravityModeSelect.val(FC.ADVANCED_TUNING.antiGravityMode).trigger('change');
+ $('.antigravity .suboption').hide();
}
+ });
+ antiGravitySwitch.trigger("change");
- } else {
- $('.itermrotation').hide();
- $('.smartfeedforward').hide();
- $('.itermrelax').hide();
- $('.absoluteControlGain').hide();
- $('.throttleBoost').hide();
- $('.acroTrainerAngleLimit').hide();
+ $('.pid_tuning input[name="rc_rate_pitch"]').val(FC.RC_TUNING.rcPitchRate.toFixed(2));
+ $('.pid_tuning input[name="rc_pitch_expo"]').val(FC.RC_TUNING.RC_PITCH_EXPO.toFixed(2));
- $('.pid_tuning .YAW input[name="d"]').hide();
- // Feedforward column
- $('#pid_main tr :nth-child(6)').hide();
+ $('.pid_filter input[name="gyroLowpass2Frequency"]').val(FC.FILTER_CONFIG.gyro_lowpass2_hz);
+ $('.pid_filter select[name="gyroLowpassType"]').val(FC.FILTER_CONFIG.gyro_lowpass_type);
+ $('.pid_filter select[name="gyroLowpass2Type"]').val(FC.FILTER_CONFIG.gyro_lowpass2_type);
+ $('.pid_filter input[name="dtermLowpass2Frequency"]').val(FC.FILTER_CONFIG.dterm_lowpass2_hz);
+ $('.pid_filter select[name="dtermLowpass2Type"]').val(FC.FILTER_CONFIG.dterm_lowpass2_type);
- $('#pid-tuning .feedforwardGroup').hide();
+ // We load it again because the limits are now bigger than in 1.16.0
+ $('.pid_filter input[name="gyroLowpassFrequency"]').attr("max","16000");
+ $('.pid_filter input[name="gyroLowpassFrequency"]').val(FC.FILTER_CONFIG.gyro_lowpass_hz);
+ //removes 5th column which is Feedforward
+ $('#pid_main .pid_titlebar2 th').attr('colspan', 4);
+
+ // I Term Rotation
+ $('input[id="itermrotation"]').prop('checked', FC.ADVANCED_TUNING.itermRotation !== 0);
+
+ // Smart Feed Forward
+ $('input[id="smartfeedforward"]').prop('checked', FC.ADVANCED_TUNING.smartFeedforward !== 0);
+
+ // I Term Relax
+ const itermRelaxCheck = $('input[id="itermrelax"]');
+
+ itermRelaxCheck.prop('checked', FC.ADVANCED_TUNING.itermRelax !== 0);
+ $('select[id="itermrelaxAxes"]').val(FC.ADVANCED_TUNING.itermRelax > 0 ? FC.ADVANCED_TUNING.itermRelax : 1);
+ $('select[id="itermrelaxType"]').val(FC.ADVANCED_TUNING.itermRelaxType);
+ $('input[name="itermRelaxCutoff"]').val(FC.ADVANCED_TUNING.itermRelaxCutoff);
+
+ if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_43)) {
+ $('.itermrelax input[name="itermRelaxCutoff"]').attr("max","50");
}
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_41)) {
- $('select[id="throttleLimitType"]').val(FC.RC_TUNING.throttleLimitType);
- $('.throttle_limit input[name="throttleLimitPercent"]').val(FC.RC_TUNING.throttleLimitPercent);
+ itermRelaxCheck.change(function() {
+ const checked = $(this).is(':checked');
- $('.pid_filter input[name="gyroLowpassDynMinFrequency"]').val(FC.FILTER_CONFIG.gyro_lowpass_dyn_min_hz);
- $('.pid_filter input[name="gyroLowpassDynMaxFrequency"]').val(FC.FILTER_CONFIG.gyro_lowpass_dyn_max_hz);
- $('.pid_filter select[name="gyroLowpassDynType"]').val(FC.FILTER_CONFIG.gyro_lowpass_type);
+ if (checked) {
+ $('.itermrelax .suboption').show();
+ if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_42)) {
+ $('.itermRelaxCutoff').show();
+ } else {
+ $('.itermRelaxCutoff').hide();
+ }
+ } else {
+ $('.itermrelax .suboption').hide();
+ }
+ });
+ itermRelaxCheck.change();
- $('.pid_filter input[name="dtermLowpassDynMinFrequency"]').val(FC.FILTER_CONFIG.dterm_lowpass_dyn_min_hz);
- $('.pid_filter input[name="dtermLowpassDynMaxFrequency"]').val(FC.FILTER_CONFIG.dterm_lowpass_dyn_max_hz);
- $('.pid_filter select[name="dtermLowpassDynType"]').val(FC.FILTER_CONFIG.dterm_lowpass_type);
+ // Absolute Control
+ const absoluteControlGainNumberElement = $('input[name="absoluteControlGain-number"]');
+ absoluteControlGainNumberElement.val(FC.ADVANCED_TUNING.absoluteControlGain).trigger('input');
- $('.pid_tuning input[name="dMinRoll"]').val(FC.ADVANCED_TUNING.dMinRoll);
- $('.pid_tuning input[name="dMinPitch"]').val(FC.ADVANCED_TUNING.dMinPitch);
- $('.pid_tuning input[name="dMinYaw"]').val(FC.ADVANCED_TUNING.dMinYaw);
- $('.dminGroup input[name="dMinGain"]').val(FC.ADVANCED_TUNING.dMinGain);
- $('.dminGroup input[name="dMinAdvance"]').val(FC.ADVANCED_TUNING.dMinAdvance);
+ // Throttle Boost
+ const throttleBoostNumberElement = $('input[name="throttleBoost-number"]');
+ throttleBoostNumberElement.val(FC.ADVANCED_TUNING.throttleBoost).trigger('input');
- $('input[id="useIntegratedYaw"]').prop('checked', FC.ADVANCED_TUNING.useIntegratedYaw !== 0);
- //dmin column
- $('#pid_main .pid_titlebar2 th').attr('colspan', 6);
- } else {
- $('.throttle_limit').hide();
+ // Acro Trainer
+ const acroTrainerAngleLimitNumberElement = $('input[name="acroTrainerAngleLimit-number"]');
+ acroTrainerAngleLimitNumberElement.val(FC.ADVANCED_TUNING.acroTrainerAngleLimit).trigger('input');
- $('.gyroLowpassDynLegacy').hide();
- $('.dtermLowpassDynLegacy').hide();
- $('.dtermLowpass2TypeGroup').hide();
+ // Yaw D
+ $('.pid_tuning .YAW input[name="d"]').val(FC.PIDS[2][2]); // PID Yaw D
- $('.dminGroup').hide();
- $('.dMinDisabledNote').hide();
- //dmin column
- $('#pid_main tr :nth-child(5)').hide();
+ // Feedforward
+ $('.pid_tuning .ROLL input[name="f"]').val(FC.ADVANCED_TUNING.feedforwardRoll);
+ $('.pid_tuning .PITCH input[name="f"]').val(FC.ADVANCED_TUNING.feedforwardPitch);
+ $('.pid_tuning .YAW input[name="f"]').val(FC.ADVANCED_TUNING.feedforwardYaw);
+ $('#pid_main .pid_titlebar2 th').attr('colspan', 5);
- $('.integratedYaw').hide();
+ const feedforwardTransitionNumberElement = $('input[name="feedforwardTransition-number"]');
+ feedforwardTransitionNumberElement.val(Number.parseFloat(FC.ADVANCED_TUNING.feedforwardTransition / 100).toFixed(2));
+
+ if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
+ // AntiGravity Mode
+ const antiGravityModeSelect = $('.antigravity select[id="antiGravityMode"]');
+
+ antiGravityModeSelect.on('change', function () {
+ const antiGravityModeValue = antiGravityModeSelect.val();
+
+ // Smooth removes threshold
+ $('.antiGravityThres').toggle(antiGravityModeValue !== 0);
+ });
+
+ antiGravityModeSelect.val(FC.ADVANCED_TUNING.antiGravityMode).trigger('change');
}
+ $('select[id="throttleLimitType"]').val(FC.RC_TUNING.throttleLimitType);
+ $('.throttle_limit input[name="throttleLimitPercent"]').val(FC.RC_TUNING.throttleLimitPercent);
+
+ $('.pid_filter input[name="gyroLowpassDynMinFrequency"]').val(FC.FILTER_CONFIG.gyro_lowpass_dyn_min_hz);
+ $('.pid_filter input[name="gyroLowpassDynMaxFrequency"]').val(FC.FILTER_CONFIG.gyro_lowpass_dyn_max_hz);
+ $('.pid_filter select[name="gyroLowpassDynType"]').val(FC.FILTER_CONFIG.gyro_lowpass_type);
+
+ $('.pid_filter input[name="dtermLowpassDynMinFrequency"]').val(FC.FILTER_CONFIG.dterm_lowpass_dyn_min_hz);
+ $('.pid_filter input[name="dtermLowpassDynMaxFrequency"]').val(FC.FILTER_CONFIG.dterm_lowpass_dyn_max_hz);
+ $('.pid_filter select[name="dtermLowpassDynType"]').val(FC.FILTER_CONFIG.dterm_lowpass_type);
+
+ $('.pid_tuning input[name="dMinRoll"]').val(FC.ADVANCED_TUNING.dMinRoll);
+ $('.pid_tuning input[name="dMinPitch"]').val(FC.ADVANCED_TUNING.dMinPitch);
+ $('.pid_tuning input[name="dMinYaw"]').val(FC.ADVANCED_TUNING.dMinYaw);
+ $('.dminGroup input[name="dMinGain"]').val(FC.ADVANCED_TUNING.dMinGain);
+ $('.dminGroup input[name="dMinAdvance"]').val(FC.ADVANCED_TUNING.dMinAdvance);
+
+ $('input[id="useIntegratedYaw"]').prop('checked', FC.ADVANCED_TUNING.useIntegratedYaw !== 0);
+ //dmin column
+ $('#pid_main .pid_titlebar2 th').attr('colspan', 6);
+
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_42)) {
$('.smartfeedforward').hide();
@@ -623,14 +530,10 @@ pid_tuning.initialize = function (callback) {
$('.vbatSagCompensation').hide();
$('.thrustLinearization').hide();
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_40)) {
- $('.pid_tuning .ROLL input[name="f"]').val(FC.ADVANCED_TUNING.feedforwardRoll > 0 ? FC.ADVANCED_TUNING.feedforwardRoll : PID_DEFAULT[4]);
- $('.pid_tuning .PITCH input[name="f"]').val(FC.ADVANCED_TUNING.feedforwardPitch > 0 ? FC.ADVANCED_TUNING.feedforwardPitch : PID_DEFAULT[9]);
- $('.pid_tuning .YAW input[name="f"]').val(FC.ADVANCED_TUNING.feedforwardYaw > 0 ? FC.ADVANCED_TUNING.feedforwardYaw : PID_DEFAULT[14]);
- $('span.feedforwardOption').hide();
- } else {
- $('.feedforwardGroup').hide();
- }
+ $('.pid_tuning .ROLL input[name="f"]').val(FC.ADVANCED_TUNING.feedforwardRoll > 0 ? FC.ADVANCED_TUNING.feedforwardRoll : PID_DEFAULT[4]);
+ $('.pid_tuning .PITCH input[name="f"]').val(FC.ADVANCED_TUNING.feedforwardPitch > 0 ? FC.ADVANCED_TUNING.feedforwardPitch : PID_DEFAULT[9]);
+ $('.pid_tuning .YAW input[name="f"]').val(FC.ADVANCED_TUNING.feedforwardYaw > 0 ? FC.ADVANCED_TUNING.feedforwardYaw : PID_DEFAULT[14]);
+ $('span.feedforwardOption').hide();
}
$('input[id="useIntegratedYaw"]').change(function() {
@@ -712,54 +615,52 @@ pid_tuning.initialize = function (callback) {
}).change();
// dMinSwitch toggle - renamed to Dynamic Damping and disabled in 4.3
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_41)) {
- const dMinSwitch = $('#dMinSwitch');
+ const dMinSwitch = $('#dMinSwitch');
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
- const box = document.getElementById('dMinSwitch');
- if (box.parentNode) {
- box.parentNode.removeChild(box);
- }
- $('.dMinDisabledNote').hide();
- } else {
- dMinSwitch.prop('checked', FC.ADVANCED_TUNING.dMinRoll > 0 || FC.ADVANCED_TUNING.dMinPitch > 0 || FC.ADVANCED_TUNING.dMinYaw > 0);
-
- dMinSwitch.on('change', function() {
- const checked = $(this).is(':checked');
-
- if (checked) {
- if ($('.pid_tuning input[name="dMinRoll"]').val() == 0 && $('.pid_tuning input[name="dMinPitch"]').val() == 0 && $('.pid_tuning input[name="dMinYaw"]').val() == 0) {
- // when enabling dmin set its value based on 0.57x of actual dmax, dmin is limited to 100
- $('.pid_tuning input[name="dMinRoll"]').val(Math.min(Math.round($('.pid_tuning .ROLL input[name="d"]').val() * 0.57), 100));
- $('.pid_tuning input[name="dMinPitch"]').val(Math.min(Math.round($('.pid_tuning .PITCH input[name="d"]').val() * 0.57), 100));
- $('.pid_tuning input[name="dMinYaw"]').val(Math.min(Math.round($('.pid_tuning .YAW input[name="d"]').val() * 0.57), 100));
- if (semver.eq(FC.CONFIG.apiVersion, API_VERSION_1_43)) {
- $('.pid_tuning input[name="dMinRoll"]').val(Math.min(Math.round($('.pid_tuning .ROLL input[name="d"]').val() * 0.65), 100));
- $('.pid_tuning input[name="dMinPitch"]').val(Math.min(Math.round($('.pid_tuning .PITCH input[name="d"]').val() * 0.65), 100));
- $('.pid_tuning input[name="dMinYaw"]').val(Math.min(Math.round($('.pid_tuning .YAW input[name="d"]').val() * 0.65), 100));
- }
- } else {
- $('.pid_tuning input[name="dMinRoll"]').val(FC.ADVANCED_TUNING.dMinRoll);
- $('.pid_tuning input[name="dMinPitch"]').val(FC.ADVANCED_TUNING.dMinPitch);
- $('.pid_tuning input[name="dMinYaw"]').val(FC.ADVANCED_TUNING.dMinYaw);
- }
- $('.dMinDisabledNote').hide();
- $('.dminGroup .suboption').show();
- $('#pid_main tr :nth-child(5)').show();
- $('#pid_main .pid_titlebar2 th').attr('colspan', 6);
- $('.derivativeText').text(i18n.getMessage("pidTuningDMax"));
- } else {
- $('.dMinDisabledNote').show();
- $('.dminGroup .suboption').hide();
- $('#pid_main tr :nth-child(5)').hide();
- $('#pid_main .pid_titlebar2 th').attr('colspan', 5);
- $('.derivativeText').text(i18n.getMessage("pidTuningDerivative"));
- $('.pid_tuning input[name="dMinRoll"]').val(0);
- $('.pid_tuning input[name="dMinPitch"]').val(0);
- $('.pid_tuning input[name="dMinYaw"]').val(0);
- }
- }).trigger('change');
+ if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
+ const box = document.getElementById('dMinSwitch');
+ if (box.parentNode) {
+ box.parentNode.removeChild(box);
}
+ $('.dMinDisabledNote').hide();
+ } else {
+ dMinSwitch.prop('checked', FC.ADVANCED_TUNING.dMinRoll > 0 || FC.ADVANCED_TUNING.dMinPitch > 0 || FC.ADVANCED_TUNING.dMinYaw > 0);
+
+ dMinSwitch.on('change', function() {
+ const checked = $(this).is(':checked');
+
+ if (checked) {
+ if ($('.pid_tuning input[name="dMinRoll"]').val() == 0 && $('.pid_tuning input[name="dMinPitch"]').val() == 0 && $('.pid_tuning input[name="dMinYaw"]').val() == 0) {
+ // when enabling dmin set its value based on 0.57x of actual dmax, dmin is limited to 100
+ $('.pid_tuning input[name="dMinRoll"]').val(Math.min(Math.round($('.pid_tuning .ROLL input[name="d"]').val() * 0.57), 100));
+ $('.pid_tuning input[name="dMinPitch"]').val(Math.min(Math.round($('.pid_tuning .PITCH input[name="d"]').val() * 0.57), 100));
+ $('.pid_tuning input[name="dMinYaw"]').val(Math.min(Math.round($('.pid_tuning .YAW input[name="d"]').val() * 0.57), 100));
+ if (semver.eq(FC.CONFIG.apiVersion, API_VERSION_1_43)) {
+ $('.pid_tuning input[name="dMinRoll"]').val(Math.min(Math.round($('.pid_tuning .ROLL input[name="d"]').val() * 0.65), 100));
+ $('.pid_tuning input[name="dMinPitch"]').val(Math.min(Math.round($('.pid_tuning .PITCH input[name="d"]').val() * 0.65), 100));
+ $('.pid_tuning input[name="dMinYaw"]').val(Math.min(Math.round($('.pid_tuning .YAW input[name="d"]').val() * 0.65), 100));
+ }
+ } else {
+ $('.pid_tuning input[name="dMinRoll"]').val(FC.ADVANCED_TUNING.dMinRoll);
+ $('.pid_tuning input[name="dMinPitch"]').val(FC.ADVANCED_TUNING.dMinPitch);
+ $('.pid_tuning input[name="dMinYaw"]').val(FC.ADVANCED_TUNING.dMinYaw);
+ }
+ $('.dMinDisabledNote').hide();
+ $('.dminGroup .suboption').show();
+ $('#pid_main tr :nth-child(5)').show();
+ $('#pid_main .pid_titlebar2 th').attr('colspan', 6);
+ $('.derivativeText').text(i18n.getMessage("pidTuningDMax"));
+ } else {
+ $('.dMinDisabledNote').show();
+ $('.dminGroup .suboption').hide();
+ $('#pid_main tr :nth-child(5)').hide();
+ $('#pid_main .pid_titlebar2 th').attr('colspan', 5);
+ $('.derivativeText').text(i18n.getMessage("pidTuningDerivative"));
+ $('.pid_tuning input[name="dMinRoll"]').val(0);
+ $('.pid_tuning input[name="dMinPitch"]').val(0);
+ $('.pid_tuning input[name="dMinYaw"]').val(0);
+ }
+ }).trigger('change');
}
$('input[id="gyroNotch1Enabled"]').change(function() {
@@ -1211,102 +1112,82 @@ pid_tuning.initialize = function (callback) {
FC.ADVANCED_TUNING.vbatPidCompensation = value;
}
- if (semver.gte(FC.CONFIG.apiVersion, "1.16.0")) {
- FC.ADVANCED_TUNING.deltaMethod = $('#pid-tuning .delta select').val();
- }
+ FC.ADVANCED_TUNING.deltaMethod = $('#pid-tuning .delta select').val();
- if (semver.gte(FC.CONFIG.apiVersion, "1.20.0")) {
- FC.ADVANCED_TUNING.dtermSetpointTransition = parseInt($('input[name="dtermSetpointTransition-number"]').val() * 100);
- FC.ADVANCED_TUNING.dtermSetpointWeight = parseInt($('input[name="dtermSetpoint-number"]').val() * 100);
+ FC.ADVANCED_TUNING.dtermSetpointTransition = parseInt($('input[name="dtermSetpointTransition-number"]').val() * 100);
+ FC.ADVANCED_TUNING.dtermSetpointWeight = parseInt($('input[name="dtermSetpoint-number"]').val() * 100);
- FC.FILTER_CONFIG.gyro_notch_hz = parseInt($('.pid_filter input[name="gyroNotch1Frequency"]').val());
- FC.FILTER_CONFIG.gyro_notch_cutoff = parseInt($('.pid_filter input[name="gyroNotch1Cutoff"]').val());
- FC.FILTER_CONFIG.dterm_notch_hz = parseInt($('.pid_filter input[name="dTermNotchFrequency"]').val());
- FC.FILTER_CONFIG.dterm_notch_cutoff = parseInt($('.pid_filter input[name="dTermNotchCutoff"]').val());
- if (semver.gte(FC.CONFIG.apiVersion, "1.21.0")) {
- FC.FILTER_CONFIG.gyro_notch2_hz = parseInt($('.pid_filter input[name="gyroNotch2Frequency"]').val());
- FC.FILTER_CONFIG.gyro_notch2_cutoff = parseInt($('.pid_filter input[name="gyroNotch2Cutoff"]').val());
- }
- }
+ FC.FILTER_CONFIG.gyro_notch_hz = parseInt($('.pid_filter input[name="gyroNotch1Frequency"]').val());
+ FC.FILTER_CONFIG.gyro_notch_cutoff = parseInt($('.pid_filter input[name="gyroNotch1Cutoff"]').val());
+ FC.FILTER_CONFIG.dterm_notch_hz = parseInt($('.pid_filter input[name="dTermNotchFrequency"]').val());
+ FC.FILTER_CONFIG.dterm_notch_cutoff = parseInt($('.pid_filter input[name="dTermNotchCutoff"]').val());
+ FC.FILTER_CONFIG.gyro_notch2_hz = parseInt($('.pid_filter input[name="gyroNotch2Frequency"]').val());
+ FC.FILTER_CONFIG.gyro_notch2_cutoff = parseInt($('.pid_filter input[name="gyroNotch2Cutoff"]').val());
- if (semver.gte(FC.CONFIG.apiVersion, "1.24.0")) {
- FC.ADVANCED_TUNING.levelAngleLimit = parseInt($('.pid_tuning input[name="angleLimit"]').val());
-
- if (semver.lte(FC.CONFIG.apiVersion, API_VERSION_1_36)) {
- FC.ADVANCED_TUNING.levelSensitivity = parseInt($('.pid_tuning input[name="sensitivity"]').val());
- }
- }
+ FC.ADVANCED_TUNING.levelAngleLimit = parseInt($('.pid_tuning input[name="angleLimit"]').val());
const antiGravityGain = $('.antigravity input[name="itermAcceleratorGain"]');
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_36)) {
- FC.FILTER_CONFIG.dterm_lowpass_type = parseInt($('.pid_filter select[name="dtermLowpassType"]').val());
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
- FC.ADVANCED_TUNING.antiGravityGain = parseInt(antiGravityGain.val() * 10);
- } else {
- FC.ADVANCED_TUNING.itermThrottleThreshold = parseInt($('.antigravity input[name="itermThrottleThreshold"]').val());
- FC.ADVANCED_TUNING.itermAcceleratorGain = parseInt(antiGravityGain.val() * 1000);
+ FC.FILTER_CONFIG.dterm_lowpass_type = parseInt($('.pid_filter select[name="dtermLowpassType"]').val());
+ if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
+ FC.ADVANCED_TUNING.antiGravityGain = parseInt(antiGravityGain.val() * 10);
+ } else {
+ FC.ADVANCED_TUNING.itermThrottleThreshold = parseInt($('.antigravity input[name="itermThrottleThreshold"]').val());
+ FC.ADVANCED_TUNING.itermAcceleratorGain = parseInt(antiGravityGain.val() * 1000);
+ }
+
+ FC.FILTER_CONFIG.gyro_lowpass2_hz = parseInt($('.pid_filter input[name="gyroLowpass2Frequency"]').val());
+ FC.FILTER_CONFIG.gyro_lowpass_type = parseInt($('.pid_filter select[name="gyroLowpassType"]').val());
+ FC.FILTER_CONFIG.gyro_lowpass2_type = parseInt($('.pid_filter select[name="gyroLowpass2Type"]').val());
+ FC.FILTER_CONFIG.dterm_lowpass2_hz = parseInt($('.pid_filter input[name="dtermLowpass2Frequency"]').val());
+ FC.FILTER_CONFIG.dterm_lowpass2_type = parseInt($('.pid_filter select[name="dtermLowpass2Type"]').val());
+
+ FC.ADVANCED_TUNING.itermRotation = $('input[id="itermrotation"]').is(':checked') ? 1 : 0;
+ FC.ADVANCED_TUNING.smartFeedforward = $('input[id="smartfeedforward"]').is(':checked') ? 1 : 0;
+
+ FC.ADVANCED_TUNING.itermRelax = $('input[id="itermrelax"]').is(':checked') ? $('select[id="itermrelaxAxes"]').val() : 0;
+ FC.ADVANCED_TUNING.itermRelaxType = $('select[id="itermrelaxType"]').val();
+ FC.ADVANCED_TUNING.itermRelaxCutoff = parseInt($('input[name="itermRelaxCutoff"]').val());
+
+ FC.ADVANCED_TUNING.absoluteControlGain = $('input[name="absoluteControlGain-number"]').val();
+
+ FC.ADVANCED_TUNING.throttleBoost = $('input[name="throttleBoost-number"]').val();
+
+ FC.ADVANCED_TUNING.acroTrainerAngleLimit = $('input[name="acroTrainerAngleLimit-number"]').val();
+
+ FC.ADVANCED_TUNING.feedforwardRoll = parseInt($('.pid_tuning .ROLL input[name="f"]').val());
+ FC.ADVANCED_TUNING.feedforwardPitch = parseInt($('.pid_tuning .PITCH input[name="f"]').val());
+ FC.ADVANCED_TUNING.feedforwardYaw = parseInt($('.pid_tuning .YAW input[name="f"]').val());
+
+ FC.ADVANCED_TUNING.feedforwardTransition = parseInt($('input[name="feedforwardTransition-number"]').val() * 100);
+
+ FC.ADVANCED_TUNING.antiGravityMode = semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_45) ? $('select[id="antiGravityMode"]').val() : 0;
+
+ FC.RC_TUNING.throttleLimitType = $('select[id="throttleLimitType"]').val();
+ FC.RC_TUNING.throttleLimitPercent = parseInt($('.throttle_limit input[name="throttleLimitPercent"]').val());
+
+ FC.FILTER_CONFIG.gyro_lowpass_dyn_min_hz = parseInt($('.pid_filter input[name="gyroLowpassDynMinFrequency"]').val());
+ FC.FILTER_CONFIG.gyro_lowpass_dyn_max_hz = parseInt($('.pid_filter input[name="gyroLowpassDynMaxFrequency"]').val());
+ FC.FILTER_CONFIG.dterm_lowpass_dyn_min_hz = parseInt($('.pid_filter input[name="dtermLowpassDynMinFrequency"]').val());
+ FC.FILTER_CONFIG.dterm_lowpass_dyn_max_hz = parseInt($('.pid_filter input[name="dtermLowpassDynMaxFrequency"]').val());
+
+ if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
+ if (FC.FILTER_CONFIG.gyro_lowpass_dyn_min_hz > 0 && FC.FILTER_CONFIG.gyro_lowpass_dyn_min_hz < FC.FILTER_CONFIG.gyro_lowpass_dyn_max_hz ) {
+ FC.FILTER_CONFIG.gyro_lowpass_type = $('.pid_filter select[name="gyroLowpassDynType"]').val();
+ }
+ if (FC.FILTER_CONFIG.dterm_lowpass_dyn_min_hz > 0 && FC.FILTER_CONFIG.dterm_lowpass_dyn_min_hz < FC.FILTER_CONFIG.dterm_lowpass_dyn_max_hz ) {
+ FC.FILTER_CONFIG.dterm_lowpass_type = $('.pid_filter select[name="dtermLowpassDynType"]').val();
}
}
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_39)) {
- FC.FILTER_CONFIG.gyro_lowpass2_hz = parseInt($('.pid_filter input[name="gyroLowpass2Frequency"]').val());
- FC.FILTER_CONFIG.gyro_lowpass_type = parseInt($('.pid_filter select[name="gyroLowpassType"]').val());
- FC.FILTER_CONFIG.gyro_lowpass2_type = parseInt($('.pid_filter select[name="gyroLowpass2Type"]').val());
- FC.FILTER_CONFIG.dterm_lowpass2_hz = parseInt($('.pid_filter input[name="dtermLowpass2Frequency"]').val());
- FC.FILTER_CONFIG.dterm_lowpass2_type = parseInt($('.pid_filter select[name="dtermLowpass2Type"]').val());
- }
+ FC.ADVANCED_TUNING.dMinRoll = parseInt($('.pid_tuning input[name="dMinRoll"]').val());
+ FC.ADVANCED_TUNING.dMinPitch = parseInt($('.pid_tuning input[name="dMinPitch"]').val());
+ FC.ADVANCED_TUNING.dMinYaw = parseInt($('.pid_tuning input[name="dMinYaw"]').val());
+ FC.ADVANCED_TUNING.dMinGain = parseInt($('.dminGroup input[name="dMinGain"]').val());
+ FC.ADVANCED_TUNING.dMinAdvance = parseInt($('.dminGroup input[name="dMinAdvance"]').val());
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_40)) {
+ FC.ADVANCED_TUNING.useIntegratedYaw = $('input[id="useIntegratedYaw"]').is(':checked') ? 1 : 0;
- FC.ADVANCED_TUNING.itermRotation = $('input[id="itermrotation"]').is(':checked') ? 1 : 0;
- FC.ADVANCED_TUNING.smartFeedforward = $('input[id="smartfeedforward"]').is(':checked') ? 1 : 0;
-
- FC.ADVANCED_TUNING.itermRelax = $('input[id="itermrelax"]').is(':checked') ? $('select[id="itermrelaxAxes"]').val() : 0;
- FC.ADVANCED_TUNING.itermRelaxType = $('select[id="itermrelaxType"]').val();
- FC.ADVANCED_TUNING.itermRelaxCutoff = parseInt($('input[name="itermRelaxCutoff"]').val());
-
- FC.ADVANCED_TUNING.absoluteControlGain = $('input[name="absoluteControlGain-number"]').val();
-
- FC.ADVANCED_TUNING.throttleBoost = $('input[name="throttleBoost-number"]').val();
-
- FC.ADVANCED_TUNING.acroTrainerAngleLimit = $('input[name="acroTrainerAngleLimit-number"]').val();
-
- FC.ADVANCED_TUNING.feedforwardRoll = parseInt($('.pid_tuning .ROLL input[name="f"]').val());
- FC.ADVANCED_TUNING.feedforwardPitch = parseInt($('.pid_tuning .PITCH input[name="f"]').val());
- FC.ADVANCED_TUNING.feedforwardYaw = parseInt($('.pid_tuning .YAW input[name="f"]').val());
-
- FC.ADVANCED_TUNING.feedforwardTransition = parseInt($('input[name="feedforwardTransition-number"]').val() * 100);
-
- FC.ADVANCED_TUNING.antiGravityMode = semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_45) ? $('select[id="antiGravityMode"]').val() : 0;
- }
-
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_41)) {
- FC.RC_TUNING.throttleLimitType = $('select[id="throttleLimitType"]').val();
- FC.RC_TUNING.throttleLimitPercent = parseInt($('.throttle_limit input[name="throttleLimitPercent"]').val());
-
- FC.FILTER_CONFIG.gyro_lowpass_dyn_min_hz = parseInt($('.pid_filter input[name="gyroLowpassDynMinFrequency"]').val());
- FC.FILTER_CONFIG.gyro_lowpass_dyn_max_hz = parseInt($('.pid_filter input[name="gyroLowpassDynMaxFrequency"]').val());
- FC.FILTER_CONFIG.dterm_lowpass_dyn_min_hz = parseInt($('.pid_filter input[name="dtermLowpassDynMinFrequency"]').val());
- FC.FILTER_CONFIG.dterm_lowpass_dyn_max_hz = parseInt($('.pid_filter input[name="dtermLowpassDynMaxFrequency"]').val());
-
- if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
- if (FC.FILTER_CONFIG.gyro_lowpass_dyn_min_hz > 0 && FC.FILTER_CONFIG.gyro_lowpass_dyn_min_hz < FC.FILTER_CONFIG.gyro_lowpass_dyn_max_hz ) {
- FC.FILTER_CONFIG.gyro_lowpass_type = $('.pid_filter select[name="gyroLowpassDynType"]').val();
- }
- if (FC.FILTER_CONFIG.dterm_lowpass_dyn_min_hz > 0 && FC.FILTER_CONFIG.dterm_lowpass_dyn_min_hz < FC.FILTER_CONFIG.dterm_lowpass_dyn_max_hz ) {
- FC.FILTER_CONFIG.dterm_lowpass_type = $('.pid_filter select[name="dtermLowpassDynType"]').val();
- }
- }
-
- FC.ADVANCED_TUNING.dMinRoll = parseInt($('.pid_tuning input[name="dMinRoll"]').val());
- FC.ADVANCED_TUNING.dMinPitch = parseInt($('.pid_tuning input[name="dMinPitch"]').val());
- FC.ADVANCED_TUNING.dMinYaw = parseInt($('.pid_tuning input[name="dMinYaw"]').val());
- FC.ADVANCED_TUNING.dMinGain = parseInt($('.dminGroup input[name="dMinGain"]').val());
- FC.ADVANCED_TUNING.dMinAdvance = parseInt($('.dminGroup input[name="dMinAdvance"]').val());
-
- FC.ADVANCED_TUNING.useIntegratedYaw = $('input[id="useIntegratedYaw"]').is(':checked') ? 1 : 0;
- }
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_42)) {
FC.FILTER_CONFIG.dyn_notch_range = parseInt($('.pid_filter select[name="dynamicNotchRange"]').val());
@@ -1382,12 +1263,6 @@ pid_tuning.initialize = function (callback) {
// Show titles and other elements needed by the PID
$(`.needed_by_${elementPid}`).show();
});
-
- // Special case
- if (semver.lt(FC.CONFIG.apiVersion, "1.24.0")) {
- $('#pid_sensitivity').hide();
- }
-
}
function hideUnusedPids() {
@@ -1449,17 +1324,12 @@ pid_tuning.initialize = function (callback) {
return value;
}
- let useLegacyCurve = false;
- if (!semver.gte(FC.CONFIG.apiVersion, "1.16.0")) {
- useLegacyCurve = true;
- }
+ const useLegacyCurve = true;
self.rateCurve = new RateCurve(useLegacyCurve);
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_36)) {
- $('.pid_tuning input[name="sensitivity"]').hide();
- $('.pid_tuning .levelSensitivityHeader').empty();
- }
+ $('.pid_tuning input[name="sensitivity"]').hide();
+ $('.pid_tuning .levelSensitivityHeader').empty();
function printMaxAngularVel(rate, rcRate, rcExpo, useSuperExpo, deadband, limit, maxAngularVelElement) {
const maxAngularVel = self.rateCurve.getMaxAngularVel(rate, rcRate, rcExpo, useSuperExpo, deadband, limit).toFixed(0);
@@ -1480,13 +1350,7 @@ pid_tuning.initialize = function (callback) {
TABS.pid_tuning.isHtmlProcessing = true;
FC.FEATURE_CONFIG.features.generateElements($('.tab-pid_tuning .features'));
- if (semver.lt(FC.CONFIG.apiVersion, "1.16.0") || semver.gte(FC.CONFIG.apiVersion, "1.20.0")) {
- $('.tab-pid_tuning .pidTuningSuperexpoRates').hide();
- }
-
- if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_39)) {
- $('input[name="dtermSetpoint-number"]').attr('max', self.SETPOINT_WEIGHT_RANGE_LEGACY);
- }
+ $('.tab-pid_tuning .pidTuningSuperexpoRates').hide();
// translate to user-selected language
i18n.localizePage();
@@ -1500,7 +1364,7 @@ pid_tuning.initialize = function (callback) {
$('.tab-pid_tuning .tab-container .filter').on('click', () => activateSubtab('filter'));
function loadProfilesList() {
- const numberOfProfiles = semver.gte(FC.CONFIG.apiVersion, "1.16.0") ? FC.CONFIG.numProfiles : 3;
+ const numberOfProfiles = FC.CONFIG.numProfiles;
const profileElements = [];
for (let i = 0; i < numberOfProfiles; i++) {
@@ -1512,10 +1376,6 @@ pid_tuning.initialize = function (callback) {
function loadRateProfilesList() {
let numberOfRateProfiles = 6;
- if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_37)) {
- numberOfRateProfiles = 3;
- }
-
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
numberOfRateProfiles = 4;
}
@@ -1600,52 +1460,39 @@ pid_tuning.initialize = function (callback) {
});
});
- if (semver.gte(FC.CONFIG.apiVersion, "1.20.0")) {
- $('.tab-pid_tuning select[name="rate_profile"]').change(function () {
- self.currentRateProfile = parseInt($(this).val());
- self.updating = true;
- $(this).prop('disabled', 'true');
- MSP.promise(MSPCodes.MSP_SELECT_SETTING, [self.currentRateProfile + self.RATE_PROFILE_MASK]).then(function () {
- self.refresh(function () {
- self.updating = false;
+ $('.tab-pid_tuning select[name="rate_profile"]').change(function () {
+ self.currentRateProfile = parseInt($(this).val());
+ self.updating = true;
+ $(this).prop('disabled', 'true');
+ MSP.promise(MSPCodes.MSP_SELECT_SETTING, [self.currentRateProfile + self.RATE_PROFILE_MASK]).then(function () {
+ self.refresh(function () {
+ self.updating = false;
- $('.tab-pid_tuning select[name="rate_profile"]').prop('disabled', 'false');
- FC.CONFIG.rateProfile = self.currentRateProfile;
- self.currentRates = self.rateCurve.getCurrentRates();
+ $('.tab-pid_tuning select[name="rate_profile"]').prop('disabled', 'false');
+ FC.CONFIG.rateProfile = self.currentRateProfile;
+ self.currentRates = self.rateCurve.getCurrentRates();
- GUI.log(i18n.getMessage('pidTuningLoadedRateProfile', [self.currentRateProfile + 1]));
- });
+ GUI.log(i18n.getMessage('pidTuningLoadedRateProfile', [self.currentRateProfile + 1]));
});
});
+ });
- const dtermTransitionNumberElement = $('input[name="dtermSetpointTransition-number"]');
- const dtermTransitionWarningElement = $('#pid-tuning .dtermSetpointTransitionWarning');
+ const dtermTransitionNumberElement = $('input[name="dtermSetpointTransition-number"]');
+ const dtermTransitionWarningElement = $('#pid-tuning .dtermSetpointTransitionWarning');
- function checkUpdateDtermTransitionWarning(value) {
- if (value > 0 && value < 0.1) {
- dtermTransitionWarningElement.show();
- } else {
- dtermTransitionWarningElement.hide();
- }
+ function checkUpdateDtermTransitionWarning(value) {
+ if (value > 0 && value < 0.1) {
+ dtermTransitionWarningElement.show();
+ } else {
+ dtermTransitionWarningElement.hide();
}
- checkUpdateDtermTransitionWarning(dtermTransitionNumberElement.val());
-
- //Use 'input' event for coupled controls to allow synchronized update
- dtermTransitionNumberElement.on('input', function () {
- checkUpdateDtermTransitionWarning($(this).val());
- });
-
- } else {
- $('.tab-pid_tuning .rate_profile').hide();
-
- $('#pid-tuning .dtermSetpointTransition').hide();
- $('#pid-tuning .dtermSetpoint').hide();
}
+ checkUpdateDtermTransitionWarning(dtermTransitionNumberElement.val());
- if (!semver.gte(FC.CONFIG.apiVersion, "1.16.0")) {
- $('#pid-tuning .delta').hide();
- $('.tab-pid_tuning .note').hide();
- }
+ //Use 'input' event for coupled controls to allow synchronized update
+ dtermTransitionNumberElement.on('input', function () {
+ checkUpdateDtermTransitionWarning($(this).val());
+ });
// Add a name to each row of PIDs if empty
$('.pid_tuning tr').each(function() {
@@ -1664,13 +1511,12 @@ pid_tuning.initialize = function (callback) {
const filterTypeValues = [];
filterTypeValues.push("PT1");
filterTypeValues.push("BIQUAD");
- if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_39)) {
- filterTypeValues.push("FIR");
- }
+
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
filterTypeValues.push("PT2");
filterTypeValues.push("PT3");
}
+
return filterTypeValues;
}
@@ -1728,64 +1574,11 @@ pid_tuning.initialize = function (callback) {
activateSubtab(self.activeSubtab);
- const pidController_e = $('select[name="controller"]');
+ $('.tab-pid_tuning div.controller').hide();
- if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_31)) {
- let pidControllerList;
+ self.updatePidControllerParameters();
-
- if (semver.lt(FC.CONFIG.apiVersion, "1.14.0")) {
- pidControllerList = [
- {name: "MultiWii (Old)"},
- {name: "MultiWii (rewrite)"},
- {name: "LuxFloat"},
- {name: "MultiWii (2.3 - latest)"},
- {name: "MultiWii (2.3 - hybrid)"},
- {name: "Harakiri"},
- ];
- } else if (semver.lt(FC.CONFIG.apiVersion, "1.20.0")) {
- pidControllerList = [
- {name: ""},
- {name: "Integer"},
- {name: "Float"},
- ];
- } else {
- pidControllerList = [
- {name: "Legacy"},
- {name: "Betaflight"},
- ];
- }
-
- for (let i = 0; i < pidControllerList.length; i++) {
- pidController_e.append(`
`);
- }
-
- if (semver.gte(FC.CONFIG.apiVersion, CONFIGURATOR.API_VERSION_MIN_SUPPORTED_PID_CONTROLLER_CHANGE)) {
- pidController_e.val(FC.PID.controller);
-
- self.updatePidControllerParameters();
- } else {
- GUI.log(i18n.getMessage('pidTuningUpgradeFirmwareToChangePidController', [FC.CONFIG.apiVersion, CONFIGURATOR.API_VERSION_MIN_SUPPORTED_PID_CONTROLLER_CHANGE]));
-
- pidController_e.empty();
- pidController_e.append('
');
-
- pidController_e.prop('disabled', true);
- }
- } else {
- $('.tab-pid_tuning div.controller').hide();
-
- self.updatePidControllerParameters();
- }
-
- if (semver.lt(FC.CONFIG.apiVersion, "1.7.0")) {
- $('.tpa-old .tpa-breakpoint').hide();
-
- $('.pid_tuning .roll_rate').hide();
- $('.pid_tuning .pitch_rate').hide();
- } else {
- $('.pid_tuning .roll_pitch_rate').hide();
- }
+ $('.pid_tuning .roll_pitch_rate').hide();
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
$('.tpa-old').hide();
@@ -1793,16 +1586,11 @@ pid_tuning.initialize = function (callback) {
$('.tpa').hide();
}
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_37)) {
- $('.pid_tuning .bracket').hide();
- $('.pid_tuning input[name=rc_rate]').parent().attr('class', 'pid_data');
- $('.pid_tuning input[name=rc_rate]').parent().attr('rowspan', 1);
- $('.pid_tuning input[name=rc_expo]').parent().attr('class', 'pid_data');
- $('.pid_tuning input[name=rc_expo]').parent().attr('rowspan', 1);
- } else {
- $('.pid_tuning input[name=rc_rate_pitch]').parent().hide();
- $('.pid_tuning input[name=rc_pitch_expo]').parent().hide();
- }
+ $('.pid_tuning .bracket').hide();
+ $('.pid_tuning input[name=rc_rate]').parent().attr('class', 'pid_data');
+ $('.pid_tuning input[name=rc_rate]').parent().attr('rowspan', 1);
+ $('.pid_tuning input[name=rc_expo]').parent().attr('class', 'pid_data');
+ $('.pid_tuning input[name=rc_expo]').parent().attr('rowspan', 1);
if (useLegacyCurve) {
$('.new_rates').hide();
@@ -1839,31 +1627,12 @@ pid_tuning.initialize = function (callback) {
updateNeeded = true;
}
- if (targetElement.attr('name') === 'rc_rate' && semver.lt(FC.CONFIG.apiVersion, "1.16.0")) {
- self.currentRates.rc_rate_yaw = targetValue;
- }
-
- if (targetElement.attr('name') === 'roll_pitch_rate' && semver.lt(FC.CONFIG.apiVersion, "1.7.0")) {
- self.currentRates.roll_rate = targetValue;
- self.currentRates.pitch_rate = targetValue;
-
- updateNeeded = true;
- }
-
if (targetElement.attr('name') === 'SUPEREXPO_RATES') {
self.currentRates.superexpo = targetElement.is(':checked');
updateNeeded = true;
}
- if (targetElement.attr('name') === 'rc_rate' && semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_37)) {
- self.currentRates.rc_rate_pitch = targetValue;
- }
-
- if (targetElement.attr('name') === 'rc_expo' && semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_37)) {
- self.currentRates.rc_pitch_expo = targetValue;
- }
-
if (targetElement.attr('id') === 'ratesType' && semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_43)) {
self.changeRatesType(targetValue);
@@ -2032,73 +1801,67 @@ pid_tuning.initialize = function (callback) {
const DIALOG_MODE_RATEPROFILE = 1;
let dialogCopyProfileMode;
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_36)) {
+ const selectProfile = $('.selectProfile');
+ const selectRateProfile = $('.selectRateProfile');
- const selectProfile = $('.selectProfile');
- const selectRateProfile = $('.selectRateProfile');
+ $.each(selectProfileValues, function(key, value) {
+ if (key !== FC.CONFIG.profile) {
+ selectProfile.append(new Option(value, key));
+ }
+ });
+ $.each(selectRateProfileValues, function(key, value) {
+ if (key !== FC.CONFIG.rateProfile) {
+ selectRateProfile.append(new Option(value, key));
+ }
+ });
- $.each(selectProfileValues, function(key, value) {
- if (key !== FC.CONFIG.profile) {
- selectProfile.append(new Option(value, key));
- }
- });
- $.each(selectRateProfileValues, function(key, value) {
- if (key !== FC.CONFIG.rateProfile) {
- selectRateProfile.append(new Option(value, key));
- }
- });
+ $('.copyprofilebtn').click(function() {
+ $('.dialogCopyProfile').find('.contentProfile').show();
+ $('.dialogCopyProfile').find('.contentRateProfile').hide();
+ dialogCopyProfileMode = DIALOG_MODE_PROFILE;
+ dialogCopyProfile.showModal();
+ });
- $('.copyprofilebtn').click(function() {
- $('.dialogCopyProfile').find('.contentProfile').show();
- $('.dialogCopyProfile').find('.contentRateProfile').hide();
- dialogCopyProfileMode = DIALOG_MODE_PROFILE;
- dialogCopyProfile.showModal();
- });
+ $('.copyrateprofilebtn').click(function() {
+ $('.dialogCopyProfile').find('.contentProfile').hide();
+ $('.dialogCopyProfile').find('.contentRateProfile').show();
+ dialogCopyProfileMode = DIALOG_MODE_RATEPROFILE;
+ dialogCopyProfile.showModal();
+ });
- $('.copyrateprofilebtn').click(function() {
- $('.dialogCopyProfile').find('.contentProfile').hide();
- $('.dialogCopyProfile').find('.contentRateProfile').show();
- dialogCopyProfileMode = DIALOG_MODE_RATEPROFILE;
- dialogCopyProfile.showModal();
- });
+ $('.dialogCopyProfile-cancelbtn').click(function() {
+ dialogCopyProfile.close();
+ });
- $('.dialogCopyProfile-cancelbtn').click(function() {
+ $('.dialogCopyProfile-confirmbtn').click(function() {
+ switch(dialogCopyProfileMode) {
+ case DIALOG_MODE_PROFILE:
+ FC.COPY_PROFILE.type = DIALOG_MODE_PROFILE; // 0 = pid profile
+ FC.COPY_PROFILE.dstProfile = parseInt(selectProfile.val());
+ FC.COPY_PROFILE.srcProfile = FC.CONFIG.profile;
+
+ MSP.send_message(MSPCodes.MSP_COPY_PROFILE, mspHelper.crunch(MSPCodes.MSP_COPY_PROFILE), false, close_dialog);
+
+ break;
+
+ case DIALOG_MODE_RATEPROFILE:
+ FC.COPY_PROFILE.type = DIALOG_MODE_RATEPROFILE; // 1 = rate profile
+ FC.COPY_PROFILE.dstProfile = parseInt(selectRateProfile.val());
+ FC.COPY_PROFILE.srcProfile = FC.CONFIG.rateProfile;
+
+ MSP.send_message(MSPCodes.MSP_COPY_PROFILE, mspHelper.crunch(MSPCodes.MSP_COPY_PROFILE), false, close_dialog);
+
+ break;
+
+ default:
+ close_dialog();
+ break;
+ }
+
+ function close_dialog() {
dialogCopyProfile.close();
- });
-
- $('.dialogCopyProfile-confirmbtn').click(function() {
- switch(dialogCopyProfileMode) {
- case DIALOG_MODE_PROFILE:
- FC.COPY_PROFILE.type = DIALOG_MODE_PROFILE; // 0 = pid profile
- FC.COPY_PROFILE.dstProfile = parseInt(selectProfile.val());
- FC.COPY_PROFILE.srcProfile = FC.CONFIG.profile;
-
- MSP.send_message(MSPCodes.MSP_COPY_PROFILE, mspHelper.crunch(MSPCodes.MSP_COPY_PROFILE), false, close_dialog);
-
- break;
-
- case DIALOG_MODE_RATEPROFILE:
- FC.COPY_PROFILE.type = DIALOG_MODE_RATEPROFILE; // 1 = rate profile
- FC.COPY_PROFILE.dstProfile = parseInt(selectRateProfile.val());
- FC.COPY_PROFILE.srcProfile = FC.CONFIG.rateProfile;
-
- MSP.send_message(MSPCodes.MSP_COPY_PROFILE, mspHelper.crunch(MSPCodes.MSP_COPY_PROFILE), false, close_dialog);
-
- break;
-
- default:
- close_dialog();
- break;
- }
-
- function close_dialog() {
- dialogCopyProfile.close();
- }
- });
- } else {
- $('.copyprofilebtn').hide();
- $('.copyrateprofilebtn').hide();
- }
+ }
+ });
/*
* TuningSliders
@@ -2454,37 +2217,16 @@ pid_tuning.initialize = function (callback) {
$('.tuningHelpSliders').hide();
}
- if (semver.gte(FC.CONFIG.apiVersion, "1.16.0")) {
- $('#pid-tuning .delta select').change(function() {
- self.setDirty(true);
- });
- }
-
- if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_31)) {
- pidController_e.change(function () {
- self.setDirty(true);
-
- self.updatePidControllerParameters();
- });
- }
+ $('#pid-tuning .delta select').change(function() {
+ self.setDirty(true);
+ });
// update == save.
$('a.update').click(function () {
form_to_pid_and_rc();
self.updating = true;
- Promise.resolve(true)
- .then(function () {
- let promise;
- if (semver.gte(FC.CONFIG.apiVersion, CONFIGURATOR.API_VERSION_MIN_SUPPORTED_PID_CONTROLLER_CHANGE) && semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_31)) {
- FC.PID.controller = pidController_e.val();
- promise = MSP.promise(MSPCodes.MSP_SET_PID_CONTROLLER, mspHelper.crunch(MSPCodes.MSP_SET_PID_CONTROLLER));
- } else {
- console.log(`Unsupported API version: ${FC.CONFIG.apiVersion}`);
- }
- return promise;
- })
- .then(() => MSP.promise(MSPCodes.MSP_SET_PID, mspHelper.crunch(MSPCodes.MSP_SET_PID)))
+ MSP.promise(MSPCodes.MSP_SET_PID, mspHelper.crunch(MSPCodes.MSP_SET_PID))
.then(() => MSP.promise(MSPCodes.MSP_SET_PID_ADVANCED, mspHelper.crunch(MSPCodes.MSP_SET_PID_ADVANCED)))
.then(() => {
self.updatePIDColors();
@@ -2637,9 +2379,7 @@ pid_tuning.setDirty = function (isDirty) {
self.dirty = isDirty;
$('.tab-pid_tuning select[name="profile"]').prop('disabled', isDirty);
- if (semver.gte(FC.CONFIG.apiVersion, "1.20.0")) {
- $('.tab-pid_tuning select[name="rate_profile"]').prop('disabled', isDirty);
- }
+ $('.tab-pid_tuning select[name="rate_profile"]').prop('disabled', isDirty);
};
pid_tuning.checkUpdateProfile = function (updateRateProfile) {
@@ -2656,9 +2396,7 @@ pid_tuning.checkUpdateProfile = function (updateRateProfile) {
}
let changedRateProfile = false;
- if (semver.gte(FC.CONFIG.apiVersion, "1.20.0")
- && updateRateProfile
- && self.currentRateProfile !== FC.CONFIG.rateProfile) {
+ if (updateRateProfile && self.currentRateProfile !== FC.CONFIG.rateProfile) {
self.setRateProfile();
changedRateProfile = true;
@@ -2711,26 +2449,10 @@ pid_tuning.checkThrottle = function() {
};
pid_tuning.updatePidControllerParameters = function () {
- if (semver.gte(FC.CONFIG.apiVersion, "1.20.0") && semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_31) && $('.tab-pid_tuning select[name="controller"]').val() === '0') {
- $('.pid_tuning .YAW_JUMP_PREVENTION').show();
-
- $('#pid-tuning .delta').show();
-
- $('#pid-tuning .dtermSetpointTransition').hide();
- $('#pid-tuning .dtermSetpoint').hide();
- } else {
- $('.pid_tuning .YAW_JUMP_PREVENTION').hide();
-
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_40)) {
- $('#pid-tuning .dtermSetpointTransition').hide();
- $('#pid-tuning .dtermSetpoint').hide();
- } else {
- $('#pid-tuning .dtermSetpointTransition').show();
- $('#pid-tuning .dtermSetpoint').show();
- }
-
- $('#pid-tuning .delta').hide();
- }
+ $('.pid_tuning .YAW_JUMP_PREVENTION').hide();
+ $('#pid-tuning .dtermSetpointTransition').hide();
+ $('#pid-tuning .dtermSetpoint').hide();
+ $('#pid-tuning .delta').hide();
};
pid_tuning.updateRatesLabels = function() {
diff --git a/src/js/tabs/ports.js b/src/js/tabs/ports.js
index a9461db4..f06c69aa 100644
--- a/src/js/tabs/ports.js
+++ b/src/js/tabs/ports.js
@@ -20,39 +20,22 @@ ports.initialize = function (callback) {
{ name: 'BLACKBOX', groups: ['peripherals'], sharableWith: ['msp'], notSharableWith: ['telemetry'], maxPorts: 1 },
];
- if (semver.gte(FC.CONFIG.apiVersion, "1.15.0")) {
- const ltmFunctionRule = {name: 'TELEMETRY_LTM', groups: ['telemetry'], sharableWith: ['msp'], notSharableWith: ['peripherals'], maxPorts: 1};
- functionRules.push(ltmFunctionRule);
- } else {
- const mspFunctionRule = {name: 'TELEMETRY_MSP', groups: ['telemetry'], sharableWith: ['msp'], notSharableWith: ['peripherals'], maxPorts: 1};
- functionRules.push(mspFunctionRule);
- }
+ const ltmFunctionRule = {name: 'TELEMETRY_LTM', groups: ['telemetry'], sharableWith: ['msp'], notSharableWith: ['peripherals'], maxPorts: 1};
+ functionRules.push(ltmFunctionRule);
- if (semver.gte(FC.CONFIG.apiVersion, "1.18.0")) {
- const mavlinkFunctionRule = {name: 'TELEMETRY_MAVLINK', groups: ['telemetry'], sharableWith: ['msp'], notSharableWith: ['peripherals'], maxPorts: 1};
- functionRules.push(mavlinkFunctionRule);
- }
+ const mavlinkFunctionRule = {name: 'TELEMETRY_MAVLINK', groups: ['telemetry'], sharableWith: ['msp'], notSharableWith: ['peripherals'], maxPorts: 1};
+ functionRules.push(mavlinkFunctionRule);
- if (semver.gte(FC.CONFIG.apiVersion, "1.27.0")) {
- functionRules.push({ name: 'IRC_TRAMP', groups: ['peripherals'], maxPorts: 1 });
- }
+ functionRules.push({ name: 'IRC_TRAMP', groups: ['peripherals'], maxPorts: 1 });
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_31)) {
- functionRules.push({ name: 'ESC_SENSOR', groups: ['sensors'], maxPorts: 1 });
- functionRules.push({ name: 'TBS_SMARTAUDIO', groups: ['peripherals'], maxPorts: 1 });
- }
+ functionRules.push({ name: 'ESC_SENSOR', groups: ['sensors'], maxPorts: 1 });
+ functionRules.push({ name: 'TBS_SMARTAUDIO', groups: ['peripherals'], maxPorts: 1 });
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_32)) {
- functionRules.push({ name: 'TELEMETRY_IBUS', groups: ['telemetry'], maxPorts: 1 });
- }
+ functionRules.push({ name: 'TELEMETRY_IBUS', groups: ['telemetry'], maxPorts: 1 });
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_36)) {
- functionRules.push({ name: 'RUNCAM_DEVICE_CONTROL', groups: ['peripherals'], maxPorts: 1 });
- }
+ functionRules.push({ name: 'RUNCAM_DEVICE_CONTROL', groups: ['peripherals'], maxPorts: 1 });
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_37)) {
- functionRules.push({ name: 'LIDAR_TF', groups: ['peripherals'], maxPorts: 1 });
- }
+ functionRules.push({ name: 'LIDAR_TF', groups: ['peripherals'], maxPorts: 1 });
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_43)) {
functionRules.push({ name: 'FRSKY_OSD', groups: ['peripherals'], maxPorts: 1 });
@@ -74,12 +57,10 @@ ports.initialize = function (callback) {
'115200',
'230400',
'250000',
+ '500000',
+ '1000000',
];
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_31)) {
- mspBaudRates = mspBaudRates.concat(['500000', '1000000']);
- }
-
const gpsBaudRates = [
'AUTO',
'9600',
@@ -140,12 +121,6 @@ ports.initialize = function (callback) {
function update_ui() {
self.analyticsChanges = {};
- if (semver.lt(FC.CONFIG.apiVersion, "1.6.0")) {
-
- $(".tab-ports").removeClass("supported");
- return;
- }
-
$(".tab-ports").addClass("supported");
const VCP_PORT_IDENTIFIER = 20;
diff --git a/src/js/tabs/power.js b/src/js/tabs/power.js
index 735a84a3..11b05cd8 100644
--- a/src/js/tabs/power.js
+++ b/src/js/tabs/power.js
@@ -1,4 +1,3 @@
-import semver from 'semver';
import { i18n } from '../localization';
const power = {
@@ -54,13 +53,9 @@ power.initialize = function (callback) {
$('#content').load("./tabs/power.html", process_html);
}
- this.supported = semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_33);
+ this.supported = true;
- if (!this.supported) {
- load_html();
- } else {
- load_status();
- }
+ load_status();
function updateDisplay(voltageDataSource, currentDataSource) {
// voltage meters
@@ -227,18 +222,16 @@ power.initialize = function (callback) {
const elementBatteryConfiguration = templateBatteryConfiguration.clone();
destinationBatteryConfiguration.append(elementBatteryConfiguration);
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_41)) {
- $('input[name="mincellvoltage"]').prop('step','0.01');
- $('input[name="maxcellvoltage"]').prop('step','0.01');
- $('input[name="warningcellvoltage"]').prop('step','0.01');
- }
+ $('input[name="mincellvoltage"]').prop('step','0.01');
+ $('input[name="maxcellvoltage"]').prop('step','0.01');
+ $('input[name="warningcellvoltage"]').prop('step','0.01');
$('input[name="mincellvoltage"]').val(FC.BATTERY_CONFIG.vbatmincellvoltage);
$('input[name="maxcellvoltage"]').val(FC.BATTERY_CONFIG.vbatmaxcellvoltage);
$('input[name="warningcellvoltage"]').val(FC.BATTERY_CONFIG.vbatwarningcellvoltage);
$('input[name="capacity"]').val(FC.BATTERY_CONFIG.capacity);
- const haveFc = (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_35) || (FC.CONFIG.boardType == 0 || FC.CONFIG.boardType == 2));
+ const haveFc = FC.CONFIG.boardType === 0 || FC.CONFIG.boardType === 2;
const batteryMeterTypes = [
i18n.getMessage('powerBatteryVoltageMeterTypeNone'),
@@ -264,10 +257,7 @@ power.initialize = function (callback) {
if (haveFc) {
currentMeterTypes.push(i18n.getMessage('powerBatteryCurrentMeterTypeVirtual'));
currentMeterTypes.push(i18n.getMessage('powerBatteryCurrentMeterTypeEsc'));
-
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_36)) {
- currentMeterTypes.push(i18n.getMessage('powerBatteryCurrentMeterTypeMsp'));
- }
+ currentMeterTypes.push(i18n.getMessage('powerBatteryCurrentMeterTypeMsp'));
}
let currentMeterType_e = $('select.currentmetersource');
@@ -495,19 +485,11 @@ power.initialize = function (callback) {
}
function save_voltage_config() {
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_36)) {
- mspHelper.sendVoltageConfig(save_amperage_config);
- } else {
- MSP.send_message(MSPCodes.MSP_SET_VOLTAGE_METER_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_VOLTAGE_METER_CONFIG), false, save_amperage_config);
- }
+ mspHelper.sendVoltageConfig(save_amperage_config);
}
function save_amperage_config() {
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_36)) {
- mspHelper.sendCurrentConfig(save_to_eeprom);
- } else {
- MSP.send_message(MSPCodes.MSP_SET_CURRENT_METER_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_CURRENT_METER_CONFIG), false, save_to_eeprom);
- }
+ mspHelper.sendCurrentConfig(save_to_eeprom);
}
function save_to_eeprom() {
diff --git a/src/js/tabs/receiver.js b/src/js/tabs/receiver.js
index b7b6fc31..13673d6e 100644
--- a/src/js/tabs/receiver.js
+++ b/src/js/tabs/receiver.js
@@ -58,21 +58,11 @@ receiver.initialize = function (callback) {
}
function load_rc_configs() {
- const nextCallback = load_rx_config;
- if (semver.gte(FC.CONFIG.apiVersion, "1.15.0")) {
- MSP.send_message(MSPCodes.MSP_RC_DEADBAND, false, false, nextCallback);
- } else {
- nextCallback();
- }
+ MSP.send_message(MSPCodes.MSP_RC_DEADBAND, false, false, load_rx_config);
}
function load_rx_config() {
- const nextCallback = load_mixer_config;
- if (semver.gte(FC.CONFIG.apiVersion, "1.20.0")) {
- MSP.send_message(MSPCodes.MSP_RX_CONFIG, false, false, nextCallback);
- } else {
- nextCallback();
- }
+ MSP.send_message(MSPCodes.MSP_RX_CONFIG, false, false, load_mixer_config);
}
function load_mixer_config() {
@@ -95,32 +85,20 @@ receiver.initialize = function (callback) {
// translate to user-selected language
i18n.localizePage();
- if (semver.lt(FC.CONFIG.apiVersion, "1.15.0")) {
- $('.deadband').hide();
- } else {
- $('.deadband input[name="yaw_deadband"]').val(FC.RC_DEADBAND_CONFIG.yaw_deadband);
- $('.deadband input[name="deadband"]').val(FC.RC_DEADBAND_CONFIG.deadband);
- $('.deadband input[name="3ddeadbandthrottle"]').val(FC.RC_DEADBAND_CONFIG.deadband3d_throttle);
- }
+ $('.deadband input[name="yaw_deadband"]').val(FC.RC_DEADBAND_CONFIG.yaw_deadband);
+ $('.deadband input[name="deadband"]').val(FC.RC_DEADBAND_CONFIG.deadband);
+ $('.deadband input[name="3ddeadbandthrottle"]').val(FC.RC_DEADBAND_CONFIG.deadband3d_throttle);
- if (semver.lt(FC.CONFIG.apiVersion, "1.15.0")) {
- $('.sticks').hide();
- } else {
- $('.sticks input[name="stick_min"]').val(FC.RX_CONFIG.stick_min);
- $('.sticks input[name="stick_center"]').val(FC.RX_CONFIG.stick_center);
- $('.sticks input[name="stick_max"]').val(FC.RX_CONFIG.stick_max);
- }
+ $('.sticks input[name="stick_min"]').val(FC.RX_CONFIG.stick_min);
+ $('.sticks input[name="stick_center"]').val(FC.RX_CONFIG.stick_center);
+ $('.sticks input[name="stick_max"]').val(FC.RX_CONFIG.stick_max);
- if (semver.gte(FC.CONFIG.apiVersion, "1.20.0")) {
- $('select[name="rcInterpolation-select"]').val(FC.RX_CONFIG.rcInterpolation);
- $('input[name="rcInterpolationInterval-number"]').val(FC.RX_CONFIG.rcInterpolationInterval);
+ $('select[name="rcInterpolation-select"]').val(FC.RX_CONFIG.rcInterpolation);
+ $('input[name="rcInterpolationInterval-number"]').val(FC.RX_CONFIG.rcInterpolationInterval);
- $('select[name="rcInterpolation-select"]').change(function () {
- tab.updateRcInterpolationParameters();
- }).change();
- } else {
- $('.tab-receiver div.rcInterpolation').hide();
- }
+ $('select[name="rcInterpolation-select"]').change(function () {
+ tab.updateRcInterpolationParameters();
+ }).change();
// generate bars
const bar_names = [
@@ -289,108 +267,96 @@ receiver.initialize = function (callback) {
});
}
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_31)) {
- const spiRxTypes = [
- 'NRF24_V202_250K',
- 'NRF24_V202_1M',
- 'NRF24_SYMA_X',
- 'NRF24_SYMA_X5C',
- 'NRF24_CX10',
- 'CX10A',
- 'NRF24_H8_3D',
- 'NRF24_INAV',
- 'FRSKY_D',
- ];
+ const spiRxTypes = [
+ 'NRF24_V202_250K',
+ 'NRF24_V202_1M',
+ 'NRF24_SYMA_X',
+ 'NRF24_SYMA_X5C',
+ 'NRF24_CX10',
+ 'CX10A',
+ 'NRF24_H8_3D',
+ 'NRF24_INAV',
+ 'FRSKY_D',
+ 'FRSKY_X',
+ 'A7105_FLYSKY',
+ 'A7105_FLYSKY_2A',
+ 'NRF24_KN',
+ 'SFHSS',
+ 'SPEKTRUM',
+ 'FRSKY_X_LBT',
+ ];
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_37)) {
- spiRxTypes.push(
- 'FRSKY_X',
- 'A7105_FLYSKY',
- 'A7105_FLYSKY_2A',
- 'NRF24_KN',
- );
+ if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_43)) {
+ spiRxTypes.push(
+ 'REDPINE',
+ );
+ }
+
+ if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
+ spiRxTypes.push(
+ 'FRSKY_X_V2',
+ 'FRSKY_X_LBT_V2',
+ 'EXPRESSLRS',
+ );
+ }
+
+ const spiRxElement = $('select.spiRx');
+ for (let i = 0; i < spiRxTypes.length; i++) {
+ spiRxElement.append(`
`);
+ }
+
+ spiRxElement.change(function () {
+ const value = parseInt($(this).val());
+
+ let newValue = undefined;
+ if (value !== FC.RX_CONFIG.rxSpiProtocol) {
+ newValue = $(this).find('option:selected').text();
+ updateSaveButton(true);
}
+ tab.analyticsChanges['SPIRXProtocol'] = newValue;
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_41)) {
- spiRxTypes.push(
- 'SFHSS',
- 'SPEKTRUM',
- 'FRSKY_X_LBT',
- );
- }
+ FC.RX_CONFIG.rxSpiProtocol = value;
+ });
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_43)) {
- spiRxTypes.push(
- 'REDPINE',
- );
- }
+ // select current serial RX type
+ spiRxElement.val(FC.RX_CONFIG.rxSpiProtocol);
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
- spiRxTypes.push(
- 'FRSKY_X_V2',
- 'FRSKY_X_LBT_V2',
- 'EXPRESSLRS',
- );
- }
-
- const spiRxElement = $('select.spiRx');
- for (let i = 0; i < spiRxTypes.length; i++) {
- spiRxElement.append(`
`);
- }
-
- spiRxElement.change(function () {
- const value = parseInt($(this).val());
-
- let newValue = undefined;
- if (value !== FC.RX_CONFIG.rxSpiProtocol) {
- newValue = $(this).find('option:selected').text();
- updateSaveButton(true);
- }
- tab.analyticsChanges['SPIRXProtocol'] = newValue;
-
- FC.RX_CONFIG.rxSpiProtocol = value;
+ if (!GUI.isCordova()) {
+ // Convert to select2 and order alphabetic
+ spiRxElement.select2({
+ sorter(data) {
+ return data.sort(function(a, b) {
+ return a.text.localeCompare(b.text);
+ });
+ },
});
+ }
- // select current serial RX type
- spiRxElement.val(FC.RX_CONFIG.rxSpiProtocol);
+ if (FC.FEATURE_CONFIG.features.isEnabled('RX_SPI') && FC.RX_CONFIG.rxSpiProtocol == 19 && semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
+ tab.elrsPassphraseEnabled = true;
- if (!GUI.isCordova()) {
- // Convert to select2 and order alphabetic
- spiRxElement.select2({
- sorter(data) {
- return data.sort(function(a, b) {
- return a.text.localeCompare(b.text);
- });
- },
- });
+ const elrsUid = $('span.elrsUid');
+ const elrsUidString = FC.RX_CONFIG.elrsUid.join(',');
+
+ elrsUid.text(elrsUidString);
+
+ const elrsPassphrase = $('input.elrsPassphrase');
+
+ const passphraseString = lookup_elrs_passphrase(elrsUidString);
+ if (passphraseString) {
+ elrsPassphrase.val(passphraseString);
}
-
- if (FC.FEATURE_CONFIG.features.isEnabled('RX_SPI') && FC.RX_CONFIG.rxSpiProtocol == 19 && semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
- tab.elrsPassphraseEnabled = true;
-
- const elrsUid = $('span.elrsUid');
- const elrsUidString = FC.RX_CONFIG.elrsUid.join(',');
-
- elrsUid.text(elrsUidString);
-
- const elrsPassphrase = $('input.elrsPassphrase');
-
- const passphraseString = lookup_elrs_passphrase(elrsUidString);
- if (passphraseString) {
- elrsPassphrase.val(passphraseString);
+ elrsPassphrase.on('keyup', function() {
+ const passphrase = elrsPassphrase.val();
+ if (passphrase) {
+ elrsUid.text(elrs_passphrase_to_bytes(passphrase));
+ } else {
+ elrsUid.text("0.0.0.0.0.0");
}
- elrsPassphrase.on('keyup', function() {
- const passphrase = elrsPassphrase.val();
- if (passphrase) {
- elrsUid.text(elrs_passphrase_to_bytes(passphrase));
- } else {
- elrsUid.text("0.0.0.0.0.0");
- }
- updateSaveButton(true);
- });
- } else {
- tab.elrsPassphraseEnabled = false;
- }
+ updateSaveButton(true);
+ });
+ } else {
+ tab.elrsPassphraseEnabled = false;
}
// UI Hooks
@@ -465,14 +431,12 @@ receiver.initialize = function (callback) {
function saveConfiguration(boot=false) {
- if (semver.gte(FC.CONFIG.apiVersion, "1.15.0")) {
- FC.RX_CONFIG.stick_max = parseInt($('.sticks input[name="stick_max"]').val());
- FC.RX_CONFIG.stick_center = parseInt($('.sticks input[name="stick_center"]').val());
- FC.RX_CONFIG.stick_min = parseInt($('.sticks input[name="stick_min"]').val());
- FC.RC_DEADBAND_CONFIG.yaw_deadband = parseInt($('.deadband input[name="yaw_deadband"]').val());
- FC.RC_DEADBAND_CONFIG.deadband = parseInt($('.deadband input[name="deadband"]').val());
- FC.RC_DEADBAND_CONFIG.deadband3d_throttle = ($('.deadband input[name="3ddeadbandthrottle"]').val());
- }
+ FC.RX_CONFIG.stick_max = parseInt($('.sticks input[name="stick_max"]').val());
+ FC.RX_CONFIG.stick_center = parseInt($('.sticks input[name="stick_center"]').val());
+ FC.RX_CONFIG.stick_min = parseInt($('.sticks input[name="stick_min"]').val());
+ FC.RC_DEADBAND_CONFIG.yaw_deadband = parseInt($('.deadband input[name="yaw_deadband"]').val());
+ FC.RC_DEADBAND_CONFIG.deadband = parseInt($('.deadband input[name="deadband"]').val());
+ FC.RC_DEADBAND_CONFIG.deadband3d_throttle = ($('.deadband input[name="3ddeadbandthrottle"]').val());
// catch rc map
rcMapLetters = ['A', 'E', 'R', 'T', '1', '2', '3', '4'];
@@ -485,19 +449,14 @@ receiver.initialize = function (callback) {
// catch rssi aux
FC.RSSI_CONFIG.channel = parseInt($('select[name="rssi_channel"]').val());
+ FC.RX_CONFIG.rcInterpolation = parseInt($('select[name="rcInterpolation-select"]').val());
+ FC.RX_CONFIG.rcInterpolationInterval = parseInt($('input[name="rcInterpolationInterval-number"]').val());
- if (semver.gte(FC.CONFIG.apiVersion, "1.20.0")) {
- FC.RX_CONFIG.rcInterpolation = parseInt($('select[name="rcInterpolation-select"]').val());
- FC.RX_CONFIG.rcInterpolationInterval = parseInt($('input[name="rcInterpolationInterval-number"]').val());
- }
-
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_40)) {
- FC.RX_CONFIG.rcSmoothingSetpointCutoff = parseInt($('input[name="rcSmoothingSetpointHz-number"]').val());
- FC.RX_CONFIG.rcSmoothingFeedforwardCutoff = parseInt($('input[name="rcSmoothingFeedforwardCutoff-number"]').val());
- FC.RX_CONFIG.rcSmoothingDerivativeType = parseInt($('select[name="rcSmoothingFeedforwardType-select"]').val());
- FC.RX_CONFIG.rcInterpolationChannels = parseInt($('select[name="rcSmoothingChannels-select"]').val());
- FC.RX_CONFIG.rcSmoothingInputType = parseInt($('select[name="rcSmoothingSetpointType-select"]').val());
- }
+ FC.RX_CONFIG.rcSmoothingSetpointCutoff = parseInt($('input[name="rcSmoothingSetpointHz-number"]').val());
+ FC.RX_CONFIG.rcSmoothingFeedforwardCutoff = parseInt($('input[name="rcSmoothingFeedforwardCutoff-number"]').val());
+ FC.RX_CONFIG.rcSmoothingDerivativeType = parseInt($('select[name="rcSmoothingFeedforwardType-select"]').val());
+ FC.RX_CONFIG.rcInterpolationChannels = parseInt($('select[name="rcSmoothingChannels-select"]').val());
+ FC.RX_CONFIG.rcSmoothingInputType = parseInt($('select[name="rcSmoothingSetpointType-select"]').val());
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_42)) {
FC.RX_CONFIG.rcSmoothingAutoFactor = parseInt($('input[name="rcSmoothingAutoFactor-number"]').val());
@@ -521,21 +480,12 @@ receiver.initialize = function (callback) {
}
function save_rc_configs() {
- const nextCallback = save_rx_config;
- if (semver.gte(FC.CONFIG.apiVersion, "1.15.0")) {
- MSP.send_message(MSPCodes.MSP_SET_RC_DEADBAND, mspHelper.crunch(MSPCodes.MSP_SET_RC_DEADBAND), false, nextCallback);
- } else {
- nextCallback();
- }
+ MSP.send_message(MSPCodes.MSP_SET_RC_DEADBAND, mspHelper.crunch(MSPCodes.MSP_SET_RC_DEADBAND), false, save_rx_config);
}
function save_rx_config() {
const nextCallback = (boot) ? save_feature_config : save_to_eeprom;
- if (semver.gte(FC.CONFIG.apiVersion, "1.20.0")) {
- MSP.send_message(MSPCodes.MSP_SET_RX_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_RX_CONFIG), false, nextCallback);
- } else {
- nextCallback();
- }
+ MSP.send_message(MSPCodes.MSP_SET_RX_CONFIG, mspHelper.crunch(MSPCodes.MSP_SET_RX_CONFIG), false, nextCallback);
}
function save_feature_config() {
@@ -613,105 +563,92 @@ receiver.initialize = function (callback) {
$(".bind_btn").toggle(showBindButton);
// RC Smoothing
- const smoothingOnOff = ((semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44)) ?
- FC.RX_CONFIG.rcSmoothingMode : FC.RX_CONFIG.rcSmoothingType);
+ const smoothingOnOff = semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44) ? FC.RX_CONFIG.rcSmoothingMode : FC.RX_CONFIG.rcSmoothingType;
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_40)) {
- $('.tab-receiver .rcSmoothing').show();
-
- const rc_smoothing_protocol_e = $('select[name="rcSmoothing-select"]');
- rc_smoothing_protocol_e.change(function () {
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
- FC.RX_CONFIG.rcSmoothingMode = parseFloat($(this).val());
- } else {
- FC.RX_CONFIG.rcSmoothingType = parseFloat($(this).val());
- }
- updateInterpolationView();
- });
- rc_smoothing_protocol_e.val(smoothingOnOff);
-
- const rcSmoothingNumberElement = $('input[name="rcSmoothingSetpointHz-number"]');
- const rcSmoothingFeedforwardNumberElement = $('input[name="rcSmoothingFeedforwardCutoff-number"]');
- rcSmoothingNumberElement.val(FC.RX_CONFIG.rcSmoothingSetpointCutoff);
- rcSmoothingFeedforwardNumberElement.val(FC.RX_CONFIG.rcSmoothingFeedforwardCutoff);
- $('.tab-receiver .rcSmoothing-setpoint-cutoff').show();
- $('select[name="rcSmoothing-setpoint-manual-select"]').val("1");
- if (FC.RX_CONFIG.rcSmoothingSetpointCutoff === 0) {
- $('.tab-receiver .rcSmoothing-setpoint-cutoff').hide();
- $('select[name="rcSmoothing-setpoint-manual-select"]').val("0");
- }
- $('select[name="rcSmoothing-setpoint-manual-select"]').change(function () {
- if ($(this).val() === "0") {
- rcSmoothingNumberElement.val(0);
- $('.tab-receiver .rcSmoothing-setpoint-cutoff').hide();
- }
- if ($(this).val() === "1") {
- rcSmoothingNumberElement.val(FC.RX_CONFIG.rcSmoothingSetpointCutoff);
- $('.tab-receiver .rcSmoothing-setpoint-cutoff').show();
- }
- }).change();
-
- $('.tab-receiver .rcSmoothing-feedforward-cutoff').show();
- $('select[name="rcSmoothing-feedforward-select"]').val("1");
- if (FC.RX_CONFIG.rcSmoothingFeedforwardCutoff === 0) {
- $('select[name="rcSmoothing-feedforward-select"]').val("0");
- $('.tab-receiver .rcSmoothing-feedforward-cutoff').hide();
- }
- $('select[name="rcSmoothing-feedforward-select"]').change(function () {
- if ($(this).val() === "0") {
- $('.tab-receiver .rcSmoothing-feedforward-cutoff').hide();
- rcSmoothingFeedforwardNumberElement.val(0);
- }
- if ($(this).val() === "1") {
- $('.tab-receiver .rcSmoothing-feedforward-cutoff').show();
- rcSmoothingFeedforwardNumberElement.val(FC.RX_CONFIG.rcSmoothingFeedforwardCutoff);
- }
- }).change();
-
- const rcSmoothingFeedforwardType = $('select[name="rcSmoothingFeedforwardType-select"]');
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_43)) {
- rcSmoothingFeedforwardType.append($(`
`));
- }
-
- rcSmoothingFeedforwardType.val(FC.RX_CONFIG.rcSmoothingDerivativeType);
- const rcSmoothingChannels = $('select[name="rcSmoothingChannels-select"]');
- rcSmoothingChannels.val(FC.RX_CONFIG.rcInterpolationChannels);
- const rcSmoothingSetpointType = $('select[name="rcSmoothingSetpointType-select"]');
- rcSmoothingSetpointType.val(FC.RX_CONFIG.rcSmoothingInputType);
-
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_42)) {
- $('select[name="rcSmoothing-setpoint-manual-select"], select[name="rcSmoothing-feedforward-select"]').change(function() {
- if ($('select[name="rcSmoothing-setpoint-manual-select"]').val() === "0" || $('select[name="rcSmoothing-feedforward-select"]').val() === "0") {
- $('.tab-receiver .rcSmoothing-auto-factor').show();
- } else {
- $('.tab-receiver .rcSmoothing-auto-factor').hide();
- }
- });
- $('select[name="rcSmoothing-setpoint-manual-select"]').change();
-
- const rcSmoothingAutoFactor = $('input[name="rcSmoothingAutoFactor-number"]');
- rcSmoothingAutoFactor.val(FC.RX_CONFIG.rcSmoothingAutoFactor);
- } else {
- $('.tab-receiver .rcSmoothing-auto-factor').hide();
- }
+ $('.tab-receiver .rcSmoothing').show();
+ const rc_smoothing_protocol_e = $('select[name="rcSmoothing-select"]');
+ rc_smoothing_protocol_e.change(function () {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
- $('.receiverRcSmoothingAutoFactorHelp').attr('title', i18n.getMessage("receiverRcSmoothingAutoFactorHelp2"));
+ FC.RX_CONFIG.rcSmoothingMode = parseFloat($(this).val());
+ } else {
+ FC.RX_CONFIG.rcSmoothingType = parseFloat($(this).val());
}
-
updateInterpolationView();
- } else {
- $('.tab-receiver .rcInterpolation').show();
- $('.tab-receiver .rcSmoothing-feedforward-cutoff').hide();
+ });
+ rc_smoothing_protocol_e.val(smoothingOnOff);
+
+ const rcSmoothingNumberElement = $('input[name="rcSmoothingSetpointHz-number"]');
+ const rcSmoothingFeedforwardNumberElement = $('input[name="rcSmoothingFeedforwardCutoff-number"]');
+ rcSmoothingNumberElement.val(FC.RX_CONFIG.rcSmoothingSetpointCutoff);
+ rcSmoothingFeedforwardNumberElement.val(FC.RX_CONFIG.rcSmoothingFeedforwardCutoff);
+ $('.tab-receiver .rcSmoothing-setpoint-cutoff').show();
+ $('select[name="rcSmoothing-setpoint-manual-select"]').val("1");
+ if (FC.RX_CONFIG.rcSmoothingSetpointCutoff === 0) {
$('.tab-receiver .rcSmoothing-setpoint-cutoff').hide();
- $('.tab-receiver .rcSmoothing-feedforward-type').hide();
- $('.tab-receiver .rcSmoothing-setpoint-type').hide();
- $('.tab-receiver .rcSmoothing-feedforward-manual').hide();
- $('.tab-receiver .rcSmoothing-setpoint-manual').hide();
- $('.tab-receiver .rc-smoothing-type').hide();
+ $('select[name="rcSmoothing-setpoint-manual-select"]').val("0");
+ }
+ $('select[name="rcSmoothing-setpoint-manual-select"]').change(function () {
+ if ($(this).val() === "0") {
+ rcSmoothingNumberElement.val(0);
+ $('.tab-receiver .rcSmoothing-setpoint-cutoff').hide();
+ }
+ if ($(this).val() === "1") {
+ rcSmoothingNumberElement.val(FC.RX_CONFIG.rcSmoothingSetpointCutoff);
+ $('.tab-receiver .rcSmoothing-setpoint-cutoff').show();
+ }
+ }).change();
+
+ $('.tab-receiver .rcSmoothing-feedforward-cutoff').show();
+ $('select[name="rcSmoothing-feedforward-select"]').val("1");
+ if (FC.RX_CONFIG.rcSmoothingFeedforwardCutoff === 0) {
+ $('select[name="rcSmoothing-feedforward-select"]').val("0");
+ $('.tab-receiver .rcSmoothing-feedforward-cutoff').hide();
+ }
+ $('select[name="rcSmoothing-feedforward-select"]').change(function () {
+ if ($(this).val() === "0") {
+ $('.tab-receiver .rcSmoothing-feedforward-cutoff').hide();
+ rcSmoothingFeedforwardNumberElement.val(0);
+ }
+ if ($(this).val() === "1") {
+ $('.tab-receiver .rcSmoothing-feedforward-cutoff').show();
+ rcSmoothingFeedforwardNumberElement.val(FC.RX_CONFIG.rcSmoothingFeedforwardCutoff);
+ }
+ }).change();
+
+ const rcSmoothingFeedforwardType = $('select[name="rcSmoothingFeedforwardType-select"]');
+ if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_43)) {
+ rcSmoothingFeedforwardType.append($(`
`));
+ }
+
+ rcSmoothingFeedforwardType.val(FC.RX_CONFIG.rcSmoothingDerivativeType);
+ const rcSmoothingChannels = $('select[name="rcSmoothingChannels-select"]');
+ rcSmoothingChannels.val(FC.RX_CONFIG.rcInterpolationChannels);
+ const rcSmoothingSetpointType = $('select[name="rcSmoothingSetpointType-select"]');
+ rcSmoothingSetpointType.val(FC.RX_CONFIG.rcSmoothingInputType);
+
+ if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_42)) {
+ $('select[name="rcSmoothing-setpoint-manual-select"], select[name="rcSmoothing-feedforward-select"]').change(function() {
+ if ($('select[name="rcSmoothing-setpoint-manual-select"]').val() === "0" || $('select[name="rcSmoothing-feedforward-select"]').val() === "0") {
+ $('.tab-receiver .rcSmoothing-auto-factor').show();
+ } else {
+ $('.tab-receiver .rcSmoothing-auto-factor').hide();
+ }
+ });
+ $('select[name="rcSmoothing-setpoint-manual-select"]').change();
+
+ const rcSmoothingAutoFactor = $('input[name="rcSmoothingAutoFactor-number"]');
+ rcSmoothingAutoFactor.val(FC.RX_CONFIG.rcSmoothingAutoFactor);
+ } else {
$('.tab-receiver .rcSmoothing-auto-factor').hide();
}
+ if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
+ $('.receiverRcSmoothingAutoFactorHelp').attr('title', i18n.getMessage("receiverRcSmoothingAutoFactorHelp2"));
+ }
+
+ updateInterpolationView();
+
// Only show the MSP control sticks if the MSP Rx feature is enabled
$(".sticks_btn").toggle(FC.FEATURE_CONFIG.features.isEnabled('RX_MSP'));
@@ -888,15 +825,7 @@ receiver.initModelPreview = function () {
this.keepRendering = true;
this.model = new Model($('.model_preview'), $('.model_preview canvas'));
- let useOldRateCurve = false;
- const cleanFlight = FC.CONFIG.flightControllerIdentifier === 'CLFL' && semver.lt(FC.CONFIG.apiVersion, '2.0.0');
- const betaFlight = FC.CONFIG.flightControllerIdentifier === 'BTFL' && semver.lt(FC.CONFIG.flightControllerVersion, '2.8.0');
-
- if (cleanFlight || betaFlight) {
- useOldRateCurve = true;
- }
-
- this.rateCurve = new RateCurve(useOldRateCurve);
+ this.rateCurve = new RateCurve(false);
this.currentRates = this.rateCurve.getCurrentRates();
$(window).on('resize', $.bind(this.model.resize, this.model));
@@ -946,12 +875,10 @@ receiver.refresh = function (callback) {
};
receiver.updateRcInterpolationParameters = function () {
- if (semver.gte(FC.CONFIG.apiVersion, "1.20.0")) {
- if ($('select[name="rcInterpolation-select"]').val() === '3') {
- $('.tab-receiver .rc-interpolation-manual').show();
- } else {
- $('.tab-receiver .rc-interpolation-manual').hide();
- }
+ if ($('select[name="rcInterpolation-select"]').val() === '3') {
+ $('.tab-receiver .rc-interpolation-manual').show();
+ } else {
+ $('.tab-receiver .rc-interpolation-manual').hide();
}
};
diff --git a/src/js/tabs/sensors.js b/src/js/tabs/sensors.js
index 3f2734ce..bf6fdf63 100644
--- a/src/js/tabs/sensors.js
+++ b/src/js/tabs/sensors.js
@@ -193,7 +193,7 @@ sensors.initialize = function (callback) {
if (!have_sensor(FC.CONFIG.activeSensors, 'mag')) {
checkboxes.eq(2).prop('disabled', true);
}
- if (!(have_sensor(FC.CONFIG.activeSensors, 'baro') || (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_40) && have_sensor(FC.CONFIG.activeSensors, 'gps')))) {
+ if (!(have_sensor(FC.CONFIG.activeSensors, 'baro') || have_sensor(FC.CONFIG.activeSensors, 'gps'))) {
checkboxes.eq(3).prop('disabled', true);
}
if (!have_sensor(FC.CONFIG.activeSensors, 'sonar')) {
@@ -241,11 +241,6 @@ sensors.initialize = function (callback) {
ConfigStorage.set({'graphs_enabled': _checkboxes});
});
- let altitudeHint_e = $('.tab-sensors #sensorsAltitudeHint');
- if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_40)) {
- altitudeHint_e.hide();
- }
-
// Always start with default/empty sensor data array, clean slate all
initSensorData();
diff --git a/src/js/tabs/servos.js b/src/js/tabs/servos.js
index 6b877e92..21608105 100644
--- a/src/js/tabs/servos.js
+++ b/src/js/tabs/servos.js
@@ -30,7 +30,7 @@ servos.initialize = function (callback) {
function update_ui() {
- if (semver.lt(FC.CONFIG.apiVersion, "1.12.0") || FC.SERVO_CONFIG.length === 0) {
+ if (FC.SERVO_CONFIG.length === 0) {
$(".tab-servos").removeClass("supported");
return;
diff --git a/src/js/tabs/setup.js b/src/js/tabs/setup.js
index 7a119b86..0a86099c 100644
--- a/src/js/tabs/setup.js
+++ b/src/js/tabs/setup.js
@@ -29,34 +29,6 @@ setup.initialize = function (callback) {
// translate to user-selected language
i18n.localizePage();
- const backupButton = $('#content .backup');
- const restoreButton = $('#content .restore');
-
- backupButton.on('click', () => configuration_backup(() => GUI.log(i18n.getMessage('initialSetupBackupSuccess'))));
-
- restoreButton.on('click', () => configuration_restore(() => {
- // get latest settings
- TABS.setup.initialize();
-
- GUI.log(i18n.getMessage('initialSetupRestoreSuccess'));
- }));
-
- if (semver.lt(FC.CONFIG.apiVersion, CONFIGURATOR.API_VERSION_MIN_SUPPORTED_BACKUP_RESTORE)) {
- backupButton.addClass('disabled');
- restoreButton.addClass('disabled');
-
- GUI.log(i18n.getMessage('initialSetupBackupAndRestoreApiVersion', [FC.CONFIG.apiVersion, CONFIGURATOR.API_VERSION_MIN_SUPPORTED_BACKUP_RESTORE]));
- }
-
- if (CONFIGURATOR.virtualMode) {
- // saving and uploading an imaginary config to hardware is a bad idea
- backupButton.addClass('disabled');
- } else if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_41)) {
- restoreButton.addClass('disabled');
-
- $('.backupRestore').hide();
- }
-
// initialize 3D Model
self.initModel();
@@ -82,22 +54,18 @@ setup.initialize = function (callback) {
$('#arming-disable-flag').attr('title', i18n.getMessage('initialSetupArmingDisableFlagsTooltip'));
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_40)) {
- if (isExpertModeEnabled()) {
- $('.initialSetupRebootBootloader').show();
- } else {
- $('.initialSetupRebootBootloader').hide();
- }
-
- $('a.rebootBootloader').click(function () {
- const buffer = [];
- buffer.push(FC.boardHasFlashBootloader() ? mspHelper.REBOOT_TYPES.BOOTLOADER_FLASH : mspHelper.REBOOT_TYPES.BOOTLOADER);
- MSP.send_message(MSPCodes.MSP_SET_REBOOT, buffer, false);
- });
+ if (isExpertModeEnabled()) {
+ $('.initialSetupRebootBootloader').show();
} else {
$('.initialSetupRebootBootloader').hide();
}
+ $('a.rebootBootloader').click(function () {
+ const buffer = [];
+ buffer.push(FC.boardHasFlashBootloader() ? mspHelper.REBOOT_TYPES.BOOTLOADER_FLASH : mspHelper.REBOOT_TYPES.BOOTLOADER);
+ MSP.send_message(MSPCodes.MSP_SET_REBOOT, buffer, false);
+ });
+
// UI Hooks
$('a.calibrateAccel').click(function () {
const _self = $(this);
@@ -192,9 +160,7 @@ setup.initialize = function (callback) {
pitch_e = $('dd.pitch'),
heading_e = $('dd.heading');
- if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_36)) {
- arming_disable_flags_e.hide();
- }
+ arming_disable_flags_e.hide();
// DISARM FLAGS
// We add all the arming/disarming flags available, and show/hide them if needed.
@@ -219,25 +185,20 @@ setup.initialize = function (callback) {
'MSP',
];
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_38)) {
- disarmFlagElements.splice(disarmFlagElements.indexOf('THROTTLE'), 0, 'RUNAWAY_TAKEOFF');
- }
+ disarmFlagElements.splice(disarmFlagElements.indexOf('THROTTLE'), 0, 'RUNAWAY_TAKEOFF');
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_39)) {
- disarmFlagElements = disarmFlagElements.concat(['PARALYZE',
- 'GPS']);
- }
+ disarmFlagElements = disarmFlagElements.concat(['PARALYZE', 'GPS']);
+
+ disarmFlagElements.splice(disarmFlagElements.indexOf('OSD_MENU'), 1);
+ disarmFlagElements = disarmFlagElements.concat(['RESC']);
+ disarmFlagElements = disarmFlagElements.concat(['RPMFILTER']);
- if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_41)) {
- disarmFlagElements.splice(disarmFlagElements.indexOf('OSD_MENU'), 1);
- disarmFlagElements = disarmFlagElements.concat(['RESC']);
- disarmFlagElements = disarmFlagElements.concat(['RPMFILTER']);
- }
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_42)) {
disarmFlagElements.splice(disarmFlagElements.indexOf('THROTTLE'), 0, 'CRASH');
disarmFlagElements = disarmFlagElements.concat(['REBOOT_REQD',
'DSHOT_BBANG']);
}
+
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_43)) {
disarmFlagElements = disarmFlagElements.concat(['NO_ACC_CAL', 'MOTOR_PROTO']);
}
diff --git a/src/js/tabs/transponder.js b/src/js/tabs/transponder.js
index fcc5e902..37c07924 100644
--- a/src/js/tabs/transponder.js
+++ b/src/js/tabs/transponder.js
@@ -108,14 +108,13 @@ transponder.initialize = function(callback) {
};
/////////////////////////////////////////////
- if ( GUI.active_tab != 'transponder' ) {
- GUI.active_tab = 'transponder';
- // Disabled on merge into betaflight-configurator
- //googleAnalytics.sendAppView('Transponder');
- }
+ GUI.active_tab = 'transponder';
+ // Disabled on merge into betaflight-configurator
+ //googleAnalytics.sendAppView('Transponder');
+
// transponder supported added in MSP API Version 1.16.0
- if ( FC.CONFIG ) {
- TABS.transponder.available = semver.gte(FC.CONFIG.apiVersion, "1.16.0");
+ if (FC.CONFIG) {
+ TABS.transponder.available = true;
}
//////////////
if ( !TABS.transponder.available ) {
diff --git a/src/main.html b/src/main.html
index 7d6cc806..1cdf5aa5 100644
--- a/src/main.html
+++ b/src/main.html
@@ -102,7 +102,6 @@
-
diff --git a/src/tabs/sensors.html b/src/tabs/sensors.html
index 1b3d731c..af3fc2fd 100644
--- a/src/tabs/sensors.html
+++ b/src/tabs/sensors.html
@@ -49,6 +49,9 @@
+
+
+
diff --git a/src/tabs/setup.html b/src/tabs/setup.html
index e28808c4..1aa05956 100644
--- a/src/tabs/setup.html
+++ b/src/tabs/setup.html
@@ -152,22 +152,6 @@