diff --git a/include/configuration.h b/include/configuration.h index d5e1def..1b72453 100644 --- a/include/configuration.h +++ b/include/configuration.h @@ -195,9 +195,9 @@ public: REMOTE_MANAGEMENT remoteManagement; MQTT mqtt; - void setup(); void setDefaultValues(); bool writeFile(); + Configuration(); private: bool readFile(); diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp index 9f6fbb6..ce9b498 100644 --- a/src/LoRa_APRS_iGate.cpp +++ b/src/LoRa_APRS_iGate.cpp @@ -68,7 +68,7 @@ ___________________________________________________________________*/ String versionDate = "2026-03-08"; -String versionNumber = "3.2.101"; +String versionNumber = "3.2.102"; Configuration Config; WiFiClient aprsIsClient; WiFiClient mqttClient; @@ -101,7 +101,6 @@ String firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seven void setup() { Serial.begin(115200); - Config.setup(); POWER_Utils::setup(); Utils::setupDisplay(); LoRa_Utils::setup(); diff --git a/src/configuration.cpp b/src/configuration.cpp index 3b04b94..4ffb2a6 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -25,29 +25,11 @@ 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..."); - DynamicJsonDocument data(3584); + StaticJsonDocument<3584> data; File configFile = SPIFFS.open("/igate_conf.json", "w"); if (!configFile) { @@ -576,3 +558,22 @@ 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(); +} \ No newline at end of file