Store more messages in flash (#299)

Author: jniebuhr

src/display/core/Controller.cpp

@@ -18,7 +18,7 @@ void Controller::setup() {
     mode = settings.getStartupMode();
 
     if (!SPIFFS.begin(true)) {
-        Serial.println("An Error has occurred while mounting LittleFS");
+        Serial.println(F("An Error has occurred while mounting LittleFS"));
     }
 
     pluginManager = new PluginManager();

src/display/core/zones.h

@@ -2,13 +2,14 @@
 #define ZONES_H
 
 #include "Arduino.h"
+#include <pgmspace.h>
 
 typedef struct {
-    String name;
-    String zones;
+    const char *name;
+    const char *zones;
 } zones_t;
 
-const zones_t zones[] = {
+static const zones_t zones[] PROGMEM = {
     {"Africa/Abidjan", "GMT0"},
     {"Africa/Accra", "GMT0"},
     {"Africa/Addis_Ababa", "EAT-3"},
@@ -472,12 +473,12 @@ const zones_t zones[] = {
     {"Pacific/Wallis", "<+12>-12"},
 };
 
-inline char const *FALLBACK_TZ = "GMT0";
+static const char FALLBACK_TZ[] PROGMEM = "GMT0";
 
-inline const char *resolve_timezone(String time_zone_label) {
-    for (int i = 0; i < sizeof(zones); i++) {
-        if (zones[i].name == time_zone_label) {
-            return zones[i].zones.c_str();
+inline const char *resolve_timezone(const String &time_zone_label) {
+    for (size_t i = 0; i < sizeof(zones) / sizeof(zones[0]); i++) {
+        if (time_zone_label == zones[i].name) {
+            return zones[i].zones;
         }
     }
     return FALLBACK_TZ;

src/display/drivers/LilyGo-T-RGB/LilyGo_RGBPanel.cpp

@@ -45,7 +45,7 @@ bool LilyGo_RGBPanel::begin(LilyGo_RGBPanel_Color_Order order) {
 
     // Initialize the XL9555 expansion chip
     if (!extension.init(Wire, BOARD_I2C_SDA, BOARD_I2C_SCL)) {
-        Serial.println("External GPIO expansion chip does not exist.");
+        Serial.println(F("External GPIO expansion chip does not exist."));
         assert(false);
     }
 
@@ -57,7 +57,7 @@ bool LilyGo_RGBPanel::begin(LilyGo_RGBPanel_Color_Order order) {
     extension.digitalWrite(power_enable, HIGH);
 
     if (!initTouch()) {
-        Serial.println("Touch chip not found.");
+        Serial.println(F("Touch chip not found."));
     }
 
     initBUS();
@@ -76,15 +76,15 @@ bool LilyGo_RGBPanel::installSD() {
     if (SD_MMC.begin("/sdcard", true, false)) {
         uint8_t cardType = SD_MMC.cardType();
         if (cardType != CARD_NONE) {
-            Serial.print("SD Card Type: ");
+            Serial.print(F("SD Card Type: "));
             if (cardType == CARD_MMC)
-                Serial.println("MMC");
+                Serial.println(F("MMC"));
             else if (cardType == CARD_SD)
-                Serial.println("SDSC");
+                Serial.println(F("SDSC"));
             else if (cardType == CARD_SDHC)
-                Serial.println("SDHC");
+                Serial.println(F("SDHC"));
             else
-                Serial.println("UNKNOWN");
+                Serial.println(F("UNKNOWN"));
             uint64_t cardSize = SD_MMC.cardSize() / (1024 * 1024);
             Serial.printf("SD Card Size: %lluMB\n", cardSize);
         }

src/display/drivers/LilyGoDriver.cpp

@@ -13,7 +13,7 @@ void LilyGoDriver::init() {
     printf("Initializing LilyGo driver\n");
     if (!panel.begin()) {
         for (uint8_t i = 0; i < 20; i++) {
-            Serial.println("Error, failed to initialize T-RGB");
+            Serial.println(F("Error, failed to initialize T-RGB"));
             delay(1000);
         }
         ESP.restart();

src/display/drivers/Waveshare/WavesharePanel.cpp

@@ -58,7 +58,7 @@ bool WavesharePanel::begin(WS_RGBPanel_Color_Order order) {
     Set_EXIO(EXIO_PIN8, Low);
 
     if (!initTouch()) {
-        Serial.println("Touch chip not found.");
+        Serial.println(F("Touch chip not found."));
         return false;
     }
 
@@ -78,15 +78,15 @@ bool WavesharePanel::installSD() {
     if (SD_MMC.begin("/sdcard", true, false)) {
         uint8_t cardType = SD_MMC.cardType();
         if (cardType != CARD_NONE) {
-            Serial.print("SD Card Type: ");
+            Serial.print(F("SD Card Type: "));
             if (cardType == CARD_MMC)
-                Serial.println("MMC");
+                Serial.println(F("MMC"));
             else if (cardType == CARD_SD)
-                Serial.println("SDSC");
+                Serial.println(F("SDSC"));
             else if (cardType == CARD_SDHC)
-                Serial.println("SDHC");
+                Serial.println(F("SDHC"));
             else
-                Serial.println("UNKNOWN");
+                Serial.println(F("UNKNOWN"));
             uint64_t cardSize = SD_MMC.cardSize() / (1024 * 1024);
             Serial.printf("SD Card Size: %lluMB\n", cardSize);
         }

src/display/drivers/WaveshareDriver.cpp

@@ -7,7 +7,7 @@ void WaveshareDriver::init() {
     printf("WaveshareDriver initialzing\n");
     if (!panel.begin()) {
         for (uint8_t i = 0; i < 20; i++) {
-            Serial.println("Error, failed to initialize T-RGB");
+            Serial.println(F("Error, failed to initialize T-RGB"));
             delay(1000);
         }
         ESP.restart();

src/display/plugins/WebUIPlugin.cpp

@@ -221,21 +221,21 @@ void WebUIPlugin::handleProfileRequest(uint32_t clientId, JsonDocument &request)
             auto obj = response["profile"].to<JsonObject>();
             writeProfile(obj, profile);
         } else {
-            response["error"] = "Profile not found";
+            response["error"] = F("Profile not found");
         }
     } else if (type == "req:profiles:save") {
         auto obj = request["profile"].as<JsonObject>();
         Profile profile;
         parseProfile(obj, profile);
         if (!profileManager->saveProfile(profile)) {
-            response["error"] = "Save failed";
+            response["error"] = F("Save failed");
         }
         auto respObj = response["profile"].to<JsonObject>();
         writeProfile(respObj, profile);
     } else if (type == "req:profiles:delete") {
         auto id = request["id"].as<String>();
         if (!profileManager->deleteProfile(id)) {
-            response["error"] = "Delete failed";
+            response["error"] = F("Delete failed");
         }
     } else if (type == "req:profiles:select") {
         auto id = request["id"].as<String>();

src/display/plugins/mDNSPlugin.cpp

@@ -13,6 +13,6 @@ void mDNSPlugin::start(Event const &event) const {
     if (apMode)
         return;
     if (!MDNS.begin(controller->getSettings().getMdnsName().c_str())) {
-        Serial.println("Error setting up MDNS responder!");
+        Serial.println(F("Error setting up MDNS responder!"));
     }
 }