Skip to content

Commit 7e9fd0a

Browse files
authored
Merge pull request #126 from etracer65/gyro_hardware_lpf_headers
Add parsing and header display for gyro hardware lpf settings
2 parents 45aa589 + adf5f61 commit 7e9fd0a

File tree

4 files changed

+45
-0
lines changed

4 files changed

+45
-0
lines changed

index.html

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1228,6 +1228,33 @@ <h5 class="modal-title-craft"></h5>
12281228
</table>
12291229
</div>
12301230
</div>
1231+
<div class="gui_box grey debug">
1232+
<div class="gui_box_titlebar">
1233+
<div class="spacer_box_title">Gyro Hardware Lowpass Settings</div>
1234+
</div>
1235+
<div class="spacer_box">
1236+
<table class="parameter cf">
1237+
<tbody>
1238+
<tr>
1239+
<td name='gyro_hardware_lpf'>
1240+
<label>Gyro Hardware LPF</label>
1241+
<select>
1242+
<!-- list generated here -->
1243+
</select>
1244+
</td>
1245+
</tr>
1246+
<tr>
1247+
<td name='gyro_32khz_hardware_lpf'>
1248+
<label>Gyro 32KHz Hardware LPF</label>
1249+
<select>
1250+
<!-- list generated here -->
1251+
</select>
1252+
</td>
1253+
</tr>
1254+
</tbody>
1255+
</table>
1256+
</div>
1257+
</div>
12311258
</div>
12321259
<div class="cf_column half right">
12331260
<div class="spacer_left">

js/flightlog_fielddefs.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,17 @@ var
207207
"EXPERIMENTAL"
208208
]),
209209

210+
GYRO_HARDWARE_LPF = makeReadOnly([
211+
"NORMAL",
212+
"EXPERIMENTAL",
213+
"1KHZ_SAMPLING"
214+
]),
215+
216+
GYRO_32KHZ_HARDWARE_LPF = makeReadOnly([
217+
"NORMAL",
218+
"EXPERIMENTAL"
219+
]),
220+
210221
ACC_HARDWARE = makeReadOnly([
211222
"AUTO",
212223
"NONE",

js/flightlog_parser.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,9 @@ var FlightLogParser = function(logData) {
236236
iterm_reset_offset:null, // I-Term reset offset
237237
deadband:null, // Roll, Pitch Deadband
238238
yaw_deadband:null, // Yaw Deadband
239+
gyro_lpf:null, // Gyro lpf setting. (pre BF3.4)
240+
gyro_hardware_lpf:null, // Gyro hardware lpf setting. (post BF3.4)
241+
gyro_32khz_hardware_lpf:null, // Gyro 32khz hardware lpf setting. (post BF3.4)
239242
gyro_lpf:null, // Gyro lpf setting.
240243
gyro_lowpass_hz:null, // Gyro Soft Lowpass Filter Hz
241244
gyro_notch_hz:null, // Gyro Notch Frequency
@@ -455,6 +458,8 @@ var FlightLogParser = function(logData) {
455458
case "deadband":
456459
case "yaw_deadband":
457460
case "gyro_lpf":
461+
case "gyro_hardware_lpf":
462+
case "gyro_32khz_hardware_lpf":
458463
case "acc_lpf_hz":
459464
case "acc_hardware":
460465
case "baro_hardware":

js/header_dialog.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,8 @@ function HeaderDialog(dialog, onSave) {
481481
setParameter('deadband' ,sysConfig.deadband,0);
482482
setParameter('yaw_deadband' ,sysConfig.yaw_deadband,0);
483483
renderSelect('gyro_lpf' ,sysConfig.gyro_lpf, GYRO_LPF);
484+
renderSelect('gyro_hardware_lpf' ,sysConfig.gyro_hardware_lpf, GYRO_HARDWARE_LPF);
485+
renderSelect('gyro_32khz_hardware_lpf' ,sysConfig.gyro_32khz_hardware_lpf, GYRO_32KHZ_HARDWARE_LPF);
484486
setParameter('acc_lpf_hz' ,sysConfig.acc_lpf_hz,2);
485487
setParameter('acc_cut_hz' ,sysConfig.acc_cut_hz,2);
486488
setParameter('airmode_activate_throttle',sysConfig.airmode_activate_throttle, 0);

0 commit comments

Comments
 (0)