Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-26 01:35:28 +03:00
Code Issues Wiki Activity

Rebase to master

Browse source
This commit is contained in:
Mark Haslinghuis 2021-12-21 12:58:45 +01:00
parent 393be634b9
commit 611190603f
No known key found for this signature in database
GPG key ID: 198B0F616296A584
1 changed files with 27 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/js/TuningSliders.js
View file

@ -362,35 +362,40 @@ TuningSliders.updatePidSlidersDisplay = function() {
$('#sliderPidsModeSelect').val(this.sliderPidsMode); $('#sliderPidsModeSelect').val(this.sliderPidsMode);
} else { } else {
this.pidSlidersUnavailable = false; this.pidSlidersUnavailable = false;
this.calculateNewPids(true); this.calculateNewPids(true);
FC.PID_NAMES.forEach(function (elementPid, indexPid) { FC.PID_NAMES.forEach(function (elementPid, indexPid) {
const pidElements = $(`.pid_tuning .${elementPid} input`); const pidElements = $(`.pid_tuning .${elementPid} input`);
pidElements.each(function (indexInput) { pidElements.each(function (indexInput) {
const val = parseInt($(this).val()); const val = parseInt($(this).val());
if (indexPid < 3 && indexInput < 3) {
if (val !== FC.PIDS[indexPid][indexInput]) { if (indexPid < 3 && indexInput < 3) {
TuningSliders.pidSlidersUnavailable = true; if (val !== FC.PIDS[indexPid][indexInput]) {
}
} else {
if (indexPid < 3 && indexInput === 3 && !this.dMinFeatureEnabled) {
const dMinRoll = (val !== FC.ADVANCED_TUNING.dMinRoll) && indexPid === 0;
const dMinPitch = (val !== FC.ADVANCED_TUNING.dMinPitch) && indexPid === 1;
const dMinYaw = (val !== FC.ADVANCED_TUNING.dMinYaw) && indexPid === 2;
if (dMinRoll || dMinPitch || dMinYaw) {
TuningSliders.pidSlidersUnavailable = true; TuningSliders.pidSlidersUnavailable = true;
} }
} else if ((indexPid < 3 && indexInput === 3 && this.dMinFeatureEnabled) || } else {
(indexPid < 3 && indexInput === 4 && !this.dMinFeatureEnabled)) { if (indexPid < 3 && indexInput === 3 && !this.dMinFeatureEnabled) {
const feedforwardRoll = (val !== FC.ADVANCED_TUNING.feedforwardRoll) && indexPid === 0; const dMinRoll = (val !== FC.ADVANCED_TUNING.dMinRoll) && indexPid === 0;
const feedforwardPitch = (val !== FC.ADVANCED_TUNING.feedforwardPitch) && indexPid === 1; const dMinPitch = (val !== FC.ADVANCED_TUNING.dMinPitch) && indexPid === 1;
const feedforwardYaw = (val !== FC.ADVANCED_TUNING.feedforwardYaw) && indexPid === 2; const dMinYaw = (val !== FC.ADVANCED_TUNING.dMinYaw) && indexPid === 2;
if (feedforwardRoll || feedforwardPitch || feedforwardYaw) {
TuningSliders.pidSlidersUnavailable = true; if (dMinRoll || dMinPitch || dMinYaw) {
TuningSliders.pidSlidersUnavailable = true;
}
} else if ((indexPid < 3 && indexInput === 3 && this.dMinFeatureEnabled) ||
(indexPid < 3 && indexInput === 4 && !this.dMinFeatureEnabled)) {
const feedforwardRoll = (val !== FC.ADVANCED_TUNING.feedforwardRoll) && indexPid === 0;
const feedforwardPitch = (val !== FC.ADVANCED_TUNING.feedforwardPitch) && indexPid === 1;
const feedforwardYaw = (val !== FC.ADVANCED_TUNING.feedforwardYaw) && indexPid === 2;
if (feedforwardRoll || feedforwardPitch || feedforwardYaw) {
TuningSliders.pidSlidersUnavailable = true;
}
} }
} }
} });
}); });
if ($('input[id="useIntegratedYaw"]').is(':checked')) { if ($('input[id="useIntegratedYaw"]').is(':checked')) {