diff --git a/src/js/gui.js b/src/js/gui.js index 54e24712..b29d2cc2 100644 --- a/src/js/gui.js +++ b/src/js/gui.js @@ -323,17 +323,11 @@ GUI_control.prototype.content_ready = function (callback) { GUI_control.prototype.selectDefaultTabWhenConnected = function() { chrome.storage.local.get(['rememberLastTab', 'lastTab'], function (result) { - let fallbackTab = '#tabs ul.mode-connected .tab_setup a'; if (!(result.rememberLastTab && !!result.lastTab)) { - $(fallbackTab).click(); + $('#tabs ul.mode-connected .tab_setup a').click(); return; } - let $savedTab = $("#tabs ul.mode-connected ." + result.lastTab + " a"); - if (!!$savedTab.data("ignore-reopen")) { - $(fallbackTab).click(); - } else { - $savedTab.click(); - } + $("#tabs ul.mode-connected ." + result.lastTab + " a").click(); }); }; diff --git a/src/js/main.js b/src/js/main.js index b4c66ad1..0d8c308a 100644 --- a/src/js/main.js +++ b/src/js/main.js @@ -98,7 +98,7 @@ function startProcess() { GUI.tab_switch_cleanup(function () { // disable previously active tab highlight $('li', ui_tabs).removeClass('active'); - + // Highlight selected tab $(self).parent().addClass('active'); diff --git a/src/js/tabs/motors.js b/src/js/tabs/motors.js index d90e3fa4..d8d6e4d5 100644 --- a/src/js/tabs/motors.js +++ b/src/js/tabs/motors.js @@ -45,7 +45,11 @@ TABS.motors.initialize = function (callback) { } function load_motor_data() { - MSP.send_message(MSPCodes.MSP_MOTOR, false, false, load_html); + MSP.send_message(MSPCodes.MSP_MOTOR, false, false, load_mixer_config); + } + + function load_mixer_config() { + MSP.send_message(MSPCodes.MSP_MIXER_CONFIG, false, false, load_html); } function load_html() { diff --git a/src/js/tabs/pid_tuning.js b/src/js/tabs/pid_tuning.js index c29c574b..ca60d0ca 100755 --- a/src/js/tabs/pid_tuning.js +++ b/src/js/tabs/pid_tuning.js @@ -39,9 +39,13 @@ TABS.pid_tuning.initialize = function (callback) { }).then(function() { return MSP.promise(MSPCodes.MSP_RC_DEADBAND); }).then(function() { - $('#content').load("./tabs/pid_tuning.html", process_html); + MSP.send_message(MSPCodes.MSP_MIXER_CONFIG, false, false, load_html); }); + function load_html() { + $('#content').load("./tabs/pid_tuning.html", process_html); + } + function pid_and_rc_to_form() { self.setProfile(); if (semver.gte(CONFIG.apiVersion, "1.20.0")) { diff --git a/src/js/tabs/receiver.js b/src/js/tabs/receiver.js index 2347065a..3d252bef 100644 --- a/src/js/tabs/receiver.js +++ b/src/js/tabs/receiver.js @@ -40,7 +40,7 @@ TABS.receiver.initialize = function (callback) { } function load_rx_config() { - var next_callback = load_html; + var next_callback = load_mixer_config; if (semver.gte(CONFIG.apiVersion, "1.20.0")) { MSP.send_message(MSPCodes.MSP_RX_CONFIG, false, false, next_callback); } else { @@ -48,6 +48,10 @@ TABS.receiver.initialize = function (callback) { } } + function load_mixer_config() { + MSP.send_message(MSPCodes.MSP_MIXER_CONFIG, false, false, load_html); + } + function load_html() { $('#content').load("./tabs/receiver.html", process_html); }