pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-10-03 13:55:45 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

save CPU cycles in ExternalNotificationModule

Browse Source 
e.g. no need for a 25ms loop when we only blink a LED at 1sec
This commit is contained in:
Links2004 2025-09-24 17:02:52 +02:00
parent 85cdcad194
commit 2fdc0d0928
No known key found for this signature in database
GPG Key ID: 68FB9F01C0C482FC
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/modules/ExternalNotificationModule.cpp
View File

@ -69,7 +69,7 @@ bool ascending = true;
#endif #endif
#define EXT_NOTIFICATION_MODULE_OUTPUT_MS 1000 #define EXT_NOTIFICATION_MODULE_OUTPUT_MS 1000
#define EXT_NOTIFICATION_DEFAULT_THREAD_MS 25 #define EXT_NOTIFICATION_FAST_THREAD_MS 25
#define ASCII_BELL 0x07 #define ASCII_BELL 0x07
@ -88,7 +88,7 @@ int32_t ExternalNotificationModule::runOnce()
if (!moduleConfig.external_notification.enabled) { if (!moduleConfig.external_notification.enabled) {
return INT32_MAX; // we don't need this thread here... return INT32_MAX; // we don't need this thread here...
} else { } else {
uint32_t delay = EXT_NOTIFICATION_MODULE_OUTPUT_MS;
bool isPlaying = rtttl::isPlaying(); bool isPlaying = rtttl::isPlaying();
#ifdef HAS_I2S #ifdef HAS_I2S
isPlaying = rtttl::isPlaying() || audioThread->isPlaying(); isPlaying = rtttl::isPlaying() || audioThread->isPlaying();
@ -116,21 +116,16 @@ int32_t ExternalNotificationModule::runOnce()
// If the output is turned on, turn it back off after the given period of time. // If the output is turned on, turn it back off after the given period of time.
if (isNagging) { if (isNagging) {
if (externalTurnedOn[0] + (moduleConfig.external_notification.output_ms ? moduleConfig.external_notification.output_ms delay = (moduleConfig.external_notification.output_ms ? moduleConfig.external_notification.output_ms
: EXT_NOTIFICATION_MODULE_OUTPUT_MS) < : EXT_NOTIFICATION_MODULE_OUTPUT_MS);
millis()) { if (externalTurnedOn[0] + delay < millis()) {
setExternalState(0, !getExternal(0)); setExternalState(0, !getExternal(0));
} }
if (externalTurnedOn[1] + (moduleConfig.external_notification.output_ms ? moduleConfig.external_notification.output_ms if (externalTurnedOn[1] + delay < millis()) {
: EXT_NOTIFICATION_MODULE_OUTPUT_MS) <
millis()) {
setExternalState(1, !getExternal(1)); setExternalState(1, !getExternal(1));
} }
// Only toggle buzzer output if not using PWM mode (to avoid conflict with RTTTL) // Only toggle buzzer output if not using PWM mode (to avoid conflict with RTTTL)
if (!moduleConfig.external_notification.use_pwm && if (!moduleConfig.external_notification.use_pwm && externalTurnedOn[2] + delay < millis()) {
externalTurnedOn[2] + (moduleConfig.external_notification.output_ms ? moduleConfig.external_notification.output_ms
: EXT_NOTIFICATION_MODULE_OUTPUT_MS) <
millis()) {
LOG_DEBUG("EXTERNAL 2 %d compared to %d", externalTurnedOn[2] + moduleConfig.external_notification.output_ms, LOG_DEBUG("EXTERNAL 2 %d compared to %d", externalTurnedOn[2] + moduleConfig.external_notification.output_ms,
millis()); millis());
setExternalState(2, !getExternal(2)); setExternalState(2, !getExternal(2));
@ -181,6 +176,8 @@ int32_t ExternalNotificationModule::runOnce()
colorState = 1; colorState = 1;
} }
} }
// we need fast updates for the color change
delay = EXT_NOTIFICATION_FAST_THREAD_MS;
#endif #endif
#ifdef T_WATCH_S3 #ifdef T_WATCH_S3
@ -206,9 +203,11 @@ int32_t ExternalNotificationModule::runOnce()
// start the song again if we have time left // start the song again if we have time left
rtttl::begin(config.device.buzzer_gpio, rtttlConfig.ringtone); rtttl::begin(config.device.buzzer_gpio, rtttlConfig.ringtone);
} }
// we need fast updates to play the RTTTL
delay = EXT_NOTIFICATION_FAST_THREAD_MS;
} }
return EXT_NOTIFICATION_DEFAULT_THREAD_MS; return delay;
} }
} }