Added Buzzer and RGB led drivers

lib/ETH/ETH_Driver.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#define DEBUGLOG_DEFAULT_LOG_LEVEL_INFO
+
 #include <DebugLog.h>
 #include <Arduino.h>
 #include <Network.h>

lib/GPIO/BUZZER_Driver.cpp

@@ -0,0 +1,70 @@
+#include <BUZZER_Driver.h>
+
+#define TASK_PRIORITY 20
+#define TASK_STACK    2048
+#define OCTAVE        6
+
+namespace drivers
+{
+
+    Buzzer::Buzzer()
+    {
+        LOG_INFO("Initializing Beeper");
+        pinMode(buzzerPin, OUTPUT);
+        ledcAttach(buzzerPin, 1000, 8);
+        m_bp.pin = buzzerPin;
+        m_bp.beeperTask = NULL;
+        beep(50, NOTE_G);
+    }
+
+    Buzzer::~Buzzer()
+    {
+        beepStop();
+        ledcDetach(buzzerPin);
+        pinMode(buzzerPin, INPUT);
+    }
+
+    void Buzzer::beep(const uint16_t tBeep, const note_t note)
+    {
+        beepStop();
+        m_bp.tOn = tBeep;
+        m_bp.tOff = 0;
+        m_bp.note = note;
+        xTaskCreate(beepTask, "beeper", TASK_STACK, static_cast<void *>(&m_bp), TASK_PRIORITY, &m_bp.beeperTask);
+    }
+    
+    void Buzzer::beepRepeat(const uint16_t tOn, const uint16_t tOff, const note_t note)
+    {
+        beepStop();
+        m_bp.tOn = tOn;
+        m_bp.tOff = tOff;
+        m_bp.note = note;
+        xTaskCreate(beepTask, "beeper", TASK_STACK, static_cast<void *>(&m_bp), TASK_PRIORITY, &m_bp.beeperTask);     
+    }
+
+    void Buzzer::beepStop()
+    {
+        if (m_bp.beeperTask != NULL)
+            vTaskDelete(m_bp.beeperTask);
+        ledcWriteTone(m_bp.pin, 0); // off
+        m_bp.beeperTask = NULL;
+    }
+    
+    void Buzzer::beepTask(void *params)
+    {
+        LOG_DEBUG("Beeper Task Created");
+        beep_params_t *bPar = static_cast<beep_params_t *>(params);
+        while (true)
+        {
+            ledcWriteNote(bPar->pin, bPar->note, OCTAVE); // on with selected note
+            vTaskDelay(pdMS_TO_TICKS(bPar->tOn));
+            ledcWriteTone(bPar->pin, 0); // off
+            if (bPar->tOff == 0)
+                break;
+            vTaskDelay(pdMS_TO_TICKS(bPar->tOff));
+        }
+        LOG_DEBUG("Beeper Task Ended");
+        bPar->beeperTask = NULL;
+        vTaskDelete(NULL);
+    }
+}

lib/GPIO/BUZZER_Driver.h

@@ -0,0 +1,38 @@
+#pragma once
+
+#include <Arduino.h>
+
+#define DEBUGLOG_DEFAULT_LOG_LEVEL_INFO
+#include <DebugLog.h>
+
+namespace drivers
+{
+
+    class Buzzer
+    {
+        const uint8_t buzzerPin = 46; // hardware assigned
+        typedef struct
+        {
+            note_t note;
+            uint8_t pin;
+            uint16_t tOn;
+            uint16_t tOff;
+            TaskHandle_t beeperTask;
+        } beep_params_t;
+
+    public:
+        Buzzer();
+        ~Buzzer();
+
+        void beep(const uint16_t tBeep, const note_t note);
+        void beepRepeat(const uint16_t tOn, const uint16_t tOff, const note_t note);
+        void beepStop();
+
+    private:
+        static void beepTask(void *params);
+
+    private:
+        beep_params_t m_bp;
+    };
+
+}

lib/GPIO/LED_Driver.cpp

@@ -0,0 +1,75 @@
+#include <LED_Driver.h>
+
+#define TASK_PRIORITY 20
+#define TASK_STACK 2048
+
+namespace drivers
+{
+
+    Led::Led()
+    {
+        LOG_INFO("Inizializing RGB Led");
+        pinMode(ledPin, OUTPUT);
+        m_lp.pin = ledPin;
+        m_lp.blinkTask = NULL;
+    }
+
+    Led::~Led()
+    {
+        setColor({0, 0, 0});
+        pinMode(ledPin, INPUT);
+    }
+
+    void Led::setColor(const color_t color)
+    {
+        blinkStop();
+        rgbLedWrite(ledPin, color.r, color.g, color.b);
+    }
+
+    void Led::blinkColor(const uint16_t tOn, const uint16_t tOff, const color_t color)
+    {
+        blinkStop();
+        m_lp.color1 = color;
+        m_lp.color2 = {0, 0, 0};
+        m_lp.tOn = tOn;
+        m_lp.tOff = tOff;
+        xTaskCreate(blinkTask, "blinker", TASK_STACK, static_cast<void *>(&m_lp), TASK_PRIORITY, &m_lp.blinkTask);
+    }
+
+    void Led::blinkAlternate(const uint16_t tOn, const uint16_t tOff, const color_t color1, const color_t color2)
+    {
+        {
+            blinkStop();
+            m_lp.color1 = color1;
+            m_lp.color2 = color2;
+            m_lp.tOn = tOn;
+            m_lp.tOff = tOff;
+            xTaskCreate(blinkTask, "blinker", TASK_STACK, static_cast<void *>(&m_lp), TASK_PRIORITY, &m_lp.blinkTask);
+        }
+    }
+
+    void Led::blinkStop()
+    {
+        if (m_lp.blinkTask != NULL)
+            vTaskDelete(m_lp.blinkTask);
+        m_lp.blinkTask = NULL;
+    }
+
+    void Led::blinkTask(void *params)
+    {
+        LOG_DEBUG("Blinker Task Created");
+        led_params_t *lPar = static_cast<led_params_t *>(params);
+        while (true)
+        {
+            rgbLedWrite(lPar->pin, lPar->color1.g, lPar->color1.r, lPar->color1.b);
+            vTaskDelay(pdMS_TO_TICKS(lPar->tOn));
+            rgbLedWrite(lPar->pin, lPar->color2.g, lPar->color2.r, lPar->color2.b); // off
+            if (lPar->tOff == 0)
+                break;
+            vTaskDelay(pdMS_TO_TICKS(lPar->tOff));
+        }
+        LOG_DEBUG("Blinker Task Ended");
+        lPar->blinkTask = NULL;
+        vTaskDelete(NULL);
+    }
+}

lib/GPIO/LED_Driver.h

@@ -0,0 +1,50 @@
+#pragma once
+
+#include <Arduino.h>
+
+#define DEBUGLOG_DEFAULT_LOG_LEVEL_INFO
+#include <DebugLog.h>
+
+namespace drivers
+{
+
+    class Led
+    {
+        const uint8_t ledPin = 38;
+
+    public:
+        typedef struct
+        {
+            uint8_t r;
+            uint8_t g;
+            uint8_t b;
+        } color_t;
+
+    private:
+        typedef struct
+        {
+            color_t color1;
+            color_t color2;
+            uint8_t pin;
+            uint16_t tOn;
+            uint16_t tOff;
+            TaskHandle_t blinkTask;
+        } led_params_t;
+
+    public:
+        Led();
+        ~Led();
+
+        void setColor(const color_t color);
+        void blinkColor(const uint16_t tOn, const uint16_t tOff, const color_t color);
+        void blinkAlternate(const uint16_t tOn, const uint16_t tOff, const color_t color1, const color_t color2);
+        void blinkStop();
+
+    private:
+        static void blinkTask(void *params);
+
+    private:
+        led_params_t m_lp;
+    };
+
+}

lib/GPIO/TCA9554PWR_Driver.h

@@ -1,4 +1,8 @@
 #pragma once
+
+#define DEBUGLOG_DEFAULT_LOG_LEVEL_INFO
+
+#include <DebugLog.h>
 #include "I2C_Driver.h"
 
 /****************************************************** The macro defines the TCA9554PWR information ******************************************************/

lib/I2C/I2C_Driver.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#define DEBUGLOG_DEFAULT_LOG_LEVEL_INFO
+
 #include <DebugLog.h>
 #include <Arduino.h>
 #include <Wire.h>

lib/RS485/RS485_Driver.h

@@ -1,6 +1,6 @@
 #pragma once
 
-// #define DEBUGLOG_DEFAULT_LOG_LEVEL_TRACE
+#define DEBUGLOG_DEFAULT_LOG_LEVEL_INFO
 
 #include <DebugLog.h>
 #include <Arduino.h>

lib/RTC/PCF85063_Driver.cpp

@@ -164,7 +164,7 @@ namespace drivers
         return datetime2str(dt);
     }
 
-    PCF85063::datetime_t PCF85063::fromEpoch(time_t currentTime)
+    const PCF85063::datetime_t PCF85063::fromEpoch(const time_t currentTime)
     {
         PCF85063::datetime_t tm;
         struct tm *localTime = std::localtime(&currentTime);
@@ -178,7 +178,7 @@ namespace drivers
         return tm;
     }
 
-    const std::string PCF85063::datetime2str(datetime_t &datetime)
+    const std::string PCF85063::datetime2str(const datetime_t &datetime)
     {
         tm dtime;
         dtime.tm_sec = datetime.second;
@@ -188,7 +188,8 @@ namespace drivers
         dtime.tm_mday = datetime.day;
         dtime.tm_mon = datetime.month - 1;
         dtime.tm_year = datetime.year - 1900; // time offset in structure according cpp reference
-        return std::string(std::asctime(&dtime));
+        const std::string buf(std::asctime(&dtime));
+        return buf.substr(0, std::min(buf.find('\n'),buf.find('\r')));
     }
 
     const uint8_t PCF85063::decToBcd(const int val)

lib/RTC/PCF85063_Driver.h

@@ -1,5 +1,8 @@
 #pragma once
 
+#define DEBUGLOG_DEFAULT_LOG_LEVEL_INFO
+
+#include <DebugLog.h>
 #include "I2C_Driver.h"
 #include <string>
 
@@ -130,10 +133,10 @@ namespace drivers
     const bool readAlarm(datetime_t &time);
     const bool getAlarmFlag(uint8_t &flags);
 
-    const std::string datetime2str(datetime_t &datetime);
     const std::string getTimeStr();
     
-    static PCF85063::datetime_t fromEpoch(time_t currentTime);
+    static const  std::string datetime2str(const datetime_t &datetime);
+    static const PCF85063::datetime_t fromEpoch(const time_t currentTime);
 
   private:
     const uint8_t decToBcd(const int val);

lib/SENECA/S50140_Driver.cpp

@@ -3,7 +3,7 @@
 namespace drivers
 {
 
-    S50140::S50140(drivers::MODBUS &bus, const uint8_t address) : m_bus(bus), m_address(address)
+    S50140::S50140(drivers::MODBUS &bus, const uint8_t address) : m_bus(bus), m_address(address), m_lastRequest(millis())
     {
     }
     S50140::~S50140()
@@ -18,6 +18,7 @@ namespace drivers
         info.pAct = getPact();
         info.pApp = getPapp();
         info.pRea = getPrea();
+        info.pf = getPf();
         info.f = getF();
         info.whTot = getWhTot();
         info.whPar = getWhPar();
@@ -44,6 +45,10 @@ namespace drivers
     {
         return readFloatReg(REG_Prea);
     }
+    const float_t S50140::getPf()
+    {
+        return readFloatReg(REG_Pf);
+    }
     const float_t S50140::getF()
     {
         return readFloatReg(REG_Freq);
@@ -61,8 +66,8 @@ namespace drivers
     {
         auto now = millis();
         if ((now - m_lastRequest) < minDelay)
-        { // minimum 500ms between requests
+        { // minimum m_lastRequest between requests
-            delay(now - m_lastRequest);
+            vTaskDelay(pdMS_TO_TICKS(now - m_lastRequest));
         }
         m_lastRequest = now;
     }
@@ -90,21 +95,22 @@ namespace drivers
     void S50140::resetPartialCounters()
     {
         uint8_t retries(0);
-        const uint16_t resetAll = 0x0A03;
+        constexpr uint16_t nullVal = 0x0000;
-        const uint16_t stopAll = 0x0A02;
+        constexpr uint16_t resetAll = 0x0A03;
-        const uint16_t startAll = 0x0A01;
+        constexpr uint16_t stopAll = 0x0A02;
+        constexpr uint16_t startAll = 0x0A01;
         while (retries++ < maxRetries)
         {
             bool ok(true);
             delayRequest();
             LOG_WARN("Powermeter Counter STOP");
-            ok &= m_bus.writeRegisters(m_address, REG_PartCount, {0x0000, stopAll});
+            ok &= m_bus.writeRegisters(m_address, REG_PartCount, {nullVal, stopAll});
             delayRequest();
             LOG_WARN("Powermeter Counter RESET");
-            ok &= m_bus.writeRegisters(m_address, REG_PartCount, {0x0000, resetAll});
+            ok &= m_bus.writeRegisters(m_address, REG_PartCount, {nullVal, resetAll});
             delayRequest();
             LOG_WARN("Powermeter Counter START");
-            ok &= m_bus.writeRegisters(m_address, REG_PartCount, {0x0000, startAll});
+            ok &= m_bus.writeRegisters(m_address, REG_PartCount, {nullVal, startAll});
             if (ok)
                 return;
             LOG_ERROR("Unable to Reset Powermeter Partial Counters, device", m_address);

lib/SENECA/S50140_Driver.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#define DEBUGLOG_DEFAULT_LOG_LEVEL_INFO
+
 #include <DebugLog.h>
 #include <RS485_Driver.h>
 
@@ -19,6 +21,7 @@ namespace drivers
         const uint16_t REG_Papp = 0x102E;
         const uint16_t REG_Prea = 0x1036;
         const uint16_t REG_Freq = 0x1038;
+        const uint16_t REG_Pf = 0x101E;
         const uint16_t REG_WhTot = 0x1106;
         const uint16_t REG_WhPart = 0x1400;
         const uint16_t REG_Serial = 0x0500;
@@ -43,6 +46,7 @@ namespace drivers
             float_t pAct;
             float_t pApp;
             float_t pRea;
+            float_t pf;
             float_t f;
             float_t whTot;
             float_t whPar;
@@ -59,6 +63,7 @@ namespace drivers
         const float_t getPact();
         const float_t getPapp();
         const float_t getPrea();
+        const float_t getPf();
         const float_t getF();
         const float_t getWhTot();
         const float_t getWhPar();
@@ -75,6 +80,6 @@ namespace drivers
     private:
         const uint8_t m_address;
         drivers::MODBUS &m_bus;
-        uint64_t m_lastRequest = 0;
+        uint64_t m_lastRequest;
     };
 }

lib/TEMP/R4DCB08_Driver.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#define DEBUGLOG_DEFAULT_LOG_LEVEL_INFO
+
 #include <DebugLog.h>
 #include <RS485_Driver.h>
 

lib/utils/utils.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#define DEBUGLOG_DEFAULT_LOG_LEVEL_INFO
+
 #include <Arduino.h>
 #include <DebugLog.h>
 #include <vector>

platformio.ini

@@ -18,6 +18,7 @@ lib_deps =
 	knolleary/PubSubClient@^2.8
 	robtillaart/CRC@^1.0.3
 	hideakitai/DebugLog@^0.8.4
+build_type = release
 
 [env:esp32-s3-waveshare8-debug]
 platform = ${env:esp32-s3-waveshare8.platform}

src/digitalIO.h

@@ -1,7 +1,10 @@
 #pragma once
 
+#define DEBUGLOG_DEFAULT_LOG_LEVEL_INFO
+
 #include <DebugLog.h>
 #include <Arduino.h>
+
 #include <remoteIO.h>
 #include <TCA9554PWR_Driver.h>
 

src/main.cpp

@@ -8,6 +8,8 @@
 #include <PCF85063_Driver.h>
 #include <R4DCB08_Driver.h>
 #include <S50140_Driver.h>
+#include <BUZZER_Driver.h>
+#include <LED_Driver.h>
 #include <ETH_Driver.h>
 
 #include <digitalIO.h>
@@ -50,6 +52,7 @@ void loop()
   uint16_t k(0);
   uint8_t ethRetries(0);
   uint8_t sensors(0);
+  bool buzzing(false);
 
   //////////////// DEVICES ////////////////
   // Declared here to keep devices local to the main loop otherwise the kernel crashes //
@@ -62,33 +65,56 @@ void loop()
   auto io = digitalIO(i2c, bus, {relayBoardAddr});
   delay(100);
   auto seneca = drivers::S50140(bus, senecaMeterAddr);
-
+  auto buzzer = drivers::Buzzer();
-  Network.onEvent([&eth](arduino_event_id_t event, arduino_event_info_t info)
+  auto led = drivers::Led();
-                  { eth.onEvent(event, info); });
+  //////////////// DEVICES ////////////////
-
-  while (!eth.isConnected() && ethRetries++ < 5)
-  {
-    LOG_WARN("Waiting for Ethernet retry", ethRetries);
-    delay(1000);
-  }
-
   // Initialize temperature sensors
   sensors = tmp.getNum();
   LOG_INFO("Temperature sensors connected ->", sensors);
 
-  // Get RTC time at startup
+  //////////////// NETWORK ////////////////
-  time_t ntpTime;
+  // MQTT Test //
-  drivers::PCF85063::datetime_t dt;
-
-  // MQTT Test
   NetworkClient tcp;
   PubSubClient mqtt(tcp);
-
   mqtt.setServer("10.0.2.249", 1883);
   mqtt.setCallback(callback);
-  mqtt.connect("esp32-client");
+  //////////////// NETWORK ////////////////
+
+  //////////////// NETWORK ////////////////
+  /////////////// CALLBACK ////////////////
+  Network.onEvent(
+      [&eth, &rtc, &mqtt, &buzzer, &led](arduino_event_id_t event, arduino_event_info_t info) -> void
+      {
+        eth.onEvent(event, info); // Arduino Ethernet event handler
+        if (!eth.isConnected())
+          return;
+        // Get RTC time at ethernet connection
+        time_t ntpTime;
+        uint8_t timeRetries(0);
+        uint8_t mqttRetries(0);
+        while (timeRetries++ < 5)
+        {
+          if (eth.getNtpTime(ntpTime) && rtc.setDatetime(drivers::PCF85063::fromEpoch(ntpTime)))
+          {
+            buzzer.beep(250, NOTE_F);
+            led.setColor({255, 255, 0});
+            const drivers::PCF85063::datetime_t dt(drivers::PCF85063::fromEpoch(ntpTime));
+            LOG_INFO("NTP Time: ", drivers::PCF85063::datetime2str(dt).c_str());
+            delay(100);
+          }
+          break;
+        }
+        while (mqttRetries++ < 5)
+        {
+          if (!mqtt.connected() && mqtt.connect("esp32-client"))
+          {
             mqtt.subscribe("test/esp32-in");
             xTaskCreatePinnedToCore(myTask, "mqttLoop", 4096, &mqtt, 2, NULL, 1);
+            break;
+          }
+          delay(100);
+        }
+      });
 
   ////////////////////////////////////////
   ///////// MAIN LOOP INSIDE LOOP ////////
@@ -98,11 +124,9 @@ void loop()
   {
     LOG_INFO("[", k++, "] Loop");
 
-    eth.getNtpTime(ntpTime);
+    const std::string timeStr(rtc.getTimeStr());
-    dt = drivers::PCF85063::fromEpoch(ntpTime);
+    LOG_INFO("Current Datetime", timeStr.c_str());
-    LOG_INFO("Network Datetime", rtc.datetime2str(dt).c_str());
+    mqtt.publish("test/esp32-out", ("[" + std::to_string(k) + "] -> " + timeStr).c_str());
-    LOG_INFO("Current Datetime", rtc.getTimeStr().c_str());
-    mqtt.publish("test/esp32-out", ("[" + std::to_string(k) + "] -> " + rtc.getTimeStr()).c_str());
 
     uint8_t i(0);
     for (auto v : tmp.getTempAll())
@@ -116,12 +140,7 @@ void loop()
       LOG_INFO("Temperature correction channel", i++, "tc", v);
     }
 
-    for (auto j(0); j < io.getOutNum(); j++)
+    delay(100);
-    {
-      LOG_INFO("Input", j, io.digitalIORead(j) ? "True" : "False");
-      delay(50);
-    }
-
     drivers::S50140::powerinfo_t pinfo = seneca.getAll();
     LOG_INFO("Power Info ==> V:", pinfo.v, "- A:", pinfo.a, "- W:", pinfo.pAct, "- F:", pinfo.f, "- Wh_t:", pinfo.whTot, "- Wh_p:", pinfo.whPar);
 
@@ -133,6 +152,23 @@ void loop()
       LOG_INFO("Counter Status: ", countStat);
       seneca.resetPartialCounters();
     }
+    delay(100);
+    if (io.digitalIORead(8))
+    {
+      if (!buzzing)
+      {
+        buzzing = true;
+        buzzer.beepRepeat(100, 1000, NOTE_C);
+        led.blinkColor(100, 500, {255, 0, 255});
+      }
+      else
+      {
+        buzzer.beepStop();
+        led.blinkAlternate(500, 500, {255, 255, 0}, {0, 255, 255});
+        buzzing = false;
+      }
+      LOG_INFO("Buzzing -> ", buzzing ? "True" : "False");
+    }
 
     delay(2000);
   }

src/remoteIO.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#define DEBUGLOG_DEFAULT_LOG_LEVEL_INFO
+
 #include <DebugLog.h>
 #include <RS485_Driver.h>