mirror of
https://github.com/meshtastic/firmware.git
synced 2025-06-09 14:42:05 +00:00
Refactor OSThread consumers to use disable()
This commit is contained in:
parent
a8f93d5f47
commit
38a1315599
@ -93,10 +93,10 @@ void OSThread::run()
|
|||||||
currentThread = NULL;
|
currentThread = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
void OSThread::disable() {
|
void OSThread::disable()
|
||||||
|
{
|
||||||
enabled = false;
|
enabled = false;
|
||||||
setInterval(INT32_MAX);
|
setInterval(INT32_MAX);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -9,8 +9,7 @@ void RotaryEncoderInterruptImpl1::init()
|
|||||||
{
|
{
|
||||||
if (!moduleConfig.canned_message.rotary1_enabled) {
|
if (!moduleConfig.canned_message.rotary1_enabled) {
|
||||||
// Input device is disabled.
|
// Input device is disabled.
|
||||||
setInterval(INT32_MAX);
|
disable();
|
||||||
enabled = false;
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -12,9 +12,7 @@ void CardKbI2cImpl::init()
|
|||||||
{
|
{
|
||||||
if (cardkb_found != CARDKB_ADDR)
|
if (cardkb_found != CARDKB_ADDR)
|
||||||
{
|
{
|
||||||
// Input device is not detected.
|
disable();
|
||||||
setInterval(INT32_MAX);
|
|
||||||
enabled = false;
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -167,16 +167,14 @@ WebServerThread *webServerThread;
|
|||||||
|
|
||||||
WebServerThread::WebServerThread() : concurrency::OSThread("WebServerThread") {
|
WebServerThread::WebServerThread() : concurrency::OSThread("WebServerThread") {
|
||||||
if (!config.network.wifi_enabled) {
|
if (!config.network.wifi_enabled) {
|
||||||
setInterval(INT32_MAX);
|
disable();
|
||||||
enabled = false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t WebServerThread::runOnce()
|
int32_t WebServerThread::runOnce()
|
||||||
{
|
{
|
||||||
if (!config.network.wifi_enabled) {
|
if (!config.network.wifi_enabled) {
|
||||||
setInterval(INT32_MAX);
|
disable();
|
||||||
enabled = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
handleWebResponse();
|
handleWebResponse();
|
||||||
|
@ -55,16 +55,14 @@ CannedMessageModule::CannedMessageModule()
|
|||||||
if ((this->splitConfiguredMessages() <= 0) && (cardkb_found != CARDKB_ADDR)) {
|
if ((this->splitConfiguredMessages() <= 0) && (cardkb_found != CARDKB_ADDR)) {
|
||||||
DEBUG_MSG("CannedMessageModule: No messages are configured. Module is disabled\n");
|
DEBUG_MSG("CannedMessageModule: No messages are configured. Module is disabled\n");
|
||||||
this->runState = CANNED_MESSAGE_RUN_STATE_DISABLED;
|
this->runState = CANNED_MESSAGE_RUN_STATE_DISABLED;
|
||||||
setInterval(INT32_MAX);
|
disable();
|
||||||
enabled = false;
|
|
||||||
} else {
|
} else {
|
||||||
DEBUG_MSG("CannedMessageModule is enabled\n");
|
DEBUG_MSG("CannedMessageModule is enabled\n");
|
||||||
this->inputObserver.observe(inputBroker);
|
this->inputObserver.observe(inputBroker);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
this->runState = CANNED_MESSAGE_RUN_STATE_DISABLED;
|
this->runState = CANNED_MESSAGE_RUN_STATE_DISABLED;
|
||||||
setInterval(INT32_MAX);
|
disable();
|
||||||
enabled = false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -199,8 +199,7 @@ ExternalNotificationModule::ExternalNotificationModule()
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
DEBUG_MSG("External Notification Module Disabled\n");
|
DEBUG_MSG("External Notification Module Disabled\n");
|
||||||
setInterval(INT32_MAX);
|
disable();
|
||||||
enabled = false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -139,8 +139,7 @@ AudioModule::AudioModule() : SinglePortModule("AudioModule", PortNum_AUDIO_APP),
|
|||||||
DEBUG_MSG(" using %d frames of %d bytes for a total payload length of %d bytes\n", encode_frame_num, encode_codec_size, encode_frame_size);
|
DEBUG_MSG(" using %d frames of %d bytes for a total payload length of %d bytes\n", encode_frame_num, encode_codec_size, encode_frame_size);
|
||||||
xTaskCreate(&run_codec2, "codec2_task", 30000, NULL, 5, &codec2HandlerTask);
|
xTaskCreate(&run_codec2, "codec2_task", 30000, NULL, 5, &codec2HandlerTask);
|
||||||
} else {
|
} else {
|
||||||
setInterval(INT32_MAX);
|
disable();
|
||||||
enabled = false;
|
|
||||||
DEBUG_MSG("Codec2 disabled (AudioModule %d, Region %s, permitted %d)\n", moduleConfig.audio.codec2_enabled, myRegion->name, myRegion->audioPermitted);
|
DEBUG_MSG("Codec2 disabled (AudioModule %d, Region %s, permitted %d)\n", moduleConfig.audio.codec2_enabled, myRegion->name, myRegion->audioPermitted);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -460,8 +460,7 @@ StoreForwardModule::StoreForwardModule()
|
|||||||
DEBUG_MSG("*** Initializing Store & Forward Module in Client mode\n");
|
DEBUG_MSG("*** Initializing Store & Forward Module in Client mode\n");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
setInterval(INT32_MAX);
|
disable();
|
||||||
enabled = false;
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -137,8 +137,7 @@ MQTT::MQTT() : concurrency::OSThread("mqtt"), pubSub(mqttClient), mqttQueue(MAX_
|
|||||||
|
|
||||||
// preflightSleepObserver.observe(&preflightSleep);
|
// preflightSleepObserver.observe(&preflightSleep);
|
||||||
} else {
|
} else {
|
||||||
setInterval(INT32_MAX);
|
disable();
|
||||||
enabled = false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user