Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-19 14:25:14 +03:00
Code Issues Wiki Activity

Add iterm relax cutoff to UI

Browse source
This commit is contained in:
IvoFPV 2019-08-07 22:02:53 +02:00
parent 3eb39d716c
commit 1fb5c046f4
6 changed files with 32 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
locales/en/messages.json
View file

@ -3207,6 +3207,9 @@
"pidTuningItermRelaxTypeOptionSetpoint": { "pidTuningItermRelaxTypeOptionSetpoint": {
"message": "Setpoint" "message": "Setpoint"
}, },
"pidTuningItermRelaxCutoff": {
"message": "Cutoff:"
},
"pidTuningAbsoluteControlGain": { "pidTuningAbsoluteControlGain": {
"message": "Absolute Control" "message": "Absolute Control"
}, },

10
src/css/tabs/pid_tuning.css
View file

@ -298,7 +298,7 @@
} }
.tab-pid_tuning table.compensation .suboption { .tab-pid_tuning table.compensation .suboption {
margin-left: 40px; margin-left: 4%;
} }
.tab-pid_tuning table.compensation .suboption select{ .tab-pid_tuning table.compensation .suboption select{
@ -308,6 +308,12 @@
padding-left: 5px; padding-left: 5px;
} }
.tab-pid_tuning table.compensation .suboption input{
display: inline-block;
width: 45px;
padding-left: 5px;
}
.tab-pid_tuning .pidTuningFeatures td { .tab-pid_tuning .pidTuningFeatures td {
padding: 5px; padding: 5px;
} }
@ -515,7 +521,7 @@
} }
.tab-pid_tuing .pid_titlebar td:first-child { .tab-pid_tuning .pid_titlebar td:first-child {
text-align: left; text-align: left;
} }

1
src/js/fc.js
View file

@ -400,6 +400,7 @@ var FC = {
smartFeedforward: 0, smartFeedforward: 0,
itermRelax: 0, itermRelax: 0,
itermRelaxType: 0, itermRelaxType: 0,
itermRelaxCutoff: 0,
absoluteControlGain: 0, absoluteControlGain: 0,
throttleBoost: 0, throttleBoost: 0,
acroTrainerAngleLimit: 0, acroTrainerAngleLimit: 0,

8
src/js/msp/MSPHelper.js
View file

@ -1044,6 +1044,10 @@ MspHelper.prototype.process_data = function(dataHandler) {
ADVANCED_TUNING.dMinAdvance = data.readU8(); ADVANCED_TUNING.dMinAdvance = data.readU8();
ADVANCED_TUNING.useIntegratedYaw = data.readU8(); ADVANCED_TUNING.useIntegratedYaw = data.readU8();
ADVANCED_TUNING.integratedYawRelax = data.readU8(); ADVANCED_TUNING.integratedYawRelax = data.readU8();
if(semver.gte(CONFIG.apiVersion, "1.42.0")) {
ADVANCED_TUNING.itermRelaxCutoff = data.readU8();
}
} }
} }
} }
@ -1798,6 +1802,10 @@ MspHelper.prototype.crunch = function(code) {
.push8(ADVANCED_TUNING.dMinAdvance) .push8(ADVANCED_TUNING.dMinAdvance)
.push8(ADVANCED_TUNING.useIntegratedYaw) .push8(ADVANCED_TUNING.useIntegratedYaw)
.push8(ADVANCED_TUNING.integratedYawRelax); .push8(ADVANCED_TUNING.integratedYawRelax);
if(semver.gte(CONFIG.apiVersion, "1.42.0")) {
buffer.push8(ADVANCED_TUNING.itermRelaxCutoff);
}
} }
} }
} }

5
src/js/tabs/pid_tuning.js
View file

@ -203,6 +203,7 @@ TABS.pid_tuning.initialize = function (callback) {
itermRelaxCheck.prop('checked', ADVANCED_TUNING.itermRelax !== 0); itermRelaxCheck.prop('checked', ADVANCED_TUNING.itermRelax !== 0);
$('select[id="itermrelaxAxes"]').val(ADVANCED_TUNING.itermRelax > 0 ? ADVANCED_TUNING.itermRelax : 1); $('select[id="itermrelaxAxes"]').val(ADVANCED_TUNING.itermRelax > 0 ? ADVANCED_TUNING.itermRelax : 1);
$('select[id="itermrelaxType"]').val(ADVANCED_TUNING.itermRelaxType); $('select[id="itermrelaxType"]').val(ADVANCED_TUNING.itermRelaxType);
$('input[name="itermRelaxCutoff"]').val(ADVANCED_TUNING.itermRelaxCutoff);
itermRelaxCheck.change(function() { itermRelaxCheck.change(function() {
var checked = $(this).is(':checked'); var checked = $(this).is(':checked');
@ -350,6 +351,9 @@ TABS.pid_tuning.initialize = function (callback) {
if (semver.gte(CONFIG.apiVersion, "1.42.0")) { if (semver.gte(CONFIG.apiVersion, "1.42.0")) {
$('.smartfeedforward').hide(); $('.smartfeedforward').hide();
$('.itermRelaxCutoff').show();
} else {
$('.itermRelaxCutoff').hide();
} }
$('input[id="useIntegratedYaw"]').change(function() { $('input[id="useIntegratedYaw"]').change(function() {
@ -638,6 +642,7 @@ TABS.pid_tuning.initialize = function (callback) {
ADVANCED_TUNING.itermRelax = $('input[id="itermrelax"]').is(':checked') ? $('select[id="itermrelaxAxes"]').val() : 0; ADVANCED_TUNING.itermRelax = $('input[id="itermrelax"]').is(':checked') ? $('select[id="itermrelaxAxes"]').val() : 0;
ADVANCED_TUNING.itermRelaxType = $('input[id="itermrelax"]').is(':checked') ? $('select[id="itermrelaxType"]').val() : 0; ADVANCED_TUNING.itermRelaxType = $('input[id="itermrelax"]').is(':checked') ? $('select[id="itermrelaxType"]').val() : 0;
ADVANCED_TUNING.itermRelaxCutoff = parseInt($('input[name="itermRelaxCutoff"]').val());
ADVANCED_TUNING.absoluteControlGain = $('input[name="absoluteControlGain-number"]').val(); ADVANCED_TUNING.absoluteControlGain = $('input[name="absoluteControlGain-number"]').val();

7
src/tabs/pid_tuning.html
View file

@ -488,6 +488,13 @@
</select> </select>
</span> </span>
<span class="itermRelaxCutoff suboption">
<label for="itermRelaxCutoff">
<span i18n="pidTuningItermRelaxCutoff" />
</label>
<input type="number" name="itermRelaxCutoff" step="1" min="1" max="100" />
</span>
<div class="helpicon cf_tip" i18n_title="pidTuningItermRelaxHelp"></div> <div class="helpicon cf_tip" i18n_title="pidTuningItermRelaxHelp"></div>
</td> </td>
</tr> </tr>