Merge branch 'main' into backBefore-FIX-OTA

Fix OTA update due bad configuration behaviour

common_settings.ini

@@ -23,20 +23,20 @@ build_flags =
 	-D RADIOLIB_EXCLUDE_SSTV=1
 	-I variants/${PIOENV}
 lib_deps =
-	adafruit/Adafruit Unified Sensor @ 1.1.14
+	adafruit/Adafruit Unified Sensor @ 1.1.15
-	adafruit/Adafruit AHTX0 @ 2.0.5
+	adafruit/Adafruit AHTX0 @ 2.0.6
-	adafruit/Adafruit BME280 Library @ 2.2.4
+	adafruit/Adafruit BME280 Library @ 2.3.0
-	adafruit/Adafruit BMP280 Library @ 2.6.8
+	adafruit/Adafruit BMP280 Library @ 3.0.0
-	adafruit/Adafruit BME680 Library @ 2.0.4
+	adafruit/Adafruit BME680 Library @ 2.0.6
 	adafruit/Adafruit INA219 @ 1.2.3
 	adafruit/Adafruit Si7021 Library @ 1.5.3
 	arduino-libraries/NTPClient @ 3.2.1
 	ayushsharma82/ElegantOTA @ 3.1.7
 	bblanchon/ArduinoJson @ 6.21.3
-	jgromes/RadioLib @ 7.1.0
+	jgromes/RadioLib @ 7.6.0
 	knolleary/PubSubClient @ 2.8
-	ESP32Async/AsyncTCP @ 3.4.9
+	ESP32Async/AsyncTCP @ 3.4.10
-	ESP32Async/ESPAsyncWebServer @ 3.9.3
+	ESP32Async/ESPAsyncWebServer @ 3.10.0
 	mikalhart/TinyGPSPlus @ 1.0.3
 	richonguzman/APRSPacketLib @ 1.0.4
 display_libs =
@@ -44,4 +44,4 @@ display_libs =
 	adafruit/Adafruit SSD1306 @ 2.5.10
 usb_flags=
 	-DARDUINO_USB_MODE=1
-	-DARDUINO_USB_CDC_ON_BOOT=1 
+	-DARDUINO_USB_CDC_ON_BOOT=1

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

include/power_utils.h

@@ -34,7 +34,7 @@ namespace POWER_Utils {
         void vext_ctrl_OFF();
     #endif
 
-    #ifdef ADC_CTRL
+    #ifdef ADC_CTRL_PIN
         void adc_ctrl_ON();
         void adc_ctrl_OFF();
     #endif

platformio.ini

@@ -16,7 +16,7 @@ extra_configs =
 	variants/*/platformio.ini
 
 [env]
-platform = espressif32 @ 6.7.0
+platform = espressif32 @ 6.12.0
 board_build.partitions = min_spiffs.csv
 framework = arduino
 monitor_speed = 115200

src/LoRa_APRS_iGate.cpp

@@ -67,8 +67,8 @@ ___________________________________________________________________*/
 #endif
 
 
-String              versionDate             = "2026-02-26";
+String              versionDate             = "2026-03-08";
-String              versionNumber           = "3.2";
+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/battery_utils.cpp

@@ -154,7 +154,7 @@ namespace BATTERY_Utils {
             }
         #else
 
-            #ifdef ADC_CTRL
+            #ifdef ADC_CTRL_PIN
                 POWER_Utils::adc_ctrl_ON();
             #endif
 
@@ -180,7 +180,7 @@ namespace BATTERY_Utils {
                 delay(3);
             }
 
-            #ifdef ADC_CTRL
+            #ifdef ADC_CTRL_PIN
                 POWER_Utils::adc_ctrl_OFF();
 
                 #ifdef HELTEC_WP_V1

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) {
@@ -87,6 +105,7 @@ bool Configuration::writeFile() {
 
         data["digi"]["mode"]                        = digi.mode;
         data["digi"]["ecoMode"]                     = digi.ecoMode;
+        if (digi.ecoMode == 1) data["aprs_is"]["active"] = false;
         #if defined(HAS_A7670)
             if (digi.ecoMode == 1) data["digi"]["ecoMode"] = 2;
         #endif
@@ -557,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();
-}

src/power_utils.cpp

@@ -263,8 +263,8 @@ namespace POWER_Utils {
             pinMode(Config.battery.externalVoltagePin, INPUT);
         }
 
-        #ifdef VEXT_CTRL
+        #ifdef VEXT_CTRL_PIN
-            pinMode(VEXT_CTRL,OUTPUT); // GPS + TFT on HELTEC Wireless_Tracker and only for Oled in HELTEC V3
+            pinMode(VEXT_CTRL_PIN,OUTPUT); // GPS + TFT on HELTEC Wireless_Tracker and only for Oled in HELTEC V3
             vext_ctrl_ON();
         #endif
 
@@ -272,8 +272,8 @@ namespace POWER_Utils {
             if (Config.beacon.gpsActive && Config.digi.ecoMode != 1) activateGPS();
         #endif
 
-        #ifdef ADC_CTRL
+        #ifdef ADC_CTRL_PIN
-            pinMode(ADC_CTRL, OUTPUT);
+            pinMode(ADC_CTRL_PIN, OUTPUT);
             adc_ctrl_OFF();
         #endif
 

src/utils.cpp

@@ -408,9 +408,9 @@ namespace Utils {
             if (mode == 1) {    // low voltage detected after a while
                 displayToggle(false);
             }
-            #ifdef VEXT_CTRL
+            #ifdef VEXT_CTRL_PIN
                 #ifndef HELTEC_WSL_V3
-                    digitalWrite(VEXT_CTRL, LOW);
+                    digitalWrite(VEXT_CTRL_PIN, LOW);
                 #endif
             #endif
             LoRa_Utils::sleepRadio();