pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-21 04:22:22 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

#654 - Work in progress. Needs testing, non-blocking alert and integration with configuration

Browse Source
This commit is contained in:
Jm Casler 2021-01-27 21:20:18 -08:00
parent 2246564279
commit 5e303f8a1f
2 changed files with 50 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/plugins/ExternalNotificationPlugin.cpp
View File

@ -10,15 +10,30 @@
/* /*
This plugin supports:
https://github.com/meshtastic/Meshtastic-device/issues/654
bool ext_notification_plugin_enabled = 126; bool ext_notification_plugin_enabled = 126;
uint32 ext_notification_plugin_output_ms = 127;
uint32 ext_notification_plugin_output = 128;
bool ext_notification_plugin_active = 129; bool ext_notification_plugin_active = 129;
bool ext_notification_plugin_alert_message = 130; bool ext_notification_plugin_alert_message = 130;
bool ext_notification_plugin_alert_bell = 131; bool ext_notification_plugin_alert_bell = 131;
uint32 ext_notification_plugin_output = 128;
uint32 ext_notification_plugin_output_ms = 127;
*/ */
#define EXT_NOTIFICATION_PLUGIN_ENABLED 1
#define EXT_NOTIFICATION_PLUGIN_ACTIVE 1
#define EXT_NOTIFICATION_PLUGIN_ALERT_MESSAGE 1
#define EXT_NOTIFICATION_PLUGIN_ALERT_BELL 1
#define EXT_NOTIFICATION_PLUGIN_OUTPUT 13
#define EXT_NOTIFICATION_PLUGIN_OUTPUT_MS 100
#define ASCII_BELL 0x07
ExternalNotificationPlugin *externalNotificationPlugin; ExternalNotificationPlugin *externalNotificationPlugin;
ExternalNotificationPluginRadio *externalNotificationPluginRadio; ExternalNotificationPluginRadio *externalNotificationPluginRadio;
@ -36,7 +51,7 @@ int32_t ExternalNotificationPlugin::runOnce()
// radioConfig.preferences.externalnotificationplugin_enabled = 1; // radioConfig.preferences.externalnotificationplugin_enabled = 1;
// radioConfig.preferences.externalnotificationplugin_mode = 1; // radioConfig.preferences.externalnotificationplugin_mode = 1;
if (1) { if (EXT_NOTIFICATION_PLUGIN_ENABLED) {
if (firstTime) { if (firstTime) {
@ -47,10 +62,10 @@ int32_t ExternalNotificationPlugin::runOnce()
firstTime = 0; firstTime = 0;
// Set the direction of a pin // Set the direction of a pin
pinMode(13, OUTPUT); pinMode(EXT_NOTIFICATION_PLUGIN_OUTPUT, OUTPUT);
// if ext_notification_plugin_active // if ext_notification_plugin_active
if (1) { if (EXT_NOTIFICATION_PLUGIN_ACTIVE) {
setExternalOff(); setExternalOff();
} else { } else {
setExternalOn(); setExternalOn();
@ -78,22 +93,26 @@ int32_t ExternalNotificationPlugin::runOnce()
void ExternalNotificationPlugin::setExternalOn() void ExternalNotificationPlugin::setExternalOn()
{ {
externalCurrentState = 1;
// if ext_notification_plugin_active // if ext_notification_plugin_active
if (1) { if (EXT_NOTIFICATION_PLUGIN_ACTIVE) {
digitalWrite(13, true); digitalWrite(EXT_NOTIFICATION_PLUGIN_OUTPUT, true);
} else { } else {
digitalWrite(13, false); digitalWrite(EXT_NOTIFICATION_PLUGIN_OUTPUT, false);
} }
} }
void ExternalNotificationPlugin::setExternalOff() void ExternalNotificationPlugin::setExternalOff()
{ {
externalCurrentState = 0;
// if ext_notification_plugin_active // if ext_notification_plugin_active
if (1) { if (EXT_NOTIFICATION_PLUGIN_ACTIVE) {
digitalWrite(13, false); digitalWrite(EXT_NOTIFICATION_PLUGIN_OUTPUT, false);
} else { } else {
digitalWrite(13, true); digitalWrite(EXT_NOTIFICATION_PLUGIN_OUTPUT, true);
} }
} }
@ -111,25 +130,31 @@ bool ExternalNotificationPluginRadio::handleReceived(const MeshPacket &mp)
{ {
#ifndef NO_ESP32 #ifndef NO_ESP32
if (1) { if (EXT_NOTIFICATION_PLUGIN_ENABLED) {
auto &p = mp.decoded.data; auto &p = mp.decoded.data;
if (mp.from != nodeDB.getNodeNum()) { if (mp.from != nodeDB.getNodeNum()) {
/* if (EXT_NOTIFICATION_PLUGIN_ALERT_BELL) {
TODO: If ext_notification_plugin_alert_bell is true and we see a bell character, trigger an external notification. for (int i = 0; i < p.payload.size; i++) {
*/ if (p.payload.bytes[i] == ASCII_BELL) {
// TODO: Check p.payload.bytes to see if it contains a bell character. If it does, trigger an external notifcation. externalNotificationPlugin->setExternalOn();
/* // TODO: Make this non-blocking.
TODO: If ext_notification_plugin_alert_message is true, trigger an external notification. delay(EXT_NOTIFICATION_PLUGIN_OUTPUT_MS);
*/ externalNotificationPlugin->setExternalOff();
// TODO: On received packet, blink the LED. }
externalNotificationPlugin->setExternalOn(); }
delay(500); }
externalNotificationPlugin->setExternalOff();
if (EXT_NOTIFICATION_PLUGIN_ALERT_MESSAGE) {
externalNotificationPlugin->setExternalOn();
// TODO: Make this non-blocking.
delay(EXT_NOTIFICATION_PLUGIN_OUTPUT_MS);
externalNotificationPlugin->setExternalOff();
}
} }
} else { } else {

2
src/plugins/ExternalNotificationPlugin.h
View File

@ -10,12 +10,14 @@
class ExternalNotificationPlugin : private concurrency::OSThread class ExternalNotificationPlugin : private concurrency::OSThread
{ {
bool firstTime = 1; bool firstTime = 1;
bool externalCurrentState = 0;
public: public:
ExternalNotificationPlugin(); ExternalNotificationPlugin();
void setExternalOn(); void setExternalOn();
void setExternalOff(); void setExternalOff();
void getExternal();
protected: protected:
virtual int32_t runOnce(); virtual int32_t runOnce();