Merge pull request 'use global mqtt' (#3) from bugfix/light_mqtt_nullptr into main

Reviewed-on: #3

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "lib/state-machine"]
-	path = lib/state-machine
-	url = https://github.com/t-liu93/state-machine

include/config.h

@@ -1,15 +0,0 @@
-#pragma once
-#include <cstdint>
-#include <string>
-
-inline constexpr uint8_t ledPinR = 16;
-inline constexpr uint8_t ledPinG = 17;
-inline constexpr uint8_t ledPinB = 18;
-inline constexpr uint8_t ledPinCW = 19;
-inline constexpr uint8_t ledPinWW = 21;
-
-inline constexpr std::string_view hostName = "smart-rgb-dev";
-inline constexpr std::string_view friendlyName = "Smart RGB Dev";
-inline constexpr uint32_t maxNumberOfStates = 10;
-
-inline constexpr std::string_view mqttBroker = "10.238.75.81";

lib/light/light.cpp

@@ -14,8 +14,8 @@ const struct {
 } Availability;
 
 
-Light::Light(Pin* pinR, Pin* pinG, Pin* pinB, Mqtt* mqttClient, std::string uniqueId)
+Light::Light(Pin* pinR, Pin* pinG, Pin* pinB, std::string uniqueId)
-    : pinR(pinR), pinG(pinG), pinB(pinB), pinCW(nullptr), pinWW(nullptr), mqttClient(mqttClient) {
+    : pinR(pinR), pinG(pinG), pinB(pinB), pinCW(nullptr), pinWW(nullptr) {
     lightInfo.uniqueId = uniqueId;
     lightType = LightType::rgb;
     uint8_t bits = pinR->getLedResolutionBits();
@@ -24,8 +24,8 @@ Light::Light(Pin* pinR, Pin* pinG, Pin* pinB, Mqtt* mqttClient, std::string uniq
     subscribeToMqttTopics();
 }
 
-Light::Light(Pin* pinR, Pin* pinG, Pin* pinB, Pin* pinCW, Pin* pinWW, Mqtt* mqttClient, std::string uniqueId)
+Light::Light(Pin* pinR, Pin* pinG, Pin* pinB, Pin* pinCW, Pin* pinWW, std::string uniqueId)
-    : pinR(pinR), pinG(pinG), pinB(pinB), pinCW(pinCW), pinWW(pinWW), mqttClient(mqttClient) {
+    : pinR(pinR), pinG(pinG), pinB(pinB), pinCW(pinCW), pinWW(pinWW) {
     lightInfo.uniqueId = uniqueId;
     lightType = LightType::rgbww;
     uint8_t bits = pinR->getLedResolutionBits();
@@ -76,7 +76,7 @@ void Light::publishInitialState() {
 
     std::string configJson;
     serializeJson(configInfo, configJson);
-    mqttClient->publish(lightInfo.discoveryTopic, configJson);
+    Mqtt::publish(lightInfo.discoveryTopic, configJson);
 
     std::string stateJson;
     JsonDocument stateInfo;
@@ -95,8 +95,8 @@ void Light::publishInitialState() {
     JsonDocument availabilityInfoDoc;
     availabilityInfoDoc["availability"] = Availability.available;
     serializeJson(availabilityInfoDoc, availabilityJson);
-    mqttClient->publish(lightInfo.stateTopic, stateJson);
+    Mqtt::publish(lightInfo.stateTopic, stateJson);
-    mqttClient->publish(lightInfo.availabilityTopic, availabilityJson);
+    Mqtt::publish(lightInfo.availabilityTopic, availabilityJson);
 }
 
 void Light::operatePin() {
@@ -159,7 +159,7 @@ void Light::operatePin() {
 }
 
 void Light::subscribeToMqttTopics() {
-    mqttClient->subscribe(lightInfo.commandTopic, [this](uint8_t* payload, int length) {
+    Mqtt::subscribe(lightInfo.commandTopic, [this](uint8_t* payload, int length) {
         std::string command(reinterpret_cast<char*>(payload), length);
         handleCommand(command);
     });
@@ -241,11 +241,11 @@ void Light::publishCurrentState() {
     std::string stateJson;
     serializeJson(stateInfo, stateJson);
     Serial.println("Publishing current state: " + String(stateJson.c_str()));
-    mqttClient->publish(lightInfo.stateTopic, stateJson);
+    Mqtt::publish(lightInfo.stateTopic, stateJson);
     std::string attributeJson;
     serializeJson(attributeInfo, attributeJson);
     Serial.println("Publishing current attributes: " + String(attributeJson.c_str()));
-    mqttClient->publish(lightInfo.jsonAttributesTopic, attributeJson);
+    Mqtt::publish(lightInfo.jsonAttributesTopic, attributeJson);
 }
 
 uint32_t Light::correctGamma(uint32_t originalPwm) {

lib/light/light.h

@@ -2,7 +2,6 @@
 
 #include <cstdint>
 #include "pin.h"
-#include "mqtt.h"
 
 struct LightInfo {
     std::string uniqueId;
@@ -65,9 +64,9 @@ enum ActiveMode {
 
 class Light {
 public:
-    Light(Pin* pinR, Pin* pinG, Pin* pinB, Mqtt* mqttClient, std::string uniqueId);
+    Light(Pin* pinR, Pin* pinG, Pin* pinB, std::string uniqueId);
-    Light(Pin* pinR, Pin* pinG, Pin* pinB, Pin* pinCW, Mqtt* mqttClient, std::string uniqueId);
+    Light(Pin* pinR, Pin* pinG, Pin* pinB, Pin* pinCW, std::string uniqueId);
-    Light(Pin* pinR, Pin* pinG, Pin* pinB, Pin* pinCW, Pin* pinWW, Mqtt* mqttClient, std::string uniqueId);
+    Light(Pin* pinR, Pin* pinG, Pin* pinB, Pin* pinCW, Pin* pinWW, std::string uniqueId);
     void subscribeToMqttTopics();
     void publishInitialState();
     void publishCurrentState();
@@ -97,7 +96,6 @@ private:
     Pin* pinB;
     Pin* pinCW;
     Pin* pinWW;
-    Mqtt* mqttClient;
     LightInfo lightInfo;
     DeviceInfo deviceInfo;
     LightType lightType = onOff; // Default light type

lib/network/network.cpp

@@ -5,14 +5,14 @@
 WIFIMANAGER Network::WifiManager;
 AsyncWebServer Network::webServer(80);
 
-Network::Network(std::string_view hostname, std::string_view apSsid) : hostname(hostname), apSsid(apSsid) {
+Network::Network(std::string hostname, std::string apSsid) : hostname(hostname), apSsid(apSsid) {
     setHostname(hostname);
-    WifiManager.startBackgroundTask(apSsid.data(), "");
+    WifiManager.startBackgroundTask(apSsid.c_str(), "");
     WifiManager.fallbackToSoftAp(true);
     WifiManager.attachWebServer(&webServer);
     WifiManager.attachUI();
     webServer.on("/", HTTP_GET, [this](AsyncWebServerRequest *request) {
-        request->send(200, "text/html", this->defaultHomepage.data());
+        request->send(200, "text/html", this->defaultHomepage.c_str());
     });
     webServer.begin();
 }
@@ -25,14 +25,14 @@ std::string Network::getHostname() const {
     return WiFi.getHostname();
 }
 
-bool Network::setHostname(const std::string_view &hostname) {
+bool Network::setHostname(const std::string &hostname) {
-    return WiFi.setHostname(hostname.data());
+    return WiFi.setHostname(hostname.c_str());
 }
 
 void Network::registerMDNS() {
-    if (!MDNS.begin(hostname.data())) {
+    if (!MDNS.begin(hostname.c_str())) {
         Serial.println("Error setting up MDNS responder!");
     } else {
-        Serial.printf("mDNS responder started with hostname: %s\n", hostname.data());
+        Serial.printf("mDNS responder started with hostname: %s\n", hostname.c_str());
     }
 }

lib/network/network.h

@@ -1,13 +1,12 @@
 #include <Arduino.h>
-#include <string_view>
 #include "wifimanager.h"
 
 class Network {
 public:
-    Network(std::string_view hostname, std::string_view apSsid = "Smart RGB");
+    Network(std::string hostname, std::string apSsid = "Smart RGB");
     bool isConnected() const;
     std::string getHostname() const;
-    bool setHostname(const std::string_view &hostname);
+    bool setHostname(const std::string &hostname);
     void registerMDNS();
 private:
     static WIFIMANAGER WifiManager;
@@ -26,6 +25,6 @@ private:
   <p><small>ESP32 WiFi Manager (c) 2022-2025 by Martin Verges</small></p>
 </body></html>
     )html";
-    std::string_view hostname;
+    std::string hostname;
-    std::string_view apSsid; // SSID for the fallback AP
+    std::string apSsid; // SSID for the fallback AP
 };

lib/ota/ota.cpp

@@ -1,8 +1,8 @@
 #include <ArduinoOTA.h>
 #include "ota.h"
 
-OTAHandler::OTAHandler(std::string_view hostname) {
+OTAHandler::OTAHandler(std::string hostname) {
-    ArduinoOTA.setHostname(hostname.data());
+    ArduinoOTA.setHostname(hostname.c_str());
     ArduinoOTA.onStart([]() {
         Serial.println("OTA Start");
     });

lib/ota/ota.h

@@ -1,9 +1,9 @@
 #pragma once
-#include <string_view>
+#include <string>
 
 class OTAHandler {
 public:
-    OTAHandler(std::string_view hostname);
+    OTAHandler(std::string hostname);
 
     void poll();
 };

platformio.ini

@@ -13,10 +13,6 @@ platform = espressif32
 board = esp32dev
 framework = arduino
 monitor_speed = 115200
-build_unflags = -std=gnu++11
-build_flags =
-	-std=c++17
-	-std=gnu++17
 lib_deps =
 	martinverges/ESP32 Wifi Manager@^1.5.0
 	esp32async/ESPAsyncWebServer@^3.7.10
@@ -28,4 +24,4 @@ lib_deps =
 
 [env:esp32dev-ota]
 upload_protocol = espota
-upload_port = smart-rgb-dev.local
+upload_port = smart-rgb.local

src/appcontext.hpp

@@ -1,24 +0,0 @@
-#pragma once
-
-class Pin;
-template <uint32_t MAX_NUMBER_OF_STATES, uint32_t MAX_NUMBER_OF_TRANSITIONS>
-class StateMachine;
-class OTAHandler;
-class Mqtt;
-class Light;
-class Network;
-class Scheduler;
-
-struct AppContext {
-    Pin *pinR = nullptr;
-    Pin *pinG = nullptr;
-    Pin *pinB = nullptr;
-    Pin *pinCW = nullptr;
-    Pin *pinWW = nullptr;
-
-    Network *network = nullptr;
-    Light *light = nullptr;
-    Mqtt *mqtt = nullptr;
-    OTAHandler *otaHandler = nullptr;
-    Scheduler *scheduler = nullptr;
-};

src/main.cpp

@@ -1,42 +1,28 @@
 #include <Arduino.h>
-#include "appcontext.hpp"
-#include "config.h"
 #include "light.h"
 #include "mqtt.h"
 #include "network.h"
 #include "ota.h"
 #include "pin.h"
-#include "statemachine.hpp"
-#include "states.hpp"
 #include "TaskScheduler.h"
 #include "wifimanager.h"
 
-// Network* network = nullptr;
+Network* network = nullptr;
-// OTAHandler* otaHandler = nullptr;
+OTAHandler* otaHandler = nullptr;
-// Mqtt* mqttClient = nullptr;
+Mqtt* mqttClient = nullptr;
-// Light *light = nullptr;
+Light *light = nullptr;
 
+Task *updateTask = nullptr;
+Task *mqttTickTask = nullptr;
+Task *mqttCheckConnectionTask = nullptr;
 
-// Task *updateTask = nullptr;
+Pin *pinR = new Pin(16, true, true, 5000, 0); // Example pin numbers, adjust as needed
-// Task *mqttTickTask = nullptr;
+Pin *pinG = new Pin(17, true, true, 5000, 1);
-// Task *mqttCheckConnectionTask = nullptr;
+Pin *pinB = new Pin(18, true, true, 5000, 2);
-Task *appStateMachineUpdateTask = nullptr;
+Pin *pinCW = new Pin(19, true, true, 5000, 3);
+Pin *pinWW = new Pin(21, true, true, 5000, 4);
 
-Pin *pinR = new Pin(ledPinR, true, true, 5000, 0);
+Scheduler *scheduler;
-Pin *pinG = new Pin(ledPinG, true, true, 5000, 1);
-Pin *pinB = new Pin(ledPinB, true, true, 5000, 2);
-Pin *pinCW = new Pin(ledPinCW, true, true, 5000, 3);
-Pin *pinWW = new Pin(ledPinWW, true, true, 5000, 4);
-
-AppContext *appContext = new AppContext();
-StartState *startState = new StartState(appContext);
-NetworkInitializeState *networkInitializeState = new NetworkInitializeState(appContext);
-RunningState *runningState = new RunningState(appContext);
-
-
-StateMachine<maxNumberOfStates> *stateMachine = nullptr;
-
-Scheduler *scheduler = nullptr;
 
 void initializeScheduler();
 
@@ -44,23 +30,18 @@ void setup() {
     // put your setup code here, to run once:
     Serial.begin(115200);
     Serial.println("Starting Smart RGB ESP32...");
+    pinR->setLedLevel(0);
+    pinG->setLedLevel(0);
+    pinB->setLedLevel(0);
+    pinCW->setLedLevel(0);
+    pinWW->setLedLevel(0);
+    network = new Network("smart-rgb");
+    otaHandler = new OTAHandler("smart-rgb-ota");
+    network->registerMDNS();
+    Mqtt::connect("10.238.75.81", 1883, "smart_rgb_client", "mqtt", "mqtt");
+    delay(1000); // Wait for MQTT connection to stabilize
+    light = new Light(pinR, pinG, pinB, pinCW, pinWW, "smart_rgb_light");
     initializeScheduler();
-    stateMachine = new StateMachine<maxNumberOfStates>();
-    appContext->pinR = pinR;
-    appContext->pinG = pinG;
-    appContext->pinB = pinB;
-    appContext->pinCW = pinCW;
-    appContext->pinWW = pinWW;
-    stateMachine->addStateRaw(startState);
-    stateMachine->addStateRaw(networkInitializeState);
-    stateMachine->addTransition(StateId::StartState, EventId::PinInitialized, StateId::NetworkInitializeState);
-    stateMachine->addStateRaw(runningState);
-    stateMachine->addTransition(StateId::NetworkInitializeState, EventId::WifiConnected, StateId::RunningState);
-    stateMachine->setInitialState(StateId::StartState);
-
-    // Mqtt::connect("10.238.75.81", 1883, "smart_rgb_client", "mqtt", "mqtt");
-    // delay(1000); // Wait for MQTT connection to stabilize
-    // light = new Light(pinR, pinG, pinB, pinCW, pinWW, mqttClient, "smart_rgb_light");
 }
 
 void loop() {
@@ -70,15 +51,14 @@ void loop() {
 
 void initializeScheduler() {
     scheduler = new Scheduler();
-    appStateMachineUpdateTask = new Task(TASK_MILLISECOND, TASK_FOREVER, []() {
+    updateTask = new Task(TASK_SECOND, TASK_FOREVER, []() {
-        if (stateMachine) {
+        otaHandler->poll(); // Poll for OTA updates
-            stateMachine->update();
+
-        }
+    }, scheduler, true, nullptr, nullptr);
+    mqttTickTask = new Task(TASK_MILLISECOND * 100, TASK_FOREVER, []() {
+        Mqtt::poll(); // Poll MQTT client for messages
+    }, scheduler, true, nullptr, nullptr);
+    mqttCheckConnectionTask = new Task(TASK_SECOND * 30, TASK_FOREVER, []() {
+        Mqtt::checkConnection(); // Check MQTT connection status
     }, scheduler, true, nullptr, nullptr);
-    // mqttTickTask = new Task(TASK_MILLISECOND * 100, TASK_FOREVER, []() {
-    //     Mqtt::poll(); // Poll MQTT client for messages
-    // }, scheduler, true, nullptr, nullptr);
-    // mqttCheckConnectionTask = new Task(TASK_SECOND * 30, TASK_FOREVER, []() {
-    //     Mqtt::checkConnection(); // Check MQTT connection status
-    // }, scheduler, true, nullptr, nullptr);
 }

src/states.hpp

@@ -1,114 +0,0 @@
-#include <Arduino.h>
-#include "appcontext.hpp"
-#include "config.h"
-#include "mqtt.h"
-#include "pin.h"
-#include "statemachine.hpp"
-
-enum class StateId
-{
-    StartState,
-    NetworkInitializeState,
-    RunningState
-};
-
-enum class EventId
-{
-    PinInitialized,
-    WifiConnected
-};
-
-class StartState : public State
-{
-public:
-    StartState(AppContext *appContext) : State("StartState", StateId::StartState), appContext(appContext) {}
-
-    void onEnter(StateMachineBase &stateMachine) override {
-        if (appContext) {
-            appContext->pinR->setLedLevel(0);
-            appContext->pinG->setLedLevel(0);
-            appContext->pinB->setLedLevel(0);
-            appContext->pinCW->setLedLevel(0);
-            appContext->pinWW->setLedLevel(0);
-        }
-        stateMachine.postEvent(EventId::PinInitialized);
-    }
-
-    void onExit(StateMachineBase &stateMachine) override {
-    }
-
-    void onUpdate(StateMachineBase &stateMachine) override {
-    }
-
-private:
-    AppContext *appContext = nullptr;
-};
-
-class NetworkInitializeState : public State
-{
-public:
-    NetworkInitializeState(AppContext *appContext) : State("NetworkInitializeState", StateId::NetworkInitializeState), appContext(appContext) {}
-
-    void onEnter(StateMachineBase &stateMachine) override {
-        if (appContext) {
-            appContext->network = new Network(hostName, friendlyName);
-        }
-    }
-
-    void onExit(StateMachineBase &stateMachine) override {
-        if (appContext && appContext->network) {
-            appContext->network->registerMDNS();
-            appContext->otaHandler = new OTAHandler(hostName);
-        }
-        Mqtt::connect(mqttBroker.data(), 1883, "smart_rgb_dev", "mqtt", "mqtt");
-    }
-
-    void onUpdate(StateMachineBase &stateMachine) override {
-        if (appContext && appContext->network && appContext->network->isConnected()) {
-            stateMachine.postEvent(EventId::WifiConnected);
-        }
-    }
-
-private:
-    AppContext *appContext = nullptr;
-};
-
-class RunningState : public State
-{
-public:
-    RunningState(AppContext *appContext) : State("RunningState", StateId::RunningState), appContext(appContext) {}
-    void onEnter(StateMachineBase &stateMachine) override {
-        lastOtaPollMs = millis();
-        lastMqttPollMs = millis();
-        lastMqttCheckConnectionPollSecond = millis() / 1000;
-    }
-
-    void onExit(StateMachineBase &stateMachine) override {
-    }
-
-    void onUpdate(StateMachineBase &stateMachine) override {
-        if ((millis() - lastOtaPollMs) >= otaPollInterval) {
-            lastOtaPollMs = millis();
-            if (appContext && appContext->otaHandler) {
-                appContext->otaHandler->poll();
-            }
-        }
-        if ((millis() - lastMqttPollMs) >= mqttPollInterval) {
-            lastMqttPollMs = millis();
-            Mqtt::poll();
-        }
-        if ((millis() - lastMqttCheckConnectionPollSecond) >= mqttCheckConnectionPollIntervalSecond * 1000) {
-            lastMqttCheckConnectionPollSecond = millis() / 1000;
-            Mqtt::checkConnection();
-        }
-    }
-
-private:
-    AppContext *appContext = nullptr;
-    uint32_t lastOtaPollMs = 0;
-    static constexpr uint32_t otaPollInterval = 1000; // Poll every second
-    uint32_t lastMqttPollMs = 0;
-    static constexpr uint32_t mqttPollInterval = 100; // Poll every 100 milliseconds
-    uint32_t lastMqttCheckConnectionPollSecond = 0;
-    static constexpr uint32_t mqttCheckConnectionPollIntervalSecond = 30; // Poll every 30 seconds
-};