Merge branch 'main' into backBefore-FIX-OTA

Fix OTA update due bad configuration behaviour

include/configuration.h

@@ -195,13 +195,13 @@ public:
     REMOTE_MANAGEMENT       remoteManagement;
     MQTT                    mqtt;
 
+    void setup();
     void setDefaultValues();
     bool writeFile();
-    Configuration();
 
 private:
     bool readFile();
     String _filePath;
 };
 
-#endif
+#endif

src/LoRa_APRS_iGate.cpp

@@ -68,7 +68,7 @@ ___________________________________________________________________*/
 
 
 String              versionDate             = "2026-03-08";
-String              versionNumber           = "3.3";
+String              versionNumber           = "3.2.101";
 Configuration       Config;
 WiFiClient          aprsIsClient;
 WiFiClient          mqttClient;
@@ -101,6 +101,7 @@ String firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seven
 
 void setup() {
     Serial.begin(115200);
+    Config.setup();
     POWER_Utils::setup();
     Utils::setupDisplay();
     LoRa_Utils::setup();
@@ -216,4 +217,4 @@ void loop() {
         Utils::checkRebootTime();
         Utils::checkSleepByLowBatteryVoltage(1);
     }
-}
+}

src/configuration.cpp

@@ -25,11 +25,29 @@
 
 bool shouldSleepStop = true;
 
+void Configuration::setup() {
+    if (!SPIFFS.begin(false)) {
+        Serial.println("SPIFFS Mount Failed");
+        return;
+    } else {
+        Serial.println("SPIFFS Mounted");
+    }
+
+    bool exists = SPIFFS.exists("/igate_conf.json");
+    if (!exists) {
+        setDefaultValues();
+        writeFile();
+        delay(1000);
+        ESP.restart();
+    }
+
+    readFile();
+}
 
 bool Configuration::writeFile() {
     Serial.println("Saving configuration...");
 
-    StaticJsonDocument<3584> data;
+    DynamicJsonDocument data(3584);
     File configFile = SPIFFS.open("/igate_conf.json", "w");
 
     if (!configFile) {
@@ -558,22 +576,3 @@ void Configuration::setDefaultValues() {
 
     Serial.println("New Data Created... All is Written!");
 }
-
-Configuration::Configuration() {
-    if (!SPIFFS.begin(false)) {
-        Serial.println("SPIFFS Mount Failed");
-        return;
-    } else {
-        Serial.println("SPIFFS Mounted");
-    }
-
-    bool exists = SPIFFS.exists("/igate_conf.json");
-    if (!exists) {
-        setDefaultValues();
-        writeFile();
-        delay(1000);
-        ESP.restart();
-    }
-
-    readFile();
-}