Skip to content

Update names for rc_smoothing, rx_timing and feedforward #851

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 13 commits into from
Sep 15, 2025
Merged

Update names for rc_smoothing, rx_timing and feedforward #851

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8cce9ea
update names for rc_smoothing, rx_timing and feedforward
ctzsnooze Aug 14, 2025
ddb6d9f
fixes from codeRabbit review
ctzsnooze Aug 14, 2025
f416364
typo
ctzsnooze Aug 14, 2025
bc02adc
fix jitter value
ctzsnooze Aug 14, 2025
2ae205e
add graph scaling
ctzsnooze Aug 15, 2025
7b1cb8d
fix typo
ctzsnooze Aug 15, 2025
7ebddc3
groan
ctzsnooze Aug 15, 2025
a11c24c
more changes
ctzsnooze Aug 15, 2025
6cdd542
again
ctzsnooze Aug 15, 2025
d002ebf
correct scale for counters
ctzsnooze Aug 15, 2025
b66f52c
tweaks
ctzsnooze Aug 15, 2025
b44d249
more tweaks
ctzsnooze Aug 15, 2025
eff8e48
and more
ctzsnooze Aug 15, 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
202 changes: 181 additions & 21 deletions src/flightlog_fields_presenter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1441,6 +1441,50 @@ FlightLogFieldPresenter.adjustDebugDefsList = function (
'debug[6]': 'pidD',
'debug[7]': 'pidA',
};
DEBUG_FRIENDLY_FIELD_NAMES.FEEDFORWARD = {
"debug[all]": "Feedforward [debug_axis]",
"debug[0]": "Setpoint, un-smoothed",
"debug[1]": "Delta, smoothed",
"debug[2]": "Boost, smoothed",
"debug[3]": "rcCommand Delta",
"debug[4]": "Jitter Attenuator",
"debug[5]": "Duplicate Flag",
"debug[6]": "Yaw FF BaseAmt",
"debug[7]": "Yaw FF HoldAmt",
};
DEBUG_FRIENDLY_FIELD_NAMES.FEEDFORWARD_LIMIT = {
"debug[all]": "Feedforward Limit",
"debug[0]": "Jitter Attenuator",
"debug[1]": "MaxRcRate [debugAxis]",
"debug[2]": "Setpoint",
"debug[3]": "Feedforward",
"debug[4]": "Setpoint Speed",
"debug[5]": "Setpoint Speed Smoothed",
"debug[6]": "FF PT1K",
"debug[7]": "Rx Rate",
};
DEBUG_FRIENDLY_FIELD_NAMES.RX_TIMING = {
"debug[all]": "Receiver Timing",
"debug[0]": "Frame Interval",
"debug[1]": "Frame TimeStamp",
"debug[2]": "Is Rate Valid",
"debug[3]": "Interval Constrained",
"debug[4]": "Rx Rate",
"debug[5]": "Smoothed Rx Rate",
"debug[6]": "LQ Percent",
"debug[7]": "Is Receiving Signal",
};
DEBUG_FRIENDLY_FIELD_NAMES.RC_SMOOTHING = {
"debug[all]": "Debug RC Smoothing",
"debug[0]": "Rx Rate Current",
"debug[1]": "Rx Rate For Cutoffs",
"debug[2]": "Cutoff Hz",
"debug[3]": "Throttle Cutoff Hz",
"debug[4]": "FF Smoothing PT1K",
"debug[5]": "Smoothed Rx Rate",
"debug[6]": "Outlier Count",
"debug[7]": "Valid Count",
};
}
}
};
Expand Down Expand Up @@ -1967,18 +2011,26 @@ FlightLogFieldPresenter.decodeDebugFieldToFriendly = function (
}
case "RC_SMOOTHING":
switch (fieldName) {
case "debug[0]":
return `${(value + 1500).toFixed(0)} us`;
case "debug[3]": // rx frame rate [us]
return `${(value / 1000).toFixed(1)} ms`;
case "debug[0]": // current Rx Rate Hz
case "debug[1]": // smoothed but stepped Rx Rate Hz
case "debug[2]": // setpoint cutoff Hz
case "debug[3]": // throttle cutoff Hz
case "debug[5]": // smoothed Rx Rate Hz, without steps
return `${value.toFixed(0)} Hz`;
case "debug[4]": // Feedforward PT1k range 0-1000 show as 0.nnn
return `${(value / 1000).toFixed(3)}`;
// debug 6 is outlier count 0-3
// debug 7 is valid count 0-3
default:
return value.toFixed(0);
}
case "RC_SMOOTHING_RATE":
switch (fieldName) {
case "debug[0]": // current frame rate [us]
case "debug[2]": // average frame rate [us]
case "debug[0]": // current Rx Interval [us]
return `${(value / 1000).toFixed(2)} ms`;
case "debug[2]": // smoothed Rx Rate [Hz]
return `${value.toFixed(0)} Hz`;
// case "debug[3]": // flag to update smoothing
default:
return value.toFixed(0);
}
Expand Down Expand Up @@ -2024,14 +2076,48 @@ FlightLogFieldPresenter.decodeDebugFieldToFriendly = function (
return `${(value / 10).toFixed(1)} °/s`;
case "AC_ERROR":
return `${(value / 10).toFixed(1)} °`;
case "RX_TIMING":
switch (fieldName) {
case "debug[0]": // Frame delta us/10
case "debug[1]": // Frame age us/10
return `${(value / 100).toFixed(2)} ms`;
default:
return value.toFixed(0);
}
case "RX_TIMING":
switch (fieldName) {
case "debug[0]": // interval in ms
case "debug[3]": // constrained interval in ms
case "debug[1]": // Frame time stamp us/100
return {
// start at bottom, scale up to 30ms
power: 1.0,
MinMax: {
min: 0,
max: 30,
},
};
case "debug[2]": // IsRateValid boolean
case "debug[7]": // isReceivingSignal boolean
return {
power: 1.0,
MinMax: {
min: 0,
max: 10,
},
};
case "debug[4]": // Rx Rate
case "debug[5]": // Smoothed Rx Rate
return {
power: 1.0,
MinMax: {
min: 0,
max: 1200,
},
};
case "debug[6]": // LQ
return {
power: 1.0,
MinMax: {
min: 0,
max: 100,
},
};
default:
return getCurveForMinMaxFields(fieldName);
}
case "GHST":
switch (fieldName) {
// debug 0 is CRC error count 0 to int16_t
Expand Down Expand Up @@ -2239,6 +2325,39 @@ FlightLogFieldPresenter.decodeDebugFieldToFriendly = function (
default:
return value.toFixed(1);
}
case "FEEDFORWARD":
switch (fieldName) {
case "debug[0]": // setpoint
return `${value.toFixed(0)} °/s`;
case "debug[1]": // setpoint speed
return `${value.toFixed(0)} °/s/s`;
// case "debug[2]": feedforward boost
case "debug[3]": // rcCommand Delta integer * 10
return `${(value / 10).toFixed(1)}`;
case "debug[4]": // jitter attenuator percent
return `${value.toFixed(0)} %`;
// case "debug[5]": boolean packet duplicate
// case "debug[6]": yaw feedforward
// case "debug[7]": yaw feedforward hold element
default:
return value.toFixed(0);
}
case "FEEDFORWARD_LIMIT":
switch (fieldName) {
case "debug[0]": // jitter attenuator percent
return `${value.toFixed(0)} %`;
// case "debug[1]": max setpoint rate for the axis
// case "debug[2]": setpoint
// case "debug[3]": feedforward
// case "debug[4]": setpoint speed un-smoothed
// case "debug[5]": setpoint speed smoothed
case "debug[6]": // feedforward smoothing PT1K * 1000
return `${(value / 1000).toFixed(3)}`;
case "debug[7]": // smoothed RxRateHz
return `${value.toFixed(0)} Hz`;
default:
return value.toFixed(0);
}
}
return value.toFixed(0);
}
Expand Down Expand Up @@ -2674,18 +2793,24 @@ FlightLogFieldPresenter.ConvertDebugFieldValue = function (
}
case "RC_SMOOTHING":
switch (fieldName) {
case "debug[0]":
return toFriendly ? value + 1500 : value - 1500; // us
case "debug[3]": // rx frame rate [us]
return toFriendly ? value / 1000 : value * 1000; // ms
// case "debug[0]": // current Rx Rate Hz
// case "debug[1]": // smoothed but stepped Rx Rate Hz
// case "debug[2]": // setpoint cutoff Hz
// case "debug[3]": // throttle cutoff Hz
// case "debug[5]": // smoothed Rx Rate Hz, without steps
case "debug[4]": // Feedforward PT1K range 0-1000 show as 0.mmm
return toFriendly ? value / 1000 : value * 1000;
// debug 6 is outlier count 0-3
// debug 7 is valid count 0-3
default:
return value;
}
case "RC_SMOOTHING_RATE":
switch (fieldName) {
case "debug[0]": // current frame rate [us]
case "debug[2]": // average frame rate [us]
return toFriendly ? value / 1000 : value * 1000; // ms
case "debug[2]": // smoothed RxRate [Hz]
case "debug[3]": // boolean indicating need to update smoothing
default:
return value;
}
Expand Down Expand Up @@ -2728,9 +2853,16 @@ FlightLogFieldPresenter.ConvertDebugFieldValue = function (
return toFriendly ? value / 10 : value * 10; // °
case "RX_TIMING":
switch (fieldName) {
case "debug[0]": // Frame delta us/10
case "debug[1]": // Frame age us/10
case "debug[0]": // packet interval in hundredths of ms
case "debug[3]": // constrained packet interval in hundredths of ms
return toFriendly ? value / 100 : value * 100; //ms
case "debug[1]": // Frame time stamp us/100
return toFriendly ? value / 10 : value * 10; //ms
// debug 2 is isRateValid boolean
// debug 4 is current Rx Rate, Hz
// debug 5 is smoothed Rx Rate, Hz
// debug 6 is link wuality
// debug 7 is isReceivingSignal boolean
default:
return value;
}
Expand Down Expand Up @@ -2938,6 +3070,34 @@ FlightLogFieldPresenter.ConvertDebugFieldValue = function (
default:
return value;
}
case "FEEDFORWARD":
switch (fieldName) {
// case "debug[0]": // setpoint
// case "debug[1]": // setpoint speed
// case "debug[2]": //feedforward boost
case "debug[3]": // rcCommand Delta integer * 10
return toFriendly ? value / 10 : value * 10;
// case "debug[4]": // jitter attenuator percent
// case "debug[5]": // boolean indicating packet duplicate
// case "debug[6]": // yaw feedforward
// case "debug[7]": // yaw feedforward hold element
default:
return value;
}
case "FEEDFORWARD_LIMIT":
switch (fieldName) {
// case "debug[0]": // jitter attenuator percent
// case "debug[1]": // max setpoint rate for the axis
// case "debug[2]": // setpoint
// case "debug[3]": // feedforward
// case "debug[4]": // setpoint speed un-smoothed
// case "debug[5]": // setpoint speed smoothed
case "debug[6]": //feedforward smoothing PT1K * 1000 show as 0.nnn
return toFriendly ? value / 1000 : value * 1000;
// case "debug[7]": // smoothed RxRateHz
default:
return value;
}
}
}
return value;
Expand Down
Loading