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 #2879 from haslinghuis/fix_expert_mode

10.8-maintenance 10.8.0-RC4
J Blackman 2022-04-06 04:00:53 +10:00 committed by GitHub
parent 774405825e 2fb9308265
commit 04b4c7438c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/js/serial_backend.js
View File

@ -193,12 +193,6 @@ function finishClose(finishedCallback) {
// reset active sensor indicators // reset active sensor indicators
sensor_status(0); sensor_status(0);
// reset expert mode
ConfigStorage.get('permanentExpertMode', function (result) {
const checked = result.permanentExpertMode;
$('input[name="expertModeCheckbox"]').prop('checked', checked).trigger('change');
});
if (wasConnected) { if (wasConnected) {
// detach listeners and remove element data // detach listeners and remove element data
$('#content').empty(); $('#content').empty();
@ -232,7 +226,7 @@ function onOpen(openInfo) {
GUI.log(i18n.getMessage('serialPortOpened', serial.connectionType === 'serial' ? [serial.connectionId] : [openInfo.socketId])); GUI.log(i18n.getMessage('serialPortOpened', serial.connectionType === 'serial' ? [serial.connectionId] : [openInfo.socketId]));
// save selected port with chrome.storage if the port differs // save selected port with chrome.storage if the port differs
ConfigStorage.get('last_used_port', function (result) { let result = ConfigStorage.get('last_used_port');
if (result.last_used_port) { if (result.last_used_port) {
if (result.last_used_port !== GUI.connected_to) { if (result.last_used_port !== GUI.connected_to) {
// last used port doesn't match the one found in local db, we will store the new one // last used port doesn't match the one found in local db, we will store the new one
@ -242,7 +236,12 @@ function onOpen(openInfo) {
// variable isn't stored yet, saving // variable isn't stored yet, saving
ConfigStorage.set({'last_used_port': GUI.connected_to}); ConfigStorage.set({'last_used_port': GUI.connected_to});
} }
});
// reset expert mode
result = ConfigStorage.get('permanentExpertMode');
if (result.permanentExpertMode) {
$('input[name="expertModeCheckbox"]').prop('checked', result.permanentExpertMode).trigger('change');
}
serial.onReceive.addListener(read_serial); serial.onReceive.addListener(read_serial);
setConnectionTimeout(); setConnectionTimeout();