Skip to content

Commit d6c4172

Browse files
Gary KeebleGary Keeble
authored andcommitted
Added new header fields from beta flight master
1 parent c77e479 commit d6c4172

File tree

3 files changed

+20
-6
lines changed

3 files changed

+20
-6
lines changed

index.html

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -486,22 +486,35 @@ <h5 class="modal-title-date"></h5>
486486
<table class="parameter cf">
487487
<thead>
488488
<tr>
489-
<th colspan="1">P-Term</th>
489+
<th colspan="2">P-Term</th>
490490
<th class="bf-only" colspan="2">I-Term</th>
491491
</tr>
492492
<tr>
493+
<th>Dynamic P</th>
493494
<th>Yaw Limit</th>
494495
<th class="bf-only">Roll/Pitch Reset</th>
495496
<th class="bf-only">Yaw Reset</th>
496497
</tr>
497498
</thead>
498499
<tbody>
499500
<tr>
501+
<td class="bf-only"><select name='dynamic_pterm' title="dynamic_pterm"><!-- list generated here --></select></td>
500502
<td><input type="number" name="yaw_p_limit" step="1" min="0" max="999" /></td>
501503
<td class="bf-only"><input type="number" name="rollPitchItermResetRate" step="1" min="0" max="999" /></td>
502504
<td class="bf-only"><input type="number" name="yawItermResetRate" step="1" min="0" max="999" /></td>
503505
</tr>
504506
</tbody>
507+
<thead>
508+
<th></th>
509+
<th class="bf-only">Yaw (Hz)</th>
510+
</thead>
511+
<tbody>
512+
<tr>
513+
<td></td>
514+
<td class="bf-only"><input type="number" name="yaw_lpf_hz" step="0.01" min="0" max="999.00" /></td>
515+
516+
</tr>
517+
</tbody>
505518
</table>
506519
<table class="parameter cf">
507520
<thead>
@@ -548,13 +561,11 @@ <h5 class="modal-title-date"></h5>
548561
</tbody>
549562
<thead>
550563
<tr>
551-
<th class="bf-only">Yaw (Hz)</th>
552564
<th>Acc (Hz)</th>
553565
</tr>
554566
</thead>
555567
<tbody>
556568
<tr>
557-
<td class="bf-only"><input type="number" name="yaw_lpf_hz" step="0.01" min="0" max="999.00" /></td>
558569
<td><input type="number" name="acc_lpf_hz" step="0.01" min="0" max="999.00" /></td>
559570
</tr>
560571
</tbody>

js/flightlog_parser.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,9 @@ var FlightLogParser = function(logData) {
479479
case "dynamic_dterm_threshold": // Betaflight Only
480480
that.sysConfig.dynamic_dterm_threshold = parseInt(fieldValue, 10);
481481
break;
482+
case "dynamic_pterm": // Betaflight Only
483+
that.sysConfig.dynamic_pterm = parseInt(fieldValue, 10);
484+
break;
482485
case "H_sensitivity": // Betaflight Only
483486
that.sysConfig.H_sensitivity = parseInt(fieldValue, 10);
484487
break;

js/header_dialog.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,13 @@ function HeaderDialog(dialog, onSave) {
2121
function renderSelect(name, selected, list) {
2222
// Populate a select drop-down box
2323
var selectElem = $('.parameter select[name="' + name + '"]');
24-
if(selected!=null) {
25-
2624
selectElem.children().remove(); // clear list
27-
2825
for(var i=0; i<list.length; i++) {
2926
selectElem.append(renderOptions(selected, i, list));
3027
}
3128
selectElem.attr('title', 'set '+name+'='+list[selectElem.val()]);
29+
30+
if(selected!=null) {
3231
selectElem.removeClass('missing');
3332
} else {
3433
selectElem.addClass('missing');
@@ -326,6 +325,7 @@ function HeaderDialog(dialog, onSave) {
326325
setParameter('dterm_cut_hz' ,sysConfig.dterm_cut_hz,2);
327326
renderSelect('dterm_differentiator' ,sysConfig.dterm_differentiator, DTERM_DIFFERENTIATOR);
328327
renderSelect('deltaMethod' ,sysConfig.deltaMethod, PID_DELTA_TYPE);
328+
renderSelect('dynamic_pterm' ,sysConfig.dynamic_pterm, OFF_ON);
329329
setParameter('dynamic_dterm_threshold' ,sysConfig.dynamic_dterm_threshold,2);
330330
setParameter('H_sensitivity' ,sysConfig.H_sensitivity,2);
331331
setParameter('deadband' ,sysConfig.deadband,0);

0 commit comments

Comments
 (0)