sundowndev
/
betaflight-configurator
mirror of https://github.com/sundowndev/betaflight-configurator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2702 from Asizon/fix_i18n 

Fix duplicated i18n on filters tab
10.8-maintenance
haslinghuis 2021-12-21 12:10:14 +01:00 committed by GitHub
parent cb25761153 f6d50d77e1
commit 71542fa6b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
locales/en/messages.json
View File

@ -3881,9 +3881,6 @@
"pidTuningGyroLowpassType": { "pidTuningGyroLowpassType": {
"message": "Gyro Lowpass 1 Filter Type" "message": "Gyro Lowpass 1 Filter Type"
}, },
"pidTuningGyroLowpassFrequency": {
"message": "Cutoff Frequency [Hz]"
},
"pidTuningGyroLowpass": { "pidTuningGyroLowpass": {
"message": "Gyro Lowpass 1" "message": "Gyro Lowpass 1"
}, },
@ -3902,10 +3899,10 @@
"pidTuningGyroLowpassDyn": { "pidTuningGyroLowpassDyn": {
"message": "Gyro Lowpass Dynamic Filter" "message": "Gyro Lowpass Dynamic Filter"
}, },
"pidTuningGyroLowpassDynMinFrequency": { "pidTuningMinCutoffFrequency": {
"message": "Min Cutoff Frequency [Hz]" "message": "Min Cutoff Frequency [Hz]"
}, },
"pidTuningGyroLowpassDynMaxFrequency": { "pidTuningMaxCutoffFrequency": {
"message": "Max Cutoff Frequency [Hz]" "message": "Max Cutoff Frequency [Hz]"
}, },
"pidTuningGyroLowpassDynType": { "pidTuningGyroLowpassDynType": {
@ -3914,9 +3911,6 @@
"pidTuningGyroLowpass2": { "pidTuningGyroLowpass2": {
"message": "Gyro Lowpass 2" "message": "Gyro Lowpass 2"
}, },
"pidTuningGyroLowpass2Frequency": {
"message": "Cutoff Frequency [Hz]"
},
"pidTuningGyroLowpassFilterHelp": { "pidTuningGyroLowpassFilterHelp": {
"message": "Gyro lowpass filters attenuate higher frequency noise to keep it out of the PID loop. There are two independently configurable gyro filters; by default both are active.<br /><br />The first D lowpass can be static (fixed cutoff) or dynamic; the second D lowpass is always static. When a lowpass is in dynamic mode, filter will be stronger at low throttle, and the cutoff will go higher (less filtering) as throttle increases.<br /><br />Without RPM filtering, both PT1 filters should be enabled at default (or stronger) cutoffs, with lowpass 1 in dynamic mode.<br /><br />With RPM filtering, the gyro filter slider can often be moved some way to the right. On clean quads it can go all the way right, or alternatively a single static gyro lowpass filter at 500hz may be sufficient.<br /><br />A quad will have less propwash with the least gyro filter delay (sliders to the right, higher cutoff values).<br /><br />Always check for motor heat when shifting to less gyro filtering (sliders to the right). With minimal gyro filtering, it is essential to have enough D filtering! Take care!" "message": "Gyro lowpass filters attenuate higher frequency noise to keep it out of the PID loop. There are two independently configurable gyro filters; by default both are active.<br /><br />The first D lowpass can be static (fixed cutoff) or dynamic; the second D lowpass is always static. When a lowpass is in dynamic mode, filter will be stronger at low throttle, and the cutoff will go higher (less filtering) as throttle increases.<br /><br />Without RPM filtering, both PT1 filters should be enabled at default (or stronger) cutoffs, with lowpass 1 in dynamic mode.<br /><br />With RPM filtering, the gyro filter slider can often be moved some way to the right. On clean quads it can go all the way right, or alternatively a single static gyro lowpass filter at 500hz may be sufficient.<br /><br />A quad will have less propwash with the least gyro filter delay (sliders to the right, higher cutoff values).<br /><br />Always check for motor heat when shifting to less gyro filtering (sliders to the right). With minimal gyro filtering, it is essential to have enough D filtering! Take care!"
}, },
@ -3932,16 +3926,10 @@
"pidTuningGyroNotchFilter2": { "pidTuningGyroNotchFilter2": {
"message": "Gyro Notch Filter 2" "message": "Gyro Notch Filter 2"
}, },
"pidTuningGyroNotch1Frequency": { "pidTuningCenterFrequency": {
"message": "Center Frequency [Hz]" "message": "Center Frequency [Hz]"
}, },
"pidTuningGyroNotch2Frequency": { "pidTuningCutoffFrequency": {
"message": "Center Frequency [Hz]"
},
"pidTuningGyroNotch1Cutoff": {
"message": "Cutoff Frequency [Hz]"
},
"pidTuningGyroNotch2Cutoff": {
"message": "Cutoff Frequency [Hz]" "message": "Cutoff Frequency [Hz]"
}, },
"pidTuningNotchFilterHelp": { "pidTuningNotchFilterHelp": {
@ -4040,10 +4028,7 @@
"pidTuningDTermLowpassType": { "pidTuningDTermLowpassType": {
"message": "Filter Type" "message": "Filter Type"
}, },
"pidTuningDTermLowpassFrequency": { "pidTuningStaticCutoffFrequency": {
"message": "Static Cutoff Frequency [Hz]"
},
"pidTuningDTermLowpass2Frequency": {
"message": "Static Cutoff Frequency [Hz]" "message": "Static Cutoff Frequency [Hz]"
}, },
"pidTuningDTermLowpass2Type": { "pidTuningDTermLowpass2Type": {
@ -4052,12 +4037,6 @@
"pidTuningDTermLowpassDyn": { "pidTuningDTermLowpassDyn": {
"message": "D Term Lowpass Dynamic Filter" "message": "D Term Lowpass Dynamic Filter"
}, },
"pidTuningDTermLowpassDynMinFrequency": {
"message": "Min Cutoff Frequency [Hz]"
},
"pidTuningDTermLowpassDynMaxFrequency": {
"message": "Max Cutoff Frequency [Hz]"
},
"pidTuningDTermLowpassDynExpo": { "pidTuningDTermLowpassDynExpo": {
"message": "Dynamic Curve Expo" "message": "Dynamic Curve Expo"
}, },
@ -4067,18 +4046,9 @@
"pidTuningDTermNotchFiltersGroup": { "pidTuningDTermNotchFiltersGroup": {
"message": "D Term Notch Filter" "message": "D Term Notch Filter"
}, },
"pidTuningDTermNotchFrequency": {
"message": "Center Frequency [Hz]"
},
"pidTuningDTermNotchCutoff": {
"message": "Cutoff Frequency [Hz]"
},
"pidTuningYawLowpassFiltersGroup": { "pidTuningYawLowpassFiltersGroup": {
"message": "Yaw Lowpass Filter" "message": "Yaw Lowpass Filter"
}, },
"pidTuningYawLowpassFrequency": {
"message": "Cutoff Frequency [Hz]"
},
"pidTuningVbatPidCompensation": { "pidTuningVbatPidCompensation": {
"message": "Vbat PID Compensation" "message": "Vbat PID Compensation"
}, },

34
src/tabs/pid_tuning.html
View File

@ -1281,7 +1281,7 @@
<span class="suboption"> <span class="suboption">
<input type="number" class="nonProfile" name="gyroLowpassFrequency" step="1" min="1" max="255"/> <input type="number" class="nonProfile" name="gyroLowpassFrequency" step="1" min="1" max="255"/>
<label> <label>
<span i18n="pidTuningGyroLowpassFrequency"></span> <span i18n="pidTuningCutoffFrequency"></span>
</label> </label>
</span> </span>
<span class="suboption"> <span class="suboption">
@ -1327,14 +1327,14 @@
<span class="suboption dynamic"> <span class="suboption dynamic">
<input type="number" name="gyroLowpassDynMinFrequency" step="1" min="1" max="1000"/> <input type="number" name="gyroLowpassDynMinFrequency" step="1" min="1" max="1000"/>
<label> <label>
<span i18n="pidTuningGyroLowpassDynMinFrequency"></span> <span i18n="pidTuningMinCutoffFrequency"></span>
</label> </label>
</span> </span>
<span class="suboption dynamic"> <span class="suboption dynamic">
<input type="number" name="gyroLowpassDynMaxFrequency" step="1" min="1" max="1000"/> <input type="number" name="gyroLowpassDynMaxFrequency" step="1" min="1" max="1000"/>
<label> <label>
<span i18n="pidTuningGyroLowpassDynMaxFrequency"></span> <span i18n="pidTuningMaxCutoffFrequency"></span>
</label> </label>
</span> </span>
@ -1361,7 +1361,7 @@
<span class="suboption"> <span class="suboption">
<input type="number" class="nonProfile" name="gyroLowpass2Frequency" step="1" min="1" max="16000"/> <input type="number" class="nonProfile" name="gyroLowpass2Frequency" step="1" min="1" max="16000"/>
<label> <label>
<span i18n="pidTuningGyroLowpass2Frequency"></span> <span i18n="pidTuningCutoffFrequency"></span>
</label> </label>
</span> </span>
@ -1394,14 +1394,14 @@
<span class="suboption"> <span class="suboption">
<input type="number" class="nonProfile" name="gyroNotch1Frequency" step="1" min="1" max="16000"/> <input type="number" class="nonProfile" name="gyroNotch1Frequency" step="1" min="1" max="16000"/>
<label> <label>
<span i18n="pidTuningGyroNotch1Frequency"></span> <span i18n="pidTuningCenterFrequency"></span>
</label> </label>
</span> </span>
<span class="suboption"> <span class="suboption">
<input type="number" class="nonProfile" name="gyroNotch1Cutoff" step="1" min="0" max="16000"/> <input type="number" class="nonProfile" name="gyroNotch1Cutoff" step="1" min="0" max="16000"/>
<label> <label>
<span i18n="pidTuningGyroNotch1Cutoff"></span> <span i18n="pidTuningCutoffFrequency"></span>
</label> </label>
</span> </span>
</td> </td>
@ -1416,14 +1416,14 @@
<span class="suboption"> <span class="suboption">
<input type="number" class="nonProfile" name="gyroNotch2Frequency" step="1" min="1" max="16000"/> <input type="number" class="nonProfile" name="gyroNotch2Frequency" step="1" min="1" max="16000"/>
<label> <label>
<span i18n="pidTuningGyroNotch2Frequency"></span> <span i18n="pidTuningCenterFrequency"></span>
</label> </label>
</span> </span>
<span class="suboption"> <span class="suboption">
<input type="number" class="nonProfile" name="gyroNotch2Cutoff" step="1" min="0" max="16000"/> <input type="number" class="nonProfile" name="gyroNotch2Cutoff" step="1" min="0" max="16000"/>
<label> <label>
<span i18n="pidTuningGyroNotch2Cutoff"></span> <span i18n="pidTuningCutoffFrequency"></span>
</label> </label>
</span> </span>
@ -1556,14 +1556,14 @@
<span class="suboption"> <span class="suboption">
<span class="inputValue"><input type="number" name="dtermLowpassDynMinFrequency" step="1" min="1" max="1000"/></span> <span class="inputValue"><input type="number" name="dtermLowpassDynMinFrequency" step="1" min="1" max="1000"/></span>
<label> <label>
<span i18n="pidTuningDTermLowpassDynMinFrequency"></span> <span i18n="pidTuningMinCutoffFrequency"></span>
</label> </label>
</span> </span>
<span class="suboption"> <span class="suboption">
<span class="inputValue"><input type="number" name="dtermLowpassDynMaxFrequency" step="1" min="1" max="1000"/></span> <span class="inputValue"><input type="number" name="dtermLowpassDynMaxFrequency" step="1" min="1" max="1000"/></span>
<label> <label>
<span i18n="pidTuningDTermLowpassDynMaxFrequency"></span> <span i18n="pidTuningMaxCutoffFrequency"></span>
</label> </label>
</span> </span>
@ -1590,7 +1590,7 @@
<span class="suboption"> <span class="suboption">
<span class="inputValue"><input type="number" name="dtermLowpassFrequency" step="1" min="1" max="16000"/></span> <span class="inputValue"><input type="number" name="dtermLowpassFrequency" step="1" min="1" max="16000"/></span>
<label> <label>
<span i18n="pidTuningDTermLowpassFrequency"></span> <span i18n="pidTuningStaticCutoffFrequency"></span>
</label> </label>
</span> </span>
<span class="suboption"> <span class="suboption">
@ -1637,14 +1637,14 @@
<span class="suboption dynamic"> <span class="suboption dynamic">
<span class="inputValue"><input type="number" name="dtermLowpassDynMinFrequency" step="1" min="1" max="1000"/></span> <span class="inputValue"><input type="number" name="dtermLowpassDynMinFrequency" step="1" min="1" max="1000"/></span>
<label> <label>
<span i18n="pidTuningDTermLowpassDynMinFrequency"></span> <span i18n="pidTuningMinCutoffFrequency"></span>
</label> </label>
</span> </span>
<span class="suboption dynamic"> <span class="suboption dynamic">
<span class="inputValue"><input type="number" name="dtermLowpassDynMaxFrequency" step="1" min="1" max="1000"/></span> <span class="inputValue"><input type="number" name="dtermLowpassDynMaxFrequency" step="1" min="1" max="1000"/></span>
<label> <label>
<span i18n="pidTuningDTermLowpassDynMaxFrequency"></span> <span i18n="pidTuningMaxCutoffFrequency"></span>
</label> </label>
</span> </span>
@ -1678,7 +1678,7 @@
<span class="suboption"> <span class="suboption">
<span class="inputValue"><input type="number" name="dtermLowpass2Frequency" step="1" min="1" max="16000"/></span> <span class="inputValue"><input type="number" name="dtermLowpass2Frequency" step="1" min="1" max="16000"/></span>
<label> <label>
<span i18n="pidTuningDTermLowpass2Frequency"></span> <span i18n="pidTuningStaticCutoffFrequency"></span>
</label> </label>
</span> </span>
@ -1710,12 +1710,12 @@
<span class="suboption"> <span class="suboption">
<span class="inputValue"><input type="number" name="dTermNotchFrequency" step="1" min="1" max="16000"/></span> <span class="inputValue"><input type="number" name="dTermNotchFrequency" step="1" min="1" max="16000"/></span>
<label><span i18n="pidTuningDTermNotchFrequency"></span></label> <label><span i18n="pidTuningCenterFrequency"></span></label>
</span> </span>
<span class="suboption"> <span class="suboption">
<input type="number" name="dTermNotchCutoff" step="1" min="0" max="16000"/> <input type="number" name="dTermNotchCutoff" step="1" min="0" max="16000"/>
<label><span i18n="pidTuningDTermNotchCutoff"></span></label> <label><span i18n="pidTuningCutoffFrequency"></span></label>
</span> </span>
</td> </td>
</tr> </tr>
@ -1735,7 +1735,7 @@
<span class="suboption"> <span class="suboption">
<span class="inputValue"><input type="number" name="yawLowpassFrequency" step="1" min="1" max="500"/></span> <span class="inputValue"><input type="number" name="yawLowpassFrequency" step="1" min="1" max="500"/></span>
<label> <label>
<span i18n="pidTuningYawLowpassFrequency"></span> <span i18n="pidTuningCutoffFrequency"></span>
</label> </label>
</span> </span>
</td> </td>