Use std::string_view for mode names (#528)

* Use std::string_view for mode names

* Typo

Author: JanPetterMG

firmware/include/modes/StreamMode.h

@@ -10,8 +10,6 @@
 class StreamMode final : public ModeModule
 {
 private:
-    static constexpr std::string_view _name = "Stream";
-
     uint16_t port = 4048;
 
     std::unique_ptr<AsyncUDP> udp{};
@@ -22,7 +20,7 @@ class StreamMode final : public ModeModule
     static void onPacket(AsyncUDPPacket packet);
 
 public:
-    explicit StreamMode() : ModeModule(_name.data()) {};
+    explicit StreamMode() : ModeModule("Stream") {};
 
     void configure() override;
     void begin() override;

firmware/include/modules/ModeModule.h

@@ -1,11 +1,12 @@
 #pragma once
 
 #include <ArduinoJson.h> // NOLINT(misc-include-cleaner)
+#include <string_view>
 
 class ModeModule
 {
 protected:
-    explicit ModeModule(const char *name) : name(name) {};
+    explicit ModeModule(std::string_view name) : name(name) {};
 
 public:
     virtual ~ModeModule() = default;
@@ -15,7 +16,7 @@ class ModeModule
     ModeModule(ModeModule &&) = delete;
     ModeModule &operator=(ModeModule &&) = delete;
 
-    const char *const name;
+    const std::string_view name{};
 
     virtual void configure();
     virtual void begin();

firmware/include/services/ModesService.h

@@ -176,7 +176,7 @@ class ModesService final : public ServiceModule
     void begin();
     void handle();
     void setActive(bool active);
-    void setMode(const char *name);
+    void setMode(std::string_view _name);
     void setModeNext();
     void setModePrevious();
     [[nodiscard]] TaskHandle_t getTaskHandle() const;

firmware/src/extensions/PlaylistExtension.cpp

@@ -100,7 +100,7 @@ void PlaylistExtension::handle()
         {
             step = 0;
         }
-        Modes.setMode(playlist[step].mode.c_str());
+        Modes.setMode(playlist[step].mode);
         lastMillis = millis();
     }
 }

firmware/src/modes/AnimationMode.cpp

@@ -24,7 +24,7 @@ void AnimationMode::handle()
 #endif // EXTENSION_MICROPHONE
     {
         Preferences Storage;
-        Storage.begin(name, true);
+        Storage.begin(name.data(), true);
         if (Storage.isKey(std::to_string(index).c_str()))
         {
             lastMillis = millis();
@@ -52,7 +52,7 @@ void AnimationMode::setFrame(uint8_t _index, std::span<const uint8_t> frame)
 {
     lastMillis = millis() + (frame.size() * 2);
     Preferences Storage;
-    Storage.begin(name);
+    Storage.begin(name.data());
     Storage.putBytes(std::to_string(_index).c_str(), frame.data(), frame.size());
     Storage.end();
     this->index = 0;
@@ -63,7 +63,7 @@ void AnimationMode::setFrame(uint8_t _index, std::span<const uint8_t> frame)
 void AnimationMode::setFrames(uint8_t count)
 {
     Preferences Storage;
-    Storage.begin(name);
+    Storage.begin(name.data());
     for (uint8_t i = count; i >= 2; ++i)
     {
         const std::string key = std::to_string(i);
@@ -82,7 +82,7 @@ void AnimationMode::setInterval(uint16_t _interval)
     {
         interval = _interval;
         Preferences Storage;
-        Storage.begin(name);
+        Storage.begin(name.data());
         Storage.putUShort("interval", interval);
         Storage.end();
     }

firmware/src/modes/ClockMode.cpp

@@ -14,7 +14,7 @@
 void ClockMode::configure()
 {
     Preferences Storage;
-    Storage.begin(name, true);
+    Storage.begin(name.data(), true);
     if (Storage.isKey("font"))
     {
         fontName = Storage.getString("font").c_str();
@@ -157,7 +157,7 @@ void ClockMode::setFont(std::string_view _fontName)
     {
         fontName = _font->name.data();
         Preferences Storage;
-        Storage.begin(name);
+        Storage.begin(name.data());
         Storage.putString("font", fontName.c_str());
         Storage.end();
         pending = true;
@@ -171,7 +171,7 @@ void ClockMode::setTicking(bool _ticking)
     {
         ticking = _ticking;
         Preferences Storage;
-        Storage.begin(name);
+        Storage.begin(name.data());
         Storage.putBool("ticking", ticking);
         Storage.end();
         pending = true;

firmware/src/modes/CountdownMode.cpp

@@ -18,7 +18,7 @@
 void CountdownMode::configure()
 {
     Preferences Storage;
-    Storage.begin(name, true);
+    Storage.begin(name.data(), true);
     if (Storage.isKey("font"))
     {
         fontName = Storage.getString("font").c_str();
@@ -139,7 +139,7 @@ void CountdownMode::save()
 {
     blink = 0;
     Preferences preferences;
-    preferences.begin(name);
+    preferences.begin(name.data());
     preferences.putLong64("epoch", std::chrono::duration_cast<std::chrono::seconds>(epoch.time_since_epoch()).count());
     preferences.end();
     transmit();
@@ -151,7 +151,7 @@ void CountdownMode::setFont(std::string_view _fontName)
     {
         fontName = _font->name.data();
         Preferences Storage;
-        Storage.begin(name);
+        Storage.begin(name.data());
         Storage.putString("font", fontName.c_str());
         Storage.end();
         transmit();

firmware/src/modes/DrawMode.cpp

@@ -43,7 +43,7 @@ void DrawMode::end() { save(true); }
 void DrawMode::load(bool cache)
 {
     Preferences Storage;
-    Storage.begin(name, true);
+    Storage.begin(name.data(), true);
     const char *key = nullptr;
     if (cache && Storage.isKey("cache"))
     {
@@ -67,7 +67,7 @@ void DrawMode::save(bool cache)
     if (std::any_of(frame.begin(), frame.end(), [](uint8_t pixel) { return pixel > 0; }))
     {
         Preferences Storage;
-        Storage.begin(name);
+        Storage.begin(name.data());
         Storage.putBytes(cache ? "cache" : "saved", frame.data(), frame.size());
         Storage.end();
         pending = true;

firmware/src/modes/GameOfLifeMode.cpp

@@ -39,7 +39,7 @@ void GameOfLifeMode::configure()
     }
 #endif // EXTENSION_HOMEASSISTANT
     Preferences Storage;
-    Storage.begin(name, true);
+    Storage.begin(name.data(), true);
     if (Storage.isKey("clock"))
     {
         clock = Storage.getBool("clock");
@@ -117,7 +117,7 @@ void GameOfLifeMode::setClock(bool _clock)
     {
         clock = _clock;
         Preferences Storage;
-        Storage.begin(name);
+        Storage.begin(name.data());
         Storage.putBool("clock", clock);
         Storage.end();
         pending = true;

firmware/src/modes/HomeThermometerMode.cpp

@@ -24,7 +24,7 @@ void HomeThermometerMode::configure()
                  "outdoor",
              })
         {
-            const std::string id{std::regex_replace(name, std::regex(R"(\s+)"), "").append("_").append(where)};
+            const std::string id{std::regex_replace(name.data(), std::regex(R"(\s+)"), "").append("_").append(where)};
             JsonObject component{(*_ha.discovery)[HomeAssistantAbbreviations::components][id].to<JsonObject>()};
             component[HomeAssistantAbbreviations::command_template].set(
                 std::string(R"({")").append(where).append(R"(":{{value}}})"));