Add ttgo-t-beam-v1_SX1262 configuration

Network manager

.github/workflows/build.yml

@@ -55,6 +55,8 @@ jobs:
                       chip: esp32
                     - name: ttgo-t-beam-v1_SX1268
                       chip: esp32
+                    - name: ttgo-t-beam-v1_SX1262
+                      chip: esp32
                     - name: ttgo-t-beam-v1_2_SX1262
                       chip: esp32
                     - name: ttgo_t_deck_plus

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 AHTX0 @ 2.0.5
-	adafruit/Adafruit BME280 Library @ 2.2.4
-	adafruit/Adafruit BMP280 Library @ 2.6.8
-	adafruit/Adafruit BME680 Library @ 2.0.4
+	adafruit/Adafruit Unified Sensor @ 1.1.15
+	adafruit/Adafruit AHTX0 @ 2.0.6
+	adafruit/Adafruit BME280 Library @ 2.3.0
+	adafruit/Adafruit BMP280 Library @ 3.0.0
+	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
+	bblanchon/ArduinoJson @ 7.4.2
+	jgromes/RadioLib @ 7.6.0
 	knolleary/PubSubClient @ 2.8
-	ESP32Async/AsyncTCP @ 3.4.9
-	ESP32Async/ESPAsyncWebServer @ 3.9.3
+	ESP32Async/AsyncTCP @ 3.4.10
+	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

data_embed/index.html

@@ -1853,46 +1853,68 @@
                             </div>
                             <div class="col-9">
                                 <div class="row">
-                                    <div class="col-6">
-                                        <label
-                                            for="wifi.autoAP.password"
-                                            class="form-label"
-                                            >Password</label
-                                        >
-                                        <div class="input-group">
+                                    <div class="col-12">
+                                        <div class="form-check form-switch">
                                             <input
-                                                type="password"
-                                                name="wifi.autoAP.password"
-                                                id="wifi.autoAP.password"
-                                                class="form-control"
-                                                placeholder="1234567890"
-                                                required=""
+                                                type="checkbox"
+                                                name="wifi.autoAP.enabled"
+                                                id="wifi.autoAP.enabled"
+                                                class="form-check-input"
                                             />
-                                        </div>
-                                    </div>
-                                    <div class="col-6">
-                                        <label
-                                            for="wifi.autoAP.timeout"
-                                            class="form-label"
-                                            >WiFiAP timeout (to search again)</label
-                                        >
-                                        <div class="input-group">
-                                            <input
-                                                type="number"
-                                                name="wifi.autoAP.timeout"
-                                                id="wifi.autoAP.timeout"
-                                                class="form-control"
-                                                placeholder="10"
-                                                required=""
-                                                step="1"
-                                                min="0"
-                                            />
-                                            <span class="input-group-text"
-                                                >minutes</span
+                                            <label
+                                                for="wifi.autoAP.enabled"
+                                                class="form-label"
+                                                >Enable Auto AP</label
                                             >
                                             <div class="form-text">
-                                                Set to <strong>0</strong> if you don't
-                                                want WiFi AP to stop.
+                                                Create WiFi AP when no network is available
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div id="wifi-autoap-config" style="{{wifi.autoAP.enabled ? '' : 'display:none'}}">
+                                    <div class="row mt-3">
+                                        <div class="col-6">
+                                            <label
+                                                for="wifi.autoAP.password"
+                                                class="form-label"
+                                                >Password</label
+                                            >
+                                            <div class="input-group">
+                                                <input
+                                                    type="password"
+                                                    name="wifi.autoAP.password"
+                                                    id="wifi.autoAP.password"
+                                                    class="form-control"
+                                                    placeholder="1234567890"
+                                                    required=""
+                                                />
+                                            </div>
+                                        </div>
+                                        <div class="col-6">
+                                            <label
+                                                for="wifi.autoAP.timeout"
+                                                class="form-label"
+                                                >WiFiAP timeout (to search again)</label
+                                            >
+                                            <div class="input-group">
+                                                <input
+                                                    type="number"
+                                                    name="wifi.autoAP.timeout"
+                                                    id="wifi.autoAP.timeout"
+                                                    class="form-control"
+                                                    placeholder="10"
+                                                    required=""
+                                                    step="1"
+                                                    min="0"
+                                                />
+                                                <span class="input-group-text"
+                                                    >minutes</span
+                                                >
+                                                <div class="form-text">
+                                                    Set to <strong>0</strong> if you don't
+                                                    want WiFi AP to stop.
+                                                </div>
                                             </div>
                                         </div>
                                     </div>

data_embed/script.js

@@ -237,8 +237,10 @@ function loadSettings(settings) {
     RebootModeTime.disabled     = !RebootModeCheckbox.check;
 
     // WiFi Auto AP
+    document.getElementById("wifi.autoAP.enabled").checked              = settings.wifi.autoAP.enabled;
     document.getElementById("wifi.autoAP.password").value               = settings.wifi.autoAP.password;
     document.getElementById("wifi.autoAP.timeout").value                = settings.wifi.autoAP.timeout;
+    toggleWiFiAutoAPFields();
 
     // OTA
     document.getElementById("ota.username").value                       = settings.ota.username;
@@ -432,6 +434,18 @@ WebadminCheckbox.addEventListener("change", function () {
     WebadminPassword.disabled   = !this.checked;
 });
 
+// WiFi Auto AP Switches
+const WiFiAutoAPCheckbox             = document.querySelector('input[name="wifi.autoAP.enabled"]');
+WiFiAutoAPCheckbox.addEventListener("change", function () {
+    toggleWiFiAutoAPFields();
+});
+
+function toggleWiFiAutoAPFields() {
+    const isEnabled = WiFiAutoAPCheckbox.checked;
+    const autoAPConfig = document.getElementById('wifi-autoap-config');
+    if (autoAPConfig) autoAPConfig.style.display = isEnabled ? 'block' : 'none';
+}
+
 
 document.querySelector(".new button").addEventListener("click", function () {
     const networksContainer = document.querySelector(".list-networks");

include/configuration.h

@@ -32,6 +32,7 @@ public:
 
 class WiFi_Auto_AP {
 public:
+    bool    enabled;            // Enable Auto AP
     String  password;
     int     timeout;
 };
@@ -195,13 +196,13 @@ public:
     REMOTE_MANAGEMENT       remoteManagement;
     MQTT                    mqtt;
 
+    void setup();
     void setDefaultValues();
     bool writeFile();
-    Configuration();
 
 private:
     bool readFile();
     String _filePath;
 };
 
-#endif
+#endif

include/network_manager.h

@@ -0,0 +1,82 @@
+#include <Arduino.h>
+#include <SPI.h>
+#include <WiFi.h>
+#include <ETH.h>
+#include <vector>
+
+/**
+ * Class for managing network connections
+ */
+class NetworkManager
+{
+private:
+    class WiFiNetwork {
+    public:
+        String ssid;
+        String psk;
+    };
+
+    bool _wifiAPmode = false;
+    bool _wifiSTAmode = false;
+    bool _ethernetMode = false;
+    bool _ethernetConnected = false;
+    unsigned long _apStartup = 0;
+    unsigned long _apTimeout = 0;
+
+    String _hostName = "";
+    std::vector<WiFiNetwork> _wifiNetworks;
+
+    int _findWiFiNetworkIndex(const String& ssid) const;
+    bool _connectWiFi(const WiFiNetwork& network);
+    void _processAPTimeout();
+    void _onNetworkEvent(arduino_event_id_t event, arduino_event_info_t /*info*/);
+
+public:
+    // Constructor
+    NetworkManager();
+
+    // Destructor
+    ~NetworkManager();
+
+    // Initialize network module
+    bool setup();
+    void loop();
+
+    void setHostName(const String& hostName);
+
+    // WiFi methods
+    bool setupAP(String apName, String apPsk = "");
+    bool disableAP();
+    void setAPTimeout(unsigned long timeout);
+    void addWiFiNetwork(const String& ssid, const String& psk = "");
+    void clearWiFiNetworks();
+    bool hasWiFiNetworks() const;
+    size_t getWiFiNetworkCount() const;
+    bool connectWiFi();
+    bool connectWiFi(const String& ssid, const String& psk = "");
+    bool disconnectWiFi();
+    String getWiFiSSID() const;
+    String getWiFiAPSSID() const;
+    IPAddress getWiFiIP() const;
+    IPAddress getWiFiAPIP() const;
+    wifi_mode_t getWiFiMode() const;
+    uint8_t* getWiFimacAddress(uint8_t* mac);
+    String getWiFimacAddress(void) const;
+
+    // Ethernet methods
+    bool ethernetConnect(eth_phy_type_t type, uint8_t phy_addr, uint8_t mdc, uint8_t mdio, int power, eth_clock_mode_t clock_mode, bool use_mac_from_efuse = false);
+    bool setEthernetIP(const String& staticIP, const String& gateway, const String& subnet, const String& dns1, const String& dns2);
+    bool ethernetDisconnect();
+    IPAddress getEthernetIP() const;
+    String getEthernetMACAddress() const;
+
+    // Check if any network is available
+    bool isConnected() const;
+
+    // Check if specific network is connected
+    bool isWiFiConnected() const;
+    bool isEthernetConnected() const;
+    bool isModemConnected() const;
+
+    bool isWifiAPActive() const;
+};

include/ntp_utils.h

@@ -24,7 +24,7 @@
 
 namespace NTP_Utils {
 
-    void    setup();
+    bool    setup();
     void    update();
     String  getFormatedTime();
 

include/wifi_utils.h

@@ -27,7 +27,6 @@ namespace WIFI_Utils {
     void checkWiFi();
     void startAutoAP();
     void startWiFi();
-    void checkAutoAPTimeout();
     void setup();
 
 }

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

@@ -41,9 +41,10 @@ ___________________________________________________________________*/
 #include <ElegantOTA.h>
 #include <TinyGPS++.h>
 #include <Arduino.h>
-#include <WiFi.h>
+#include <WiFiClient.h>
 #include <vector>
 #include "configuration.h"
+#include "network_manager.h"
 #include "aprs_is_utils.h"
 #include "station_utils.h"
 #include "battery_utils.h"
@@ -67,8 +68,8 @@ ___________________________________________________________________*/
 #endif
 
 
-String              versionDate             = "2026-03-05";
-String              versionNumber           = "3.2.2";
+String              versionDate             = "2026-03-11";
+String              versionNumber           = "3.2.107";
 Configuration       Config;
 WiFiClient          aprsIsClient;
 WiFiClient          mqttClient;
@@ -79,9 +80,7 @@ WiFiClient          mqttClient;
     bool            gpsInfoToggle           = false;
 #endif
 
-uint8_t             myWiFiAPIndex           = 0;
-int                 myWiFiAPSize            = Config.wifiAPs.size();
-WiFi_AP             *currentWiFi            = &Config.wifiAPs[myWiFiAPIndex];
+NetworkManager      *networkManager;
 
 bool                isUpdatingOTA           = false;
 uint32_t            lastBatteryCheck        = 0;
@@ -101,6 +100,13 @@ String firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seven
 
 void setup() {
     Serial.begin(115200);
+    Config.setup();
+    networkManager = new NetworkManager();
+    networkManager->setup();
+    if (Config.wifiAutoAP.enabled) {
+        networkManager->setAPTimeout(Config.wifiAutoAP.timeout * 60 * 1000); // Convert minutes to milliseconds
+    }
+    networkManager->setHostName("iGATE-" + Config.callsign);
     POWER_Utils::setup();
     Utils::setupDisplay();
     LoRa_Utils::setup();
@@ -132,7 +138,7 @@ void loop() {
         Utils::checkSleepByLowBatteryVoltage(1);
         SLEEP_Utils::startSleeping();
     } else {
-        WIFI_Utils::checkAutoAPTimeout();
+        networkManager->loop();
 
         if (isUpdatingOTA) {
             ElegantOTA.loop();
@@ -161,11 +167,14 @@ void loop() {
         #endif
 
         #ifdef HAS_A7670
+            // TODO: Make this part of Network manager, and use ESP-IDF network stack instead manual AT commands
             if (Config.aprs_is.active && !modemLoggedToAPRSIS) A7670_Utils::APRS_IS_connect();
         #else
             WIFI_Utils::checkWiFi();
-            if (Config.aprs_is.active && (WiFi.status() == WL_CONNECTED) && !aprsIsClient.connected()) APRS_IS_Utils::connect();
-            if (Config.mqtt.active && (WiFi.status() == WL_CONNECTED) && !mqttClient.connected()) MQTT_Utils::connect();
+            if (networkManager->isConnected()) {
+                if (Config.aprs_is.active && !aprsIsClient.connected()) APRS_IS_Utils::connect();
+                if (Config.mqtt.active && !mqttClient.connected()) MQTT_Utils::connect();
+            }
         #endif
 
         NTP_Utils::update();
@@ -216,4 +225,4 @@ void loop() {
         Utils::checkRebootTime();
         Utils::checkSleepByLowBatteryVoltage(1);
     }
-}
+}

src/aprs_is_utils.cpp

@@ -16,9 +16,10 @@
  * along with LoRa APRS iGate. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <APRSPacketLib.h>
-#include <WiFi.h>
+#include <APRSPacketLib.h> 
+#include <WiFiClient.h>
 #include "configuration.h"
+#include "network_manager.h"
 #include "aprs_is_utils.h"
 #include "station_utils.h"
 #include "board_pinout.h"
@@ -32,6 +33,7 @@
 
 
 extern Configuration        Config;
+extern NetworkManager       *networkManager;
 extern WiFiClient           aprsIsClient;
 extern uint32_t             lastScreenOn;
 extern String               firstLine;
@@ -93,7 +95,7 @@ namespace APRS_IS_Utils {
 
     void checkStatus() {
         String wifiState, aprsisState;
-        if (WiFi.status() == WL_CONNECTED) {
+        if (networkManager->isWiFiConnected()) {
             wifiState = "OK";
         } else {
             if (backupDigiMode || Config.digi.ecoMode == 1 || Config.digi.ecoMode == 2) {
@@ -408,7 +410,7 @@ namespace APRS_IS_Utils {
     }
 
     void firstConnection() {
-        if (Config.aprs_is.active && (WiFi.status() == WL_CONNECTED) && !aprsIsClient.connected()) {
+        if (Config.aprs_is.active && networkManager->isConnected() && !aprsIsClient.connected()) {
             connect();
             while (!passcodeValid) {
                 listenAPRSIS();
@@ -416,4 +418,4 @@ namespace APRS_IS_Utils {
         }
     }
 
-}
+}

src/configuration.cpp

@@ -29,7 +29,7 @@ bool shouldSleepStop = true;
 bool Configuration::writeFile() {
     Serial.println("Saving configuration...");
 
-    StaticJsonDocument<3584> data;
+    JsonDocument data;
     File configFile = SPIFFS.open("/igate_conf.json", "w");
 
     if (!configFile) {
@@ -47,6 +47,7 @@ bool Configuration::writeFile() {
 
         data["other"]["startupDelay"]               = startupDelay;
 
+        data["wifi"]["autoAP"]["enabled"]           = wifiAutoAP.enabled;
         data["wifi"]["autoAP"]["password"]          = wifiAutoAP.password;
         data["wifi"]["autoAP"]["timeout"]           = wifiAutoAP.timeout;
 
@@ -195,8 +196,7 @@ bool Configuration::readFile() {
 
     if (configFile) {
         bool needsRewrite = false;
-        StaticJsonDocument<3584> data;
-
+        JsonDocument data;
         DeserializationError error = deserializeJson(data, configFile);
         if (error) {
             Serial.println("Failed to read file, using default configuration");
@@ -211,26 +211,28 @@ bool Configuration::readFile() {
             wifiAPs.push_back(wifiap);
         }
 
-        if (!data["other"].containsKey("startupDelay")) needsRewrite = true;
+        if (data["other"]["startupDelay"].isNull()) needsRewrite = true;
         startupDelay                    = data["other"]["startupDelay"] | 0;
 
-        if (!data["wifi"]["autoAP"].containsKey("password") ||
-            !data["wifi"]["autoAP"].containsKey("timeout")) needsRewrite = true;
+        if (data["wifi"]["autoAP"]["enabled"].isNull() ||
+            data["wifi"]["autoAP"]["password"].isNull() ||
+            data["wifi"]["autoAP"]["timeout"].isNull()) needsRewrite = true;
+        wifiAutoAP.enabled              = data["wifi"]["autoAP"]["enabled"] | true;
         wifiAutoAP.password             = data["wifi"]["autoAP"]["password"] | "1234567890";
         wifiAutoAP.timeout              = data["wifi"]["autoAP"]["timeout"] | 10;
 
-        if (!data.containsKey("callsign")) needsRewrite = true;
+        if (data["callsign"].isNull()) needsRewrite = true;
         callsign                        = data["callsign"] | "NOCALL-10";
-        if (!data.containsKey("tacticalCallsign")) needsRewrite = true;
+        if (data["tacticalCallsign"].isNull()) needsRewrite = true;
         tacticalCallsign                = data["tacticalCallsign"] | "";
 
-        if (!data["aprs_is"].containsKey("active") ||
-            !data["aprs_is"].containsKey("passcode") ||
-            !data["aprs_is"].containsKey("server") ||
-            !data["aprs_is"].containsKey("port") ||
-            !data["aprs_is"].containsKey("filter") ||
-            !data["aprs_is"].containsKey("messagesToRF") ||
-            !data["aprs_is"].containsKey("objectsToRF")) needsRewrite = true;
+        if (data["aprs_is"]["active"].isNull() ||
+            data["aprs_is"]["passcode"].isNull() ||
+            data["aprs_is"]["server"].isNull() ||
+            data["aprs_is"]["port"].isNull() ||
+            data["aprs_is"]["filter"].isNull() ||
+            data["aprs_is"]["messagesToRF"].isNull() ||
+            data["aprs_is"]["objectsToRF"].isNull()) needsRewrite = true;
         aprs_is.active                  = data["aprs_is"]["active"] | false;
         aprs_is.passcode                = data["aprs_is"]["passcode"] | "XYZWV";
         aprs_is.server                  = data["aprs_is"]["server"] | "rotate.aprs2.net";
@@ -239,20 +241,20 @@ bool Configuration::readFile() {
         aprs_is.messagesToRF            = data["aprs_is"]["messagesToRF"] | false;
         aprs_is.objectsToRF             = data["aprs_is"]["objectsToRF"] | false;
 
-        if (!data["beacon"].containsKey("latitude") ||
-            !data["beacon"].containsKey("longitude") ||
-            !data["beacon"].containsKey("comment") ||
-            !data["beacon"].containsKey("interval") ||
-            !data["beacon"].containsKey("overlay") ||
-            !data["beacon"].containsKey("symbol") ||
-            !data["beacon"].containsKey("path") ||
-            !data["beacon"].containsKey("sendViaAPRSIS") ||
-            !data["beacon"].containsKey("sendViaRF") ||
-            !data["beacon"].containsKey("beaconFreq") ||
-            !data["beacon"].containsKey("statusActive") ||
-            !data["beacon"].containsKey("statusPacket") ||
-            !data["beacon"].containsKey("gpsActive") ||
-            !data["beacon"].containsKey("ambiguityLevel")) needsRewrite = true;
+        if (data["beacon"]["latitude"].isNull() ||
+            data["beacon"]["longitude"].isNull() ||
+            data["beacon"]["comment"].isNull() ||
+            data["beacon"]["interval"].isNull() ||
+            data["beacon"]["overlay"].isNull() ||
+            data["beacon"]["symbol"].isNull() ||
+            data["beacon"]["path"].isNull() ||
+            data["beacon"]["sendViaAPRSIS"].isNull() ||
+            data["beacon"]["sendViaRF"].isNull() ||
+            data["beacon"]["beaconFreq"].isNull() ||
+            data["beacon"]["statusActive"].isNull() ||
+            data["beacon"]["statusPacket"].isNull() ||
+            data["beacon"]["gpsActive"].isNull() ||
+            data["beacon"]["ambiguityLevel"].isNull()) needsRewrite = true;
         beacon.latitude                 = data["beacon"]["latitude"] | 0.0;
         beacon.longitude                = data["beacon"]["longitude"] | 0.0;
         beacon.comment                  = data["beacon"]["comment"] | "LoRa APRS";
@@ -268,15 +270,15 @@ bool Configuration::readFile() {
         beacon.gpsActive                = data["beacon"]["gpsActive"] | false;
         beacon.ambiguityLevel           = data["beacon"]["ambiguityLevel"] | 0;
 
-        if (!data.containsKey("personalNote")) needsRewrite = true;
+        if (data["personalNote"].isNull()) needsRewrite = true;
         personalNote    	            = data["personalNote"] | "personal note here";
 
-        if (!data.containsKey("blacklist")) needsRewrite = true;
+        if (data["blacklist"].isNull()) needsRewrite = true;
         blacklist                       = data["blacklist"] | "station callsign";
 
-        if (!data["digi"].containsKey("mode") ||
-            !data["digi"].containsKey("ecoMode") ||
-            !data["digi"].containsKey("backupDigiMode")) needsRewrite = true;
+        if (data["digi"]["mode"].isNull() ||
+            data["digi"]["ecoMode"].isNull() ||
+            data["digi"]["backupDigiMode"].isNull()) needsRewrite = true;
         digi.mode                       = data["digi"]["mode"] | 0;
         digi.ecoMode                    = data["digi"]["ecoMode"] | 0;
         if (digi.ecoMode == 1) shouldSleepStop = false;
@@ -286,17 +288,17 @@ bool Configuration::readFile() {
         digi.backupDigiMode             = data["digi"]["backupDigiMode"] | false;
 
 
-        if (!data["lora"].containsKey("rxActive") ||
-            !data["lora"].containsKey("rxFreq") ||
-            !data["lora"].containsKey("rxSpreadingFactor") ||
-            !data["lora"].containsKey("rxCodingRate4") ||
-            !data["lora"].containsKey("rxSignalBandwidth") ||
-            !data["lora"].containsKey("txActive") ||
-            !data["lora"].containsKey("txFreq") ||
-            !data["lora"].containsKey("txSpreadingFactor") ||
-            !data["lora"].containsKey("txCodingRate4") ||
-            !data["lora"].containsKey("txSignalBandwidth") ||
-            !data["lora"].containsKey("power")) needsRewrite = true;
+        if (data["lora"]["rxActive"].isNull() ||
+            data["lora"]["rxFreq"].isNull() ||
+            data["lora"]["rxSpreadingFactor"].isNull() ||
+            data["lora"]["rxCodingRate4"].isNull() ||
+            data["lora"]["rxSignalBandwidth"].isNull() ||
+            data["lora"]["txActive"].isNull() ||
+            data["lora"]["txFreq"].isNull() ||
+            data["lora"]["txSpreadingFactor"].isNull() ||
+            data["lora"]["txCodingRate4"].isNull() ||
+            data["lora"]["txSignalBandwidth"].isNull() ||
+            data["lora"]["power"].isNull()) needsRewrite = true;
         loramodule.rxActive             = data["lora"]["rxActive"] | true;
         loramodule.rxFreq               = data["lora"]["rxFreq"] | 433775000;
         loramodule.rxSpreadingFactor    = data["lora"]["rxSpreadingFactor"] | 12;
@@ -309,9 +311,9 @@ bool Configuration::readFile() {
         loramodule.txSignalBandwidth    = data["lora"]["txSignalBandwidth"] | 125000;
         loramodule.power                = data["lora"]["power"] | 20;
 
-        if (!data["display"].containsKey("alwaysOn") ||
-            !data["display"].containsKey("timeout") ||
-            !data["display"].containsKey("turn180")) needsRewrite = true;
+        if (data["display"]["alwaysOn"].isNull() ||
+            data["display"]["timeout"].isNull() ||
+            data["display"]["turn180"].isNull()) needsRewrite = true;
         #ifdef HAS_EPAPER
             display.alwaysOn            = true;
         #else
@@ -320,17 +322,17 @@ bool Configuration::readFile() {
         display.timeout                 = data["display"]["timeout"] | 4;
         display.turn180                 = data["display"]["turn180"] | false;
 
-        if (!data["battery"].containsKey("sendInternalVoltage") ||
-            !data["battery"].containsKey("monitorInternalVoltage") ||
-            !data["battery"].containsKey("internalSleepVoltage") ||
-            !data["battery"].containsKey("sendExternalVoltage") ||
-            !data["battery"].containsKey("monitorExternalVoltage") ||
-            !data["battery"].containsKey("externalSleepVoltage") ||
-            !data["battery"].containsKey("useExternalI2CSensor") ||
-            !data["battery"].containsKey("voltageDividerR1") ||
-            !data["battery"].containsKey("voltageDividerR2") ||
-            !data["battery"].containsKey("externalVoltagePin") ||
-            !data["battery"].containsKey("sendVoltageAsTelemetry")) needsRewrite = true;
+        if (data["battery"]["sendInternalVoltage"].isNull() ||
+            data["battery"]["monitorInternalVoltage"].isNull() ||
+            data["battery"]["internalSleepVoltage"].isNull() ||
+            data["battery"]["sendExternalVoltage"].isNull() ||
+            data["battery"]["monitorExternalVoltage"].isNull() ||
+            data["battery"]["externalSleepVoltage"].isNull() ||
+            data["battery"]["useExternalI2CSensor"].isNull() ||
+            data["battery"]["voltageDividerR1"].isNull() ||
+            data["battery"]["voltageDividerR2"].isNull() ||
+            data["battery"]["externalVoltagePin"].isNull() ||
+            data["battery"]["sendVoltageAsTelemetry"].isNull()) needsRewrite = true;
         battery.sendInternalVoltage     = data["battery"]["sendInternalVoltage"] | false;
         battery.monitorInternalVoltage  = data["battery"]["monitorInternalVoltage"] | false;
         battery.internalSleepVoltage    = data["battery"]["internalSleepVoltage"] | 2.9;
@@ -343,38 +345,38 @@ bool Configuration::readFile() {
         battery.externalVoltagePin      = data["battery"]["externalVoltagePin"] | 34;
         battery.sendVoltageAsTelemetry  = data["battery"]["sendVoltageAsTelemetry"] | false;
 
-        if (!data["wxsensor"].containsKey("active") ||
-            !data["wxsensor"].containsKey("heightCorrection") ||
-            !data["wxsensor"].containsKey("temperatureCorrection")) needsRewrite = true;
+        if (data["wxsensor"]["active"].isNull() ||
+            data["wxsensor"]["heightCorrection"].isNull() ||
+            data["wxsensor"]["temperatureCorrection"].isNull()) needsRewrite = true;
         wxsensor.active                 = data["wxsensor"]["active"] | false;
         wxsensor.heightCorrection       = data["wxsensor"]["heightCorrection"] | 0;
         wxsensor.temperatureCorrection  = data["wxsensor"]["temperatureCorrection"] | 0.0;
 
-        if (!data["syslog"].containsKey("active") ||
-            !data["syslog"].containsKey("server") ||
-            !data["syslog"].containsKey("port") ||
-            !data["syslog"].containsKey("logBeaconOverTCPIP")) needsRewrite = true;
+        if (data["syslog"]["active"].isNull() ||
+            data["syslog"]["server"].isNull() ||
+            data["syslog"]["port"].isNull() ||
+            data["syslog"]["logBeaconOverTCPIP"].isNull()) needsRewrite = true;
         syslog.active                   = data["syslog"]["active"] | false;
         syslog.server                   = data["syslog"]["server"] | "lora.link9.net";
         syslog.port                     = data["syslog"]["port"] | 1514;
         syslog.logBeaconOverTCPIP       = data["syslog"]["logBeaconOverTCPIP"] | false;
 
-        if (!data["tnc"].containsKey("enableServer") ||
-            !data["tnc"].containsKey("enableSerial") ||
-            !data["tnc"].containsKey("acceptOwn") ||
-            !data["tnc"].containsKey("aprsBridgeActive")) needsRewrite = true;
+        if (data["tnc"]["enableServer"].isNull() ||
+            data["tnc"]["enableSerial"].isNull() ||
+            data["tnc"]["acceptOwn"].isNull() ||
+            data["tnc"]["aprsBridgeActive"].isNull()) needsRewrite = true;
         tnc.enableServer                = data["tnc"]["enableServer"] | false;
         tnc.enableSerial                = data["tnc"]["enableSerial"] | false;
         tnc.acceptOwn                   = data["tnc"]["acceptOwn"] | false;
         tnc.aprsBridgeActive            = data["tnc"]["aprsBridgeActive"] | false;
 
-        if (!data["mqtt"].containsKey("active") ||
-            !data["mqtt"].containsKey("server") ||
-            !data["mqtt"].containsKey("topic") ||
-            !data["mqtt"].containsKey("username") ||
-            !data["mqtt"].containsKey("password") ||
-            !data["mqtt"].containsKey("port") ||
-            !data["mqtt"].containsKey("beaconOverMqtt")) needsRewrite = true;
+        if (data["mqtt"]["active"].isNull() ||
+            data["mqtt"]["server"].isNull() ||
+            data["mqtt"]["topic"].isNull() ||
+            data["mqtt"]["username"].isNull() ||
+            data["mqtt"]["password"].isNull() ||
+            data["mqtt"]["port"].isNull() ||
+            data["mqtt"]["beaconOverMqtt"].isNull()) needsRewrite = true;
         mqtt.active                     = data["mqtt"]["active"] | false;
         mqtt.server                     = data["mqtt"]["server"] | "";
         mqtt.topic                      = data["mqtt"]["topic"] | "aprs-igate";
@@ -383,34 +385,34 @@ bool Configuration::readFile() {
         mqtt.port                       = data["mqtt"]["port"] | 1883;
         mqtt.beaconOverMqtt             = data["mqtt"]["beaconOverMqtt"] | false;
 
-        if (!data["ota"].containsKey("username") ||
-            !data["ota"].containsKey("password")) needsRewrite = true;
+        if (data["ota"]["username"].isNull() ||
+            data["ota"]["password"].isNull()) needsRewrite = true;
         ota.username                    = data["ota"]["username"] | "";
         ota.password                    = data["ota"]["password"] | "";
 
-        if (!data["webadmin"].containsKey("active") ||
-            !data["webadmin"].containsKey("username") ||
-            !data["webadmin"].containsKey("password")) needsRewrite = true;
+        if (data["webadmin"]["active"].isNull() ||
+            data["webadmin"]["username"].isNull() ||
+            data["webadmin"]["password"].isNull()) needsRewrite = true;
         webadmin.active                 = data["webadmin"]["active"] | false;
         webadmin.username               = data["webadmin"]["username"] | "admin";
         webadmin.password               = data["webadmin"]["password"] | "";
 
-        if (!data["remoteManagement"].containsKey("managers") ||
-            !data["remoteManagement"].containsKey("rfOnly")) needsRewrite = true;
+        if (data["remoteManagement"]["managers"].isNull() ||
+            data["remoteManagement"]["rfOnly"].isNull()) needsRewrite = true;
         remoteManagement.managers       = data["remoteManagement"]["managers"] | "";
         remoteManagement.rfOnly         = data["remoteManagement"]["rfOnly"] | true;
 
-        if (!data["ntp"].containsKey("server") ||
-            !data["ntp"].containsKey("gmtCorrection")) needsRewrite = true;
+        if (data["ntp"]["server"].isNull() ||
+            data["ntp"]["gmtCorrection"].isNull()) needsRewrite = true;
         ntp.server                      = data["ntp"]["server"] | "pool.ntp.org";
         ntp.gmtCorrection               = data["ntp"]["gmtCorrection"] | 0.0;
 
-        if (!data["other"].containsKey("rebootMode") ||
-            !data["other"].containsKey("rebootModeTime")) needsRewrite = true;
+        if (data["other"]["rebootMode"].isNull() ||
+            data["other"]["rebootModeTime"].isNull()) needsRewrite = true;
         rebootMode                      = data["other"]["rebootMode"] | false;
         rebootModeTime                  = data["other"]["rebootModeTime"] | 6;
 
-        if (!data["other"].containsKey("rememberStationTime")) needsRewrite = true;
+        if (data["other"]["rememberStationTime"].isNull()) needsRewrite = true;
         rememberStationTime             = data["other"]["rememberStationTime"] | 30;
 
         if (wifiAPs.size() == 0) { // If we don't have any WiFi's from config we need to add "empty" SSID for AUTO AP
@@ -446,6 +448,7 @@ void Configuration::setDefaultValues() {
 
     startupDelay                    = 0;
 
+    wifiAutoAP.enabled              = true;
     wifiAutoAP.password             = "1234567890";
     wifiAutoAP.timeout              = 10;
 
@@ -559,7 +562,7 @@ void Configuration::setDefaultValues() {
     Serial.println("New Data Created... All is Written!");
 }
 
-Configuration::Configuration() {
+void Configuration::setup() {
     if (!SPIFFS.begin(false)) {
         Serial.println("SPIFFS Mount Failed");
         return;

src/lora_utils.cpp

@@ -17,8 +17,8 @@
  */
 
 #include <RadioLib.h>
-#include <WiFi.h>
 #include "configuration.h"
+#include "network_manager.h"
 #include "aprs_is_utils.h"
 #include "station_utils.h"
 #include "board_pinout.h"
@@ -29,6 +29,7 @@
 
 
 extern Configuration    Config;
+extern NetworkManager   *networkManager;
 extern uint32_t         lastRxTime;
 extern bool             packetIsBeacon;
 
@@ -181,7 +182,7 @@ namespace LoRa_Utils {
         int state = radio.transmit("\x3c\xff\x01" + newPacket);
         transmitFlag = true;
         if (state == RADIOLIB_ERR_NONE) {
-            if (Config.syslog.active && WiFi.status() == WL_CONNECTED) {
+            if (Config.syslog.active && networkManager->isConnected()) {
                 SYSLOG_Utils::log(3, newPacket, 0, 0.0, 0);    // TX
             }
             Utils::print("---> LoRa Packet Tx : ");
@@ -243,7 +244,7 @@ namespace LoRa_Utils {
                                 receivedPackets.push_back(receivedPacket);
                             }
 
-                            if (Config.syslog.active && WiFi.status() == WL_CONNECTED) {
+                            if (Config.syslog.active && networkManager->isConnected()) {
                                 SYSLOG_Utils::log(1, packet, rssi, snr, freqError); // RX
                             }
                         } else {
@@ -257,7 +258,7 @@ namespace LoRa_Utils {
                     snr         = radio.getSNR();
                     freqError   = radio.getFrequencyError();
                     Utils::println(F("CRC error!"));
-                    if (Config.syslog.active && WiFi.status() == WL_CONNECTED) {
+                    if (Config.syslog.active && networkManager->isConnected()) {
                         SYSLOG_Utils::log(0, packet, rssi, snr, freqError); // CRC
                     }
                     packet = "";

src/mqtt_utils.cpp

@@ -16,7 +16,7 @@
  * along with LoRa APRS iGate. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <WiFiClientSecure.h>
+#include <WiFiClient.h>
 #include <PubSubClient.h>
 #include "configuration.h"
 #include "station_utils.h"

src/network_manager.cpp

@@ -0,0 +1,333 @@
+#include <Arduino.h>
+
+#include "network_manager.h"
+
+ // Constructor
+NetworkManager::NetworkManager() { }
+
+// Destructor
+NetworkManager::~NetworkManager() { }
+
+// Private methods
+
+int NetworkManager::_findWiFiNetworkIndex(const String& ssid) const {
+    for (size_t i = 0; i < _wifiNetworks.size(); i++) {
+        if (_wifiNetworks[i].ssid == ssid) {
+            return static_cast<int>(i);
+        }
+    }
+    return -1;
+}
+
+bool NetworkManager::_connectWiFi(const WiFiNetwork& network) {
+    if (network.ssid.isEmpty()) {
+        return false;
+    }
+
+    _wifiSTAmode = true;
+
+    if (!_hostName.isEmpty()) {
+        WiFi.setHostname(_hostName.c_str());
+    }
+
+    WiFi.mode(_wifiAPmode ? WIFI_AP_STA : WIFI_STA);
+
+    Serial.println("[NM] Attempting to connect to WiFi: " + network.ssid);
+    WiFi.begin(network.ssid.c_str(), network.psk.c_str());
+
+    Serial.print("[NM] Connecting ");
+
+    int attempts = 0;
+    while (!isWiFiConnected() && attempts < 10) {
+        delay(500);
+        #ifdef INTERNAL_LED_PIN
+            digitalWrite(INTERNAL_LED_PIN,HIGH);
+        #endif
+        Serial.print('.');
+        delay(500);
+        #ifdef INTERNAL_LED_PIN
+            digitalWrite(INTERNAL_LED_PIN,LOW);
+        #endif
+        attempts++;
+    }
+    Serial.println();
+
+    if (isWiFiConnected()) return true;
+
+    Serial.println("[NM] Failed to connect to WiFi after " + String(attempts) + " attempts. SSID: " + network.ssid);
+    return false;
+}
+
+void NetworkManager::_processAPTimeout() {
+    if (!_wifiAPmode || _apTimeout == 0) {
+        return;
+    }
+
+    // If any station is connected, reset the timer
+    if (WiFi.softAPgetStationNum() > 0) {
+        _apStartup = millis();
+        return;
+    }
+
+    if (millis() - _apStartup > _apTimeout) {
+        Serial.println("[NM] AP timeout reached. Disabling AP mode.");
+        disableAP();
+    }
+}
+
+void NetworkManager::_onNetworkEvent(arduino_event_id_t event, arduino_event_info_t /*info*/) {
+    switch (event) {
+        case ARDUINO_EVENT_ETH_START:
+            Serial.println("[NM] ETH Started");
+            if (!_hostName.isEmpty()) {
+                Serial.println("[NM] ETH Setting Hostname: " + _hostName);
+                ETH.setHostname(_hostName.c_str());
+            }
+        break;
+        case ARDUINO_EVENT_ETH_CONNECTED:
+            Serial.println("[NM] ETH Connected");
+            break;
+        case ARDUINO_EVENT_ETH_GOT_IP:
+            Serial.println("[NM] ETH Got IP");
+            _ethernetConnected = true;
+            break;
+        case ARDUINO_EVENT_ETH_DISCONNECTED:
+            Serial.println("[NM] ETH Disconnected");
+            _ethernetConnected = false;
+            break;
+        case ARDUINO_EVENT_ETH_STOP:
+            Serial.println("[NM] ETH Stopped");
+            _ethernetConnected = false;
+            break;
+        default:
+            break;
+    }
+}
+
+// Initialize
+bool NetworkManager::setup() {
+    Serial.println("[NM] Initializing Networking...");
+
+    WiFi.onEvent(
+        [this](arduino_event_id_t event, arduino_event_info_t info) {
+            _onNetworkEvent(event, info);
+        });
+
+    return true;
+}
+
+void NetworkManager::loop() {
+    if (_wifiAPmode) {
+        _processAPTimeout();
+    }
+}
+
+void NetworkManager::setHostName(const String& hostName) {
+    _hostName = hostName;
+}
+
+// WiFi methods
+
+bool NetworkManager::setupAP(String apName, String apPsk) {
+    _wifiAPmode = true;
+
+    Serial.println("[NM] Starting AP mode: " + apName);
+
+    // Full WiFi reset sequence
+    WiFi.disconnect(true);
+    WiFi.mode(WIFI_OFF);
+    delay(200);
+
+    // Set up AP mode with optimized settings
+    WiFi.mode(WIFI_AP);
+
+    bool apStarted = WiFi.softAP(apName.c_str(), apPsk.c_str());
+    delay(1000); // Give AP time to fully initialize
+
+    if (apStarted) {
+        Serial.println("[NM] AP setup successful");
+        _apStartup = millis();
+    }
+    else {
+        Serial.println("[NM] AP setup failed");
+        return false;
+    }
+
+    IPAddress apIP = getWiFiAPIP();
+    Serial.println("[NM] AP IP assigned: " + apIP.toString());
+
+    return true;
+}
+
+bool NetworkManager::disableAP() {
+    WiFi.mode(_wifiSTAmode ? WIFI_STA : WIFI_OFF);
+    _wifiAPmode = false;
+
+    return true;
+}
+
+void NetworkManager::setAPTimeout(unsigned long timeout) {
+    Serial.println("[NM] Setting AP timeout to " + String(timeout / 1000) + " sec");
+    _apTimeout = timeout;
+}
+
+void NetworkManager::addWiFiNetwork(const String& ssid, const String& psk) {
+    if (ssid.isEmpty()) {
+        return;
+    }
+
+    int index = _findWiFiNetworkIndex(ssid);
+    if (index >= 0) {
+        Serial.println("[NM] Updating WiFi network: " + ssid);
+        _wifiNetworks[static_cast<size_t>(index)].psk = psk;
+        return;
+    }
+
+    Serial.println("[NM] Adding WiFi network: " + ssid);
+    WiFiNetwork network;
+    network.ssid = ssid;
+    network.psk = psk;
+    _wifiNetworks.push_back(network);
+}
+
+void NetworkManager::clearWiFiNetworks() {
+    _wifiNetworks.clear();
+}
+
+bool NetworkManager::hasWiFiNetworks() const {
+    return !_wifiNetworks.empty();
+}
+
+size_t NetworkManager::getWiFiNetworkCount() const {
+    return _wifiNetworks.size();
+}
+
+bool NetworkManager::connectWiFi() {
+    if (_wifiNetworks.empty()) {
+        return false;
+    }
+
+    for (size_t i = 0; i < _wifiNetworks.size(); i++) {
+        disconnectWiFi();
+        if (_connectWiFi(_wifiNetworks[i])) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+bool NetworkManager::connectWiFi(const String& ssid, const String& psk) {
+    addWiFiNetwork(ssid, psk);
+    return connectWiFi();
+}
+
+bool NetworkManager::disconnectWiFi() {
+    WiFi.disconnect(true);
+    WiFi.mode(_wifiAPmode ? WIFI_AP : WIFI_OFF);
+
+    _wifiSTAmode = false;
+    return true;
+}
+
+String NetworkManager::getWiFiSSID() const {
+    return WiFi.SSID();
+}
+
+String NetworkManager::getWiFiAPSSID() const {
+    return WiFi.softAPSSID();
+}
+
+IPAddress NetworkManager::getWiFiIP() const {
+    return WiFi.localIP();
+}
+
+IPAddress NetworkManager::getWiFiAPIP() const {
+    return WiFi.softAPIP();
+}
+
+wifi_mode_t NetworkManager::getWiFiMode() const {
+    return WiFi.getMode();
+}
+
+uint8_t* NetworkManager::getWiFimacAddress(uint8_t* mac) {
+    return WiFi.macAddress(mac);
+}
+
+String NetworkManager::getWiFimacAddress(void) const {
+    return WiFi.macAddress();
+}
+
+// Ethernet methods
+bool NetworkManager::ethernetConnect(eth_phy_type_t type, uint8_t phy_addr, uint8_t mdc, uint8_t mdio, int power, eth_clock_mode_t clock_mode, bool use_mac_from_efuse) {
+    _ethernetMode = true;
+    Serial.println("[NM] Setting up Ethernet...");
+
+    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
+        // SDK 5.x (Arduino SDK 3.x)
+        #pragma message("Compiling ETH init: SDK 5.x (Arduino core 3.x)")
+        return ETH.begin(type, phy_addr, mdc, mdio, power, clock_mode, use_mac_from_efuse);
+    #else
+        // SDK 4.x (Arduino SDK 2.x)
+        #pragma message("Compiling ETH init: SDK 4.x (Arduino core 2.x)")
+        return ETH.begin(phy_addr, power, mdc, mdio, type, clock_mode, use_mac_from_efuse);
+    #endif
+}
+
+bool NetworkManager::setEthernetIP(const String& staticIP, const String& gateway, const String& subnet, const String& dns1, const String& dns2) {
+    if (staticIP.isEmpty()) {
+        return false;
+    }
+
+    IPAddress ip, gw, sn, d1, d2;
+    if (!ip.fromString(staticIP) || !gw.fromString(gateway) || !sn.fromString(subnet)) {
+        Serial.println("[NM] Invalid static IP configuration");
+        return false;
+    }
+
+    if (!dns1.isEmpty() && d1.fromString(dns1)) {
+        if (!dns2.isEmpty() && d2.fromString(dns2)) {
+            ETH.config(ip, gw, sn, d1, d2);
+        } else {
+            ETH.config(ip, gw, sn, d1);
+        }
+    } else {
+        ETH.config(ip, gw, sn);
+    }
+
+    Serial.println("[NM] Ethernet static IP: " + staticIP);
+    return true;
+}
+
+IPAddress NetworkManager::getEthernetIP() const {
+    return ETH.localIP();
+}
+
+String NetworkManager::getEthernetMACAddress() const {
+    return ETH.macAddress();
+}
+
+// Check if network is available
+bool NetworkManager::isConnected() const {
+    return isWiFiConnected() || isEthernetConnected() || isModemConnected();
+}
+
+// Check if WiFi is connected
+bool NetworkManager::isWiFiConnected() const {
+    return _wifiSTAmode ? WiFi.status() == WL_CONNECTED : false;
+}
+
+bool NetworkManager::isWifiAPActive() const {
+    return _wifiAPmode;
+}
+
+// Check if Ethernet is connected
+bool NetworkManager::isEthernetConnected() const {
+    return _ethernetMode && _ethernetConnected && ETH.linkUp();
+}
+
+// Check if Modem is connected
+bool NetworkManager::isModemConnected() const {
+    // Implement Modem connection check logic here
+    return false;
+}

src/ntp_utils.cpp

@@ -18,35 +18,49 @@
 
 #include <NTPClient.h>
 #include <WiFiUdp.h>
-#include <WiFi.h>
 #include "configuration.h"
+#include "network_manager.h"
 #include "ntp_utils.h"
 #include "time.h"
 
 
 extern      Configuration  Config;
-
+extern      NetworkManager *networkManager;
 WiFiUDP     ntpUDP;
-NTPClient*  timeClient;
+NTPClient*  timeClient = nullptr;
 
 
 namespace NTP_Utils {
 
-    void setup() {
-        if (WiFi.status() == WL_CONNECTED && Config.digi.ecoMode == 0 && Config.callsign != "NOCALL-10") {
+    bool setup() {
+        if (networkManager->isConnected() && Config.digi.ecoMode == 0 && Config.callsign != "NOCALL-10") {
             int gmt = Config.ntp.gmtCorrection * 3600;
+            Serial.println("[NTP] Setting up, TZ offset: " + String(gmt) + " Server: " +  Config.ntp.server);
             timeClient = new NTPClient(ntpUDP, Config.ntp.server.c_str(), gmt, 15 * 60 * 1000); // Update interval 15 min
             timeClient->begin();
+            return true;
         }
+        return false;
     }
 
     void update() {
-        if (WiFi.status() == WL_CONNECTED && Config.digi.ecoMode == 0 && Config.callsign != "NOCALL-10") timeClient->update();
+        if (!networkManager->isConnected() || Config.digi.ecoMode != 0 || Config.callsign == "NOCALL-10") {
+            return;
+        }
+        if (timeClient == nullptr) {
+            if (!setup()) {
+                return;
+            }
+        }
+
+        timeClient->update();
     }
 
     String getFormatedTime() {
-        if (WiFi.status() == WL_CONNECTED && Config.digi.ecoMode == 0) return timeClient->getFormattedTime();
+        if (networkManager->isConnected() && Config.digi.ecoMode == 0 && timeClient != nullptr) {
+            return timeClient->getFormattedTime();
+        }
         return "DigiEcoMode Active";
     }
 
-}
+}

src/syslog_utils.cpp

@@ -17,13 +17,14 @@
  */
 
 #include <WiFiUdp.h>
-#include <WiFi.h>
 #include "configuration.h"
+#include "network_manager.h"
 #include "syslog_utils.h"
 #include "gps_utils.h"
 
 
 extern Configuration    Config;
+extern NetworkManager   *networkManager;
 extern String           versionDate;
 extern String           versionNumber;
 
@@ -33,7 +34,7 @@ WiFiUDP udpClient;
 namespace SYSLOG_Utils {
 
     void log(const uint8_t type, const String& packet, const int rssi, const float snr, const int freqError) {
-        if (Config.syslog.active && WiFi.status() == WL_CONNECTED) {
+        if (Config.syslog.active && networkManager->isConnected()) {
             String syslogPacket = "<165>1 - ";
             syslogPacket.concat(Config.callsign);
             syslogPacket.concat(" CA2RXU_LoRa_iGate_");
@@ -140,7 +141,7 @@ namespace SYSLOG_Utils {
     }
 
     void setup() {
-        if (WiFi.status() == WL_CONNECTED) {
+        if (networkManager->isConnected()) {
             udpClient.begin(0);
             if (Config.syslog.active) Serial.println("init : Syslog Server  ...     done!    (at " + Config.syslog.server + ")");
         }

src/utils.cpp

@@ -18,9 +18,9 @@
 
 #include <APRSPacketLib.h>
 #include <TinyGPS++.h>
-#include <WiFi.h>
 #include "telemetry_utils.h"
 #include "configuration.h"
+#include "network_manager.h"
 #include "station_utils.h"
 #include "battery_utils.h"
 #include "aprs_is_utils.h"
@@ -37,6 +37,7 @@
 #define DAY_MS (24UL * 60UL * 60UL * 1000UL)
 
 extern Configuration        Config;
+extern NetworkManager       *networkManager;
 extern TinyGPSPlus          gps;
 extern String               versionDate;
 extern String               firstLine;
@@ -52,7 +53,6 @@ extern int                  rssi;
 extern float                snr;
 extern int                  freqError;
 extern String               distance;
-extern bool                 WiFiConnected;
 extern int                  wxModuleType;
 extern bool                 backupDigiMode;
 extern bool                 shouldSleepLowVoltage;
@@ -75,7 +75,7 @@ String      secondaryBeaconPacket;
 namespace Utils {
 
     void processStatus() {
-        bool sendOverAPRSIS = Config.beacon.sendViaAPRSIS && Config.aprs_is.active && WiFi.status() == WL_CONNECTED;
+        bool sendOverAPRSIS = Config.beacon.sendViaAPRSIS && Config.aprs_is.active && networkManager->isConnected();
         bool sendOverRF     = !Config.beacon.sendViaAPRSIS && Config.beacon.sendViaRF;
 
         if (!sendOverAPRSIS && !sendOverRF) {
@@ -104,12 +104,14 @@ namespace Utils {
     String getLocalIP() {
         if (Config.digi.ecoMode == 1 || Config.digi.ecoMode == 2) {
             return "** WiFi AP  Killed **";
-        } else if (!WiFiConnected) {
-            return "IP :  192.168.4.1";
+        } else if (networkManager->isEthernetConnected()) {
+            return "LAN: " + networkManager->getEthernetIP().toString();
+        } else if (!networkManager->isWiFiConnected() && networkManager->isWifiAPActive()) {
+            return "IP :  " + networkManager->getWiFiAPIP().toString();
         } else if (backupDigiMode) {
             return "- BACKUP DIGI MODE -";
         } else {
-            return "IP :  " + String(WiFi.localIP()[0]) + "." + String(WiFi.localIP()[1]) + "." + String(WiFi.localIP()[2]) + "." + String(WiFi.localIP()[3]);
+            return "IP :  " + networkManager->getWiFiIP().toString();
         }
     }
 
@@ -481,4 +483,4 @@ namespace Utils {
         }
     }
 
-}
+}

src/web_utils.cpp

@@ -98,7 +98,7 @@ namespace WEB_Utils {
     }
 
     void handleReceivedPackets(AsyncWebServerRequest *request) {
-        StaticJsonDocument<1536> data;
+        JsonDocument data;
 
         for (int i = 0; i < receivedPackets.size(); i++) {
             data[i]["rxTime"]   = receivedPackets[i].rxTime;
@@ -161,7 +161,7 @@ namespace WEB_Utils {
 
         Config.callsign                     = getParamStringSafe("callsign", Config.callsign);
         Config.tacticalCallsign             = getParamStringSafe("tacticalCallsign", Config.tacticalCallsign);
-
+        Config.wifiAutoAP.enabled           = request->hasParam("wifi.autoAP.enabled", true);
         Config.wifiAutoAP.password          = getParamStringSafe("wifi.autoAP.password", Config.wifiAutoAP.password);
         Config.wifiAutoAP.timeout           = getParamIntSafe("wifi.autoAP.timeout", Config.wifiAutoAP.timeout);
 

src/wifi_utils.cpp

@@ -18,6 +18,7 @@
 
 #include <WiFi.h>
 #include "configuration.h"
+#include "network_manager.h"
 #include "board_pinout.h"
 #include "wifi_utils.h"
 #include "display.h"
@@ -25,16 +26,11 @@
 
 
 extern Configuration    Config;
+extern NetworkManager   *networkManager;
 
-extern uint8_t          myWiFiAPIndex;
-extern int              myWiFiAPSize;
-extern WiFi_AP          *currentWiFi;
 extern bool             backupDigiMode;
 extern uint32_t         lastServerCheck;
 
-bool        WiFiConnected       = false;
-uint32_t    WiFiAutoAPTime      = millis();
-bool        WiFiAutoAPStarted   = false;
 uint8_t     wifiCounter         = 0;
 uint32_t    lastBackupDigiTime  = millis();
 uint32_t    lastWiFiCheck       = 0;
@@ -44,32 +40,35 @@ namespace WIFI_Utils {
 
     void checkWiFi() {
         if (Config.digi.ecoMode != 0) return;
+
+        if (!networkManager->hasWiFiNetworks()) {
+            return;
+        }
+
         uint32_t currentTime = millis();
 
         if (backupDigiMode) {
-            if (WiFi.status() != WL_CONNECTED && ((currentTime - lastBackupDigiTime) >= 15 * 60 * 1000)) {
+            if (!networkManager->isWiFiConnected() && ((currentTime - lastBackupDigiTime) >= 15 * 60 * 1000)) {
                 Serial.println("*** Stopping BackUp Digi Mode ***");
                 backupDigiMode = false;
                 wifiCounter = 0;
-            } else if (WiFi.status() == WL_CONNECTED) {
+            } else if (networkManager->isWiFiConnected()) {
                 Serial.println("*** WiFi Reconnect Success (Stopping Backup Digi Mode) ***");
                 backupDigiMode = false;
                 wifiCounter = 0;
             }
         }
 
-        if (!backupDigiMode && ((currentTime - lastWiFiCheck) >= 30 * 1000) && !WiFiAutoAPStarted) {
+        if (!backupDigiMode && ((currentTime - lastWiFiCheck) >= 30 * 1000) && !networkManager->isWifiAPActive()) {
             lastWiFiCheck = currentTime;
-            if (WiFi.status() == WL_CONNECTED) {
+            if (networkManager->isWiFiConnected()) {
                 if (Config.digi.backupDigiMode && (currentTime - lastServerCheck > 30 * 1000)) {
                     Serial.println("*** Server Connection LOST → Backup Digi Mode ***");
                     backupDigiMode = true;
-                    WiFi.disconnect();
                     lastBackupDigiTime = currentTime;
                 }
             } else {
                 Serial.println("Reconnecting to WiFi...");
-                WiFi.disconnect();
                 WIFI_Utils::startWiFi();
 
                 if (Config.digi.backupDigiMode) wifiCounter++;
@@ -83,97 +82,47 @@ namespace WIFI_Utils {
     }
 
     void startAutoAP() {
-        WiFi.mode(WIFI_MODE_NULL);
-
-        WiFi.mode(WIFI_AP);
-        WiFi.softAP(Config.callsign + "-AP", Config.wifiAutoAP.password);
-
-        WiFiAutoAPTime = millis();
-        WiFiAutoAPStarted = true;
+        displayShow("", "   Starting Auto AP", " Please connect to it " , "     loading ...", 1000);
+        networkManager->setupAP(Config.callsign + "-AP", Config.wifiAutoAP.password);
     }
 
     void startWiFi() {
-        bool startAP = false;
-        if (currentWiFi->ssid == "") {
-            startAP = true;
-        } else {
-            uint8_t wifiCounter = 0;
-            String hostName = "iGATE-" + Config.callsign;
-            WiFi.setHostname(hostName.c_str());
-            WiFi.mode(WIFI_STA);
-            WiFi.disconnect();
-            delay(500);
-            unsigned long start = millis();
-            displayShow("", "Connecting to WiFi:", "", currentWiFi->ssid + " ...", 0);
-            Serial.print("\nConnecting to WiFi '"); Serial.print(currentWiFi->ssid); Serial.print("' ");
-            WiFi.begin(currentWiFi->ssid.c_str(), currentWiFi->password.c_str());
-            while (WiFi.status() != WL_CONNECTED && wifiCounter < myWiFiAPSize) {
-                delay(500);
-                #ifdef INTERNAL_LED_PIN
-                    digitalWrite(INTERNAL_LED_PIN, HIGH);
-                #endif
-                Serial.print('.');
-                delay(500);
-                #ifdef INTERNAL_LED_PIN
-                    digitalWrite(INTERNAL_LED_PIN, LOW);
-                #endif
-                if ((millis() - start) > 10000){
-                    delay(1000);
-                    if (myWiFiAPIndex >= (myWiFiAPSize - 1)) {
-                        myWiFiAPIndex = 0;
-                        wifiCounter++;
-                    } else {
-                        myWiFiAPIndex++;
-                    }
-                    wifiCounter++;
-                    currentWiFi = &Config.wifiAPs[myWiFiAPIndex];
-                    start = millis();
-                    Serial.print("\nConnecting to WiFi '"); Serial.print(currentWiFi->ssid); Serial.println("' ...");
-                    displayShow("", "Connecting to WiFi:", "", currentWiFi->ssid + " ...", 0);
-                    WiFi.disconnect();
-                    WiFi.begin(currentWiFi->ssid.c_str(), currentWiFi->password.c_str());
-                }
-            }
+        networkManager->clearWiFiNetworks();
+        for (size_t i = 0; i < Config.wifiAPs.size(); i++) {
+            const WiFi_AP& wifiAP = Config.wifiAPs[i];
+            if (wifiAP.ssid.isEmpty()) continue;
+            networkManager->addWiFiNetwork(wifiAP.ssid, wifiAP.password);
         }
+
+        if (!networkManager->hasWiFiNetworks()) {
+            Serial.println("WiFi SSID not set!");
+            if (Config.wifiAutoAP.enabled) {
+                Serial.println("Starting AP fallback...");
+                startAutoAP();
+            }
+            return;
+        }
+
+        displayShow("", "Connecting to WiFi:", "", "     loading ...", 0);
+        networkManager->connectWiFi();
+
         #ifdef INTERNAL_LED_PIN
             digitalWrite(INTERNAL_LED_PIN, LOW);
         #endif
-        if (WiFi.status() == WL_CONNECTED) {
-            Serial.print("\nConnected as ");
-            Serial.print(WiFi.localIP());
+        if (networkManager->isWiFiConnected()) {
+            Serial.print("[WiFi] Connected as ");
+            Serial.print(networkManager->getWiFiIP());
             Serial.print(" / MAC Address: ");
-            Serial.println(WiFi.macAddress());
+            Serial.println(networkManager->getWiFimacAddress());
             displayShow("", "     Connected!!", "" , "     loading ...", 1000);
         } else {
-            startAP = true;
-
-            Serial.println("\nNot connected to WiFi! Starting Auto AP");
-            displayShow("", " WiFi Not Connected!", "" , "     loading ...", 1000);
-        }
-        WiFiConnected = !startAP;
-        if (startAP) {
-            Serial.println("\nNot connected to WiFi! Starting Auto AP");
-            displayShow("", "   Starting Auto AP", " Please connect to it " , "     loading ...", 1000);
-
-            startAutoAP();
-        }
-    }
-
-    void checkAutoAPTimeout() {
-        if (WiFiAutoAPStarted && Config.wifiAutoAP.timeout > 0) {
-            if (WiFi.softAPgetStationNum() > 0) {
-                WiFiAutoAPTime = 0;
+            Serial.println("[WiFi] Not connected to WiFi!");
+            if (Config.wifiAutoAP.enabled) {
+                Serial.println("Starting AP fallback...");
+                displayShow("", " WiFi Not Connected!", "" , "     loading ...", 1000);
+                startAutoAP();
             } else {
-                if (WiFiAutoAPTime == 0) {
-                    WiFiAutoAPTime = millis();
-                } else if ((millis() - WiFiAutoAPTime) > Config.wifiAutoAP.timeout * 60 * 1000) {
-                    Serial.println("Stopping auto AP");
-
-                    WiFiAutoAPStarted = false;
-                    WiFi.softAPdisconnect(true);
-
-                    Serial.println("Auto AP stopped (timeout)");
-                }
+                displayShow("", " WiFi Not Connected!", "" , "     loading ...", 1000);
             }
         }
     }
@@ -183,4 +132,4 @@ namespace WIFI_Utils {
         btStop();
     }
 
-}
+}

variants/ttgo-t-beam-v1_SX1262/board_pinout.h

@@ -0,0 +1,55 @@
+/* Copyright (C) 2025 Ricardo Guzman - CA2RXU
+ *
+ * This file is part of LoRa APRS iGate.
+ *
+ * LoRa APRS iGate is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LoRa APRS iGate is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LoRa APRS iGate. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1262
+    #define HAS_TCXO
+    #define RADIO_SCLK_PIN          5
+    #define RADIO_MISO_PIN          19
+    #define RADIO_MOSI_PIN          27
+    #define RADIO_CS_PIN            18
+    #define RADIO_DIO0_PIN          26
+    #define RADIO_RST_PIN           23
+    #define RADIO_DIO1_PIN          33
+    #define RADIO_BUSY_PIN          32
+    #define RADIO_WAKEUP_PIN        RADIO_DIO1_PIN
+    #define GPIO_WAKEUP_PIN         GPIO_SEL_33
+
+    //  Display
+    #define HAS_DISPLAY
+
+    #undef  OLED_SDA
+    #undef  OLED_SCL
+    #undef  OLED_RST
+
+    #define OLED_SDA                21
+    #define OLED_SCL                22
+    #define OLED_RST                -1      // Reset pin # (or -1 if sharing Arduino reset pin)
+
+    //  Aditional Config
+    #define HAS_AXP192
+
+    //  GPS
+    #define HAS_GPS
+    #define GPS_RX                  12
+    #define GPS_TX                  34
+
+#endif

variants/ttgo-t-beam-v1_SX1262/platformio.ini

@@ -0,0 +1,12 @@
+[env:ttgo-t-beam-v1_SX1262]
+board = ttgo-t-beam
+build_flags =
+	${common.build_flags}
+	-D RADIOLIB_EXCLUDE_LR11X0=1
+	-D RADIOLIB_EXCLUDE_SX127X=1
+	-D RADIOLIB_EXCLUDE_SX128X=1
+	-D TTGO_T_BEAM_V1_0_SX1262
+lib_deps =
+	${common.lib_deps}
+	${common.display_libs}
+	lewisxhe/XPowersLib @ 0.2.4