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

disable only if rpy

Browse source
This commit is contained in:
Asizon 2021-12-08 09:34:33 +01:00
parent 5a13439897
commit 476ba71e63
2 changed files with 29 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/js/TuningSliders.js
View file

@ -405,8 +405,10 @@ TuningSliders.updatePidSlidersDisplay = function() {
}); });
}); });
if ($('input[id="useIntegratedYaw"]').is(':checked')) { if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
this.pidSlidersUnavailable = true; if ($('input[id="useIntegratedYaw"]').is(':checked')) {
this.pidSlidersUnavailable = true;
}
} }
if (!this.pidSlidersUnavailable) { if (!this.pidSlidersUnavailable) {

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

@ -547,10 +547,10 @@ TABS.pid_tuning.initialize = function (callback) {
$('input[id="useIntegratedYaw"]').change(function() { $('input[id="useIntegratedYaw"]').change(function() {
const checked = $(this).is(':checked'); const checked = $(this).is(':checked');
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44)) { // 4.3 firmware has RP mode.
this.sliderPidsMode = 0; if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
$('#pid_main .pid_data input').prop('disabled', !checked);
} }
$('#pid_main .pid_data input').prop('disabled', !checked);
$('#pidTuningIntegratedYawCaution').toggle(checked); $('#pidTuningIntegratedYawCaution').toggle(checked);
}).change(); }).change();
@ -1806,9 +1806,11 @@ TABS.pid_tuning.initialize = function (callback) {
}); });
}); });
// exclude integratedYaw from setDirty for 4.3 as it uses RP mode.
$('#pid-tuning').find('input').each(function (k, item) { $('#pid-tuning').find('input').each(function (k, item) {
if ($(item).attr('class') !== "feature toggle" if ($(item).attr('class') !== "feature toggle"
&& $(item).attr('class') !== "nonProfile") { && $(item).attr('class') !== "nonProfile"
&& (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44) && $(item).attr('id'))) {
$(item).change(function () { $(item).change(function () {
self.setDirty(true); self.setDirty(true);
}); });
@ -1931,12 +1933,23 @@ TABS.pid_tuning.initialize = function (callback) {
}); });
} }
// disable slides if Integrated Yaw is enabled or Slider PID mode is set to OFF const useIntegratedYaw = $('input[id="useIntegratedYaw"]');
$('input[id="useIntegratedYaw"]').change(() => TuningSliders.updatePidSlidersDisplay());
useIntegratedYaw.on('change', () => {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
// set slider to RP mode if Integrated Yaw is enabled and sliders are enabled
if (useIntegratedYaw.is(':checked') && TuningSliders.sliderPidsMode) {
sliderPidsModeSelect.val(1).trigger('change');
}
} else {
// disable sliders if Integrated Yaw is enabled or Slider PID mode is set to OFF
TuningSliders.updatePidSlidersDisplay();
}
});
// trigger Slider Display update when PID mode is changed // trigger Slider Display update when PID mode is changed
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44)) { if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
$('select[id="sliderPidsModeSelect"]').on('change', function () { sliderPidsModeSelect.on('change', function () {
const setMode = parseInt($(this).val()); const setMode = parseInt($(this).val());
TuningSliders.sliderPidsMode = setMode; TuningSliders.sliderPidsMode = setMode;
@ -1947,6 +1960,11 @@ TABS.pid_tuning.initialize = function (callback) {
const disableRP = !!setMode; const disableRP = !!setMode;
const disableY = setMode > 1; const disableY = setMode > 1;
// disable Integrated Yaw when going into RPY mode
if (setMode === 2) {
useIntegratedYaw.prop('checked', false).trigger('change');
}
$('#pid_main .ROLL .pid_data input, #pid_main .PITCH .pid_data input').each(function() { $('#pid_main .ROLL .pid_data input, #pid_main .PITCH .pid_data input').each(function() {
$(this).prop('disabled', disableRP); $(this).prop('disabled', disableRP);
}); });