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

fix anti gravity tooltip

Browse source
This commit is contained in:
Mark Haslinghuis 2022-10-06 01:37:56 +02:00
parent 1efa12672b
commit f86bbfdba6
3 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
locales/en/messages.json
View file

@ -1680,6 +1680,11 @@
"message": "Gain", "message": "Gain",
"description": "Anti Gravity Gain Parameter" "description": "Anti Gravity Gain Parameter"
}, },
"pidTuningAntiGravityGainHelp": {
"message": "Boost iTerm and increase P during fast throttle changes.<br><br>8.0 means about 8x iTerm boost",
"description": "Anti Gravity Gain Parameter Help Icon"
},
"pidTuningAntiGravityThres": { "pidTuningAntiGravityThres": {
"message": "Threshold", "message": "Threshold",
"description": "Anti Gravity Threshold Parameter" "description": "Anti Gravity Threshold Parameter"

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

@ -192,30 +192,25 @@ pid_tuning.initialize = function (callback) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) { if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
// we keep the same name in html - just switching variable. // we keep the same name in html - just switching variable.
antiGravityGain.val(FC.ADVANCED_TUNING.antiGravityGain); antiGravityGain.val(FC.ADVANCED_TUNING.antiGravityGain / 10);
antiGravitySwitch.prop('checked', FC.ADVANCED_TUNING.antiGravityGain !== ITERM_ACCELERATOR_GAIN_OFF); antiGravitySwitch.prop('checked', FC.ADVANCED_TUNING.antiGravityGain !== ITERM_ACCELERATOR_GAIN_OFF);
} else { } else {
$('.antigravity input[name="itermThrottleThreshold"]').val(FC.ADVANCED_TUNING.itermThrottleThreshold); $('.antigravity input[name="itermThrottleThreshold"]').val(FC.ADVANCED_TUNING.itermThrottleThreshold);
antiGravityGain.val(FC.ADVANCED_TUNING.itermAcceleratorGain / 1000); antiGravityGain.val(FC.ADVANCED_TUNING.itermAcceleratorGain / 1000);
antiGravitySwitch.prop('checked', FC.ADVANCED_TUNING.itermAcceleratorGain !== ITERM_ACCELERATOR_GAIN_OFF); antiGravitySwitch.prop('checked', FC.ADVANCED_TUNING.itermAcceleratorGain !== ITERM_ACCELERATOR_GAIN_OFF);
} }
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44)) { if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
antiGravityGain.attr("min","0.1"); antiGravityGain.attr("min", "0.1");
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
antiGravityGain.attr({ "min": "0.1", "max": "25.0", "step": "0.1" });
}
} }
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) { antiGravitySwitch.on("change", function() {
antiGravityGain.attr({ "min": "1", "max": "250", "step": "1" }); if (antiGravitySwitch.is(':checked')) {
}
antiGravitySwitch.change(function() {
const checked = $(this).is(':checked');
if (checked) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) { if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
antiGravityGain.val(FC.ADVANCED_TUNING.antiGravityGain || 1); antiGravityGain.val(Number.parseFloat(FC.ADVANCED_TUNING.antiGravityGain / 10 || 8).toFixed(1));
} else { } else {
const DEFAULT_ACCELERATOR_GAIN = semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_43) ? 3.5 : 1.1; const DEFAULT_ACCELERATOR_GAIN = semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_43) ? 3.5 : 1.1;
@ -231,17 +226,17 @@ pid_tuning.initialize = function (callback) {
$('.antigravity .antiGravityThres').toggle(semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_45) && FC.ADVANCED_TUNING.itermAcceleratorGain === 0); $('.antigravity .antiGravityThres').toggle(semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_45) && FC.ADVANCED_TUNING.itermAcceleratorGain === 0);
$('.antigravity .antiGravityMode').toggle(semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_40) && semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_45)); $('.antigravity .antiGravityMode').toggle(semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_40) && semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_45));
} else { } else {
if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_45)) { if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
antiGravityGain.val(ITERM_ACCELERATOR_GAIN_OFF / 1000);
} else {
$('.antigravity select[id="antiGravityMode"]').val(0); $('.antigravity select[id="antiGravityMode"]').val(0);
antiGravityGain.val(ITERM_ACCELERATOR_GAIN_OFF); antiGravityGain.val(ITERM_ACCELERATOR_GAIN_OFF);
} else {
antiGravityGain.val(ITERM_ACCELERATOR_GAIN_OFF / 1000);
} }
$('.antigravity .suboption').hide(); $('.antigravity .suboption').hide();
} }
}); });
antiGravitySwitch.change(); antiGravitySwitch.trigger("change");
} else { } else {
$('.dtermLowpassType').hide(); $('.dtermLowpassType').hide();
$('.antigravity').hide(); $('.antigravity').hide();
@ -330,7 +325,7 @@ pid_tuning.initialize = function (callback) {
$('#pid_main .pid_titlebar2 th').attr('colspan', 5); $('#pid_main .pid_titlebar2 th').attr('colspan', 5);
const feedforwardTransitionNumberElement = $('input[name="feedforwardTransition-number"]'); const feedforwardTransitionNumberElement = $('input[name="feedforwardTransition-number"]');
feedforwardTransitionNumberElement.val(FC.ADVANCED_TUNING.feedforwardTransition / 100); feedforwardTransitionNumberElement.val(Number.parseFloat(FC.ADVANCED_TUNING.feedforwardTransition / 100).toFixed(2));
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_40) && semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_45)) { if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_40) && semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
// AntiGravity Mode // AntiGravity Mode
@ -1233,7 +1228,7 @@ pid_tuning.initialize = function (callback) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_36)) { if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_36)) {
FC.FILTER_CONFIG.dterm_lowpass_type = parseInt($('.pid_filter select[name="dtermLowpassType"]').val()); FC.FILTER_CONFIG.dterm_lowpass_type = parseInt($('.pid_filter select[name="dtermLowpassType"]').val());
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) { if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_45)) {
FC.ADVANCED_TUNING.antiGravityGain = parseInt(antiGravityGain.val()); FC.ADVANCED_TUNING.antiGravityGain = parseInt(antiGravityGain.val() * 10);
} else { } else {
FC.ADVANCED_TUNING.itermThrottleThreshold = parseInt($('.antigravity input[name="itermThrottleThreshold"]').val()); FC.ADVANCED_TUNING.itermThrottleThreshold = parseInt($('.antigravity input[name="itermThrottleThreshold"]').val());
FC.ADVANCED_TUNING.itermAcceleratorGain = parseInt(antiGravityGain.val() * 1000); FC.ADVANCED_TUNING.itermAcceleratorGain = parseInt(antiGravityGain.val() * 1000);

1
src/tabs/pid_tuning.html
View file

@ -687,6 +687,7 @@
<label for="antiGravityGain"> <label for="antiGravityGain">
<span i18n="pidTuningAntiGravityGain"></span> <span i18n="pidTuningAntiGravityGain"></span>
</label> </label>
<div class="helpicon cf_tip" i18n_title="pidTuningAntiGravityGainHelp"></div>
</span> </span>
<span class="suboption antiGravityThres"> <span class="suboption antiGravityThres">