Skip to content

Commit 105aa26

Browse files
authored
Fix RC smoothing (#4637)
* Fix rc smoothing setpointhz range * Rename * Remove duplicate key * Rename smoothingMode to smoothing * Sonar nitpick
1 parent 24d983a commit 105aa26

File tree

5 files changed

+9
-12
lines changed

5 files changed

+9
-12
lines changed

locales/en/messages.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2107,9 +2107,6 @@
21072107
"receiverRcSmoothingFeedforwardTypeAuto": {
21082108
"message": "Auto"
21092109
},
2110-
"receiverRcSmoothingMode": {
2111-
"message": "Smoothing Mode"
2112-
},
21132110
"pidTuningDtermSetpointTransition": {
21142111
"message": "D Setpoint transition"
21152112
},

src/js/fc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ const FC = {
632632
rcSmoothingDerivativeType: 0,
633633
rcSmoothingAutoFactor: 0,
634634
usbCdcHidType: 0,
635-
rcSmoothingMode: 0,
635+
rcSmoothing: 0,
636636
elrsUid: [0, 0, 0, 0, 0, 0],
637637
};
638638

src/js/msp/MSPHelper.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,7 +1053,7 @@ MspHelper.prototype.process_data = function (dataHandler) {
10531053
data.readU8(); // was FC.RX_CONFIG.rcSmoothingDerivativeType
10541054
FC.RX_CONFIG.usbCdcHidType = data.readU8();
10551055
FC.RX_CONFIG.rcSmoothingAutoFactor = data.readU8();
1056-
FC.RX_CONFIG.rcSmoothingMode = data.readU8();
1056+
FC.RX_CONFIG.rcSmoothing = data.readU8();
10571057

10581058
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
10591059
const elrsUidLength = 6;
@@ -2004,7 +2004,7 @@ MspHelper.prototype.crunch = function (code, modifierCode = undefined) {
20042004
buffer.push8(FC.RX_CONFIG.usbCdcHidType).push8(FC.RX_CONFIG.rcSmoothingAutoFactor);
20052005

20062006
// Introduced in 1.44
2007-
buffer.push8(FC.RX_CONFIG.rcSmoothingMode);
2007+
buffer.push8(FC.RX_CONFIG.rcSmoothing);
20082008

20092009
// Introduced in 1.45
20102010
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) {

src/js/tabs/receiver.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -620,10 +620,10 @@ receiver.initialize = function (callback) {
620620

621621
const rc_smoothing_protocol_e = $('select[name="rcSmoothing-select"]');
622622
rc_smoothing_protocol_e.change(function () {
623-
FC.RX_CONFIG.rcSmoothingMode = parseFloat($(this).val());
623+
FC.RX_CONFIG.rcSmoothing = Number.parseInt($(this).val());
624624
updateInterpolationView();
625625
});
626-
rc_smoothing_protocol_e.val(FC.RX_CONFIG.rcSmoothingMode);
626+
rc_smoothing_protocol_e.val(FC.RX_CONFIG.rcSmoothing);
627627

628628
const rcSmoothingNumberElement = $('input[name="rcSmoothingSetpointHz-number"]');
629629
rcSmoothingNumberElement.val(FC.RX_CONFIG.rcSmoothingSetpointCutoff);
@@ -967,7 +967,7 @@ function updateInterpolationView() {
967967
$(".tab-receiver .rcSmoothingOff").text(i18n.getMessage("off"));
968968
$(".tab-receiver .rcSmoothingOn").text(i18n.getMessage("on"));
969969

970-
if (FC.RX_CONFIG.rcSmoothingMode === 0) {
970+
if (FC.RX_CONFIG.rcSmoothing === 0) {
971971
$(".tab-receiver .rcSmoothing-feedforward-cutoff").hide();
972972
$(".tab-receiver .rcSmoothing-setpoint-cutoff").hide();
973973
$(".tab-receiver .rcSmoothing-feedforward-manual").hide();

src/tabs/receiver.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@
191191
</td>
192192
<td colspan="2">
193193
<div>
194-
<label class="rcSmoothingMode">
195-
<span i18n="receiverRcSmoothingMode"></span>
194+
<label>
195+
<span i18n="receiverRcSmoothing"></span>
196196
</label>
197197
</div>
198198
</td>
@@ -216,7 +216,7 @@
216216
</td>
217217
</tr>
218218
<tr class="rcSmoothing-setpoint-manual">
219-
<td class="rcSmoothing-setpoint-cutoff"><input type="number" name="rcSmoothingSetpointHz-number" step="1" min="1" max="255"/></td>
219+
<td class="rcSmoothing-setpoint-cutoff"><input type="number" name="rcSmoothingSetpointHz-number" step="1" min="0" max="255"/></td>
220220
<td class="rcSmoothing-setpoint-cutoff" colspan="2">
221221
<div>
222222
<label>

0 commit comments

Comments
 (0)