Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-16 12:55:13 +03:00
Code Wiki Activity

Catch up on Stage2 filters

Browse source
This commit is contained in:
Pawel Spychalski (DzikuVx) 2020-02-04 21:53:59 +01:00
parent 8c24d1ee5c
commit d76e1dcb21
4 changed files with 70 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

24
_locales/en/messages.json
View file

@ -3167,6 +3167,30 @@
"gyro_lpf_type_help": { "gyro_lpf_type_help": {
"message": "BIQUAD offers better noise attenuation for a price of higher delay. PT1 has lower attenuation but offers lower delay." "message": "BIQUAD offers better noise attenuation for a price of higher delay. PT1 has lower attenuation but offers lower delay."
}, },
"gyro_stage2_lowpass_type": {
"message": "Gyro Stage 2 LPF type"
},
"gyro_stage2_lowpass_type_help": {
"message": "BIQUAD offers better noise attenuation for a price of higher delay. PT1 has lower attenuation but offers lower delay."
},
"dterm_lpf_type": {
"message": "D-term LPF type"
},
"dterm_lpf_type_help": {
"message": "BIQUAD offers better noise attenuation for a price of higher delay. PT1 has lower attenuation but offers lower delay."
},
"dterm_lpf2_type": {
"message": "D-term Stage 2 LPF type"
},
"dterm_lpf2_type_help": {
"message": "BIQUAD offers better noise attenuation for a price of higher delay. PT1 has lower attenuation but offers lower delay."
},
"dterm_lpf2_hz": {
"message": "D-term Stage 2 LPF cutoff frequency"
},
"dterm_lpf2_hz_help": {
"message": "Lowpass cutoff filter for D-term on ROLL and PITCH axises. 0 mean filter is disabled"
},
"tabFilteringAdvanced": { "tabFilteringAdvanced": {
"message": "Other filters" "message": "Other filters"
}, },

4
js/data_storage.js
View file

@ -2,8 +2,8 @@
var CONFIGURATOR = { var CONFIGURATOR = {
// all versions are specified and compared using semantic versioning http://semver.org/ // all versions are specified and compared using semantic versioning http://semver.org/
'minfirmwareVersionAccepted': '2.3.0', 'minfirmwareVersionAccepted': '2.4.0',
'maxFirmwareVersionAccepted': '2.5.0', // COndition is < (lt) so we accept all in 2.2 branch, not 2.3 actualy 'maxFirmwareVersionAccepted': '2.6.0', // COndition is < (lt) so we accept all in 2.2 branch, not 2.3 actualy
'connectionValid': false, 'connectionValid': false,
'connectionValidCliOnly': false, 'connectionValidCliOnly': false,
'cliActive': false, 'cliActive': false,

60
tabs/pid_tuning.html
View file

@ -276,7 +276,7 @@
<div class="cf_column"> <div class="cf_column">
<table class="rate-tpa rate-tpa--filtering"> <table class="rate-tpa rate-tpa--filtering">
<tbody> <tbody>
<tr class="requires-v2_3"> <tr>
<th>Gyro Dynamic Notch Filter</th> <th>Gyro Dynamic Notch Filter</th>
<td> <td>
<div style="padding-left: 1em; line-height: 28px;"> <div style="padding-left: 1em; line-height: 28px;">
@ -284,21 +284,21 @@
</div> </div>
</td> </td>
</tr> </tr>
<tr class="requires-v2_3"> <tr>
<th>Gyro Dynamic Notch Width</th> <th>Gyro Dynamic Notch Width</th>
<td> <td>
<input data-setting="dyn_notch_width_percent" type="number" class="rate-tpa_input" /> <input data-setting="dyn_notch_width_percent" type="number" class="rate-tpa_input" />
<div class="helpicon cf_tip" title="Sets the distance in percent between dynamic gyro notches. Set to 0 to use single dynamic gyro notch."></div> <div class="helpicon cf_tip" title="Sets the distance in percent between dynamic gyro notches. Set to 0 to use single dynamic gyro notch."></div>
</td> </td>
</tr> </tr>
<tr class="requires-v2_3"> <tr>
<th>Gyro Dynamic Notch Min Frequency</th> <th>Gyro Dynamic Notch Min Frequency</th>
<td> <td>
<input data-setting="dyn_notch_min_hz" type="number" class="rate-tpa_input" /> <input data-setting="dyn_notch_min_hz" type="number" class="rate-tpa_input" />
<div class="helpicon cf_tip" title="Minimum frequency for dynamic gyro notch filters. Value should depends on propeller size. 150Hz work fine with 5&quot; and smaller. For 7&quot; and above lower even below 100Hz."></div> <div class="helpicon cf_tip" title="Minimum frequency for dynamic gyro notch filters. Value should depends on propeller size. 150Hz work fine with 5&quot; and smaller. For 7&quot; and above lower even below 100Hz."></div>
</td> </td>
</tr> </tr>
<tr class="requires-v2_2"> <tr>
<th data-i18n="gyro_lpf_type"></th> <th data-i18n="gyro_lpf_type"></th>
<td> <td>
<select data-setting="gyro_lpf_type" /> <select data-setting="gyro_lpf_type" />
@ -313,6 +313,13 @@
<div class="helpicon cf_tip" data-i18n_title="gyroLpfCutoffFrequencyHelp"></div> <div class="helpicon cf_tip" data-i18n_title="gyroLpfCutoffFrequencyHelp"></div>
</td> </td>
</tr> </tr>
<tr>
<th data-i18n="gyro_stage2_lowpass_type"></th>
<td>
<select data-setting="gyro_stage2_lowpass_type" />
<div class="helpicon cf_tip" data-i18n_title="gyro_stage2_lowpass_type_help"></div>
</td>
</tr>
<tr> <tr>
<th data-i18n="gyroStage2LpfCutoffFrequency"></th> <th data-i18n="gyroStage2LpfCutoffFrequency"></th>
<td> <td>
@ -322,6 +329,13 @@
<div class="helpicon cf_tip" data-i18n_title="gyroStage2LpfCutoffFrequencyHelp"></div> <div class="helpicon cf_tip" data-i18n_title="gyroStage2LpfCutoffFrequencyHelp"></div>
</td> </td>
</tr> </tr>
<tr>
<th data-i18n="dterm_lpf_type"></th>
<td>
<select data-setting="dterm_lpf_type" />
<div class="helpicon cf_tip" data-i18n_title="dterm_lpf_type_help"></div>
</td>
</tr>
<tr> <tr>
<th data-i18n="dtermLpfCutoffFrequency"></th> <th data-i18n="dtermLpfCutoffFrequency"></th>
<td> <td>
@ -330,6 +344,20 @@
<div class="helpicon cf_tip" data-i18n_title="dtermLpfCutoffFrequencyHelp"></div> <div class="helpicon cf_tip" data-i18n_title="dtermLpfCutoffFrequencyHelp"></div>
</td> </td>
</tr> </tr>
<tr>
<th data-i18n="dterm_lpf2_type"></th>
<td>
<select data-setting="dterm_lpf2_type" />
<div class="helpicon cf_tip" data-i18n_title="dterm_lpf2_type_help"></div>
</td>
</tr>
<tr>
<th data-i18n="dterm_lpf2_hz"></th>
<td>
<input data-setting="dterm_lpf2_hz" type="number" class="rate-tpa_input" />
<div class="helpicon cf_tip" data-i18n_title="dterm_lpf2_hz_help"></div>
</td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>
@ -347,7 +375,7 @@
<div class="helpicon cf_tip" data-i18n_title="accLpfCutoffFrequencyHelp"></div> <div class="helpicon cf_tip" data-i18n_title="accLpfCutoffFrequencyHelp"></div>
</td> </td>
</tr> </tr>
<tr class="requires-v2_2"> <tr>
<th data-i18n="acc_lpf_type"></th> <th data-i18n="acc_lpf_type"></th>
<td> <td>
<select data-setting="acc_lpf_type" /> <select data-setting="acc_lpf_type" />
@ -374,54 +402,54 @@
<div class="cf_column"> <div class="cf_column">
<table class="rate-tpa rate-tpa--filtering"> <table class="rate-tpa rate-tpa--filtering">
<tbody> <tbody>
<tr class="requires-v2_2"> <tr>
<th data-i18n="mc_airmode_type"></th> <th data-i18n="mc_airmode_type"></th>
<td> <td>
<select data-setting="mc_airmode_type" /> <select data-setting="mc_airmode_type" />
<div class="helpicon cf_tip" data-i18n_title="mc_airmode_type_help"></div> <div class="helpicon cf_tip" data-i18n_title="mc_airmode_type_help"></div>
</td> </td>
</tr> </tr>
<tr class="requires-v2_2"> <tr>
<th data-i18n="mc_airmode_threshold"></th> <th data-i18n="mc_airmode_threshold"></th>
<td> <td>
<select data-setting="mc_airmode_threshold" /> <select data-setting="mc_airmode_threshold" />
<div class="helpicon cf_tip" data-i18n_title="mc_airmode_threshold_help"></div> <div class="helpicon cf_tip" data-i18n_title="mc_airmode_threshold_help"></div>
</td> </td>
</tr> </tr>
<tr class="requires-v2_2"> <tr>
<th data-i18n="itermRelax"></th> <th data-i18n="itermRelax"></th>
<td> <td>
<select data-setting="mc_iterm_relax" /> <select data-setting="mc_iterm_relax" />
<div class="helpicon cf_tip" data-i18n_title="itermRelaxHelp"></div> <div class="helpicon cf_tip" data-i18n_title="itermRelaxHelp"></div>
</td> </td>
</tr> </tr>
<tr class="requires-v2_2"> <tr>
<th data-i18n="itermRelaxCutoff"></th> <th data-i18n="itermRelaxCutoff"></th>
<td> <td>
<input data-setting="mc_iterm_relax_cutoff" class="rate-tpa_input" /> <input data-setting="mc_iterm_relax_cutoff" class="rate-tpa_input" />
<div class="helpicon cf_tip" data-i18n_title="itermRelaxCutoffHelp"></div> <div class="helpicon cf_tip" data-i18n_title="itermRelaxCutoffHelp"></div>
</td> </td>
</tr> </tr>
<tr class="requires-v2_2"> <tr>
<th data-i18n="itermRelaxType"></th> <th data-i18n="itermRelaxType"></th>
<td> <td>
<select data-setting="mc_iterm_relax_type" /> <select data-setting="mc_iterm_relax_type" />
<div class="helpicon cf_tip" data-i18n_title="itermRelaxTypeHelp"></div> <div class="helpicon cf_tip" data-i18n_title="itermRelaxTypeHelp"></div>
</td> </td>
</tr> </tr>
<tr class="requires-v2_2_2"> <tr>
<th data-i18n="antigravityGain"></th> <th data-i18n="antigravityGain"></th>
<td> <td>
<input class="rate-tpa_input" data-setting="antigravity_gain" /> <input class="rate-tpa_input" data-setting="antigravity_gain" />
</td> </td>
</tr> </tr>
<tr class="requires-v2_2_2"> <tr>
<th data-i18n="antigravityAccelerator"></th> <th data-i18n="antigravityAccelerator"></th>
<td> <td>
<input class="rate-tpa_input" data-setting="antigravity_accelerator" /> <input class="rate-tpa_input" data-setting="antigravity_accelerator" />
</td> </td>
</tr> </tr>
<tr class="requires-v2_2_2"> <tr>
<th data-i18n="antigravityCutoff"></th> <th data-i18n="antigravityCutoff"></th>
<td> <td>
<input class="rate-tpa_input" data-setting="antigravity_cutoff_lpf_hz" /> <input class="rate-tpa_input" data-setting="antigravity_cutoff_lpf_hz" />
@ -443,21 +471,21 @@
<div class="helpicon cf_tip" data-i18n_title="dtermSetpointWeightHelp"></div> <div class="helpicon cf_tip" data-i18n_title="dtermSetpointWeightHelp"></div>
</td> </td>
</tr> </tr>
<tr class="requires-v2_2"> <tr>
<th data-i18n="d_boost_factor"></th> <th data-i18n="d_boost_factor"></th>
<td> <td>
<input data-setting="d_boost_factor" class="rate-tpa_input" /> <input data-setting="d_boost_factor" class="rate-tpa_input" />
<div class="helpicon cf_tip" data-i18n_title="d_boost_factor_help"></div> <div class="helpicon cf_tip" data-i18n_title="d_boost_factor_help"></div>
</td> </td>
</tr> </tr>
<tr class="requires-v2_2"> <tr>
<th data-i18n="d_boost_max_at_acceleration"></th> <th data-i18n="d_boost_max_at_acceleration"></th>
<td> <td>
<input data-setting="d_boost_max_at_acceleration" class="rate-tpa_input" /> <input data-setting="d_boost_max_at_acceleration" class="rate-tpa_input" />
<div class="helpicon cf_tip" data-i18n_title="d_boost_max_at_acceleration_help"></div> <div class="helpicon cf_tip" data-i18n_title="d_boost_max_at_acceleration_help"></div>
</td> </td>
</tr> </tr>
<tr class="requires-v2_2"> <tr>
<th data-i18n="d_boost_gyro_delta_lpf_hz"></th> <th data-i18n="d_boost_gyro_delta_lpf_hz"></th>
<td> <td>
<input data-setting="d_boost_gyro_delta_lpf_hz" class="rate-tpa_input" /> <input data-setting="d_boost_gyro_delta_lpf_hz" class="rate-tpa_input" />

22
tabs/pid_tuning.js
View file

@ -162,28 +162,6 @@ TABS.pid_tuning.initialize = function (callback) {
FILTER_CONFIG.yawLpfHz = parseInt($yawLpfHz.val(), 10); FILTER_CONFIG.yawLpfHz = parseInt($yawLpfHz.val(), 10);
}); });
if (semver.gte(CONFIG.flightControllerVersion, "2.2.0")) {
$('.requires-v2_2').show();
} else {
$('.requires-v2_2').hide();
}
if (semver.gte(CONFIG.flightControllerVersion, "2.2.2")) {
$('.requires-v2_2_2').show();
} else {
$('.requires-v2_2_2').hide();
}
if (semver.gte(CONFIG.flightControllerVersion, "2.3.0")) {
$('.requires-v2_3').show();
} else {
$('.requires-v2_3').hide();
}
if (semver.lt(CONFIG.flightControllerVersion, "2.2.0")) {
$('[name=ff]').prop('disabled', 'disabled');
}
if (!FC.isRpyFfComponentUsed()) { if (!FC.isRpyFfComponentUsed()) {
$('.rpy_ff').prop('disabled', 'disabled'); $('.rpy_ff').prop('disabled', 'disabled');
} }