More disables

src/modules/RemoteHardwareModule.cpp

@@ -135,8 +135,7 @@ int32_t RemoteHardwareModule::runOnce()
         }
     } else {
         // No longer watching anything - stop using CPU
-        enabled = false;
+        return disable();
-        return INT32_MAX;
     }
 
     return 200; // Poll our GPIOs every 200ms (FIXME, make adjustable via protobuf arg)

src/modules/SerialModule.cpp

@@ -221,9 +221,7 @@ int32_t SerialModule::runOnce()
         return (10);
     } else {
         DEBUG_MSG("Serial Module Disabled\n");
-
+        return disable();
-        enabled = false;
-        return INT32_MAX;
     }
 }
 

src/modules/Telemetry/EnvironmentTelemetry.cpp

@@ -67,8 +67,7 @@ int32_t EnvironmentTelemetryModule::runOnce()
     if (!(moduleConfig.telemetry.environment_measurement_enabled ||
           moduleConfig.telemetry.environment_screen_enabled)) {
         // If this module is not enabled, and the user doesn't want the display screen don't waste any OSThread time on it
-        enabled = false;
+        return disable();
-        return result;
     }
 
     if (firstTime) {

src/modules/esp32/RangeTestModule.cpp

@@ -82,8 +82,7 @@ int32_t RangeTestModule::runOnce()
 
                 return (senderHeartbeat);
             } else {
-                enabled = false;
+                return disable();
-                return (INT32_MAX);
                 // This thread does not need to run as a receiver
             }
 

src/modules/esp32/StoreForwardModule.cpp

@@ -52,8 +52,7 @@ int32_t StoreForwardModule::runOnce()
         return (this->packetTimeMax);
     }
 #endif
-    enabled = false; // Client doesn't need periodical
+    return disable();
-    return (INT32_MAX);
 }
 
 /*