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

Merge pull request #181 from mikeller/fix_rate_switching 

Fixed profile switching when not on PID tab.
10.3.x-maintenance
Michael Keller 2016-08-05 02:25:16 +12:00 committed by GitHub
parent 43929cbb9d 74cf83a3bf
commit b86d019643
2 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
tabs/pid_tuning.js
View File

@ -12,7 +12,7 @@ TABS.pid_tuning = {
TABS.pid_tuning.initialize = function (callback) {
var self = this;
if (GUI.active_tab != 'pid_tuning') {
if (GUI.active_tab !== 'pid_tuning') {
GUI.active_tab = 'pid_tuning';
}
@ -854,40 +854,41 @@ TABS.pid_tuning.setDirty = function (isDirty) {
TABS.pid_tuning.checkUpdateProfile = function (updateRateProfile) {
var self = this;
if (semver.gte(CONFIG.flightControllerVersion, "3.0.0")
&& CONFIG.numProfiles === 2) {
$('.tab-pid_tuning select[name="profile"] .profile3').hide();
}
if (!self.updating && !self.dirty) {
var changedProfile = false;
if (self.currentProfile !== CONFIG.profile) {
self.setProfile();
changedProfile = true;
}
var changedRateProfile = false;
if (GUI.active_tab === 'pid_tuning') {
if (semver.gte(CONFIG.flightControllerVersion, "3.0.0")
&& updateRateProfile
&& self.currentRateProfile !== CONFIG.rateProfile) {
self.setRateProfile();
changedRateProfile = true;
&& CONFIG.numProfiles === 2) {
$('.tab-pid_tuning select[name="profile"] .profile3').hide();
}
if (changedProfile || changedRateProfile) {
self.refresh(function () {
if (changedProfile) {
GUI.log(chrome.i18n.getMessage('pidTuningReceivedProfile', [CONFIG.profile + 1]));
}
if (!self.updating && !self.dirty) {
var changedProfile = false;
if (self.currentProfile !== CONFIG.profile) {
self.setProfile();
if (changedRateProfile) {
GUI.log(chrome.i18n.getMessage('pidTuningReceivedRateProfile', [CONFIG.rateProfile + 1]));
}
});
changedProfile = true;
}
var changedRateProfile = false;
if (semver.gte(CONFIG.flightControllerVersion, "3.0.0")
&& updateRateProfile
&& self.currentRateProfile !== CONFIG.rateProfile) {
self.setRateProfile();
changedRateProfile = true;
}
if (changedProfile || changedRateProfile) {
self.refresh(function () {
if (changedProfile) {
GUI.log(chrome.i18n.getMessage('pidTuningReceivedProfile', [CONFIG.profile + 1]));
}
if (changedRateProfile) {
GUI.log(chrome.i18n.getMessage('pidTuningReceivedRateProfile', [CONFIG.rateProfile + 1]));
}
});
}
}
}
}

6
tabs/setup.js
View File

@ -141,10 +141,7 @@ TABS.setup.initialize = function (callback) {
return;
}
TABS.pid_tuning.setUpdating(true);
configuration_backup(function () {
TABS.pid_tuning.setUpdating(false);
GUI.log(chrome.i18n.getMessage('initialSetupBackupSuccess'));
});
});
@ -154,13 +151,10 @@ TABS.setup.initialize = function (callback) {
return;
}
TABS.pid_tuning.setUpdating(true);
configuration_restore(function () {
// get latest settings
TABS.setup.initialize();
TABS.pid_tuning.setUpdating(false);
GUI.log(chrome.i18n.getMessage('initialSetupRestoreSuccess'));
});
});