Merge pull request #2040 from iNavFlight/dzikuvx-groundstation-activa…

…tion Activate groundstation when MSP switches to LTM
iNavFlight · Apr 25, 2024 · a4fd2bc · a4fd2bc
2 parents 8103003 + aa8aee3
commit a4fd2bc
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/js/gui.js b/js/gui.js
@@ -91,7 +91,7 @@ GUI_control.prototype.log = function (message) {
 GUI_control.prototype.tab_switch_cleanup = function (callback) {
     MSP.callbacks_cleanup(); // we don't care about any old data that might or might not arrive
 
-    interval.killAll(['global_data_refresh', 'msp-load-update']);
+    interval.killAll(['global_data_refresh', 'msp-load-update', 'ltm-connection-check']);
     mspBalancedInterval.flush();
 
     if (this.active_tab) {

diff --git a/js/intervals.js b/js/intervals.js
@@ -111,6 +111,8 @@ var interval = function () {
     publicScope.killAll = function (keep_array) {
         var timers_killed = 0;
 
+        console.log('Killing all intervals except: ' + keep_array);
+
         for (var i = (privateScope.intervals.length - 1); i >= 0; i--) { // reverse iteration
             var keep = false;
             if (keep_array) { // only run through the array if it exists
@@ -131,6 +133,10 @@ var interval = function () {
         return timers_killed;
     };
 
+    publicScope.list = function () {
+        return privateScope.intervals;
+    };
+
     return publicScope;
 }();
 

diff --git a/tabs/firmware_flasher.js b/tabs/firmware_flasher.js
@@ -774,7 +774,7 @@ TABS.firmware_flasher.onValidFirmware = function() {
 
 TABS.firmware_flasher.closeTempConnection = function() {
     timeout.killAll();
-    interval.killAll(['global_data_refresh', 'msp-load-update']);
+    interval.killAll(['global_data_refresh', 'msp-load-update', 'ltm-connection-check']);
     mspBalancedInterval.flush();
 
     mspQueue.flush();

diff --git a/tabs/logging.js b/tabs/logging.js
@@ -105,7 +105,7 @@ TABS.logging.initialize = function (callback) {
                             GUI.log(i18n.getMessage('loggingErrorOneProperty'));
                         }
                     } else {
-                        interval.killAll(['global_data_refresh', 'msp-load-update']);
+                        interval.killAll(['global_data_refresh', 'msp-load-update', 'ltm-connection-check']);
                         mspBalancedInterval.flush();
 
                         $('.speed').prop('disabled', false);

diff --git a/tabs/outputs.js b/tabs/outputs.js
@@ -429,7 +429,7 @@ TABS.outputs.initialize = function (callback) {
             $voltageHelper = $(".current-voltage");
 
         // timer initialization
-        interval.killAll(['motor_and_status_pull', 'global_data_refresh', 'msp-load-update']);
+        interval.killAll(['motor_and_status_pull', 'global_data_refresh', 'msp-load-update', 'ltm-connection-check']);
         mspBalancedInterval.flush();
 
         interval.add('IMU_pull', function () {

diff --git a/tabs/sensors.js b/tabs/sensors.js
@@ -437,7 +437,7 @@ TABS.sensors.initialize = function (callback) {
             });
 
             // timer initialization
-            interval.killAll(['status_pull', 'global_data_refresh', 'msp-load-update']);
+            interval.killAll(['status_pull', 'global_data_refresh', 'msp-load-update', 'ltm-connection-check']);
 
             // data pulling timers
             if (checkboxes[0] || checkboxes[1] || checkboxes[2]) {