remove CONFIG_FILE from platformio.ini

pr3y · Nov 6, 2024 · 5732e71 · 5732e71
1 parent 285571e
commit 5732e71
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/platformio.ini b/platformio.ini
@@ -31,7 +31,6 @@ build_flags =
 	-DEEPROMSIZE=128
 	-DLH=8
 	-DLW=6
-	-DCONFIG_FILE='"/bruce.conf"'
 	-w
 	-Wl,--print-memory-usage
 	-Wl,--gc-sections
@@ -1261,7 +1260,7 @@ build_flags =
 	; SERIAL (GPS) dedicated pins
 	-DSERIAL_TX=1
 	-DSERIAL_RX=3
-	
+
 	;Battery ADC read pin
 	;-DBAT_PIN=10
 

diff --git a/src/core/config.h b/src/core/config.h
@@ -31,6 +31,8 @@ class BruceConfig {
         String pwd;
     };
 
+    const char *filepath = "/bruce.conf";
+
     // Theme colors in RGB565 format
     uint16_t priColor = 0xA80F;
     uint16_t secColor = 0x880F;
@@ -115,8 +117,6 @@ class BruceConfig {
     void setDevMode(int value);
     void validateDevModeValue();
 
-private:
-    const char *filepath = "/bruce.conf";
 };
 
 #endif
diff --git a/src/core/serialcmds.cpp b/src/core/serialcmds.cpp
@@ -733,9 +733,8 @@ bool processSerialCommand(String cmd_str) {
 
   if(cmd_str == "factory_reset") {
       // remove config file and recreate
-      if(SD.exists(CONFIG_FILE)) SD.remove(CONFIG_FILE);
-      if(LittleFS.exists(CONFIG_FILE)) LittleFS.remove(CONFIG_FILE);
-      // TODO: need to reset EEPROM too?
+      if(SD.exists(bruceConfig.filepath)) SD.remove(bruceConfig.filepath);
+      if(LittleFS.exists(bruceConfig.filepath)) LittleFS.remove(bruceConfig.filepath);
       bruceConfig.fromFile();  // recreate config file if it does not exists
       return true;
   }