fix(storage): fix flags and move mode loading to bottom

byte4c · Apr 6, 2023 · e675489 · e675489
1 parent f53c460
commit e675489
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/include/constants.h b/include/constants.h
@@ -10,6 +10,7 @@
 #define ENABLE_SERVER
 
 // disable if you do not want to use the internal storage
+// https://randomnerdtutorials.com/esp32-save-data-permanently-preferences/
 #define ENABLE_STORAGE
 
 #ifdef ENABLE_SERVER

diff --git a/src/main.cpp b/src/main.cpp
@@ -20,10 +20,6 @@ void setup()
   pinMode(PIN_ENABLE, OUTPUT);
   pinMode(PIN_BUTTON, INPUT_PULLUP);
 
-  Screen.clear();
-  loadMode();
-  Screen.loadFromStorage();
-
 // server
 #ifdef ENABLE_SERVER
   // wifi
@@ -32,7 +28,7 @@ void setup()
   WiFi.begin(WIFI_SSID, WIFI_PASSWORD);
   while (WiFi.status() != WL_CONNECTED && attempts < 7)
   {
-    delay(500);
+    delay(2000);
     Serial.print(".");
     attempts++;
   }
@@ -55,6 +51,10 @@ void setup()
   initWebsocketServer(server);
   initWebServer();
 #endif
+
+  Screen.clear();
+  loadMode();
+  Screen.loadFromStorage();
 }
 
 void loop()

diff --git a/src/mode/mode.cpp b/src/mode/mode.cpp
@@ -283,10 +283,9 @@ void loopOfAllModes()
   }
 }
 
-
 void persistMode()
 {
-  #ifdef STORAGE_ENABLED
+  #ifdef ENABLE_STORAGE
   storage.begin("led-wall", false);
   storage.putInt("mode", currentMode);
   storage.end();
@@ -295,7 +294,7 @@ void persistMode()
 
 void loadMode()
 {
-  #ifdef STORAGE_ENABLED
+  #ifdef ENABLE_STORAGE
   storage.begin("led-wall", false);
   setMode((MODE)storage.getInt("mode"));
   storage.end();

diff --git a/src/screen.cpp b/src/screen.cpp
@@ -34,7 +34,6 @@ uint8_t Screen_::getBufferIndex(int index)
 
 void Screen_::loadFromStorage()
 {
-// https://randomnerdtutorials.com/esp32-save-data-permanently-preferences/
 #ifdef ENABLE_STORAGE
   storage.begin("led-wall", false);
   if (currentMode == NONE)