rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-14 14:52:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix dismiss of ext. notification (#8512)

Browse Source 
* Dismiss all ext notifications with any input broker event

* Account for nagging
This commit is contained in:
Ben Meadors
2025-11-01 21:11:36 -05:00
committed by GitHub
parent bca0e1abde
commit a7796fc7b4
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/input/InputBroker.cpp
View File

@@ -1,5 +1,7 @@
#include "InputBroker.h" #include "InputBroker.h"
#include "PowerFSM.h" // needed for event trigger #include "PowerFSM.h" // needed for event trigger
#include "configuration.h"
#include "modules/ExternalNotificationModule.h"
InputBroker *inputBroker = nullptr; InputBroker *inputBroker = nullptr;
@@ -48,6 +50,12 @@ void InputBroker::processInputEventQueue()
int InputBroker::handleInputEvent(const InputEvent *event) int InputBroker::handleInputEvent(const InputEvent *event)
{ {
powerFSM.trigger(EVENT_INPUT); // todo: not every input should wake, like long hold release powerFSM.trigger(EVENT_INPUT); // todo: not every input should wake, like long hold release
if (event && event->inputEvent != INPUT_BROKER_NONE && externalNotificationModule &&
moduleConfig.external_notification.enabled) {
externalNotificationModule->stopNow();
}
this->notifyObservers(event); this->notifyObservers(event);
return 0; return 0;
} }

4
src/modules/ExternalNotificationModule.cpp
View File

@@ -325,6 +325,10 @@ void ExternalNotificationModule::stopNow()
drv.stop(); drv.stop();
#endif #endif
// Prevent the state machine from immediately re-triggering outputs after a manual stop.
isNagging = false;
nagCycleCutoff = UINT32_MAX;
#ifdef HAS_I2S #ifdef HAS_I2S
// GPIO0 is used as mclk for I2S audio and set to OUTPUT by the sound library // GPIO0 is used as mclk for I2S audio and set to OUTPUT by the sound library
// T-Deck uses GPIO0 as trackball button, so restore the mode // T-Deck uses GPIO0 as trackball button, so restore the mode