a macro for the settings file path

lyusupov · Oct 5, 2023 · a0b002f · a0b002f
1 parent 04a8b61
commit a0b002f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/software/firmware/source/SoftRF/SoftRF.h b/software/firmware/source/SoftRF/SoftRF.h
@@ -39,6 +39,8 @@
 #define LED_EXPIRATION_TIME     5 /* seconds */
 #define EXPORT_EXPIRATION_TIME  5 /* seconds */
 
+#define SETTINGS_JSON_PATH      "/settings.json"
+
 /*
  * If you need for SoftRF to operate in wireless
  * client mode - specify your local AP's SSID/PSK:

diff --git a/software/firmware/source/SoftRF/src/platform/ESP32.cpp b/software/firmware/source/SoftRF/src/platform/ESP32.cpp
@@ -2509,7 +2509,7 @@ static void ESP32_EEPROM_extension(int cmd)
   if (cmd == EEPROM_EXT_LOAD) {
 #if defined(CONFIG_IDF_TARGET_ESP32S3)
     if ( ESP32_has_spiflash && FATFS_is_mounted ) {
-      File32 file = fatfs.open("/settings.json", FILE_READ);
+      File32 file = fatfs.open(SETTINGS_JSON_PATH, FILE_READ);
 
       if (file) {
         // StaticJsonBuffer<ESP32_JSON_BUFFER_SIZE> ESP32_jsonBuffer;

diff --git a/software/firmware/source/SoftRF/src/platform/RP2040.cpp b/software/firmware/source/SoftRF/src/platform/RP2040.cpp
@@ -731,7 +731,7 @@ static void RP2040_EEPROM_extension(int cmd)
   if (cmd == EEPROM_EXT_LOAD) {
 
     if ( RP2040_has_spiflash && FATFS_is_mounted ) {
-      File32 file = fatfs.open("/settings.json", FILE_READ);
+      File32 file = fatfs.open(SETTINGS_JSON_PATH, FILE_READ);
 
       if (file) {
         // StaticJsonBuffer<RP2040_JSON_BUFFER_SIZE> RP2040_jsonBuffer;

diff --git a/software/firmware/source/SoftRF/src/platform/nRF52.cpp b/software/firmware/source/SoftRF/src/platform/nRF52.cpp
@@ -1189,7 +1189,7 @@ static void nRF52_EEPROM_extension(int cmd)
       }
 
       if ( nRF52_has_spiflash && FATFS_is_mounted ) {
-        File32 file = fatfs.open("/settings.json", FILE_READ);
+        File32 file = fatfs.open(SETTINGS_JSON_PATH, FILE_READ);
 
         if (file) {
           // StaticJsonBuffer<NRF52_JSON_BUFFER_SIZE> nRF52_jsonBuffer;