WEBUI update

lastServerCheck update
lastServerCheck
2026-03-28 16:52:33 +01:00 · 2026-01-20 22:44:03 -03:00 · 2026-01-20 21:19:53 -03:00 · 2026-01-20 21:08:28 -03:00 · 2026-01-20 20:56:20 -03:00 · 2026-01-20 09:50:09 -03:00
19 changed files with 381 additions and 250 deletions
--- a/README.md
+++ b/README.md
@@ -51,6 +51,8 @@ ____________________________________________________
 <br />

 # Timeline (Versions):
+- 2026-01-07 Tactical Callsign added.
+- 2026-01-05 Heltec V4 support added.
 - 2025-12-22 Heltec Wireless Paper V1.2 and VisionMaster E290 Added. Thanks HA5SZI.
 - 2025-12-18 TCXO and packet decoding updates.
 - 2025-12-01 APRSPacketLib updates, AHT20 sensor added, INA219 support added.
--- a/common_settings.ini
+++ b/common_settings.ini
@@ -31,12 +31,12 @@ lib_deps =
 	adafruit/Adafruit INA219 @ 1.2.3
 	adafruit/Adafruit Si7021 Library @ 1.5.3
 	arduino-libraries/NTPClient @ 3.2.1
-	ayushsharma82/ElegantOTA @ 3.1.5
+	ayushsharma82/ElegantOTA @ 3.1.7
 	bblanchon/ArduinoJson @ 6.21.3
 	jgromes/RadioLib @ 7.1.0
 	knolleary/PubSubClient @ 2.8
-	mathieucarbou/AsyncTCP @ 3.2.5
-	mathieucarbou/ESPAsyncWebServer @ 3.2.3
+	ESP32Async/AsyncTCP @ 3.4.9
+	ESP32Async/ESPAsyncWebServer @ 3.9.3
 	mikalhart/TinyGPSPlus @ 1.0.3
 	richonguzman/APRSPacketLib @ 1.0.4
 display_libs =
--- a/data/igate_conf.json
+++ b/data/igate_conf.json
@@ -36,7 +36,8 @@
    "blacklist": "",
    "digi": {
        "mode": 0,
-        "ecoMode": 0
+        "ecoMode": 0,
+        "backupDigiMode": false
    },
    "lora": {
        "rxActive": true,
@@ -113,7 +114,6 @@
    },
    "other": {
        "rememberStationTime": 30,
-        "backupDigiMode": false,
        "rebootMode": false,
        "rebootModeTime": 6,
        "startupDelay": 0
--- a/data_embed/index.html
+++ b/data_embed/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" data-bs-theme="auto">
+<html lang="en" data-bs-theme="dark">
    <head>
        <meta charset="utf-8" />
        <meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -36,8 +36,8 @@
                            <li class="nav-item dropdown">
                                <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">Backup</a>
                                <div class="dropdown-menu">
-                                    <a class="dropdown-item" href="#" id="backup">Download</a>
-                                    <a class="dropdown-item" href="#" id="restore">Restore</a>
+                                    <a class="dropdown-item" href="#" id="backup">Download Conf.</a>
+                                    <a class="dropdown-item" href="#" id="restore">Restore Conf.</a>
                                </div>
                            </li>
                            <li class="nav-item dropdown">
@@ -119,7 +119,7 @@
                            </div>
                            <div class="col-lg-9 col-sm-12">
                                <div class="row">
-                                    <div class="col-12">
+                                    <div class="col-6">
                                        <label for="callsign" class="form-label"
                                            >Callsign - SSID</label
                                        >
@@ -133,6 +133,19 @@
                                            oninput="this.value = this.value.toUpperCase();"
                                        />
                                    </div>
+                                    <div class="col-6">
+                                        <label for="tacticalCallsign" class="form-label"
+                                            >Tactical Callsign</label
+                                        >
+                                        <input
+                                            type="text"
+                                            name="tacticalCallsign"
+                                            id="tacticalCallsign"
+                                            class="form-control"
+                                            placeholder=""
+                                            oninput="this.value = this.value.toUpperCase();"
+                                        />
+                                    </div>
                                    <div class="col-12 mt-3">
                                        <label
                                            for="beacon.comment"
@@ -158,7 +171,7 @@
                                            name="beacon.path"
                                            id="beacon.path"
                                            class="form-control"
-                                            placeholder="We prefer WIDE1-1"
+                                            placeholder="WIDE1-1"
                                        />
                                    </div>
                                    <div class="col-8 mt-3">
@@ -244,7 +257,7 @@
                                            name="personalNote"
                                            id="personalNote"
                                            class="form-control"
-                                            placeholder="A couple of words"
+                                            placeholder="Describe here your Station"
                                        />
                                    </div>
                                    <div class="col-12 mt-3">
@@ -591,11 +604,11 @@
                                                type="number"
                                                name="beacon.interval"
                                                id="beacon.interval"
-                                                placeholder="15"
                                                class="form-control"
-                                                required=""
+                                                value="15"
+                                                min="10"
                                                step="1"
-                                                min="15"
+                                                required
                                            />
                                            <span class="input-group-text"
                                                >minutes
@@ -735,6 +748,24 @@
                                            <option value="1">Ultra Eco Mode (Sleep till Packet Rx (WiFiAP/WebUI & Display disabled))</option>
                                            <option value="2">OFF (Normal Mode - WiFiAP disabled but Serial Output still enabled)</option>
                                        </select>
+                                    </div>                                    
+                                    <div class="col-12 mt-3">
+                                        <div class="form-check form-switch">
+                                            <div class="form-text">
+                                                If WiFi/server connection is lost in iGate-only mode, the device switches to Digipeater mode (WIDE1-1) and retries connection every 15 minutes.
+                                            </div>
+                                            <input
+                                                type="checkbox"
+                                                name="digi.backupDigiMode"
+                                                id="digi.backupDigiMode"
+                                                class="form-check-input"
+                                            />
+                                            <label
+                                                for="digi.backupDigiMode"
+                                                class="form-label"
+                                                >Backup Digipeater Mode</label
+                                            >
+                                        </div>
                                    </div>
                                </div>
                            </div>
@@ -853,7 +884,9 @@
                                            id="lora.rxSpreadingFactor"
                                            required=""
                                        >
-                                            <option value="7">SF7 - Lowest battery usage</option>
+                                            <option value="5">SF5 - Lowest battery usage</option>
+                                            <option value="6">SF6</option>
+                                            <option value="7">SF7</option>
                                            <option value="8">SF8</option>
                                            <option value="9">SF9</option>
                                            <option value="10">SF10</option>
@@ -873,7 +906,9 @@
                                            id="lora.txSpreadingFactor"
                                            required=""
                                        >
-                                            <option value="7">SF7 - Lowest battery usage</option>
+                                            <option value="5">SF5 - Lowest battery usage</option>
+                                            <option value="6">SF6</option>
+                                            <option value="7">SF7</option>
                                            <option value="8">SF8</option>
                                            <option value="9">SF9</option>
                                            <option value="10">SF10</option>
@@ -2110,52 +2145,6 @@
                            </div>
                        </div>
                        <hr>
-
-                        <div class="row my-5 d-flex align-items-top">
-                            <div class="col-lg-3 col-sm-12">
-                                <h5>
-                                    <svg
-                                        xmlns="http://www.w3.org/2000/svg"
-                                        width="20"
-                                        height="20"
-                                        fill="currentColor"
-                                        class="bi bi-heart-pulse-fill"
-                                        viewBox="0 0 16 16"
-                                    >
-                                        <path
-                                            d="M1.475 9C2.702 10.84 4.779 12.871 8 15c3.221-2.129 5.298-4.16 6.525-6H12a.5.5 0 0 1-.464-.314l-1.457-3.642-1.598 5.593a.5.5 0 0 1-.945.049L5.889 6.568l-1.473 2.21A.5.5 0 0 1 4 9z"
-                                        />
-                                        <path
-                                            d="M.88 8C-2.427 1.68 4.41-2 7.823 1.143q.09.083.176.171a3 3 0 0 1 .176-.17C11.59-2 18.426 1.68 15.12 8h-2.783l-1.874-4.686a.5.5 0 0 0-.945.049L7.921 8.956 6.464 5.314a.5.5 0 0 0-.88-.091L3.732 8z"
-                                        />
-                                    </svg>
-                                    Experimental
-                                </h5>
-                                <small>You can test new features. <u>Use at your own risk!</u></small>
-                            </div>
-                            <div class="col-lg-9 col-sm-12">
-                                <div class="row">
-                                    <div class="col-12">
-                                        <div class="form-check form-switch">
-                                            <div class="form-text">
-                                                When "only" iGate Mode loses WiFi, it will change into a Digipeater Mode and after 15 min check if WiFi available and return to "only" iGate Mode.
-                                            </div>
-                                            <input
-                                                type="checkbox"
-                                                name="other.backupDigiMode"
-                                                id="other.backupDigiMode"
-                                                class="form-check-input"
-                                            />
-                                            <label
-                                                for="other.backupDigiMode"
-                                                class="form-label"
-                                                >Backup Digipeater Mode</label
-                                            >
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
                    </div>
                </main>
                <footer
@@ -2210,7 +2199,7 @@
                            <a
                                href="https://cd3eap.aguayoki.cl/"
                                target="_blank"
-                                >CD3EAP</a
+                                >CA3EAP</a
                            ></b
                        >: Settings Page.
                    </p>
--- a/data_embed/script.js
+++ b/data_embed/script.js
@@ -54,6 +54,7 @@ function loadSettings(settings) {
    currentSettings = settings;
    // General
    document.getElementById("callsign").value                           = settings.callsign;
+    document.getElementById("tacticalCallsign").value                   = settings.tacticalCallsign;
    document.getElementById("beacon.comment").value                     = settings.beacon.comment;
    document.getElementById("beacon.path").value                        = settings.beacon.path;
    document.getElementById("beacon.symbol").value                      = settings.beacon.symbol;
@@ -139,6 +140,7 @@ function loadSettings(settings) {
    // Digi
    document.getElementById("digi.mode").value                          = settings.digi.mode;
    document.getElementById("digi.ecoMode").value                       = settings.digi.ecoMode;
+    document.getElementById("digi.backupDigiMode").checked              = settings.digi.backupDigiMode;

    // LoRa
    document.getElementById("lora.rxActive").checked                    = settings.lora.rxActive;
@@ -258,9 +260,6 @@ function loadSettings(settings) {
    document.getElementById("ntp.server").value                         = settings.ntp.server;
    document.getElementById("ntp.gmtCorrection").value                  = settings.ntp.gmtCorrection;

-    // Experimental
-    document.getElementById("other.backupDigiMode").checked             = settings.other.backupDigiMode;
-
    updateImage();
 }

--- a/include/configuration.h
+++ b/include/configuration.h
@@ -68,7 +68,8 @@ public:
 class DIGI {
 public:
    int     mode;
-    int     ecoMode;        // 0 = Not Active | 1 = Ultra EcoMode | 2 = Not Active (WiFi OFF, Serial ON)  
+    int     ecoMode;        // 0 = Not Active | 1 = Ultra EcoMode | 2 = Not Active (WiFi OFF, Serial ON)
+    bool    backupDigiMode;
 };

 class LoraModule {
@@ -170,8 +171,8 @@ public:
 class Configuration {
 public:
    String                  callsign;
+    String                  tacticalCallsign;
    int                     rememberStationTime;
-    bool                    backupDigiMode;
    bool                    rebootMode;
    int                     rebootModeTime;
    int                     startupDelay;
--- a/src/LoRa_APRS_iGate.cpp
+++ b/src/LoRa_APRS_iGate.cpp
@@ -67,8 +67,8 @@ ___________________________________________________________________*/
 #endif


-String              versionDate             = "2025-12-28";
-String              versionNumber           = "3.1.6.3";
+String              versionDate             = "2026-01-21";
+String              versionNumber           = "3.2";
 Configuration       Config;
 WiFiClient          aprsIsClient;
 WiFiClient          mqttClient;
@@ -86,7 +86,7 @@ WiFi_AP             *currentWiFi            = &Config.wifiAPs[myWiFiAPIndex];
 bool                isUpdatingOTA           = false;
 uint32_t            lastBatteryCheck        = 0;

-bool                backUpDigiMode          = false;
+bool                backupDigiMode          = false;
 bool                modemLoggedToAPRSIS     = false;

 #ifdef HAS_EPAPER
@@ -187,7 +187,7 @@ void loop() {
                APRS_IS_Utils::processLoRaPacket(packet); // Send received packet to APRSIS
            }

-            if (Config.loramodule.txActive && (Config.digi.mode == 2 || Config.digi.mode == 3 || backUpDigiMode)) { // If Digi enabled
+            if (Config.loramodule.txActive && (Config.digi.mode == 2 || Config.digi.mode == 3 || backupDigiMode)) { // If Digi enabled
                STATION_Utils::clean25SegBuffer();
                DIGI_Utils::processLoRaPacket(packet); // Send received packet to Digi
            }
--- a/src/aprs_is_utils.cpp
+++ b/src/aprs_is_utils.cpp
@@ -42,11 +42,13 @@ extern String               fifthLine;
 extern String               sixthLine;
 extern String               seventhLine;
 extern bool                 modemLoggedToAPRSIS;
-extern bool                 backUpDigiMode;
+extern bool                 backupDigiMode;
 extern String               versionNumber;

 uint32_t    lastRxTime      = millis();
 bool        passcodeValid   = false;
+uint32_t    lastServerCheck = 0;
+

 #ifdef HAS_A7670
    extern bool             stationBeacon;
@@ -94,7 +96,7 @@ namespace APRS_IS_Utils {
        if (WiFi.status() == WL_CONNECTED) {
            wifiState = "OK";
        } else {
-            if (backUpDigiMode || Config.digi.ecoMode == 1 || Config.digi.ecoMode == 2) {
+            if (backupDigiMode || Config.digi.ecoMode == 1 || Config.digi.ecoMode == 2) {
                wifiState = "--";
            } else {
                wifiState = "AP";
@@ -274,7 +276,31 @@ namespace APRS_IS_Utils {
        return outputPacket;
    }

+    void processAckMessage(const String& sender, const String& message) {
+        String ackPacket = Config.callsign;
+        ackPacket += ">APLRG1,TCPIP,qAC::";
+
+        String senderCallsign = sender;
+        for (int i = sender.length(); i < 9; i++) {
+            senderCallsign += ' ';
+        }
+        ackPacket += senderCallsign;
+        ackPacket += ":";
+
+        String ackMessage = "ack";
+        ackMessage += message.substring(message.indexOf("{") + 1);
+        ackMessage.trim();
+        ackPacket += ackMessage;
+
+        #ifdef HAS_A7670
+            A7670_Utils::uploadToAPRSIS(ackPacket);
+        #else
+            upload(ackPacket);
+        #endif
+    }
+
    void processAPRSISPacket(const String& packet) {
+        uint32_t currentTime = millis();
        if (!passcodeValid && packet.indexOf(Config.callsign) != -1) {
            if (packet.indexOf("unverified") != -1 ) {
                Serial.println("\n****APRS PASSCODE NOT VALID****\n");
@@ -282,93 +308,79 @@ namespace APRS_IS_Utils {
                aprsIsClient.stop();
                Config.aprs_is.active = false;
            } else if (packet.indexOf("verified") != -1 ) {
+                if (Config.digi.backupDigiMode) lastServerCheck = currentTime;
                passcodeValid = true;
            }
        }
-        if (passcodeValid && !packet.startsWith("#")) {
-            if (Config.aprs_is.messagesToRF && packet.indexOf("::") > 0) {
-                String Sender = packet.substring(0, packet.indexOf(">"));
-                const String& AddresseeAndMessage = packet.substring(packet.indexOf("::") + 2);
-                String Addressee = AddresseeAndMessage.substring(0, AddresseeAndMessage.indexOf(":"));
-                Addressee.trim();
-                if (Addressee == Config.callsign) {                 // its for me!
-                    String receivedMessage;
-                    if (AddresseeAndMessage.indexOf("{") > 0) {     // ack?
-                        String ackMessage = "ack";
-                        ackMessage += AddresseeAndMessage.substring(AddresseeAndMessage.indexOf("{") + 1);
-                        ackMessage.trim();
-                        delay(4000);
-                        for (int i = Sender.length(); i < 9; i++) {
-                            Sender += ' ';
+        if (passcodeValid) {
+            if (packet.startsWith("#")) {
+                if (Config.digi.backupDigiMode) lastServerCheck = currentTime;
+            } else {
+                if (Config.aprs_is.messagesToRF && packet.indexOf("::") > 0) {
+                    String Sender = packet.substring(0, packet.indexOf(">"));
+                    const String& AddresseeAndMessage = packet.substring(packet.indexOf("::") + 2);
+                    String Addressee = AddresseeAndMessage.substring(0, AddresseeAndMessage.indexOf(":"));
+                    Addressee.trim();
+                    if (Addressee == Config.callsign) {                 // its for me!
+                        String receivedMessage;
+                        if (AddresseeAndMessage.indexOf("{") > 0) {     // ack?
+                            processAckMessage(Sender, AddresseeAndMessage);
+                            receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":") + 1, AddresseeAndMessage.indexOf("{"));
+                        } else {
+                            receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":") + 1);
                        }
-
-                        String ackPacket = Config.callsign;
-                        ackPacket += ">APLRG1,TCPIP,qAC::";
-                        ackPacket += Sender;
-                        ackPacket += ":";
-                        ackPacket += ackMessage;
-                        #ifdef HAS_A7670
-                            A7670_Utils::uploadToAPRSIS(ackPacket);
-                        #else
-                            upload(ackPacket);
-                        #endif
-                        receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":") + 1, AddresseeAndMessage.indexOf("{"));
-                    } else {
-                        receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":") + 1);
-                    }
-                    if (receivedMessage.indexOf("?") == 0) {
-                        Utils::println("Rx Query (APRS-IS)  : " + packet);
-                        Sender.trim();
-                        String queryAnswer = QUERY_Utils::process(receivedMessage, Sender, true, false);
-                        //Serial.println("---> QUERY Answer : " + queryAnswer.substring(0,queryAnswer.indexOf("\n")));
-                        if (!Config.display.alwaysOn && Config.display.timeout != 0) {
-                            displayToggle(true);
+                        if (receivedMessage.indexOf("?") == 0) {
+                            Utils::println("Rx Query (APRS-IS)  : " + packet);
+                            String queryAnswer = QUERY_Utils::process(receivedMessage, Sender, true, false);
+                            //Serial.println("---> QUERY Answer : " + queryAnswer.substring(0,queryAnswer.indexOf("\n")));
+                            if (!Config.display.alwaysOn && Config.display.timeout != 0) {
+                                displayToggle(true);
+                            }
+                            lastScreenOn = currentTime;
+                            #ifdef HAS_A7670
+                                A7670_Utils::uploadToAPRSIS(queryAnswer);
+                            #else
+                                upload(queryAnswer);
+                            #endif
+                            SYSLOG_Utils::log(2, queryAnswer, 0, 0.0, 0); // APRSIS TX
+                            fifthLine = "APRS-IS ----> APRS-IS";
+                            sixthLine = Config.callsign;
+                            for (int j = sixthLine.length();j < 9;j++) {
+                                sixthLine += " ";
+                            }
+                            sixthLine += "> ";
+                            sixthLine += Sender;
+                            seventhLine = "QUERY = ";
+                            seventhLine += receivedMessage;
                        }
-                        lastScreenOn = millis();
-                        delay(500);
-                        #ifdef HAS_A7670
-                            A7670_Utils::uploadToAPRSIS(queryAnswer);
-                        #else
-                            upload(queryAnswer);
-                        #endif
-                        SYSLOG_Utils::log(2, queryAnswer, 0, 0.0, 0); // APRSIS TX
-                        fifthLine = "APRS-IS ----> APRS-IS";
-                        sixthLine = Config.callsign;
-                        for (int j = sixthLine.length();j < 9;j++) {
-                            sixthLine += " ";
-                        }
-                        sixthLine += "> ";
-                        sixthLine += Sender;
-                        seventhLine = "QUERY = ";
-                        seventhLine += receivedMessage;
-                    }
-                    displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
-                } else {
-                    Utils::print("Rx Message (APRS-IS): " + packet);
-                    if (STATION_Utils::wasHeard(Addressee) && packet.indexOf("EQNS.") == -1 && packet.indexOf("UNIT.") == -1 && packet.indexOf("PARM.") == -1) {
-                        STATION_Utils::addToOutputPacketBuffer(buildPacketToTx(packet, 1));
-                        displayToggle(true);
-                        lastScreenOn = millis();
-                        Utils::typeOfPacket(packet, 1); // APRS-LoRa
                        displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
+                    } else {
+                        Utils::print("Rx Message (APRS-IS): " + packet);
+                        if (STATION_Utils::wasHeard(Addressee) && packet.indexOf("EQNS.") == -1 && packet.indexOf("UNIT.") == -1 && packet.indexOf("PARM.") == -1) {
+                            STATION_Utils::addToOutputPacketBuffer(buildPacketToTx(packet, 1));
+                            displayToggle(true);
+                            lastScreenOn = currentTime;
+                            Utils::typeOfPacket(packet, 1); // APRS-LoRa
+                            displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
+                        }
+                    }
+                } else if (Config.aprs_is.objectsToRF && packet.indexOf(":;") > 0) {
+                    Utils::print("Rx Object (APRS-IS) : " + packet);
+                    if (STATION_Utils::checkObjectTime(packet)) {
+                        STATION_Utils::addToOutputPacketBuffer(buildPacketToTx(packet, 5));
+                        displayToggle(true);
+                        lastScreenOn = currentTime;
+                        Utils::typeOfPacket(packet, 1); // APRS-LoRa
+                        Serial.println();
+                    } else {
+                        Serial.println(" ---> Rejected (Time): No Tx");
                    }
                }
-            } else if (Config.aprs_is.objectsToRF && packet.indexOf(":;") > 0) {
-                Utils::print("Rx Object (APRS-IS) : " + packet);
-                if (STATION_Utils::checkObjectTime(packet)) {
-                    STATION_Utils::addToOutputPacketBuffer(buildPacketToTx(packet, 5));
-                    displayToggle(true);
-                    lastScreenOn = millis();
-                    Utils::typeOfPacket(packet, 1); // APRS-LoRa
-                    Serial.println();
-                } else {
-                    Serial.println(" ---> Rejected (Time): No Tx");
+                if (Config.tnc.aprsBridgeActive) {
+                    if (Config.tnc.enableServer) TNC_Utils::sendToClients(packet);  // Send received packet to TNC KISS
+                    if (Config.tnc.enableSerial) TNC_Utils::sendToSerial(packet);   // Send received packet to Serial KISS
                }
            }
-            if (Config.tnc.aprsBridgeActive) {
-                if (Config.tnc.enableServer) TNC_Utils::sendToClients(packet);  // Send received packet to TNC KISS
-                if (Config.tnc.enableSerial) TNC_Utils::sendToSerial(packet);   // Send received packet to Serial KISS
-            }
        }
    }

--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -51,8 +51,9 @@ bool Configuration::writeFile() {
        data["wifi"]["autoAP"]["timeout"]           = wifiAutoAP.timeout;

        callsign.trim();
-        callsign.toUpperCase();
        data["callsign"]                            = callsign;
+        tacticalCallsign.trim();
+        data["tacticalCallsign"]                    = tacticalCallsign;

        data["aprs_is"]["active"]                   = aprs_is.active;
        data["aprs_is"]["passcode"]                 = aprs_is.passcode;
@@ -89,18 +90,35 @@ bool Configuration::writeFile() {
        #if defined(HAS_A7670)
            if (digi.ecoMode == 1) data["digi"]["ecoMode"] = 2;
        #endif
+        data["digi"]["backupDigiMode"]              = digi.backupDigiMode;

        data["lora"]["rxActive"]                    = loramodule.rxActive;
        data["lora"]["rxFreq"]                      = loramodule.rxFreq;
-        data["lora"]["rxSpreadingFactor"]           = loramodule.rxSpreadingFactor;
        data["lora"]["rxCodingRate4"]               = loramodule.rxCodingRate4;
        data["lora"]["rxSignalBandwidth"]           = loramodule.rxSignalBandwidth;
        data["lora"]["txActive"]                    = loramodule.txActive;      
        data["lora"]["txFreq"]                      = loramodule.txFreq;
-        data["lora"]["txSpreadingFactor"]           = loramodule.txSpreadingFactor;
        data["lora"]["txCodingRate4"]               = loramodule.txCodingRate4;
        data["lora"]["txSignalBandwidth"]           = loramodule.txSignalBandwidth;        
-        data["lora"]["power"]                       = loramodule.power;        
+        data["lora"]["power"]                       = loramodule.power;       
+        
+        int rxSpreadingFactor = loramodule.rxSpreadingFactor;
+        int txSpreadingFactor = loramodule.txSpreadingFactor;
+        #if defined(HAS_SX1276) || defined(HAS_SX1278)
+            const int minSF = 6, maxSF = 12;
+        #endif
+        #if defined(HAS_SX1262) || defined(HAS_SX1268)
+            const int minSF = 5, maxSF = 12;
+        #endif
+        #if defined(HAS_LLCC68)
+            const int minSF = 5, maxSF = 11;
+        #endif
+
+        rxSpreadingFactor = (rxSpreadingFactor < minSF) ? minSF : (rxSpreadingFactor > maxSF) ? maxSF : rxSpreadingFactor;
+        txSpreadingFactor = (txSpreadingFactor < minSF) ? minSF : (txSpreadingFactor > maxSF) ? maxSF : txSpreadingFactor;
+
+        data["lora"]["rxSpreadingFactor"]           = rxSpreadingFactor;
+        data["lora"]["txSpreadingFactor"]           = txSpreadingFactor;

        data["display"]["alwaysOn"]                 = display.alwaysOn;
        data["display"]["timeout"]                  = display.timeout;
@@ -160,8 +178,6 @@ bool Configuration::writeFile() {

        data["other"]["rememberStationTime"]        = rememberStationTime;

-        data["other"]["backupDigiMode"]             = backupDigiMode;
-
        serializeJson(data, configFile);
        configFile.close();
        return true;
@@ -204,6 +220,8 @@ bool Configuration::readFile() {

        if (!data.containsKey("callsign")) needsRewrite = true;
        callsign                        = data["callsign"] | "NOCALL-10";
+        if (!data.containsKey("tacticalCallsign")) needsRewrite = true;
+        tacticalCallsign                = data["tacticalCallsign"] | "";
        
        if (!data["aprs_is"].containsKey("active") ||
            !data["aprs_is"].containsKey("passcode") ||
@@ -256,13 +274,16 @@ bool Configuration::readFile() {
        blacklist                       = data["blacklist"] | "station callsign";

        if (!data["digi"].containsKey("mode") ||
-            !data["digi"].containsKey("ecoMode")) needsRewrite = true;
+            !data["digi"].containsKey("ecoMode") ||
+            !data["digi"].containsKey("backupDigiMode")) needsRewrite = true;
        digi.mode                       = data["digi"]["mode"] | 0;
        digi.ecoMode                    = data["digi"]["ecoMode"] | 0;
        if (digi.ecoMode == 1) shouldSleepStop = false;
        #if defined(HAS_A7670)
            if (digi.ecoMode == 1) digi.ecoMode = 2;
        #endif
+        digi.backupDigiMode             = data["digi"]["backupDigiMode"] | false;
+

        if (!data["lora"].containsKey("rxActive") ||
            !data["lora"].containsKey("rxFreq") ||
@@ -391,9 +412,6 @@ bool Configuration::readFile() {
        if (!data["other"].containsKey("rememberStationTime")) needsRewrite = true;
        rememberStationTime             = data["other"]["rememberStationTime"] | 30;

-        if (!data["other"].containsKey("backupDigiMode")) needsRewrite = true;
-        backupDigiMode                  = data["other"]["backupDigiMode"] | false;
-
        if (wifiAPs.size() == 0) { // If we don't have any WiFi's from config we need to add "empty" SSID for AUTO AP
            WiFi_AP wifiap;
            wifiap.ssid = "";
@@ -431,6 +449,7 @@ void Configuration::setDefaultValues() {
    wifiAutoAP.timeout              = 10;

    callsign                        = "N0CALL-10";
+    tacticalCallsign                = "";

    aprs_is.active                  = false;
    aprs_is.passcode                = "XYZVW";
@@ -464,6 +483,7 @@ void Configuration::setDefaultValues() {

    digi.mode                       = 0;
    digi.ecoMode                    = 0;
+    digi.backupDigiMode             = false;

    loramodule.rxActive             = true;
    loramodule.rxFreq               = 433775000;
@@ -535,8 +555,6 @@ void Configuration::setDefaultValues() {

    rememberStationTime             = 30;

-    backupDigiMode                  = false;
-
    Serial.println("New Data Created... All is Written!");
 }

--- a/src/digi_utils.cpp
+++ b/src/digi_utils.cpp
@@ -38,7 +38,7 @@ extern String           fourthLine;
 extern String           fifthLine;
 extern String           sixthLine;
 extern String           seventhLine;
-extern bool             backUpDigiMode;
+extern bool             backupDigiMode;


 namespace DIGI_Utils {
@@ -49,7 +49,7 @@ namespace DIGI_Utils {
            String tempPath = path;

            if (path.indexOf("WIDE1-1") != -1 && (Config.digi.mode == 2 || Config.digi.mode == 3)) {
-                tempPath.replace("WIDE1-1", Config.callsign + "*");
+                tempPath.replace("WIDE1-1", (Config.tacticalCallsign == "" ? Config.callsign : Config.tacticalCallsign) + "*");
            } else if (path.indexOf("WIDE2-") != -1 && Config.digi.mode == 3) {
                if (path.indexOf(",WIDE1*") != -1) {
                    tempPath.remove(path.indexOf(",WIDE1*"), 7);
@@ -58,9 +58,9 @@ namespace DIGI_Utils {
                    tempPath.remove(path.indexOf("*"), 1);
                }
                if (path.indexOf("WIDE2-1") != -1) {
-                    tempPath.replace("WIDE2-1", Config.callsign + "*");
+                    tempPath.replace("WIDE2-1", (Config.tacticalCallsign == "" ? Config.callsign : Config.tacticalCallsign) + "*");
                } else if (path.indexOf("WIDE2-2") != -1) {
-                    tempPath.replace("WIDE2-2", Config.callsign + "*,WIDE2-1");
+                    tempPath.replace("WIDE2-2", (Config.tacticalCallsign == "" ? Config.callsign : Config.tacticalCallsign) + "*,WIDE2-1");
                } else {
                    return "";
                }
@@ -84,7 +84,7 @@ namespace DIGI_Utils {
                }
            }
            packetToRepeat += ",";
-            packetToRepeat += Config.callsign;
+            packetToRepeat += (Config.tacticalCallsign == "" ? Config.callsign : Config.tacticalCallsign);
            packetToRepeat += "*";
            packetToRepeat += APRS_IS_Utils::checkForStartingBytes(packet.substring(packet.indexOf(suffix)));
            return packetToRepeat;
@@ -101,7 +101,7 @@ namespace DIGI_Utils {
        }
        if (temp.indexOf(",") > 2) { // checks for path
            const String& path = temp.substring(temp.indexOf(",") + 1); // after tocall
-            if (Config.digi.mode == 2 || backUpDigiMode) {
+            if (Config.digi.mode == 2 || backupDigiMode) {
                if (path.indexOf("WIDE1-1") != - 1) {
                    return buildPacket(path, packet, thirdParty, false);
                } else if (path.indexOf("WIDE1-1") == -1 && (abs(Config.loramodule.txFreq - Config.loramodule.rxFreq) >= 125000)) { //  CrossFreq Digi
@@ -127,7 +127,7 @@ namespace DIGI_Utils {
            } else {
                return "";
            }
-        } else if (temp.indexOf(",") == -1 && (Config.digi.mode == 2 || backUpDigiMode || Config.digi.mode == 3) && (abs(Config.loramodule.txFreq - Config.loramodule.rxFreq) >= 125000)) {
+        } else if (temp.indexOf(",") == -1 && (Config.digi.mode == 2 || backupDigiMode || Config.digi.mode == 3) && (abs(Config.loramodule.txFreq - Config.loramodule.rxFreq) >= 125000)) {
            return buildPacket("", packet, thirdParty, true);
        } else {
            return "";
@@ -147,8 +147,8 @@ namespace DIGI_Utils {
                temp    = packet.substring(3);
                Sender  = packet.substring(3, packet.indexOf(">"));
            }
-            if (Sender != Config.callsign) {        // Avoid listening to own packets
-                if (!thirdPartyPacket && !Utils::checkValidCallsign(Sender)) {
+            if (Sender != (Config.tacticalCallsign == "" ? Config.callsign : Config.tacticalCallsign)) {    // Avoid listening to own packets
+                if (!thirdPartyPacket && Config.tacticalCallsign == "" && !Utils::checkValidCallsign(Sender)) {
                    return;
                }
                if (STATION_Utils::check25SegBuffer(Sender, temp.substring(temp.indexOf(":") + 2))) {
@@ -159,7 +159,7 @@ namespace DIGI_Utils {
                        String AddresseeAndMessage  = temp.substring(temp.indexOf("::") + 2);
                        String Addressee            = AddresseeAndMessage.substring(0, AddresseeAndMessage.indexOf(":"));
                        Addressee.trim();
-                        if (Addressee == Config.callsign) {     // it's a message for me!
+                        if (Addressee == (Config.tacticalCallsign == "" ? Config.callsign : Config.tacticalCallsign)) {     // it's a message for me!
                            queryMessage = APRS_IS_Utils::processReceivedLoRaMessage(Sender, AddresseeAndMessage, thirdPartyPacket);
                        }
                    }
--- a/src/gps_utils.cpp
+++ b/src/gps_utils.cpp
@@ -34,6 +34,7 @@
 extern Configuration    Config;
 extern HardwareSerial   gpsSerial;
 extern TinyGPSPlus      gps;
+extern bool             callsignIsValid;
 String                  distance, iGateBeaconPacket, iGateLoRaBeaconPacket;


@@ -44,20 +45,31 @@ namespace GPS_Utils {
    }

    void generateBeacons() {
-        if (Config.callsign.indexOf("NOCALL-10") != 0 && !Utils::checkValidCallsign(Config.callsign)) {
-            displayShow("***** ERROR ******", "CALLSIGN = NOT VALID!", "", "Only Rx Mode Active", 3000);
-            Config.loramodule.txActive  = false;
-            Config.aprs_is.messagesToRF = false;
-            Config.aprs_is.objectsToRF  = false;
+        String beaconPacket = APRSPacketLib::generateBasePacket(Config.callsign, "APLRG1", Config.beacon.path);
+        String encodedGPS   = APRSPacketLib::encodeGPSIntoBase91(Config.beacon.latitude, Config.beacon.longitude, 0, 0, Config.beacon.symbol, false, 0, true, Config.beacon.ambiguityLevel);
+
+        if (Config.callsign.indexOf("NOCALL-10") != 0) {
+            if (!callsignIsValid) {
+                displayShow("***** ERROR ******", "CALLSIGN = NOT VALID!", "", "Only Rx Mode Active", 3000);
+                Config.loramodule.txActive  = false;
+                Config.aprs_is.messagesToRF = false;
+                Config.aprs_is.objectsToRF  = false;
+                Config.beacon.sendViaRF     = false;
+                Config.digi.mode            = 0;
+                Config.digi.backupDigiMode  = false;
+            } else if (callsignIsValid && Config.tacticalCallsign != "") {
+                beaconPacket = APRSPacketLib::generateBasePacket(Config.tacticalCallsign, "APLRG1", Config.beacon.path);
+                Config.aprs_is.active       = false;
+                Config.beacon.sendViaAPRSIS = false;
+                Config.digi.backupDigiMode  = false;
+            }
+        } else {
+            Config.beacon.sendViaAPRSIS = false;
            Config.beacon.sendViaRF     = false;
-            Config.digi.mode            = 0;
-            Config.backupDigiMode       = false;
        }
-        String beaconPacket     = APRSPacketLib::generateBasePacket(Config.callsign, "APLRG1", Config.beacon.path);
-        String encodedGPS       = APRSPacketLib::encodeGPSIntoBase91(Config.beacon.latitude, Config.beacon.longitude, 0, 0, Config.beacon.symbol, false, 0, true, Config.beacon.ambiguityLevel);
-        
+
        iGateBeaconPacket       = beaconPacket;
-        iGateBeaconPacket       += ",qAC:!";
+        iGateBeaconPacket       += ",qAC:=";
        iGateBeaconPacket       += Config.beacon.overlay;
        iGateBeaconPacket       += encodedGPS;

@@ -132,7 +144,7 @@ namespace GPS_Utils {
        convertedLongitude += Longitude.substring(3,5).toFloat() / 60;          // Next 2 digits (Minutes)
        convertedLongitude += Longitude.substring(Longitude.indexOf(".") + 1, Longitude.indexOf(".") + 3).toFloat() / (60*100);
        if (Longitude.endsWith("W")) convertedLongitude = -convertedLongitude;  // Handle Western Hemisphere
-        
+
        return buildDistanceAndComment(convertedLatitude, convertedLongitude, infoGPS.substring(19));
    }

@@ -142,7 +154,7 @@ namespace GPS_Utils {

        const uint8_t nonEncondedLatitudeOffset     = 9;    // "N" / "S"
        const uint8_t nonEncondedLongitudeOffset    = 19;   // "E" / "W"
-        const uint8_t encondedByteOffset            = 14;
+        const uint8_t encodedByteOffset             = 14;
        
        int indexOfExclamation  = packet.indexOf(":!");
        int indexOfEqual        = packet.indexOf(":=");
@@ -156,18 +168,18 @@ namespace GPS_Utils {

        int latitudeIndex       = baseIndex + nonEncondedLatitudeOffset;
        int longitudeIndex      = baseIndex + nonEncondedLongitudeOffset;
-        int encondedByteIndex   = baseIndex + encondedByteOffset;
+        int encodedByteIndex    = baseIndex + encodedByteOffset;
        int packetLength        = packet.length();

-        if (latitudeIndex >= packetLength || longitudeIndex >= packetLength || encondedByteIndex >= packetLength) return " _ / _ / _ ";
-
-        char latChar = packet[latitudeIndex];
-        char lngChar = packet[longitudeIndex];
-        if ((latChar == 'N' || latChar == 'S') && (lngChar == 'E' || lngChar == 'W')) return getReceivedGPS(packet);
-        
-        char byteChar = packet[encondedByteIndex];
-        if (byteChar == 'G' || byteChar == 'Q' || byteChar == '[' || byteChar == 'H' || byteChar == 'X' || byteChar == '3') return decodeEncodedGPS(packet);
-
+        if (latitudeIndex < packetLength && longitudeIndex < packetLength) {
+            char latChar = packet[latitudeIndex];
+            char lngChar = packet[longitudeIndex];
+            if ((latChar == 'N' || latChar == 'S') && (lngChar == 'E' || lngChar == 'W')) return getReceivedGPS(packet);
+        }
+        if (encodedByteIndex < packetLength) {
+            char byteChar = packet[encodedByteIndex];
+            if (byteChar == 'G' || byteChar == 'Q' || byteChar == '[' || byteChar == 'H' || byteChar == 'X' || byteChar == '3') return decodeEncodedGPS(packet);
+        }
        return " _ / _ / _ ";
    }

--- a/src/lora_utils.cpp
+++ b/src/lora_utils.cpp
@@ -81,9 +81,7 @@ namespace LoRa_Utils {
            radio.XTAL = true;
        #endif
        int state = radio.begin(freq);
-        if (state == RADIOLIB_ERR_NONE) {
-            Utils::println("Initializing LoRa Module");
-        } else {
+        if (state != RADIOLIB_ERR_NONE) {
            Utils::println("Starting LoRa failed! State: " + String(state));
            while (true);
        }
@@ -105,7 +103,7 @@ namespace LoRa_Utils {
         
        radio.setSpreadingFactor(Config.loramodule.rxSpreadingFactor);
        radio.setCodingRate(Config.loramodule.rxCodingRate4);
-        float signalBandwidth = Config.loramodule.rxSignalBandwidth/1000;
+        float signalBandwidth = Config.loramodule.rxSignalBandwidth / 1000;
        radio.setBandwidth(signalBandwidth);        
        radio.setCRC(true);

@@ -151,21 +149,21 @@ namespace LoRa_Utils {
    }

    void changeFreqTx() {
-        delay(300);
        float freq = (float)Config.loramodule.txFreq / 1000000;
        radio.setFrequency(freq);
        radio.setSpreadingFactor(Config.loramodule.txSpreadingFactor);
        radio.setCodingRate(Config.loramodule.txCodingRate4);
-        radio.setBandwidth(Config.loramodule.txSignalBandwidth);
+        float signalBandwidth = Config.loramodule.txSignalBandwidth / 1000;
+        radio.setBandwidth(signalBandwidth);
    }

    void changeFreqRx() {
-        delay(300);
        float freq = (float)Config.loramodule.rxFreq / 1000000;
        radio.setFrequency(freq);
        radio.setSpreadingFactor(Config.loramodule.rxSpreadingFactor);
        radio.setCodingRate(Config.loramodule.rxCodingRate4);
-        radio.setBandwidth(Config.loramodule.rxSignalBandwidth);
+        float signalBandwidth = Config.loramodule.rxSignalBandwidth / 1000;
+        radio.setBandwidth(signalBandwidth);
    }

    void sendNewPacket(const String& newPacket) {
--- a/src/power_utils.cpp
+++ b/src/power_utils.cpp
@@ -20,6 +20,7 @@
 #include "battery_utils.h"
 #include "board_pinout.h"
 #include "power_utils.h"
+#include "utils.h"

 #if defined(HAS_AXP192) || defined(HAS_AXP2101)
    #ifdef TTGO_T_Beam_S3_SUPREME_V3
@@ -43,6 +44,7 @@
 #endif

 extern Configuration    Config;
+extern bool             callsignIsValid;


 namespace POWER_Utils {
@@ -326,6 +328,7 @@ namespace POWER_Utils {
        delay(1000);
        BATTERY_Utils::setup();
        BATTERY_Utils::startupBatteryHealth();
+        callsignIsValid = Utils::checkValidCallsign(Config.callsign);
        setCpuFrequencyMhz(80);
    }

--- a/src/query_utils.cpp
+++ b/src/query_utils.cpp
@@ -41,7 +41,7 @@ namespace QUERY_Utils {
        String queryQuestion = query;
        queryQuestion.toUpperCase();
        if (queryQuestion == "?APRS?" || queryQuestion == "H" || queryQuestion == "HELP" || queryQuestion=="?") {
-            answer.concat("?APRSV ?APRSP ?APRSL ?APRSSSR ?EM=? ?TX=? "); // ?APRSH ?WHERE callsign
+            answer.concat("?APRSV ?APRSP ?APRSL ?APRSSR ?EM=? ?TX=? "); // ?APRSH ?WHERE callsign
        } else if (queryQuestion == "?APRSV") {
            answer.concat("CA2RXU_LoRa_iGate v");
            answer.concat(versionNumber);
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -53,7 +53,7 @@ extern int                  freqError;
 extern String               distance;
 extern bool                 WiFiConnected;
 extern int                  wxModuleType;
-extern bool                 backUpDigiMode;
+extern bool                 backupDigiMode;
 extern bool                 shouldSleepLowVoltage;
 extern bool                 transmitFlag;
 extern bool                 passcodeValid;
@@ -65,6 +65,7 @@ bool        sendStartTelemetry  = true;
 bool        beaconUpdate        = false;
 uint32_t    lastBeaconTx        = 0;
 uint32_t    lastScreenOn        = millis();
+bool        callsignIsValid     = false;
 String      beaconPacket;
 String      secondaryBeaconPacket;

@@ -95,7 +96,7 @@ namespace Utils {
            return "** WiFi AP  Killed **";
        } else if (!WiFiConnected) {
            return "IP :  192.168.4.1";
-        } else if (backUpDigiMode) {
+        } 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]);
@@ -120,7 +121,11 @@ namespace Utils {
        #ifdef INTERNAL_LED_PIN
            digitalWrite(INTERNAL_LED_PIN,LOW);
        #endif
-        firstLine   = Config.callsign;
+        if (Config.tacticalCallsign != "") {
+            firstLine = Config.tacticalCallsign;
+        } else {
+            firstLine = Config.callsign;
+        }
        seventhLine = "     listening...";
    }

@@ -187,6 +192,12 @@ namespace Utils {
            }
            beaconPacket            += Config.beacon.comment;
            secondaryBeaconPacket   += Config.beacon.comment;
+            if (callsignIsValid && Config.tacticalCallsign != "") {
+                beaconPacket            += " de ";
+                beaconPacket            += Config.callsign;
+                secondaryBeaconPacket   += " de ";
+                secondaryBeaconPacket   += Config.callsign;
+            }

            #if defined(BATTERY_PIN) || defined(HAS_AXP192) || defined(HAS_AXP2101)
                if (Config.battery.sendInternalVoltage || Config.battery.monitorInternalVoltage) {
@@ -248,7 +259,7 @@ namespace Utils {
                secondaryBeaconPacket += encodedTelemetry;
            }

-            if (Config.beacon.sendViaAPRSIS && Config.aprs_is.active && passcodeValid && !backUpDigiMode) {
+            if (Config.beacon.sendViaAPRSIS && Config.aprs_is.active && passcodeValid && !backupDigiMode) {
                Utils::println("-- Sending Beacon to APRSIS --");
                displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, "SENDING IGATE BEACON", 0);
                seventhLine = "     listening...";
@@ -260,7 +271,7 @@ namespace Utils {
                if (Config.syslog.logBeaconOverTCPIP) SYSLOG_Utils::log(1, "tcp" + beaconPacket, 0, 0.0, 0);   // APRSIS TX
            }

-            if (Config.beacon.sendViaRF || backUpDigiMode) {
+            if (Config.beacon.sendViaRF || backupDigiMode) {
                Utils::println("-- Sending Beacon to RF --");
                displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, "SENDING DIGI BEACON", 0);
                seventhLine = "     listening...";
--- a/src/web_utils.cpp
+++ b/src/web_utils.cpp
@@ -160,6 +160,7 @@ namespace WEB_Utils {
        Config.startupDelay                 = getParamIntSafe("startupDelay", Config.startupDelay);

        Config.callsign                     = getParamStringSafe("callsign", Config.callsign);
+        Config.tacticalCallsign             = getParamStringSafe("tacticalCallsign", Config.tacticalCallsign);
        
        Config.wifiAutoAP.password          = getParamStringSafe("wifi.autoAP.password", Config.wifiAutoAP.password);
        Config.wifiAutoAP.timeout           = getParamIntSafe("wifi.autoAP.timeout", Config.wifiAutoAP.timeout);
@@ -199,7 +200,7 @@ namespace WEB_Utils {

        Config.digi.mode                    = getParamIntSafe("digi.mode", Config.digi.mode);
        Config.digi.ecoMode                 = getParamIntSafe("digi.ecoMode", Config.digi.ecoMode);
-        
+        Config.digi.backupDigiMode          = request->hasParam("digi.backupDigiMode", true);

        Config.loramodule.rxActive          = request->hasParam("lora.rxActive", true);
        Config.loramodule.rxFreq            = getParamIntSafe("lora.rxFreq", Config.loramodule.rxFreq);
@@ -213,14 +214,12 @@ namespace WEB_Utils {
        Config.loramodule.txSignalBandwidth = getParamIntSafe("lora.txSignalBandwidth", Config.loramodule.txSignalBandwidth);
        Config.loramodule.power             = getParamIntSafe("lora.power", Config.loramodule.power);

-
        Config.display.alwaysOn             = request->hasParam("display.alwaysOn", true);
        if (!Config.display.alwaysOn) {
            Config.display.timeout          = getParamIntSafe("display.timeout", Config.display.timeout);
        }
        Config.display.turn180              = request->hasParam("display.turn180", true);

-
        Config.battery.sendInternalVoltage          = request->hasParam("battery.sendInternalVoltage", true);
        Config.battery.monitorInternalVoltage       = request->hasParam("battery.monitorInternalVoltage", true);
        if (Config.battery.monitorInternalVoltage) {
@@ -242,7 +241,6 @@ namespace WEB_Utils {
        }
        Config.battery.sendVoltageAsTelemetry       = request->hasParam("battery.sendVoltageAsTelemetry", true);

-
        Config.wxsensor.active                      = request->hasParam("wxsensor.active", true);
        if (Config.wxsensor.active) {
            Config.wxsensor.heightCorrection        = getParamIntSafe("wxsensor.heightCorrection", Config.wxsensor.heightCorrection);
@@ -250,7 +248,6 @@ namespace WEB_Utils {
            Config.beacon.symbol = "_";
        }

-
        Config.syslog.active                    = request->hasParam("syslog.active", true);
        if (Config.syslog.active) {
            Config.syslog.server                = getParamStringSafe("syslog.server", Config.syslog.server);
@@ -258,13 +255,11 @@ namespace WEB_Utils {
            Config.syslog.logBeaconOverTCPIP    = request->hasParam("syslog.logBeaconOverTCPIP", true);
        }

-
        Config.tnc.enableServer             = request->hasParam("tnc.enableServer", true);
        Config.tnc.enableSerial             = request->hasParam("tnc.enableSerial", true);
        Config.tnc.acceptOwn                = request->hasParam("tnc.acceptOwn", true);
        Config.tnc.aprsBridgeActive         = request->hasParam("tnc.aprsBridgeActive", true);

-
        Config.mqtt.active                  = request->hasParam("mqtt.active", true);
        if (Config.mqtt.active) {
            Config.mqtt.server              = getParamStringSafe("mqtt.server", Config.mqtt.server);
@@ -275,7 +270,6 @@ namespace WEB_Utils {
            Config.mqtt.beaconOverMqtt      = request->hasParam("mqtt.beaconOverMqtt", true);
        }

-
        Config.rebootMode                   = request->hasParam("other.rebootMode", true);
        if (Config.rebootMode) {
            Config.rebootModeTime           = getParamIntSafe("other.rebootModeTime", Config.rebootModeTime);
@@ -298,8 +292,6 @@ namespace WEB_Utils {

        Config.rememberStationTime          = getParamIntSafe("other.rememberStationTime", Config.rememberStationTime);

-        Config.backupDigiMode               = request->hasParam("other.backupDigiMode", true);
-        
        bool saveSuccess = Config.writeFile();

        if (saveSuccess) {
--- a/src/wifi_utils.cpp
+++ b/src/wifi_utils.cpp
@@ -29,47 +29,54 @@ extern Configuration    Config;
 extern uint8_t          myWiFiAPIndex;
 extern int              myWiFiAPSize;
 extern WiFi_AP          *currentWiFi;
-extern bool             backUpDigiMode;
+extern bool             backupDigiMode;
+extern uint32_t         lastServerCheck;

 bool        WiFiConnected       = false;
 uint32_t    WiFiAutoAPTime      = millis();
 bool        WiFiAutoAPStarted   = false;
-uint32_t    previousWiFiMillis  = 0;
 uint8_t     wifiCounter         = 0;
 uint32_t    lastBackupDigiTime  = millis();
+uint32_t    lastWiFiCheck       = 0;


 namespace WIFI_Utils {

    void checkWiFi() {
-        if (Config.digi.ecoMode == 0) {
-            if (backUpDigiMode) {
-                uint32_t WiFiCheck = millis() - lastBackupDigiTime;
-                if (WiFi.status() != WL_CONNECTED && WiFiCheck >= 15 * 60 * 1000) {
-                    Serial.println("*** Stopping BackUp Digi Mode ***");
-                    backUpDigiMode = false;
-                    wifiCounter = 0;
-                } else if (WiFi.status() == WL_CONNECTED) {
-                    Serial.println("*** WiFi Reconnect Success (Stopping Backup Digi Mode) ***");
-                    backUpDigiMode = false;
-                    wifiCounter = 0;
-                }
-            }
+        if (Config.digi.ecoMode != 0) return;
+        uint32_t currentTime = millis();

-            if (!backUpDigiMode && (WiFi.status() != WL_CONNECTED) && ((millis() - previousWiFiMillis) >= 30 * 1000) && !WiFiAutoAPStarted) {
-                Serial.print(millis());
+        if (backupDigiMode) {
+            if (WiFi.status() != WL_CONNECTED && ((currentTime - lastBackupDigiTime) >= 15 * 60 * 1000)) {
+                Serial.println("*** Stopping BackUp Digi Mode ***");
+                backupDigiMode = false;
+                wifiCounter = 0;
+            } else if (WiFi.status() == WL_CONNECTED) {
+                Serial.println("*** WiFi Reconnect Success (Stopping Backup Digi Mode) ***");
+                backupDigiMode = false;
+                wifiCounter = 0;
+            }
+        }
+
+        if (!backupDigiMode && ((currentTime - lastWiFiCheck) >= 30 * 1000) && !WiFiAutoAPStarted) {
+            lastWiFiCheck = currentTime;
+            if (WiFi.status() == WL_CONNECTED) {
+                if (Config.digi.backupDigiMode && (currentTime - lastServerCheck > 60 * 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();
-                previousWiFiMillis = millis();

-                if (Config.backupDigiMode) {
-                    wifiCounter++;
-                }
+                if (Config.digi.backupDigiMode) wifiCounter++;
                if (wifiCounter >= 2) {
                    Serial.println("*** Starting BackUp Digi Mode ***");
-                    backUpDigiMode = true;
-                    lastBackupDigiTime = millis();
+                    backupDigiMode = true;
+                    lastBackupDigiTime = currentTime;
                }
            }
        }
@@ -98,21 +105,21 @@ namespace WIFI_Utils {
            delay(500);
            unsigned long start = millis();
            displayShow("", "Connecting to WiFi:", "", currentWiFi->ssid + " ...", 0);
-            Serial.print("\nConnecting to WiFi '"); Serial.print(currentWiFi->ssid); Serial.println("' ...");
+            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) {
+            while (WiFi.status() != WL_CONNECTED && wifiCounter < myWiFiAPSize) {
                delay(500);
                #ifdef INTERNAL_LED_PIN
-                    digitalWrite(INTERNAL_LED_PIN,HIGH);
+                    digitalWrite(INTERNAL_LED_PIN, HIGH);
                #endif
                Serial.print('.');
                delay(500);
                #ifdef INTERNAL_LED_PIN
-                    digitalWrite(INTERNAL_LED_PIN,LOW);
+                    digitalWrite(INTERNAL_LED_PIN, LOW);
                #endif
                if ((millis() - start) > 10000){
                    delay(1000);
-                    if(myWiFiAPIndex >= (myWiFiAPSize - 1)) {
+                    if (myWiFiAPIndex >= (myWiFiAPSize - 1)) {
                        myWiFiAPIndex = 0;
                        wifiCounter++;
                    } else {
@@ -129,7 +136,7 @@ namespace WIFI_Utils {
            }
        }
        #ifdef INTERNAL_LED_PIN
-            digitalWrite(INTERNAL_LED_PIN,LOW);
+            digitalWrite(INTERNAL_LED_PIN, LOW);
        #endif
        if (WiFi.status() == WL_CONNECTED) {
            Serial.print("\nConnected as ");
@@ -137,7 +144,7 @@ namespace WIFI_Utils {
            Serial.print(" / MAC Address: ");
            Serial.println(WiFi.macAddress());
            displayShow("", "     Connected!!", "" , "     loading ...", 1000);
-        } else if (WiFi.status() != WL_CONNECTED) {
+        } else {
            startAP = true;

            Serial.println("\nNot connected to WiFi! Starting Auto AP");
--- a/variants/heltec_wifi_lora_32_V4/board_pinout.h
+++ b/variants/heltec_wifi_lora_32_V4/board_pinout.h
@@ -0,0 +1,75 @@
+/* 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          9
+    #define RADIO_MISO_PIN          11
+    #define RADIO_MOSI_PIN          10
+    #define RADIO_CS_PIN            8
+    #define RADIO_RST_PIN           12
+    #define RADIO_DIO1_PIN          14
+    #define RADIO_BUSY_PIN          13
+    #define RADIO_WAKEUP_PIN        RADIO_DIO1_PIN
+    #define GPIO_WAKEUP_PIN         GPIO_SEL_14
+
+    //  I2C
+    #define USE_WIRE_WITH_OLED_PINS
+    #define USE_WIRE1_WITH_BOARD_I2C_PINS
+    #define BOARD_I2C_SDA           41
+    #define BOARD_I2C_SCL           42
+
+    //  Display
+    #define HAS_DISPLAY
+
+    #undef  OLED_SDA
+    #undef  OLED_SCL
+    #undef  OLED_RST
+
+    #define OLED_SDA                17
+    #define OLED_SCL                18
+    #define OLED_RST                21
+    #define OLED_DISPLAY_HAS_RST_PIN
+
+    //  Aditional Config
+    #define INTERNAL_LED_PIN        35
+    #define BATTERY_PIN             1
+    #define VEXT_CTRL               36
+    #define ADC_CTRL                37
+
+    //  GPS   ??
+    #define VGNS_CTRL               34  // cambiar nombre para prender GPS ?
+    //  wakeup  40
+    //  TX      39
+    //  RX      38
+    //  RST     42
+    //  PPS     41
+    //#define GPS_L76K
+
+    // // active low, powers the oled display and the lora antenna boost
+
+    //#define LORA_PA_POWER 7 // power en
+    //#define LORA_PA_EN 2
+    //#define LORA_PA_TX_EN 46 // enable tx
+
+
+#endif
--- a/variants/heltec_wifi_lora_32_V4/platformio.ini
+++ b/variants/heltec_wifi_lora_32_V4/platformio.ini
@@ -0,0 +1,12 @@
+[env:heltec_wifi_lora_32_V4]
+board = heltec_wifi_lora_32_V3
+board_build.mcu = esp32s3
+build_flags =
+	${common.build_flags}
+	-D RADIOLIB_EXCLUDE_LR11X0=1
+	-D RADIOLIB_EXCLUDE_SX127X=1
+	-D RADIOLIB_EXCLUDE_SX128X=1
+	-D HELTEC_V4
+lib_deps =
+	${common.lib_deps}
+	${common.display_libs}
Author	SHA1	Message	Date
Ricardo Guzman (Richonguzman)	7c9903ac12	WEBUI update	2026-01-20 22:44:03 -03:00
Ricardo Guzman (Richonguzman)	0d7cff14f5	lastServerCheck update	2026-01-20 21:19:53 -03:00
Ricardo Guzman (Richonguzman)	5c89635a23	lastServerCheck	2026-01-20 21:08:28 -03:00
Ricardo Guzman (Richonguzman)	7a35f9e32a	Server Alive mod	2026-01-20 20:56:20 -03:00
Ricardo Guzman (Richonguzman)	7695675a7c	check server	2026-01-20 09:50:09 -03:00
Ricardo Guzman (Richonguzman)	c8c0be636d	check internet connection	2026-01-20 00:16:24 -03:00
Ricardo Guzman (Richonguzman)	76fe27a0ab	APRSSSR into APRSSR fix	2026-01-16 09:41:20 -03:00
Ricardo Guzman (Richonguzman)	da80391921	change Freq with bandWidth fix	2026-01-13 01:50:12 -03:00
Ricardo Guzman (Richonguzman)	d638093dbf	Tactical 6 update	2026-01-11 11:46:23 -03:00
Ricardo Guzman (Richonguzman)	66a5f03c12	de update for tactical	2026-01-09 00:02:29 -03:00
Ricardo Guzman (Richonguzman)	ce8cf3a2fe	minimal interval updated	2026-01-08 14:08:07 -03:00
Ricardo Guzman (Richonguzman)	4b45b90c88	minor path updates	2026-01-08 12:21:19 -03:00
Ricardo Guzman (Richonguzman)	dbe980a081	tactical callsign ready for testing	2026-01-07 23:18:14 -03:00
Ricardo Guzman (Richonguzman)	bb3d59a20d	digi tactical changes	2026-01-07 17:25:45 -03:00
Ricardo Guzman (Richonguzman)	fe590b41b0	tactical callsign displayShow	2026-01-07 14:30:32 -03:00
Ricardo Guzman (Richonguzman)	3f76005949	few delays killed	2026-01-07 12:19:51 -03:00
Ricardo Guzman (Richonguzman)	6d95231b9c	web mods for tactical	2026-01-07 11:53:10 -03:00
Ricardo Guzman (Richonguzman)	81692010cf	tactical validation	2026-01-07 11:44:00 -03:00
Ricardo Guzman (Richonguzman)	50b738d04b	Spreading Factor update	2026-01-07 10:37:11 -03:00
Ricardo Guzman (Richonguzman)	026d6b2eeb	starting Heltec V4	2026-01-07 10:14:42 -03:00
Ricardo Guzman (Richonguzman)	fe705519cb	V3.1.7 OTA and mode	2025-12-29 09:10:17 -03:00
Ricardo Guzman (Richonguzman)	1fa74b8697	GPS encoded payload comment fix	2025-12-28 13:45:29 -03:00
Ricardo Guzman (Richonguzman)	a3794085b4	OTA update fixed	2025-12-28 11:59:05 -03:00
Ricardo Guzman (Richonguzman)	0a898a40e6	gps payload decoding fix2	2025-12-28 11:46:43 -03:00