From 1abf0fc134c61ff766305a6fe9691e1b2b5ccccb Mon Sep 17 00:00:00 2001
From: Blaz Kristan <blaz@kristan-sp.si>
Date: Sat, 30 Jul 2022 11:04:04 +0200
Subject: [PATCH] Deprecate EEPROM support (compile time option).

---
 wled00/button.cpp      | 2 ++
 wled00/cfg.cpp         | 4 ++++
 wled00/fcn_declare.h   | 2 ++
 wled00/set.cpp         | 2 ++
 wled00/wled.cpp        | 5 ++++-
 wled00/wled.h          | 6 ++++--
 wled00/wled_eeprom.cpp | 4 +++-
 7 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/wled00/button.cpp b/wled00/button.cpp
index 0567abb0e..2bd093ceb 100644
--- a/wled00/button.cpp
+++ b/wled00/button.cpp
@@ -265,7 +265,9 @@ void handleButton()
       if (b == 0 && dur > WLED_LONG_AP) { // long press on button 0 (when released)
         if (dur > WLED_LONG_FACTORY_RESET) { // factory reset if pressed > 10 seconds
           WLED_FS.format();
+          #ifdef WLED_ADD_EEPROM_SUPPORT
           clearEEPROM();
+          #endif
           doReboot = true;
         } else {
           WLED::instance().initAP(true);
diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp
index b8796b8d8..06261a241 100644
--- a/wled00/cfg.cpp
+++ b/wled00/cfg.cpp
@@ -507,7 +507,9 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
 void deserializeConfigFromFS() {
   bool success = deserializeConfigSec();
   if (!success) { //if file does not exist, try reading from EEPROM
+    #ifdef WLED_ADD_EEPROM_SUPPORT
     deEEPSettings();
+    #endif
     return;
   }
 
@@ -517,7 +519,9 @@ void deserializeConfigFromFS() {
 
   success = readObjectFromFile("/cfg.json", nullptr, &doc);
   if (!success) { //if file does not exist, try reading from EEPROM
+    #ifdef WLED_ADD_EEPROM_SUPPORT
     deEEPSettings();
+    #endif
     releaseJSONBufferLock();
     return;
   }
diff --git a/wled00/fcn_declare.h b/wled00/fcn_declare.h
index a9a3dd8c9..d1dace1fc 100644
--- a/wled00/fcn_declare.h
+++ b/wled00/fcn_declare.h
@@ -329,11 +329,13 @@ int16_t extractModeDefaults(uint8_t mode, const char *segVar);
 uint16_t crc16(const unsigned char* data_p, size_t length);
 um_data_t* simulateSound(uint8_t simulationId);
 
+#ifdef WLED_ADD_EEPROM_SUPPORT
 //wled_eeprom.cpp
 void applyMacro(byte index);
 void deEEP();
 void deEEPSettings();
 void clearEEPROM();
+#endif
 
 //wled_math.cpp
 #ifndef WLED_USE_REAL_MATH
diff --git a/wled00/set.cpp b/wled00/set.cpp
index f53a07b5d..fc2b21161 100644
--- a/wled00/set.cpp
+++ b/wled00/set.cpp
@@ -398,7 +398,9 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
     if (request->hasArg(F("RS"))) //complete factory reset
     {
       WLED_FS.format();
+      #ifdef WLED_ADD_EEPROM_SUPPORT
       clearEEPROM();
+      #endif
       serveMessage(request, 200, F("All Settings erased."), F("Connect to WLED-AP to setup again"),255);
       doReboot = true;
     }
diff --git a/wled00/wled.cpp b/wled00/wled.cpp
index 3e63c28e1..4640270c9 100644
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -314,7 +314,10 @@ void WLED::setup()
   if (!fsinit) {
     DEBUGFS_PRINTLN(F("FS failed!"));
     errorFlag = ERR_FS_BEGIN;
-  } else deEEP();
+  } 
+#ifdef WLED_ADD_EEPROM_SUPPORT
+  else deEEP();
+#endif
   updateFSInfo();
 
   DEBUG_PRINTLN(F("Reading config"));
diff --git a/wled00/wled.h b/wled00/wled.h
index 228fec29c..2b1c9d859 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2207293
+#define VERSION 2207301
 
 //uncomment this if you have a "my_config.h" file you'd like to use
 //#define WLED_USE_MY_CONFIG
@@ -94,7 +94,9 @@
 #endif
 
 #include <ESPAsyncWebServer.h>
-#include <EEPROM.h>
+#ifdef WLED_ADD_EEPROM_SUPPORT
+  #include <EEPROM.h>
+#endif
 #include <WiFiUdp.h>
 #include <DNSServer.h>
 #ifndef WLED_DISABLE_OTA
diff --git a/wled00/wled_eeprom.cpp b/wled00/wled_eeprom.cpp
index 32ba9f50c..1fec4e8ab 100644
--- a/wled00/wled_eeprom.cpp
+++ b/wled00/wled_eeprom.cpp
@@ -1,3 +1,4 @@
+#ifdef WLED_ADD_EEPROM_SUPPORT
 #include <EEPROM.h>
 #include "wled.h"
 
@@ -472,4 +473,5 @@ void deEEPSettings() {
   usermods.readFromConfig(empty);
 
   serializeConfig();
-}
\ No newline at end of file
+}
+#endif