Refactor extensions to heapless architecture

firmware/include/extensions/AlexaExtension.h

@@ -10,21 +10,21 @@
 class AlexaExtension final : public ExtensionModule
 {
 private:
-    fauxmoESP fauxmo = fauxmoESP();
+    static constexpr std::string_view name{"Alexa"};
+
+    static inline fauxmoESP fauxmo = fauxmoESP();
 
     static void onGet(AsyncWebServerRequest *request);
     static void onSet(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total);
     static void onSetState(unsigned char deviceId, const char *deviceName, bool state, unsigned char value);
 
 public:
-    explicit AlexaExtension();
+    explicit AlexaExtension() : ExtensionModule(name) {};
 
     void begin() override;
     void handle() override;
 
-    void onTransmit(JsonObjectConst payload, const char *source) override;
+    void onTransmit(JsonObjectConst payload, std::string_view source) override;
 };
 
-extern AlexaExtension *Alexa; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
-
 #endif // EXTENSION_ALEXA

firmware/include/extensions/ButtonExtension.h

@@ -8,41 +8,41 @@
 class ButtonExtension final : public ExtensionModule
 {
 private:
+    static constexpr std::string_view name{"Button"};
+
 #ifdef PIN_SW1
     bool brightnessIncrease = false;
-    bool powerLong = false;
-    bool powerShort = false;
+    inline static bool powerLong = false;
+    inline static bool powerShort = false;
 #endif
 #ifdef PIN_SW2
-    bool modeLong = false;
-    bool modeShort = false;
+    inline static bool modeLong = false;
+    inline static bool modeShort = false;
 #endif
 
 #ifdef PIN_SW1
-    volatile bool powerState = false;
+    static inline volatile bool powerState = false;
 #endif
 #ifdef PIN_SW2
-    volatile bool modeState = false;
+    inline static volatile bool modeState = false;
 #endif
 
 #ifdef PIN_SW1
-    volatile unsigned long powerMillis = 0;
+    static inline volatile unsigned long powerMillis = 0;
 #endif
 #ifdef PIN_SW2
-    volatile unsigned long modeMillis = 0;
+    static inline volatile unsigned long modeMillis = 0;
 #endif
 
     static IRAM_ATTR void onInterrupt();
 
     static void event(const char *key, const char *value);
 
 public:
-    explicit ButtonExtension();
+    explicit ButtonExtension() : ExtensionModule(name) {};
 
     void configure() override;
     void handle() override;
 };
 
-extern ButtonExtension *Button; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
-
 #endif // EXTENSION_BUTTON

firmware/include/extensions/HeapExtension.h

@@ -7,10 +7,12 @@
 class HeapExtension final : public ExtensionModule
 {
 private:
+    static constexpr std::string_view name{"Heap"};
+
     unsigned long lastMillis = 0;
 
 public:
-    explicit HeapExtension();
+    explicit HeapExtension() : ExtensionModule(name) {};
 
 #if EXTENSION_HOMEASSISTANT
     void configure() override;
@@ -20,6 +22,4 @@ class HeapExtension final : public ExtensionModule
     void transmit();
 };
 
-extern HeapExtension *Heap; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
-
 #endif // EXTENSION_HEAP

firmware/include/extensions/HomeAssistantExtension.h

@@ -9,6 +9,8 @@
 class HomeAssistantExtension final : public ExtensionModule
 {
 private:
+    static constexpr std::string_view name{"Home Assistant"};
+
     bool pending = false;
 
     inline static const std::string discoveryTopic =
@@ -20,11 +22,11 @@
     void transmit();
 
 public:
-    explicit HomeAssistantExtension();
+    explicit HomeAssistantExtension() : ExtensionModule(name) {};
 
     inline static const std::string uniquePrefix = std::format("0x{:x}_", ESP.getEfuseMac());
 
     JsonDocument *discovery = new JsonDocument();
 
     void configure() override;
     void begin() override;
@@ -32,11 +34,9 @@
 
     void undiscover();
 
-    void onTransmit(JsonObjectConst payload, const char *source) override;
+    void onTransmit(JsonObjectConst payload, std::string_view source) override;
 };
 
-extern HomeAssistantExtension *HomeAssistant; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
-
 namespace HomeAssistantAbbreviations
 {
 static constexpr std::string_view action_template = "act_tpl";

firmware/include/extensions/InfraredExtension.h

@@ -16,6 +16,8 @@
 class InfraredExtension final : public ExtensionModule
 {
 private:
+    static constexpr std::string_view name{"Infrared"};
+
     struct Code
     {
         decode_type_t protocol{};
@@ -137,7 +139,7 @@ class InfraredExtension final : public ExtensionModule
     void transmit();
 
 public:
-    explicit InfraredExtension();
+    explicit InfraredExtension() : ExtensionModule(name) {};
 
     void configure() override;
     void begin() override;
@@ -147,9 +149,7 @@ class InfraredExtension final : public ExtensionModule
     void setActive(bool active);
     void parse();
 
-    void onReceive(JsonObjectConst payload, const char *source) override;
+    void onReceive(JsonObjectConst payload, std::string_view source) override;
 };
 
-extern InfraredExtension *Infrared; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
-
 #endif // EXTENSION_INFRARED

firmware/include/extensions/MessageExtension.h

@@ -13,6 +13,8 @@
 class MessageExtension final : public ExtensionModule
 {
 private:
+    static constexpr std::string_view name{"Message"};
+
     bool active = false;
     bool pending = false;
 
@@ -46,17 +48,15 @@ class MessageExtension final : public ExtensionModule
     void transmit();
 
 public:
-    explicit MessageExtension();
+    explicit MessageExtension() : ExtensionModule(name) {};
 
 #if EXTENSION_HOMEASSISTANT
     void configure() override;
 #endif
 
     void begin() override;
     void handle() override;
-    void onReceive(JsonObjectConst payload, const char *source) override;
+    void onReceive(JsonObjectConst payload, std::string_view source) override;
 };
 
-extern MessageExtension *Message; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
-
 #endif // EXTENSION_MESSAGE

firmware/include/extensions/MicrophoneExtension.h

@@ -7,6 +7,8 @@
 class MicrophoneExtension final : public ExtensionModule
 {
 private:
+    static constexpr std::string_view name{"Microphone"};
+
     bool active = false;
     bool detected = false;
     bool pending = false;
@@ -21,7 +23,7 @@ class MicrophoneExtension final : public ExtensionModule
     void transmit();
 
 public:
-    explicit MicrophoneExtension();
+    explicit MicrophoneExtension() : ExtensionModule(name) {};
 
     void configure() override;
     void begin() override;
@@ -32,9 +34,7 @@ class MicrophoneExtension final : public ExtensionModule
     void setThreshold(uint16_t _threshold);
     [[nodiscard]] bool isTriggered() const;
 
-    void onReceive(JsonObjectConst payload, const char *source) override;
+    void onReceive(JsonObjectConst payload, std::string_view source) override;
 };
 
-extern MicrophoneExtension *Microphone; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
-
 #endif // EXTENSION_MICROPHONE

firmware/include/extensions/MqttExtension.h

@@ -9,6 +9,8 @@
 class MqttExtension final : public ExtensionModule
 {
 private:
+    static constexpr std::string_view name{"MQTT"};
+
     unsigned long lastMillis = 0;
 
     static inline bool subscribed = false;
@@ -22,7 +24,7 @@ class MqttExtension final : public ExtensionModule
                           const uint8_t *payload, size_t len, size_t index, size_t total);
 
 public:
-    explicit MqttExtension();
+    explicit MqttExtension() : ExtensionModule(name) {};
 
     espMqttClient client;
 
@@ -31,9 +33,7 @@ class MqttExtension final : public ExtensionModule
 
     void disconnect();
 
-    void onTransmit(JsonObjectConst payload, const char *source) override;
+    void onTransmit(JsonObjectConst payload, std::string_view source) override;
 };
 
-extern MqttExtension *Mqtt; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
-
 #endif // EXTENSION_MQTT

firmware/include/extensions/OtaExtension.h

@@ -10,6 +10,8 @@
 class OtaExtension final : public ExtensionModule
 {
 private:
+    static constexpr std::string_view name{"OTA"};
+
     ArduinoOTAClass ArduinoOTA;
 
     static void onStart();
@@ -21,13 +23,11 @@ class OtaExtension final : public ExtensionModule
 #endif
 
 public:
-    explicit OtaExtension();
+    explicit OtaExtension() : ExtensionModule(name) {};
 
     void configure() override;
     void begin() override;
     void handle() override;
 };
 
-extern OtaExtension *Ota; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
-
 #endif // EXTENSION_OTA

firmware/include/extensions/PhotocellExtension.h

@@ -7,6 +7,8 @@
 class PhotocellExtension final : public ExtensionModule
 {
 private:
+    static constexpr std::string_view name{"Photocell"};
+
     bool active = false;
     bool direction = false;
     bool pending = false;
@@ -27,7 +29,7 @@ class PhotocellExtension final : public ExtensionModule
     void transmit();
 
 public:
-    explicit PhotocellExtension();
+    explicit PhotocellExtension() : ExtensionModule(name) {};
 
     void configure() override;
     void begin() override;
@@ -36,10 +38,8 @@ class PhotocellExtension final : public ExtensionModule
     [[nodiscard]] bool getActive() const;
     void setActive(bool active);
 
-    void onReceive(JsonObjectConst payload, const char *source) override;
-    void onTransmit(JsonObjectConst payload, const char *source) override;
+    void onReceive(JsonObjectConst payload, std::string_view source) override;
+    void onTransmit(JsonObjectConst payload, std::string_view source) override;
 };
 
-extern PhotocellExtension *Photocell; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
-
 #endif // EXTENSION_PHOTOCELL

firmware/include/extensions/PlaylistExtension.h

@@ -10,7 +10,7 @@
 class PlaylistExtension final : public ExtensionModule
 {
 public:
-    explicit PlaylistExtension();
+    explicit PlaylistExtension() : ExtensionModule(name) {};
 
     struct Mode
     {
@@ -24,10 +24,12 @@ class PlaylistExtension final : public ExtensionModule
     [[nodiscard]] bool getActive() const;
     void setActive(bool active);
 
-    void onReceive(JsonObjectConst payload, const char *source) override;
-    void onTransmit(JsonObjectConst payload, const char *source) override;
+    void onReceive(JsonObjectConst payload, std::string_view source) override;
+    void onTransmit(JsonObjectConst payload, std::string_view source) override;
 
 private:
+    static constexpr std::string_view name{"Playlist"};
+
     bool active = false;
 
     uint8_t step = 0;
@@ -40,6 +42,4 @@ class PlaylistExtension final : public ExtensionModule
     void transmit();
 };
 
-extern PlaylistExtension *Playlist; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
-
 #endif // EXTENSION_PLAYLIST

firmware/include/extensions/RestfulExtension.h

@@ -9,17 +9,17 @@
 class RestfulExtension final : public ExtensionModule
 {
 private:
+    static constexpr std::string_view name{"Restful"};
+
     static constexpr size_t prefixLength = sizeof("/restful/") - 1;
 
     static void onGet(AsyncWebServerRequest *request);
     static void onPatch(AsyncWebServerRequest *request, const uint8_t *data, size_t len, size_t index, size_t total);
 
 public:
-    explicit RestfulExtension();
+    explicit RestfulExtension() : ExtensionModule(name) {};
 
     void begin() override;
 };
 
-extern RestfulExtension *Restful; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
-
 #endif // EXTENSION_RESTFUL

firmware/include/extensions/RtcExtension.h

@@ -14,8 +14,10 @@
 class RtcExtension final : public ExtensionModule
 {
 private:
+    static constexpr std::string_view name{"RTC"};
+
 #ifdef PIN_INT
-    bool pending = true;
+    inline static bool pending = true;
 #endif
 
 #if defined(RTC_DS3231) || defined(RTC_DS3232)
@@ -33,16 +35,16 @@ class RtcExtension final : public ExtensionModule
 #endif
 
 public:
-    explicit RtcExtension();
+    explicit RtcExtension() : ExtensionModule(name) {};
 
 #ifdef RTC_DS1307
-    RtcDS1307<TwoWire> rtc{Wire};
+    inline static RtcDS1307<TwoWire> rtc{Wire};
 #elif defined(RTC_DS3231)
-    RtcDS3231<TwoWire> rtc{Wire};
+    inline static RtcDS3231<TwoWire> rtc{Wire};
 #elif defined(RTC_DS3232)
-    RtcDS3232<TwoWire> rtc{Wire};
+    inline static RtcDS3232<TwoWire> rtc{Wire};
 #elif defined(RTC_PCF8563)
-    RtcPCF8563<TwoWire> rtc{Wire};
+    inline static RtcPCF8563<TwoWire> rtc{Wire};
 #endif // RTC_DS1307
 
     void configure() override;
@@ -51,6 +53,4 @@ class RtcExtension final : public ExtensionModule
 #endif
 };
 
-extern RtcExtension *Rtc; // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
-
 #endif // EXTENSION_RTC