From 110c80d04585825e752ed3c585bbe986d194d114 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Thu, 29 Dec 2022 16:54:39 -0600 Subject: [PATCH] Make disable return an int32_t for runOnce usage --- src/concurrency/OSThread.cpp | 4 +++- src/concurrency/OSThread.h | 2 +- src/modules/esp32/AudioModule.cpp | 3 +-- src/mqtt/MQTT.cpp | 3 +-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/concurrency/OSThread.cpp b/src/concurrency/OSThread.cpp index 53058de6a..4e6bf1b5f 100644 --- a/src/concurrency/OSThread.cpp +++ b/src/concurrency/OSThread.cpp @@ -93,10 +93,12 @@ void OSThread::run() currentThread = NULL; } -void OSThread::disable() +int32_t OSThread::disable() { enabled = false; setInterval(INT32_MAX); + + return INT32_MAX; } /** diff --git a/src/concurrency/OSThread.h b/src/concurrency/OSThread.h index f0071c516..aa8e3e2d8 100644 --- a/src/concurrency/OSThread.h +++ b/src/concurrency/OSThread.h @@ -53,7 +53,7 @@ class OSThread : public Thread static void setup(); - void disable(); + int32_t disable(); /** * Wait a specified number msecs starting from the current time (rather than the last time we were run) diff --git a/src/modules/esp32/AudioModule.cpp b/src/modules/esp32/AudioModule.cpp index 25762aa3f..a0dffd0eb 100644 --- a/src/modules/esp32/AudioModule.cpp +++ b/src/modules/esp32/AudioModule.cpp @@ -260,8 +260,7 @@ int32_t AudioModule::runOnce() return 100; } else { DEBUG_MSG("Audio Module Disabled\n"); - enabled = false; - return INT32_MAX; + return disable(); } } diff --git a/src/mqtt/MQTT.cpp b/src/mqtt/MQTT.cpp index 4cd6dcee4..08b16f287 100644 --- a/src/mqtt/MQTT.cpp +++ b/src/mqtt/MQTT.cpp @@ -244,8 +244,7 @@ bool MQTT::wantsLink() const int32_t MQTT::runOnce() { if(!moduleConfig.mqtt.enabled) { - enabled = false; - return INT32_MAX; + return disable(); } bool wantConnection = wantsLink();