Skip to content

Commit 76c31e4

Browse files
ctzsnoozectzsnooze
committed
changes for 4.3
1 parent 7da5b00 commit 76c31e4

File tree

4 files changed

+236
-140
lines changed

4 files changed

+236
-140
lines changed

‎index.html‎

Lines changed: 91 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -915,17 +915,53 @@ <h5 class="modal-title-craft"></h5>
915915
</table>
916916

917917
<table class="parameter cf">
918+
<thead>
919+
<tr>
920+
<th scope="row" colspan="6">Feedforward</th>
921+
</tr>
922+
</thead>
918923
<tbody>
919924
<tr>
920-
<td name="ptermSRateWeight" class="bf-only">
921-
<label>P-Term
922-
<br>&nbsp;
925+
<td name="feedforwardTransition" class="bf-only">
926+
<label>Transition
923927
<br/>&nbsp;</label>
924928
<input type="number" step="0.01" min="0" max="999" />
925929
</td>
926-
<td name="feedforward_transition" class="bf-only">
927-
<label>Feedforward
928-
<br>Transition
930+
<td name="feedforwardAveraging" class="bf-only">
931+
<label>Averaging
932+
<br/>&nbsp;</label>
933+
<input type="number" step="0" min="0" max="100" />
934+
</td>
935+
<td name="feedforwardSmoothing" class="bf-only">
936+
<label>Smoothing
937+
<br/>&nbsp;</label>
938+
<input type="number" step="0" min="0" max="100" />
939+
</td>
940+
<td name="feedforwardJitter" class="bf-only">
941+
<label>Jitter
942+
<br/>&nbsp;</label>
943+
<input type="number" step="0" min="0" max="100" />
944+
</td>
945+
<td name="feedforwardBoost" class="bf-only">
946+
<label>Boost
947+
<br/>&nbsp;</label>
948+
<input type="number" step="0" min="0" max="100" />
949+
</td>
950+
<td name="feedforwardMaxRate" class="bf-only">
951+
<label>MaxRate
952+
<br/>&nbsp;</label>
953+
<input type="number" step="0" min="0" max="100" />
954+
</td>
955+
</tr>
956+
</tbody>
957+
</table>
958+
<table class="parameter cf">
959+
<caption>Misc</caption>
960+
<tbody>
961+
<tr>
962+
<td name="ptermSRateWeight" class="bf-only">
963+
<label>P-Term
964+
<br>&nbsp;
929965
<br/>&nbsp;</label>
930966
<input type="number" step="0.01" min="0" max="999" />
931967
</td>
@@ -1229,32 +1265,26 @@ <h5 class="modal-title-craft"></h5>
12291265
</tr>
12301266

12311267
<tr class="dyn_filter_required">
1232-
<td name='dyn_notch_range'>
1233-
<label>Dyn Notch
1234-
<br>Range</label>
1235-
<select>
1236-
<!-- list generated here -->
1237-
</select>
1238-
</td>
1239-
<td name="dyn_notch_width_percent">
1240-
<label>Dyn Notch
1241-
<br>Width (percent)</label>
1242-
<input type="number" step="0.1" min="0" max="999.00" />
1268+
<thead>
1269+
<tr>
1270+
<th scope="row" colspan="4">Dynamic notch filters</th>
1271+
</tr>
1272+
</thead>
1273+
<td name='dynNotchCount'>
1274+
<label>Count/Width</label>
1275+
<input type="number" step="1" min="0" max="10" />
12431276
</td>
1244-
<td name='dyn_notch_q'>
1245-
<label>Dyn Notch
1246-
<br>Q</label>
1247-
<input type="number" step="0.01" min="0" max="999.00" />
1277+
<td name="dynNotchQ">
1278+
<label>Q factor</label>
1279+
<input type="number" step="1" min="0" max="255" />
12481280
</td>
1249-
<td name="dyn_notch_min_hz">
1250-
<label>Dyn Notch
1251-
<br>Min (Hz)</label>
1252-
<input type="number" step="0.1" min="0" max="999.00" />
1281+
<td name="dynNotchMinHz">
1282+
<label>Min (Hz)</label>
1283+
<input type="number" step="1" min="0" max="999.00" />
12531284
</td>
1254-
<td name="dyn_notch_max_hz">
1255-
<label>Dyn Notch
1256-
<br>Max (Hz)</label>
1257-
<input type="number" step="0.1" min="0" max="999.00" />
1285+
<td name="dynNotchMaxHz">
1286+
<label>>Max (Hz)</label>
1287+
<input type="number" step="1" min="0" max="999.00" />
12581288
</td>
12591289
</tr>
12601290

@@ -1274,6 +1304,11 @@ <h5 class="modal-title-craft"></h5>
12741304
<br>Min(Hz)</label>
12751305
<input type="number" step="0.01" min="0" max="999.00" />
12761306
</td>
1307+
<td name='rpm_notch_lpf'>
1308+
<label>RPM Notch
1309+
<br>Lpf</label>
1310+
<input type="number" step="0.01" min="0" max="999.00" />
1311+
</td>
12771312
</tr>
12781313

12791314
</tbody>
@@ -1681,69 +1716,56 @@ <h5 class="modal-title-craft"></h5>
16811716
<th colspan="5">RC Smoothing</th>
16821717
</tr>
16831718
<tr>
1684-
<td name='rc_smoothing_type'>
1685-
<label>Type</label>
1719+
<td name='rcSmoothingMode'>
1720+
<label>On/Off</label>
16861721
<select>
16871722
<!-- list generated here -->
16881723
</select>
16891724
</td>
1690-
<td name='rc_interpolation'>
1691-
<label>Interpolation</label>
1692-
<select>
1693-
<!-- list generated here -->
1694-
</select>
1725+
<td name='rcSmoothingAutoFactorSetpoint'>
1726+
<label>Setpoint auto fact</label>
1727+
<input type="number" step="1" min="0" max="250" />
16951728
</td>
1696-
<td name="rc_interpolation_interval">
1697-
<label>Interval (ms)</label>
1698-
<input type="number" step="0.01" min="0" max="999.00" />
1729+
<td name="rcSmoothingAutoFactorThrottle">
1730+
<label>Throttle auto fact</label>
1731+
<input type="number" step="1" min="0" max="250" />
16991732
</td>
1700-
<td name="rc_smoothing_cutoffs_1">
1701-
<label>Input Hz</label>
1733+
</tr>
1734+
<tr>
1735+
<td name="rcSmoothingSetpointHz">
1736+
<label>Setpoint cutoff Hz</label>
17021737
<input type="number" step="1" min="0" max="255" />
17031738
</td>
1704-
<td name="rc_smoothing_cutoffs_2">
1705-
<label>Derivative Hz</label>
1739+
<td name="rcSmoothingFeedforwardHz">
1740+
<label>Feedforward cutoff Hz</label>
17061741
<input type="number" step="1" min="0" max="255" />
17071742
</td>
1743+
<td name="rcSmoothingThrottleHz">
1744+
<label>Throttle cutoff Hz</label>
1745+
<input type="number" step="1" min="0" max="255" />
1746+
</td>
1747+
</td>
17081748
</tr>
17091749
<tr>
1710-
<td name="rc_smoothing_rx_average">
1750+
<td name="rcSmoothingRxAverage">
17111751
<label>RX Average (ms)</label>
17121752
<input type="number" step="0.1" min="0"/>
17131753
</td>
1714-
<td name='rc_smoothing_filter_type_1'>
1715-
<label>Input Type</label>
1716-
<select>
1717-
<!-- list generated here -->
1718-
</select>
1719-
</td>
1720-
<td name='rc_smoothing_filter_type_2'>
1721-
<label>Derivative Type</label>
1722-
<select>
1723-
<!-- list generated here -->
1724-
</select>
1725-
</td>
1726-
</tr>
1727-
<tr>
1728-
<td name='rc_smoothing_auto_factor'>
1729-
<label>Auto factor</label>
1754+
<td name='rcSmoothingActiveCutoffsSp'>
1755+
<label>Active Cutoff Setpoint</label>
17301756
<input type="number" step="1" min="0"/>
17311757
</td>
1732-
<td name='rc_smoothing_active_cutoffs_1'>
1733-
<label>Active Cutoff 1</label>
1758+
<td name='rcSmoothingActiveCutoffsFf'>
1759+
<label>Active Cutoff FF</label>
17341760
<input type="number" step="1" min="0"/>
17351761
</td>
1736-
<td name='rc_smoothing_active_cutoffs_2'>
1737-
<label>Active Cutoff 2</label>
1762+
<td name='rcSmoothingActiveCutoffsThr'>
1763+
<label>Active Cutoff Throttle</label>
17381764
<input type="number" step="1" min="0"/>
17391765
</td>
17401766
</tr>
17411767
<tr>
1742-
<td name="rc_interpolation_channels">
1743-
<label>Channels</label>
1744-
<input type="number" step="1" min="0"/>
1745-
</td>
1746-
<td name='rc_smoothing_debug_axis'>
1768+
<td name='rcSmoothingDebugAxis'>
17471769
<label>Debug Axis</label>
17481770
<select>
17491771
<!-- list generated here -->

‎js/flightlog_fielddefs.js‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ var
220220
"STEP"
221221
]),
222222

223-
RC_SMOOTHING_TYPE = makeReadOnly([
223+
RC_SMOOTHING_TYPE = makeReadOnly([
224224
"INTERPOLATION",
225225
"FILTER"
226226
]),
@@ -230,30 +230,35 @@ var
230230
"BIQUAD"
231231
]),
232232

233-
RC_SMOOTHING_DERIVATIVE_TYPE = makeReadOnly([
234-
"OFF",
233+
RC_SMOOTHING_DERIVATIVE_TYPE = makeReadOnly([
235234
"PT1",
236235
"BIQUAD"
237236
]),
238237

238+
RC_SMOOTHING_MODE = makeReadOnly([
239+
"OFF",
240+
"ON"
241+
]),
242+
239243
RC_SMOOTHING_DEBUG_AXIS = makeReadOnly([
240244
"ROLL",
241245
"PITCH",
242246
"YAW",
243247
"THROTTLE"
244248
]),
245249

246-
RC_INTERPOLATION = makeReadOnly([
250+
RC_INTERPOLATION = makeReadOnly([
247251
"OFF",
248252
"DEFAULT",
249253
"AUTO",
250254
"MANUAL"
251255
]),
252256

253257
FILTER_TYPE = makeReadOnly([
254-
"PT1",
255-
"BIQUAD",
256-
"FIR",
258+
"PT1",
259+
"BIQUAD",
260+
"PT2",
261+
"PT3",
257262
]),
258263

259264
DEBUG_MODE = [],
@@ -426,7 +431,7 @@ var
426431
"SETPOINT",
427432
]),
428433

429-
DYN_NOTCH_RANGE = makeReadOnly([
434+
DYN_NOTCH_RANGE = makeReadOnly([
430435
"HIGH",
431436
"MEDIUM",
432437
"LOW",

0 commit comments

Comments
 (0)