pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-24 01:16:55 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

fix master too

Browse Source
This commit is contained in:
Thomas Göttgens 2022-12-28 16:03:34 +01:00
parent 63cf01223c
commit 6ea0963f4b
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/ExternalNotificationModule.cpp
View File

@ -37,7 +37,11 @@ int32_t ExternalNotificationModule::runOnce()
if (!moduleConfig.external_notification.enabled) {
return INT32_MAX; // we don't need this thread here...
} else {
#ifndef ARCH_PORTDUINO
if ((nagCycleCutoff < millis()) && !rtttl::isPlaying()) {
#else
if (nagCycleCutoff < millis()) {
#endif
nagCycleCutoff = UINT32_MAX;
DEBUG_MSG("Turning off external notification: ");
for (int i = 0; i < 2; i++) {
@ -71,6 +75,7 @@ int32_t ExternalNotificationModule::runOnce()
}
// now let the PWM buzzer play
#ifndef ARCH_PORTDUINO
if (moduleConfig.external_notification.use_pwm) {
if (rtttl::isPlaying()) {
rtttl::play();
@ -79,6 +84,7 @@ int32_t ExternalNotificationModule::runOnce()
rtttl::begin(config.device.buzzer_gpio, pwmRingtone);
}
}
#endif
return 25;
}
}
@ -129,7 +135,9 @@ bool ExternalNotificationModule::getExternal(uint8_t index)
}
void ExternalNotificationModule::stopNow() {
#ifndef ARCH_PORTDUINO
rtttl::stop();
#endif
nagCycleCutoff = 1; // small value
setIntervalFromNow(0);
}
@ -240,7 +248,9 @@ ProcessMessage ExternalNotificationModule::handleReceived(const MeshPacket &mp)
if (!moduleConfig.external_notification.use_pwm) {
setExternalOn(2);
} else {
#ifndef ARCH_PORTDUINO
rtttl::begin(config.device.buzzer_gpio, pwmRingtone);
#endif
}
if (moduleConfig.external_notification.nag_timeout) {
nagCycleCutoff = millis() + moduleConfig.external_notification.nag_timeout * 1000;
@ -276,7 +286,9 @@ ProcessMessage ExternalNotificationModule::handleReceived(const MeshPacket &mp)
if (!moduleConfig.external_notification.use_pwm) {
setExternalOn(2);
} else {
#ifndef ARCH_PORTDUINO
rtttl::begin(config.device.buzzer_gpio, pwmRingtone);
#endif
}
if (moduleConfig.external_notification.nag_timeout) {
nagCycleCutoff = millis() + moduleConfig.external_notification.nag_timeout * 1000;

2
src/modules/ExternalNotificationModule.h
View File

@ -3,7 +3,9 @@
#include "SinglePortModule.h"
#include "concurrency/OSThread.h"
#include "configuration.h"
#ifndef ARCH_PORTDUINO
#include <NonBlockingRtttl.h>
#endif
#include <Arduino.h>
#include <functional>