pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-02-02 10:50:40 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

don't depend on EXT_NOTIFY_OUT being defined.

Browse Source
This commit is contained in:
Thomas Göttgens 2022-10-22 13:45:43 +02:00
parent d4ddcdd91e
commit d817889255
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/ExternalNotificationModule.cpp
View File

@ -91,23 +91,19 @@ int32_t ExternalNotificationModule::runOnce()
void ExternalNotificationModule::setExternalOn() void ExternalNotificationModule::setExternalOn()
{ {
#ifdef EXT_NOTIFY_OUT
externalCurrentState = 1; externalCurrentState = 1;
externalTurnedOn = millis(); externalTurnedOn = millis();
digitalWrite(output, digitalWrite(output,
(moduleConfig.external_notification.active ? true : false)); (moduleConfig.external_notification.active ? true : false));
#endif
} }
void ExternalNotificationModule::setExternalOff() void ExternalNotificationModule::setExternalOff()
{ {
#ifdef EXT_NOTIFY_OUT
externalCurrentState = 0; externalCurrentState = 0;
digitalWrite(output, digitalWrite(output,
(moduleConfig.external_notification.active ? false : true)); (moduleConfig.external_notification.active ? false : true));
#endif
} }
// -------- // --------
@ -119,8 +115,6 @@ ExternalNotificationModule::ExternalNotificationModule()
// restrict to the admin channel for rx // restrict to the admin channel for rx
boundChannel = Channels::gpioChannel; boundChannel = Channels::gpioChannel;
#ifdef EXT_NOTIFY_OUT
/* /*
Uncomment the preferences below if you want to use the module Uncomment the preferences below if you want to use the module
without having to configure it from the PythonAPI or WebUI. without having to configure it from the PythonAPI or WebUI.
@ -155,13 +149,10 @@ ExternalNotificationModule::ExternalNotificationModule()
DEBUG_MSG("External Notification Module Disabled\n"); DEBUG_MSG("External Notification Module Disabled\n");
enabled = false; enabled = false;
} }
#endif
} }
ProcessMessage ExternalNotificationModule::handleReceived(const MeshPacket &mp) ProcessMessage ExternalNotificationModule::handleReceived(const MeshPacket &mp)
{ {
#ifdef EXT_NOTIFY_OUT
if (moduleConfig.external_notification.enabled) { if (moduleConfig.external_notification.enabled) {
if (getFrom(&mp) != nodeDB.getNodeNum()) { if (getFrom(&mp) != nodeDB.getNodeNum()) {
@ -195,7 +186,6 @@ ProcessMessage ExternalNotificationModule::handleReceived(const MeshPacket &mp)
} else { } else {
DEBUG_MSG("External Notification Module Disabled\n"); DEBUG_MSG("External Notification Module Disabled\n");
} }
#endif
return ProcessMessage::CONTINUE; // Let others look at this message also if they want return ProcessMessage::CONTINUE; // Let others look at this message also if they want
} }

2
src/modules/ExternalNotificationModule.h
View File

@ -12,7 +12,7 @@
*/ */
class ExternalNotificationModule : public SinglePortModule, private concurrency::OSThread class ExternalNotificationModule : public SinglePortModule, private concurrency::OSThread
{ {
uint32_t output = EXT_NOTIFY_OUT; uint32_t output = 0;
public: public:
ExternalNotificationModule(); ExternalNotificationModule();