Skip to content

Fix RC smoothing #4637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 29, 2025
Merged

Fix RC smoothing #4637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
83dc3f0
Fix rc smoothing setpointhz range
haslinghuis Sep 28, 2025
193ca6b
Rename
haslinghuis Sep 29, 2025
f2d8e8f
Remove duplicate key
haslinghuis Sep 29, 2025
f9b2f8a
Rename smoothingMode to smoothing
haslinghuis Sep 29, 2025
31fddd6
Sonar nitpick
haslinghuis Sep 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions locales/en/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2107,9 +2107,6 @@
"receiverRcSmoothingFeedforwardTypeAuto": {
"message": "Auto"
},
"receiverRcSmoothingMode": {
"message": "Smoothing Mode"
},
"pidTuningDtermSetpointTransition": {
"message": "D Setpoint transition"
},
Expand Down
2 changes: 1 addition & 1 deletion src/js/fc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ const FC = {
rcSmoothingDerivativeType: 0,
rcSmoothingAutoFactor: 0,
usbCdcHidType: 0,
rcSmoothingMode: 0,
rcSmoothing: 0,
elrsUid: [0, 0, 0, 0, 0, 0],
};

Expand Down
4 changes: 2 additions & 2 deletions src/js/msp/MSPHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)) {
Expand Down
6 changes: 3 additions & 3 deletions src/js/tabs/receiver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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();
Expand Down
6 changes: 3 additions & 3 deletions src/tabs/receiver.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@
</td>
<td colspan="2">
<div>
<label class="rcSmoothingMode">
<span i18n="receiverRcSmoothingMode"></span>
<label>
<span i18n="receiverRcSmoothing"></span>
</label>
</div>
</td>
Expand All @@ -216,7 +216,7 @@
</td>
</tr>
<tr class="rcSmoothing-setpoint-manual">
<td class="rcSmoothing-setpoint-cutoff"><input type="number" name="rcSmoothingSetpointHz-number" step="1" min="1" max="255"/></td>
<td class="rcSmoothing-setpoint-cutoff"><input type="number" name="rcSmoothingSetpointHz-number" step="1" min="0" max="255"/></td>
<td class="rcSmoothing-setpoint-cutoff" colspan="2">
<div>
<label>
Expand Down