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

Auto merged - #2618 at Wed, 06 Oct 2021 12:17:10 GMT 

Expert mode toggle bugfix and refactoring
10.8-maintenance
J Blackman 2021-10-06 23:17:10 +11:00 committed by GitHub
parent 3f74761558 b63c02673a
commit 3feefcb184
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/js/TuningSliders.js
View File

@ -111,7 +111,7 @@ TuningSliders.initialize = function() {
this.setDMinFeatureEnabled($('#dMinSwitch').is(':checked')); this.setDMinFeatureEnabled($('#dMinSwitch').is(':checked'));
} }
this.setExpertMode($('input[name="expertModeCheckbox"]').is(':checked')); this.setExpertMode(isExpertModeEnabled());
this.initPidSlidersPosition(); this.initPidSlidersPosition();
this.initGyroFilterSliderPosition(); this.initGyroFilterSliderPosition();
@ -126,8 +126,8 @@ TuningSliders.initialize = function() {
this.updateFilterSlidersDisplay(); this.updateFilterSlidersDisplay();
}; };
TuningSliders.setExpertMode = function() { TuningSliders.setExpertMode = function(expertModeEnabled) {
this.expertMode = isExpertModeEnabled(); this.expertMode = expertModeEnabled;
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44)) { if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
document.getElementById('sliderDMaxGain').disabled = !this.expertMode; document.getElementById('sliderDMaxGain').disabled = !this.expertMode;

12
src/js/main.js
View File

@ -515,8 +515,8 @@ function startProcess() {
$(expertModeCheckbox).prop('checked', true); $(expertModeCheckbox).prop('checked', true);
} }
$(expertModeCheckbox).change(function () { $(expertModeCheckbox).on("change", () => {
const checked = $(this).is(':checked'); const checked = $(expertModeCheckbox).is(':checked');
checkSetupAnalytics(function (analyticsService) { checkSetupAnalytics(function (analyticsService) {
analyticsService.setDimension(analyticsService.DIMENSIONS.CONFIGURATOR_EXPERT_MODE, checked ? 'On' : 'Off'); analyticsService.setDimension(analyticsService.DIMENSIONS.CONFIGURATOR_EXPERT_MODE, checked ? 'On' : 'Off');
}); });
@ -525,8 +525,12 @@ function startProcess() {
updateTabList(FC.FEATURE_CONFIG.features); updateTabList(FC.FEATURE_CONFIG.features);
} }
TuningSliders.setExpertMode(checked); if (GUI.active_tab) {
}).change(); TABS[GUI.active_tab]?.expertModeChanged?.(checked);
}
});
$(expertModeCheckbox).trigger("change");
}); });
ConfigStorage.get('cliAutoComplete', function (result) { ConfigStorage.get('cliAutoComplete', function (result) {

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

@ -2994,3 +2994,8 @@ TABS.pid_tuning.changeRatesTypeLogo = function() {
break; break;
} }
}; };
TABS.pid_tuning.expertModeChanged = function(expertModeEnabled) {
TuningSliders.setExpertMode(expertModeEnabled);
};