Merge pull request #1839 from meshtastic/pwm-notify

use PWM buzzer on notification module.

src/mesh/http/ContentHandler.cpp

@@ -251,7 +251,7 @@ void htmlDeleteDir(const char *dirname)
 std::vector<std::map<char *, char *>> *htmlListDir(std::vector<std::map<char *, char *>> *fileList, const char *dirname,
                                                    uint8_t levels)
 {
-    File root = FSCom.open(dirname);
+    File root = FSCom.open(dirname, FILE_O_READ);
     if (!root) {
         return NULL;
     }
@@ -264,14 +264,27 @@ std::vector<std::map<char *, char *>> *htmlListDir(std::vector<std::map<char *,
     while (file) {
         if (file.isDirectory() && !String(file.name()).endsWith(".")) {
             if (levels) {
+#ifdef ARCH_ESP32
+                htmlListDir(fileList, file.path(), levels - 1);
+#else                
                 htmlListDir(fileList, file.name(), levels - 1);
+#endif
+                file.close();
             }
         } else {
             std::map<char *, char *> thisFileMap;
             thisFileMap[strdup("size")] = strdup(String(file.size()).c_str());
+#ifdef ARCH_ESP32            
+            thisFileMap[strdup("name")] = strdup(String(file.path()).substring(1).c_str());
+#else
             thisFileMap[strdup("name")] = strdup(String(file.name()).substring(1).c_str());
+#endif
             if (String(file.name()).substring(1).endsWith(".gz")) {
+#ifdef ARCH_ESP32
+                String modifiedFile = String(file.path()).substring(1);
+#else
                 String modifiedFile = String(file.name()).substring(1);
+#endif
                 modifiedFile.remove((modifiedFile.length() - 3), 3);
                 thisFileMap[strdup("nameModified")] = strdup(modifiedFile.c_str());
             }
@@ -291,7 +304,7 @@ void handleFsBrowseStatic(HTTPRequest *req, HTTPResponse *res)
     res->setHeader("Access-Control-Allow-Methods", "GET");
 
     using namespace json11;
-    auto fileList = htmlListDir(new std::vector<std::map<char *, char *>>(), "/", 10);
+    auto fileList = htmlListDir(new std::vector<std::map<char *, char *>>(), "/static", 10);
 
     // create json output structure
     Json filesystemObj = Json::object{

src/modules/ExternalNotificationModule.cpp

@@ -3,9 +3,14 @@
 #include "NodeDB.h"
 #include "RTC.h"
 #include "Router.h"
+#include "buzz/buzz.h"
 #include "configuration.h"
 #include <Arduino.h>
 
+#ifndef PIN_BUZZER
+#define PIN_BUZZER false
+#endif
+
 //#include <assert.h>
 
 /*
@@ -44,7 +49,11 @@
 */
 
 // Default configurations
+#ifdef EXT_NOTIFY_OUT
 #define EXT_NOTIFICATION_MODULE_OUTPUT EXT_NOTIFY_OUT
+#else
+#define EXT_NOTIFICATION_MODULE_OUTPUT 0
+#endif
 #define EXT_NOTIFICATION_MODULE_OUTPUT_MS 1000
 
 #define ASCII_BELL 0x07
@@ -75,7 +84,9 @@ int32_t ExternalNotificationModule::runOnce()
                                     : EXT_NOTIFICATION_MODULE_OUTPUT_MS) <
             millis()) {
             DEBUG_MSG("Turning off external notification\n");
-            setExternalOff();
+            if (output != PIN_BUZZER) {
+                setExternalOff();
+            }
         }
     }
 
@@ -84,27 +95,19 @@ int32_t ExternalNotificationModule::runOnce()
 
 void ExternalNotificationModule::setExternalOn()
 {
-#ifdef EXT_NOTIFY_OUT
     externalCurrentState = 1;
     externalTurnedOn = millis();
 
-    digitalWrite((moduleConfig.external_notification.output
-                      ? moduleConfig.external_notification.output
-                      : EXT_NOTIFICATION_MODULE_OUTPUT),
+    digitalWrite(output,
                  (moduleConfig.external_notification.active ? true : false));
-#endif
 }
 
 void ExternalNotificationModule::setExternalOff()
 {
-#ifdef EXT_NOTIFY_OUT
     externalCurrentState = 0;
 
-    digitalWrite((moduleConfig.external_notification.output
-                      ? moduleConfig.external_notification.output
-                      : EXT_NOTIFICATION_MODULE_OUTPUT),
+    digitalWrite(output,
                  (moduleConfig.external_notification.active ? false : true));
-#endif
 }
 
 // --------
@@ -116,8 +119,6 @@ ExternalNotificationModule::ExternalNotificationModule()
     // restrict to the admin channel for rx
     boundChannel = Channels::gpioChannel;
 
-#ifdef EXT_NOTIFY_OUT
-
     /*
         Uncomment the preferences below if you want to use the module
         without having to configure it from the PythonAPI or WebUI.
@@ -135,25 +136,27 @@ ExternalNotificationModule::ExternalNotificationModule()
 
         DEBUG_MSG("Initializing External Notification Module\n");
 
-        // Set the direction of a pin
-        pinMode((moduleConfig.external_notification.output
-                     ? moduleConfig.external_notification.output
-                     : EXT_NOTIFICATION_MODULE_OUTPUT),
-                OUTPUT);
+        output = moduleConfig.external_notification.output
+                        ? moduleConfig.external_notification.output
+                        : EXT_NOTIFICATION_MODULE_OUTPUT;
 
-        // Turn off the pin
-        setExternalOff();
+        if (output != PIN_BUZZER) {
+            // Set the direction of a pin
+            DEBUG_MSG("Using Pin %i in digital mode\n", output);
+            pinMode(output, OUTPUT);
+            // Turn off the pin
+            setExternalOff();
+        } else{
+            DEBUG_MSG("Using Pin %i in PWM mode\n", output);
+        }
     } else {
         DEBUG_MSG("External Notification Module Disabled\n");
         enabled = false;
     }
-#endif
 }
 
 ProcessMessage ExternalNotificationModule::handleReceived(const MeshPacket &mp)
 {
-#ifdef EXT_NOTIFY_OUT
-
     if (moduleConfig.external_notification.enabled) {
 
         if (getFrom(&mp) != nodeDB.getNodeNum()) {
@@ -165,21 +168,28 @@ ProcessMessage ExternalNotificationModule::handleReceived(const MeshPacket &mp)
                 DEBUG_MSG("externalNotificationModule - Notification Bell\n");
                 for (int i = 0; i < p.payload.size; i++) {
                     if (p.payload.bytes[i] == ASCII_BELL) {
-                        setExternalOn();
+                        if (output != PIN_BUZZER) {
+                            setExternalOn();
+                        } else {
+                            playBeep();
+                        }
                     }
                 }
             }
 
             if (moduleConfig.external_notification.alert_message) {
                 DEBUG_MSG("externalNotificationModule - Notification Module\n");
-                setExternalOn();
+                if (output != PIN_BUZZER) {
+                    setExternalOn();
+                } else {
+                    playBeep();
+                }
             }
         }
 
     } else {
         DEBUG_MSG("External Notification Module Disabled\n");
     }
-#endif
 
     return ProcessMessage::CONTINUE; // Let others look at this message also if they want
 }

src/modules/ExternalNotificationModule.h

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

version.properties

@@ -1,4 +1,4 @@
 [VERSION]  
 major = 1
 minor = 3
-build = 46
+build = 47