diff --git a/locales/en/messages.json b/locales/en/messages.json index b780ffdd62..1e7617e071 100755 --- a/locales/en/messages.json +++ b/locales/en/messages.json @@ -2107,9 +2107,6 @@ "receiverRcSmoothingFeedforwardTypeAuto": { "message": "Auto" }, - "receiverRcSmoothingMode": { - "message": "Smoothing Mode" - }, "pidTuningDtermSetpointTransition": { "message": "D Setpoint transition" }, diff --git a/src/js/fc.js b/src/js/fc.js index f32ce8bb9c..a0585ed5bb 100644 --- a/src/js/fc.js +++ b/src/js/fc.js @@ -632,7 +632,7 @@ const FC = { rcSmoothingDerivativeType: 0, rcSmoothingAutoFactor: 0, usbCdcHidType: 0, - rcSmoothingMode: 0, + rcSmoothing: 0, elrsUid: [0, 0, 0, 0, 0, 0], }; diff --git a/src/js/msp/MSPHelper.js b/src/js/msp/MSPHelper.js index 7ab7404262..e21e62fdcc 100644 --- a/src/js/msp/MSPHelper.js +++ b/src/js/msp/MSPHelper.js @@ -1053,7 +1053,7 @@ MspHelper.prototype.process_data = function (dataHandler) { data.readU8(); // was FC.RX_CONFIG.rcSmoothingDerivativeType FC.RX_CONFIG.usbCdcHidType = data.readU8(); FC.RX_CONFIG.rcSmoothingAutoFactor = data.readU8(); - FC.RX_CONFIG.rcSmoothingMode = data.readU8(); + FC.RX_CONFIG.rcSmoothing = data.readU8(); if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) { const elrsUidLength = 6; @@ -2004,7 +2004,7 @@ MspHelper.prototype.crunch = function (code, modifierCode = undefined) { buffer.push8(FC.RX_CONFIG.usbCdcHidType).push8(FC.RX_CONFIG.rcSmoothingAutoFactor); // Introduced in 1.44 - buffer.push8(FC.RX_CONFIG.rcSmoothingMode); + buffer.push8(FC.RX_CONFIG.rcSmoothing); // Introduced in 1.45 if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) { diff --git a/src/js/tabs/receiver.js b/src/js/tabs/receiver.js index e346c476ef..bd31ff50d2 100644 --- a/src/js/tabs/receiver.js +++ b/src/js/tabs/receiver.js @@ -620,10 +620,10 @@ receiver.initialize = function (callback) { const rc_smoothing_protocol_e = $('select[name="rcSmoothing-select"]'); rc_smoothing_protocol_e.change(function () { - FC.RX_CONFIG.rcSmoothingMode = parseFloat($(this).val()); + FC.RX_CONFIG.rcSmoothing = Number.parseInt($(this).val()); updateInterpolationView(); }); - rc_smoothing_protocol_e.val(FC.RX_CONFIG.rcSmoothingMode); + rc_smoothing_protocol_e.val(FC.RX_CONFIG.rcSmoothing); const rcSmoothingNumberElement = $('input[name="rcSmoothingSetpointHz-number"]'); rcSmoothingNumberElement.val(FC.RX_CONFIG.rcSmoothingSetpointCutoff); @@ -967,7 +967,7 @@ function updateInterpolationView() { $(".tab-receiver .rcSmoothingOff").text(i18n.getMessage("off")); $(".tab-receiver .rcSmoothingOn").text(i18n.getMessage("on")); - if (FC.RX_CONFIG.rcSmoothingMode === 0) { + if (FC.RX_CONFIG.rcSmoothing === 0) { $(".tab-receiver .rcSmoothing-feedforward-cutoff").hide(); $(".tab-receiver .rcSmoothing-setpoint-cutoff").hide(); $(".tab-receiver .rcSmoothing-feedforward-manual").hide(); diff --git a/src/tabs/receiver.html b/src/tabs/receiver.html index 416f0ad100..646b76dcc8 100644 --- a/src/tabs/receiver.html +++ b/src/tabs/receiver.html @@ -191,8 +191,8 @@
-
@@ -216,7 +216,7 @@ - +