replaced string for hash in 25segBuffer

update digi2000
digipeater logic improved
2026-03-28 16:52:33 +01:00 · 2026-02-23 18:59:27 -03:00 · 2026-02-23 18:07:26 -03:00 · 2026-02-23 17:32:52 -03:00 · 2026-02-23 12:00:55 -03:00 · 2026-02-23 11:14:42 -03:00
79 changed files with 1239 additions and 851 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -71,6 +71,10 @@ jobs:
                      chip: esp32c3
                    - name: heltec_wireless_paper_v1
                      chip: esp32s3
+                    - name: heltec_wireless_paper_v1_2
+                      chip: esp32s3
+                    - name: heltec_vision_master_e290
+                      chip: esp32s3
                    - name: OE5HWN_MeshCom
                      chip: esp32
                    - name: WEMOS-LOLIN32-OLED-DIY
--- a/README.md
+++ b/README.md
@@ -51,6 +51,9 @@ ____________________________________________________
 <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.
 - 2025-10-15 APRS Bridge for TNC 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">
@@ -188,10 +201,10 @@
                                            name="action.symbol"
                                            id="action.symbol"
                                        >
-                                            <option value="L#">Green star with L</option>
-                                            <option value="L_">Blue circle with L</option>
-                                            <option value="L&">Black diamond with L</option>
-                                            <option value="La" selected>Red diamond with L</option>
+                                            <option value="L#">Green Star with L - Digipeater</option>
+                                            <option value="L_">Blue Circle with L - Station with Wx Data</option>
+                                            <option value="L&">Black Diamond with L - Rx (only) iGate</option>
+                                            <option value="La" selected>Red Diamond with L - Rx+Tx iGate</option>
                                        </select>
                                    </div>
                                    <div
@@ -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/include/station_utils.h
+++ b/include/station_utils.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -37,8 +37,7 @@ namespace STATION_Utils {
    void deleteNotHeard();
    void updateLastHeard(const String& station);
    bool wasHeard(const String& station);
-    void clean25SegBuffer();
-    bool check25SegBuffer(const String& station, const String& textMessage);
+    bool isIn25SegHashBuffer(const String& station, const String& textMessage);
    void processOutputPacketBufferUltraEcoMode();
    void processOutputPacketBuffer();
    void addToOutputPacketBuffer(const String& packet, bool flag = false);
--- a/include/utils.h
+++ b/include/utils.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -45,7 +45,7 @@ namespace Utils {
    void    checkRebootMode();
    void    checkRebootTime();
    void    checkSleepByLowBatteryVoltage(uint8_t mode);
-    bool    checkValidCallsign(const String& callsign);
+    bool    callsignIsValid(const String& callsign);
    void    startupDelay();

 }
--- a/src/A7670_utils.cpp
+++ b/src/A7670_utils.cpp
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -26,7 +26,7 @@


 #ifdef HAS_A7670
-    #define TINY_GSM_MODEM_SIM7600      //The AT instruction of A7670 is compatible with SIM7600 
+    #define TINY_GSM_MODEM_SIM7600      //The AT instruction of A7670 is compatible with SIM7600
    #define TINY_GSM_RX_BUFFER 1024     // Set RX buffer to 1Kb
    #define SerialAT Serial1
    #include <TinyGsmClient.h>
@@ -115,6 +115,8 @@
                if (SerialAT.available()) {
                    String response = SerialAT.readString();
                    //Serial.println(response); // DEBUG of Modem AT message
+                    int responseOKIndex = response.indexOf("OK");
+                    int callsignIndex   = ATMessage.indexOf(Config.callsign);
                    if(response.indexOf("verified") >= 0) {
                        Serial.println("Logged! (User Validated)\n");
                        displayShow(firstLine, "Connecting APRS-IS...", "---> Logged!", " ", 1000);
@@ -122,7 +124,7 @@
                        validAT = true;
                        i = 1;
                        delayATMessage = 0;
-                    } else if (ATMessage == "AT+NETOPEN" && response.indexOf("OK") >= 0) {
+                    } else if (ATMessage == "AT+NETOPEN" && responseOKIndex >= 0) {
                        Serial.println("Port Open!");
                        displayShow(firstLine, "Opening Port...", "---> Port Open", " ", 0);
                        validAT = true;
@@ -145,14 +147,14 @@
                        validAT = true;
                        i = 1;
                        delayATMessage = 0;
-                    } else if (ATMessage.indexOf(Config.callsign) >= 3 && !modemLoggedToAPRSIS && response.indexOf("OK") >= 0 && !stationBeacon) { // login info
+                    } else if (callsignIndex >= 3 && !modemLoggedToAPRSIS && responseOKIndex >= 0 && !stationBeacon) { // login info
                        validAT = true;
                        delayATMessage = 0;
-                    } else if (ATMessage.indexOf(Config.callsign) == 0 && !beaconSent && response.indexOf("OK") >= 0 && !stationBeacon) {   // self beacon or querys
+                    } else if (callsignIndex == 0 && !beaconSent && responseOKIndex >= 0 && !stationBeacon) {   // self beacon or querys
                        validAT = true;
                        i = 1;
                        delayATMessage = 0;
-                    } else if (stationBeacon && response.indexOf("OK") >= 0) { //upload others beacons
+                    } else if (stationBeacon && responseOKIndex >= 0) { //upload others beacons
                        validAT = true;
                        i = 1;
                        delayATMessage = 0;
@@ -200,7 +202,7 @@
            if (beaconBytesSent) {
                Serial.print(".");
                beaconSent = checkATResponse(packet);
-            } 
+            }
            if (!beaconSent) {
                Serial.println("------------------------------------> UPLOAD FAILED!!!");
            } else {
@@ -221,5 +223,5 @@
            delay(1);
        }
    }
-    
+
 #endif
--- a/src/LoRa_APRS_iGate.cpp
+++ b/src/LoRa_APRS_iGate.cpp
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -24,7 +24,7 @@
 ██║     ██║   ██║██╔══██╗██╔══██║    ██╔══██║██╔═══╝ ██╔══██╗╚════██║
 ███████╗╚██████╔╝██║  ██║██║  ██║    ██║  ██║██║     ██║  ██║███████║
 ╚══════╝ ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═╝    ╚═╝  ╚═╝╚═╝     ╚═╝  ╚═╝╚══════╝
-                                                                     
+
                ██╗ ██████╗  █████╗ ████████╗███████╗
                ██║██╔════╝ ██╔══██╗╚══██╔══╝██╔════╝
                ██║██║  ███╗███████║   ██║   █████╗
@@ -67,8 +67,8 @@ ___________________________________________________________________*/
 #endif


-String              versionDate             = "2025-12-22";
-String              versionNumber           = "3.1.6.1";
+String              versionDate             = "2026-02-20";
+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
@@ -138,7 +138,7 @@ void loop() {
            ElegantOTA.loop();
            return; // Don't process IGate and Digi during OTA update
        }
-        
+
        #ifdef HAS_GPS
            if (Config.beacon.gpsActive) {
                if (millis() - gpsSatelliteTime > 5000) {
@@ -174,7 +174,7 @@ void loop() {

        Utils::checkDisplayInterval();
        Utils::checkBeaconInterval();
-        
+
        APRS_IS_Utils::checkStatus(); // Need that to update display, maybe split this and send APRSIS status to display func?

        String packet = "";
@@ -187,8 +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
-                STATION_Utils::clean25SegBuffer();
+            if (Config.loramodule.txActive && (Config.digi.mode == 2 || Config.digi.mode == 3 || backupDigiMode)) { // If Digi enabled
                DIGI_Utils::processLoRaPacket(packet); // Send received packet to Digi
            }

--- a/src/aprs_is_utils.cpp
+++ b/src/aprs_is_utils.cpp
@@ -1,22 +1,22 @@
 /* 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 
+ * 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/>.
 */

-#include <APRSPacketLib.h> 
+#include <APRSPacketLib.h>
 #include <WiFi.h>
 #include "configuration.h"
 #include "aprs_is_utils.h"
@@ -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";
@@ -202,7 +204,7 @@ namespace APRS_IS_Utils {
                int firstColonIndex = packet.indexOf(":");
                if (firstColonIndex > 5 && firstColonIndex < (packet.length() - 1) && packet[firstColonIndex + 1] != '}' && packet.indexOf("TCPIP") == -1) {
                    const String& Sender = packet.substring(3, packet.indexOf(">"));
-                    if (Sender != Config.callsign && Utils::checkValidCallsign(Sender)) {
+                    if (Sender != Config.callsign && Utils::callsignIsValid(Sender)) {
                        STATION_Utils::updateLastHeard(Sender);
                        Utils::typeOfPacket(packet.substring(3), 0);  // LoRa-APRS
                        const String& AddresseeAndMessage = packet.substring(packet.indexOf("::") + 2);
@@ -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/battery_utils.cpp
+++ b/src/battery_utils.cpp
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -105,9 +105,9 @@ namespace BATTERY_Utils {
    void getI2CVoltageSensorAddress() {
        uint8_t err, addr;
        for(addr = 1; addr < 0x7F; addr++) {
-            #if defined(HELTEC_V3) || defined(HELTEC_V3_2) || defined(HELTEC_WSL_V3) || defined(HELTEC_WSL_V3_DISPLAY)
-                Wire1.beginTransmission(addr);
-                err = Wire1.endTransmission();
+            #ifdef SENSOR_I2C_BUS
+                SENSOR_I2C_BUS.beginTransmission(addr);
+                err = SENSOR_I2C_BUS.endTransmission();
            #else
                Wire.beginTransmission(addr);
                err = Wire.endTransmission();
@@ -145,7 +145,7 @@ namespace BATTERY_Utils {
        }
    }

-    float checkInternalVoltage() { 
+    float checkInternalVoltage() {
        #if defined(HAS_AXP192) || defined(HAS_AXP2101)
            if(POWER_Utils::isBatteryConnected()) {
                return POWER_Utils::getBatteryVoltage();
@@ -153,7 +153,7 @@ namespace BATTERY_Utils {
                return 0.0;
            }
        #else
-            
+
            #ifdef ADC_CTRL
                POWER_Utils::adc_ctrl_ON();
            #endif
@@ -177,7 +177,7 @@ namespace BATTERY_Utils {
                        #endif
                    #endif
                #endif
-                delay(3); 
+                delay(3);
            }

            #ifdef ADC_CTRL
@@ -241,7 +241,7 @@ namespace BATTERY_Utils {
            #else
                extVoltage = ((((sampleSum/100.0)* adcReadingTransformation) + readingCorrection) * voltageDividerTransformation) - multiplyCorrection;
            #endif
-            
+
            return extVoltage; // raw voltage without mapping

            // return mapVoltage(voltage, 5.05, 6.32, 4.5, 5.5); // mapped voltage
--- 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") ||
@@ -290,7 +311,11 @@ bool Configuration::readFile() {
        if (!data["display"].containsKey("alwaysOn") ||
            !data["display"].containsKey("timeout") ||
            !data["display"].containsKey("turn180")) needsRewrite = true;
-        display.alwaysOn                = data["display"]["alwaysOn"] | true;
+        #ifdef HAS_EPAPER
+            display.alwaysOn            = true;
+        #else
+            display.alwaysOn            = data["display"]["alwaysOn"] | true;
+        #endif
        display.timeout                 = data["display"]["timeout"] | 4;
        display.turn180                 = data["display"]["turn180"] | false;

@@ -387,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 = "";
@@ -427,6 +449,7 @@ void Configuration::setDefaultValues() {
    wifiAutoAP.timeout              = 10;

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

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

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

    loramodule.rxActive             = true;
    loramodule.rxFreq               = 433775000;
@@ -531,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
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -38,142 +38,139 @@ extern String           fourthLine;
 extern String           fifthLine;
 extern String           sixthLine;
 extern String           seventhLine;
-extern bool             backUpDigiMode;
+extern bool             backupDigiMode;


 namespace DIGI_Utils {

-    String buildPacket(const String& path, const String& packet, bool thirdParty, bool crossFreq) {
-        if (!crossFreq) {
-            String packetToRepeat = packet.substring(0, packet.indexOf(",") + 1);
-            String tempPath = path;
+    String cleanPathAsterisks(String path) {
+        String terms[] = {",WIDE1*", ",WIDE2*", "*"};
+        for (String term : terms) {
+            int index = path.indexOf(term);
+            if (index != -1) path.remove(index, term.length());     // less memory than: tempPath.replace("*", "");
+        }
+        return path;
+    }

-            if (path.indexOf("WIDE1-1") != -1 && (Config.digi.mode == 2 || Config.digi.mode == 3)) {
-                tempPath.replace("WIDE1-1", Config.callsign + "*");
-            } else if (path.indexOf("WIDE2-") != -1 && Config.digi.mode == 3) {
-                if (path.indexOf(",WIDE1*") != -1) {
-                    tempPath.remove(path.indexOf(",WIDE1*"), 7);
-                }
-                if (path.indexOf("*") != -1) {
-                    tempPath.remove(path.indexOf("*"), 1);
-                }
+    String buildPacket(const String& path, const String& packet, bool thirdParty, bool crossFreq) {
+        String stationCallsign  = (Config.tacticalCallsign == "" ? Config.callsign : Config.tacticalCallsign);
+        String suffix           = thirdParty ? ":}" : ":";
+        int suffixIndex         = packet.indexOf(suffix);
+        String packetToRepeat;
+        if (!crossFreq) {
+            int digiMode        = Config.digi.mode;
+            String tempPath     = path;
+
+            if (tempPath.indexOf("WIDE1-1") != -1 && (digiMode == 2 || digiMode == 3)) {    // WIDE1-1 Digipeater
+                if (tempPath.indexOf("*") != -1 ) return "";                                  // "*" shouldn't be in WIDE1-1 (only) type of packet
+                tempPath.replace("WIDE1-1", stationCallsign + "*");
+            } else if (tempPath.indexOf("WIDE2-") != -1 && digiMode == 3) {                 // WIDE2-n Digipeater
+                tempPath = cleanPathAsterisks(path);
                if (path.indexOf("WIDE2-1") != -1) {
-                    tempPath.replace("WIDE2-1", Config.callsign + "*");
+                    tempPath.replace("WIDE2-1", stationCallsign + "*");
                } else if (path.indexOf("WIDE2-2") != -1) {
-                    tempPath.replace("WIDE2-2", Config.callsign + "*,WIDE2-1");
+                    tempPath.replace("WIDE2-2", stationCallsign + "*,WIDE2-1");
                } else {
                    return "";
                }
            }
+            packetToRepeat = packet.substring(0, packet.indexOf(",") + 1);
            packetToRepeat += tempPath;
-            if (thirdParty) {
-                packetToRepeat += APRS_IS_Utils::checkForStartingBytes(packet.substring(packet.indexOf(":}")));
-            } else {
-                packetToRepeat += APRS_IS_Utils::checkForStartingBytes(packet.substring(packet.indexOf(":")));
-            }
-            return packetToRepeat;
        } else {   // CrossFreq Digipeater
-            String suffix = thirdParty ? ":}" : ":";
-            String packetToRepeat = packet.substring(0, packet.indexOf(suffix));
-            
-            String terms[] = {",WIDE1*", ",WIDE2*", "*"};
-            for (String term : terms) {
-                int index = packetToRepeat.indexOf(term);
-                if (index != -1) {
-                    packetToRepeat.remove(index, term.length());
-                }
-            }
+            packetToRepeat = cleanPathAsterisks(packet.substring(0, suffixIndex));
+            if (packetToRepeat.indexOf(stationCallsign) != -1) return "";                   // stationCallsign shouldn't be in path
            packetToRepeat += ",";
-            packetToRepeat += Config.callsign;
+            packetToRepeat += stationCallsign;
            packetToRepeat += "*";
-            packetToRepeat += APRS_IS_Utils::checkForStartingBytes(packet.substring(packet.indexOf(suffix)));
-            return packetToRepeat;
        }
+        packetToRepeat += APRS_IS_Utils::checkForStartingBytes(packet.substring(suffixIndex));
+        return packetToRepeat;
    }

    String generateDigipeatedPacket(const String& packet, bool thirdParty){
        String temp;
-        if (thirdParty) { // only header is used
+        if (thirdParty) {   // only header is used
            const String& header = packet.substring(0, packet.indexOf(":}"));
            temp = header.substring(header.indexOf(">") + 1);
        } else {
            temp = packet.substring(packet.indexOf(">") + 1, packet.indexOf(":"));
        }
-        if (temp.indexOf(",") > 2) { // checks for path
-            const String& path = temp.substring(temp.indexOf(",") + 1); // after tocall
-            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
-                    return buildPacket(path, packet, thirdParty, true);
-                } else {
-                    return "";
-                }
-            } else if (Config.digi.mode == 3) {
-                if (path.indexOf("WIDE1-1") != -1 || path.indexOf("WIDE2-") != -1) {
-                    int wide1Index = path.indexOf("WIDE1-1");
-                    int wide2Index = path.indexOf("WIDE2-");
+        int commaIndex      = temp.indexOf(",");
+        int digiMode        = Config.digi.mode;
+        bool crossFreq      = abs(Config.loramodule.txFreq - Config.loramodule.rxFreq) >= 125000;   // CrossFreq Digi

-                    // WIDE1-1 && WIDE2-n   /   only WIDE1-1    /   only WIDE2-n
-                    if ((wide1Index != -1 && wide2Index != -1 && wide1Index < wide2Index) || (wide1Index != -1 && wide2Index == -1) || (wide1Index == -1 && wide2Index != -1)) {
-                        return buildPacket(path, packet, thirdParty, false);
-                    }
-                    return "";
-                } else if (path.indexOf("WIDE1-1") == -1 && path.indexOf("WIDE2-") == -1 && (abs(Config.loramodule.txFreq - Config.loramodule.rxFreq) >= 125000)) {    //  CrossFreq Digi
-                    return buildPacket(path, packet, thirdParty, true);
-                } else {
-                    return "";
+        if (commaIndex > 2) {   // "path" found
+            const String& path  = temp.substring(commaIndex + 1);
+            if (digiMode == 2 || backupDigiMode) {
+                bool hasWide = path.indexOf("WIDE1-1") != -1;
+                if (hasWide || crossFreq) {
+                    return buildPacket(path, packet, thirdParty, !hasWide);
                }
-            } else {
                return "";
            }
-        } 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 {
+            if (digiMode == 3) {
+                int wide1Index = path.indexOf("WIDE1-1");
+                int wide2Index = path.indexOf("WIDE2-");
+                bool hasWide1 = wide1Index != -1;
+                bool hasWide2 = wide2Index != -1;
+
+                if (hasWide1 && hasWide2 && wide2Index < wide1Index) return "";                     // check that WIDE1 before WIDE2
+
+                if (hasWide1 || hasWide2) return buildPacket(path, packet, thirdParty, false);      // regular APRS with WIDEn-N
+
+                if (crossFreq) return buildPacket(path, packet, thirdParty, true);                  // CrossFreq (without WIDE)
+
+                return "";
+            }
            return "";
        }
+
+        if (commaIndex == -1 && (digiMode == 2 || backupDigiMode || digiMode == 3) && crossFreq) return buildPacket("", packet, thirdParty, true);  // no "path" but is CrossFreq Digi
+
+        return "";
    }

    void processLoRaPacket(const String& packet) {
-        if (packet.indexOf("NOGATE") == -1) {
-            bool thirdPartyPacket = false;
-            String temp, Sender;
-            int firstColonIndex = packet.indexOf(":");
-            if (firstColonIndex > 5 && firstColonIndex < (packet.length() - 1) && packet[firstColonIndex + 1] == '}' && packet.indexOf("TCPIP") > 0) {   // 3rd Party 
-                thirdPartyPacket = true;
-                temp    = packet.substring(packet.indexOf(":}") + 2);
-                Sender  = temp.substring(0, temp.indexOf(">"));
-            } else {
-                temp    = packet.substring(3);
-                Sender  = packet.substring(3, packet.indexOf(">"));
-            }
-            if (Sender != Config.callsign) {        // Avoid listening to own packets
-                if (!thirdPartyPacket && !Utils::checkValidCallsign(Sender)) {
-                    return;
-                }
-                if (STATION_Utils::check25SegBuffer(Sender, temp.substring(temp.indexOf(":") + 2))) {
-                    STATION_Utils::updateLastHeard(Sender);
-                    Utils::typeOfPacket(temp, 2);    // Digi
-                    bool queryMessage = false;
-                    if (temp.indexOf("::") > 10) {   // it's a message
-                        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!
-                            queryMessage = APRS_IS_Utils::processReceivedLoRaMessage(Sender, AddresseeAndMessage, thirdPartyPacket);
-                        }
-                    }
-                    if (!queryMessage) {
-                        String loraPacket = generateDigipeatedPacket(packet.substring(3), thirdPartyPacket);
-                        if (loraPacket != "") {
-                            STATION_Utils::addToOutputPacketBuffer(loraPacket);
-                            if (Config.digi.ecoMode != 1) displayToggle(true);
-                            lastScreenOn = millis();
-                        }
-                    }
-                }
+        if (packet.indexOf("NOGATE") >= 0) return;
+
+        bool thirdPartyPacket = false;
+        String temp, Sender;
+        int firstColonIndex = packet.indexOf(":");
+        if (firstColonIndex > 5 && firstColonIndex < (packet.length() - 1) && packet[firstColonIndex + 1] == '}' && packet.indexOf("TCPIP") > 0) {   // 3rd Party
+            thirdPartyPacket = true;
+            temp    = packet.substring(packet.indexOf(":}") + 2);
+            Sender  = temp.substring(0, temp.indexOf(">"));
+        } else {
+            temp    = packet.substring(3);
+            Sender  = packet.substring(3, packet.indexOf(">"));
+        }
+
+        String stationCallsign = Config.tacticalCallsign == "" ? Config.callsign : Config.tacticalCallsign;
+        if (Sender == stationCallsign) return;          // Avoid listening to self packets
+        if (!thirdPartyPacket && Config.tacticalCallsign == "" && !Utils::callsignIsValid(Sender)) return;  // No thirdParty + no tactical y no valid callsign
+
+        if (STATION_Utils::isIn25SegHashBuffer(Sender, temp.substring(temp.indexOf(":") + 2))) return;
+
+        STATION_Utils::updateLastHeard(Sender);
+        Utils::typeOfPacket(temp, 2);               // Digi
+        bool queryMessage = false;
+        int doubleColonIndex = temp.indexOf("::");
+        if (doubleColonIndex > 10) {                // it's a message
+            String AddresseeAndMessage  = temp.substring(doubleColonIndex + 2);
+            String Addressee            = AddresseeAndMessage.substring(0, AddresseeAndMessage.indexOf(":"));
+            Addressee.trim();
+            if (Addressee == stationCallsign) {     // it's a message for me!
+                queryMessage = APRS_IS_Utils::processReceivedLoRaMessage(Sender, AddresseeAndMessage, thirdPartyPacket);
            }
        }
+        if (queryMessage) return;                   // answer should not be repeated.
+
+        String loraPacket = generateDigipeatedPacket(packet.substring(3), thirdPartyPacket);
+        if (loraPacket != "") {
+            STATION_Utils::addToOutputPacketBuffer(loraPacket);
+            if (Config.digi.ecoMode != 1) displayToggle(true);
+            lastScreenOn = millis();
+        }
    }

 }
--- a/src/display.cpp
+++ b/src/display.cpp
@@ -47,9 +47,13 @@
            #ifdef HELTEC_WP_V1
                EInkDisplay_WirelessPaperV1_1 display;
            #endif
-            /*#ifdef HELTEC_WP_V1_2         // SOON!
+            #ifdef HELTEC_WP_V1_2
                EInkDisplay_WirelessPaperV1_2 display;
-            #endif*/
+            #endif
+            #ifdef HELTEC_VM_E290
+                EInkDisplay_VisionMasterE290 display;
+            #endif
+
            String lastEpaperText;
        #else
            #include <Adafruit_GFX.h>
@@ -88,15 +92,22 @@ void displaySetup() {
            tft.setTextFont(0);
            tft.fillScreen(TFT_BLACK);
            #if defined(TTGO_T_DECK_GPS) || defined(TTGO_T_DECK_PLUS)
-                sprite.createSprite(320,240);
+                sprite.createSprite(320, 240);
            #else
-                sprite.createSprite(160,80);
+                sprite.createSprite(160, 80);
            #endif
        #else
            #ifdef HAS_EPAPER
                display.landscape();
                display.printCenter("LoRa APRS iGate Initialising...");
-                if (Config.display.turn180) display.setRotation(2);
+                if (Config.display.turn180) {
+                    #if defined(HELTEC_VM_E290) || defined(HELTEC_WP_V1)
+                        display.setRotation(3);
+                    #endif
+                    #if defined(HELTEC_WP_V1_2)
+                        display.setRotation(1);
+                    #endif
+                }
                display.update();
            #else
                #ifdef OLED_DISPLAY_HAS_RST_PIN
@@ -158,7 +169,6 @@ void displayToggle(bool toggle) {
                digitalWrite(TFT_BL, LOW);
            #else
                #ifdef HAS_EPAPER
-                    display.printCenter("Enabled EPAPER Display...");
                    display.update();
                #else
                    #if defined(TTGO_T_Beam_S3_SUPREME_V3)
@@ -196,7 +206,7 @@ void displayShow(const String& header, const String& line1, const String& line2,
                sprite.drawString(*lines[i], 3, (lineSpacing * (2 + i)) - 2);
            }

-            sprite.pushSprite(0,0);
+            sprite.pushSprite(0, 0);
        #else
            #ifdef HAS_EPAPER
                display.clearMemory();
@@ -261,7 +271,7 @@ void displayShow(const String& header, const String& line1, const String& line2,
                sprite.drawString(*lines[i], 3, (lineSpacing * (2 + i)) - 2);
            }

-            sprite.pushSprite(0,0);
+            sprite.pushSprite(0, 0);
        #else
            #ifdef HAS_EPAPER
                lastEpaperText = header + line1 + line2 + line3 + line4 + line5 + line6;
--- a/src/gps_utils.cpp
+++ b/src/gps_utils.cpp
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -34,6 +34,7 @@
 extern Configuration    Config;
 extern HardwareSerial   gpsSerial;
 extern TinyGPSPlus      gps;
+extern bool             stationCallsignIsValid;
 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 (!stationCallsignIsValid) {
+                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 (stationCallsignIsValid && 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;

@@ -122,46 +134,55 @@ namespace GPS_Utils {
        }

        String Latitude             = infoGPS.substring(0,8);                   // First 8 characters are Latitude
+        int latitudeColonIndex      = Latitude.indexOf(".");
        float convertedLatitude     = Latitude.substring(0,2).toFloat();        // First 2 digits (Degrees)
        convertedLatitude += Latitude.substring(2,4).toFloat() / 60;            // Next 2 digits (Minutes)
-        convertedLatitude += Latitude.substring(Latitude.indexOf(".") + 1, Latitude.indexOf(".") + 3).toFloat() / (60*100);
+        convertedLatitude += Latitude.substring(latitudeColonIndex + 1, latitudeColonIndex + 3).toFloat() / (60*100);
        if (Latitude.endsWith("S")) convertedLatitude = -convertedLatitude;     // Handle Southern Hemisphere

        String Longitude            = infoGPS.substring(9,18);                  // Next 9 characters are Longitude
+        int longitudeColonIndex     = Longitude.indexOf(".");
        float convertedLongitude    = Longitude.substring(0,3).toFloat();       // First 3 digits (Degrees)
        convertedLongitude += Longitude.substring(3,5).toFloat() / 60;          // Next 2 digits (Minutes)
-        convertedLongitude += Longitude.substring(Longitude.indexOf(".") + 1, Longitude.indexOf(".") + 3).toFloat() / (60*100);
+        convertedLongitude += Longitude.substring(longitudeColonIndex + 1, longitudeColonIndex + 3).toFloat() / (60*100);
        if (Longitude.endsWith("W")) convertedLongitude = -convertedLongitude;  // Handle Western Hemisphere
-        
+
        return buildDistanceAndComment(convertedLatitude, convertedLongitude, infoGPS.substring(19));
    }

    String getDistanceAndComment(const String& packet) {
        int indexOfAt = packet.indexOf(":@");
-        if (indexOfAt > 10) {
-            return getReceivedGPS(packet);
-        } else {
-            const uint8_t ENCODED_BYTE_OFFSET = 14;     // Offset for encoded data in the packet
-            int indexOfExclamation  = packet.indexOf(":!");
-            int indexOfEqual        = packet.indexOf(":=");
-            uint8_t encodedBytePosition = 0;
-            if (indexOfExclamation > 10) {              // Determine the position where encoded data starts
-                encodedBytePosition = indexOfExclamation + ENCODED_BYTE_OFFSET;
-            } else if (indexOfEqual > 10) {
-                encodedBytePosition = indexOfEqual + ENCODED_BYTE_OFFSET;
-            }
+        if (indexOfAt > 10) return getReceivedGPS(packet);

-            if (encodedBytePosition != 0) {
-                char currentChar = packet[encodedBytePosition];
-                if (currentChar == 'G' || currentChar == 'Q' || currentChar == '[' || currentChar == 'H' || currentChar == 'X' || currentChar == '3') {
-                    return decodeEncodedGPS(packet);    // If valid encoded data position is found, decode it
-                } else {
-                    return getReceivedGPS(packet);
-                }
-            } else {
-                return " _ / _ / _ ";
-            }
+        const uint8_t nonEncondedLatitudeOffset     = 9;    // "N" / "S"
+        const uint8_t nonEncondedLongitudeOffset    = 19;   // "E" / "W"
+        const uint8_t encodedByteOffset             = 14;
+
+        int indexOfExclamation  = packet.indexOf(":!");
+        int indexOfEqual        = packet.indexOf(":=");
+        int baseIndex           = - 1;
+        if (indexOfExclamation > 10) {
+            baseIndex = indexOfExclamation;
+        } else if (indexOfEqual > 10) {
+            baseIndex = indexOfEqual;
        }
+        if (baseIndex == -1) return " _ / _ / _ ";
+
+        int latitudeIndex       = baseIndex + nonEncondedLatitudeOffset;
+        int longitudeIndex      = baseIndex + nonEncondedLongitudeOffset;
+        int encodedByteIndex    = baseIndex + encodedByteOffset;
+        int packetLength        = packet.length();
+
+        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 " _ / _ / _ ";
    }

    void setup() {
--- a/src/kiss_utils.cpp
+++ b/src/kiss_utils.cpp
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -29,17 +29,16 @@ bool validateKISSFrame(const String& kissFormattedFrame) {
 }

 String encodeAddressAX25(String tnc2Address) {
-    bool hasBeenDigipited = tnc2Address.indexOf('*') != -1;
-
-    if (tnc2Address.indexOf('-') == -1) {
+    bool hasBeenDigipited   = tnc2Address.indexOf('*') != -1;
+    int tnc2AddressIndex    = tnc2Address.indexOf('-');
+    if (tnc2AddressIndex == -1) {
        if (hasBeenDigipited) {
            tnc2Address = tnc2Address.substring(0, tnc2Address.length() - 1);
        }
-
        tnc2Address += "-0";
    }

-    int separatorIndex = tnc2Address.indexOf('-');
+    int separatorIndex = tnc2AddressIndex;
    int ssid = tnc2Address.substring(separatorIndex + 1).toInt();

    String kissAddress = "";
@@ -131,8 +130,9 @@ String encodeKISS(const String& frame) {

    if (validateTNC2Frame(frame)) {
        String address = "";
-        bool dstAddresWritten = false;
-        for (int p = 0; p <= frame.indexOf(':'); p++) {
+        bool dstAddresWritten   = false;
+        int colonFrameIndex     = frame.indexOf(':');
+        for (int p = 0; p <= colonFrameIndex; p++) {
            char currentChar = frame.charAt(p);
            if (currentChar == ':' || currentChar == '>' || currentChar == ',') {
                if (!dstAddresWritten && (currentChar == ',' || currentChar == ':')) {
@@ -151,7 +151,7 @@ String encodeKISS(const String& frame) {
        ax25Frame.setCharAt(ax25Frame.length() - 1, (char)(lastAddressChar | IS_LAST_ADDRESS_POSITION_MASK));
        ax25Frame += (char)APRS_CONTROL_FIELD;
        ax25Frame += (char)APRS_INFORMATION_FIELD;
-        ax25Frame += frame.substring(frame.indexOf(':') + 1);
+        ax25Frame += frame.substring(colonFrameIndex + 1);
    }

    String kissFrame = encapsulateKISS(ax25Frame, CMD_DATA);
--- 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
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -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,48 +44,28 @@
 #endif

 extern Configuration    Config;
+extern bool             stationCallsignIsValid;


 namespace POWER_Utils {

-    #ifdef VEXT_CTRL
-        void vext_ctrl_ON() {
-            #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3)
-                digitalWrite(VEXT_CTRL, Config.digi.ecoMode == 1 ? LOW : HIGH);
-            #endif
-            #if defined(HELTEC_WP_V1) || defined(HELTEC_WS) || defined(HELTEC_V3_2) || defined(HELTEC_WSL_V3)
-                digitalWrite(VEXT_CTRL, Config.digi.ecoMode == 1 ? HIGH : LOW);
-            #endif
-        }
-
-        void vext_ctrl_OFF() {
-            #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3)
-                digitalWrite(VEXT_CTRL, Config.digi.ecoMode == 1 ? HIGH : LOW);
-            #endif
-            #if defined(HELTEC_WP_V1) || defined(HELTEC_WS) || defined(HELTEC_V3_2) || defined(HELTEC_WSL_V3)
-                digitalWrite(VEXT_CTRL, Config.digi.ecoMode == 1 ? LOW : HIGH);
-            #endif
-        }
-    #endif
-
-
-    #ifdef ADC_CTRL
+    #ifdef ADC_CTRL_PIN
        void adc_ctrl_ON() {
-            #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3_2)
-                digitalWrite(ADC_CTRL, HIGH);
-            #endif
-            #if defined(HELTEC_V3) || defined(HELTEC_V2) || defined(HELTEC_WSL_V3) || defined(HELTEC_WP_V1)
-                digitalWrite(ADC_CTRL, LOW);
-            #endif
+            digitalWrite(ADC_CTRL_PIN, ADC_CTRL_ON_STATE);
        }

        void adc_ctrl_OFF() {
-            #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3_2)
-                digitalWrite(ADC_CTRL, LOW);
-            #endif
-            #if defined(HELTEC_V3) || defined(HELTEC_V2) || defined(HELTEC_WSL_V3) || defined(HELTEC_WP_V1)
-                digitalWrite(ADC_CTRL, HIGH);
-            #endif
+            digitalWrite(ADC_CTRL_PIN, !ADC_CTRL_ON_STATE);
+        }
+    #endif
+
+    #ifdef VEXT_CTRL_PIN
+        void vext_ctrl_ON() {
+            digitalWrite(VEXT_CTRL_PIN, Config.digi.ecoMode == 1 ? !VEXT_CTRL_ON_STATE : VEXT_CTRL_ON_STATE);
+        }
+
+        void vext_ctrl_OFF() {
+            digitalWrite(VEXT_CTRL_PIN, Config.digi.ecoMode == 1 ? VEXT_CTRL_ON_STATE : !VEXT_CTRL_ON_STATE);
        }
    #endif

@@ -112,7 +93,7 @@ namespace POWER_Utils {
        #else
            return false;
        #endif
-    }    
+    }

    void activateGPS() {
        #ifdef HAS_AXP192
@@ -315,17 +296,14 @@ namespace POWER_Utils {
            Wire.begin(OLED_SDA, OLED_SCL);
        #endif

-        #ifdef USE_WIRE_WITH_BOARD_I2C_PINS
-            Wire.begin(BOARD_I2C_SDA, BOARD_I2C_SCL);
+        #ifdef SENSOR_I2C_BUS
+            SENSOR_I2C_BUS.begin(BOARD_I2C_SDA, BOARD_I2C_SCL);
        #endif

-        #ifdef USE_WIRE1_WITH_BOARD_I2C_PINS
-            Wire1.begin(BOARD_I2C_SDA, BOARD_I2C_SCL);
-        #endif
-        
        delay(1000);
        BATTERY_Utils::setup();
        BATTERY_Utils::startupBatteryHealth();
+        stationCallsignIsValid = Utils::callsignIsValid(Config.callsign);
        setCpuFrequencyMhz(80);
    }

--- a/src/query_utils.cpp
+++ b/src/query_utils.cpp
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -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);
@@ -49,9 +49,9 @@ namespace QUERY_Utils {
            answer.concat(versionDate);
        } else if (queryQuestion == "?APRSP") {
            answer.concat("iGate QTH: ");
-            answer.concat(String(Config.beacon.latitude,3));
+            answer.concat(String(Config.beacon.latitude,2));
            answer.concat(" ");
-            answer.concat(String(Config.beacon.longitude,3));
+            answer.concat(String(Config.beacon.longitude,2));
        } else if (queryQuestion == "?APRSL") {
            if (lastHeardStations.size() == 0) {
                char answerArray[50];
@@ -66,21 +66,25 @@ namespace QUERY_Utils {
        } else if (queryQuestion == "?APRSSR") {
            char signalData[35];
            snprintf(signalData, sizeof(signalData), " %ddBm / %.2fdB / %dHz", rssi, snr, freqError);
-            answer.concat(signalData);        
+            answer.concat(signalData);
        } /*else if (queryQuestion.indexOf("?APRSH") == 0) {
            // sacar callsign despues de ?APRSH
            Serial.println("escuchaste a X estacion? en las ultimas 24 o 8 horas?");
            answer.concat("?APRSH on development 73!");
-        } *//*else if (queryQuestion.indexOf("?WHERE") == 0) { 
+        } *//*else if (queryQuestion.indexOf("?WHERE") == 0) {
            // agregar callsign para completar donde esta X callsign --> posicion
            Serial.println("estaciones escuchadas directo (ultimos 30 min)");
            answer.concat("?WHERE on development 73!");
        } */
        else if (STATION_Utils::isManager(station) && (!queryFromAPRSIS || !Config.remoteManagement.rfOnly)) {
-            if (queryQuestion.indexOf("?EM=OFF") == 0) {
-                if ((Config.digi.mode == 2 || Config.digi.mode == 3) && Config.loramodule.txActive && Config.loramodule.rxActive && !Config.aprs_is.active) {
-                    if (Config.digi.ecoMode == 1 || Config.digi.ecoMode == 2) { // Exit Digipeater EcoMode or Digipeater without WiFiAP
-                        answer = (Config.digi.ecoMode == 1) ? "DigiEcoMode:OFF" : "Digipeater + WiFiAP enabled";
+            int digiMode            = Config.digi.mode;
+            int digiEcoMode         = Config.digi.ecoMode;
+            int radioTxActive       = Config.loramodule.txActive;
+            bool onlyRadioActive    = radioTxActive && Config.loramodule.rxActive && !Config.aprs_is.active;
+            if (queryQuestion.startsWith("?EM=OFF")) {
+                if ((digiMode == 2 || digiMode == 3) && onlyRadioActive) {
+                    if (digiEcoMode == 1 || digiEcoMode == 2) { // Exit Digipeater EcoMode or Digipeater without WiFiAP
+                        answer = (digiEcoMode == 1) ? "DigiEcoMode:OFF" : "Digipeater + WiFiAP enabled";
                        Config.digi.ecoMode         = 0;
                        Config.display.alwaysOn     = true;
                        Config.display.timeout      = 10;
@@ -92,9 +96,9 @@ namespace QUERY_Utils {
                } else {
                    answer = "Digipeater Mode control not possible";
                }
-            } else if (queryQuestion.indexOf("?EM=ON") == 0) {
-                if ((Config.digi.mode == 2 || Config.digi.mode == 3) && Config.loramodule.txActive && Config.loramodule.rxActive && !Config.aprs_is.active) {
-                    if (Config.digi.ecoMode == 0) {     // Start Digipeater EcoMode
+            } else if (queryQuestion.startsWith("?EM=ON")) {
+                if ((digiMode == 2 || digiMode == 3) && onlyRadioActive) {
+                    if (digiEcoMode == 0) {     // Start Digipeater EcoMode
                        answer = "DigiEcoMode:ON";
                        Config.digi.ecoMode         = 1;
                        shouldSleepLowVoltage       = true;     // to make sure all packets in outputPacketBuffer are sent before restart.
@@ -105,31 +109,29 @@ namespace QUERY_Utils {
                } else {
                    answer = "Digipeater Mode control not possible";
                }
-            } else if (queryQuestion.indexOf("?EM=?") == 0) {    // Digipeater EcoMode Status
-                if (Config.digi.ecoMode == 0) {
-                    answer = "DigiEcoMode:OFF";
-                } else if (Config.digi.ecoMode == 1) {
-                    answer = "DigiEcoMode:ON";
-                } else {
-                    answer = "DigiEcoMode:OFF/Only Serial Output";
+            } else if (queryQuestion.startsWith("?EM=?")) {    // Digipeater EcoMode Status
+                switch (digiEcoMode) {
+                    case 0:  answer = "DigiEcoMode:OFF"; break;
+                    case 1:  answer = "DigiEcoMode:ON"; break;
+                    default: answer = "DigiEcoMode:OFF/Only Serial Output";
                }
-            } else  if (queryQuestion.indexOf("?TX=ON") == 0) {
-                if (Config.loramodule.txActive) {
+            } else  if (queryQuestion.startsWith("?TX=ON")) {
+                if (radioTxActive) {
                    answer = "TX was ON";
                } else {
                    Config.loramodule.txActive = true;
                    answer = "TX=ON";
                }
-            } else if (queryQuestion.indexOf("?TX=OFF") == 0) {
-                if (!Config.loramodule.txActive) {
+            } else if (queryQuestion.startsWith("?TX=OFF")) {
+                if (!radioTxActive) {
                    answer = "TX was OFF";
                } else {
                    Config.loramodule.txActive = false;
                    answer = "TX=OFF";
-                } 
-            } else if (queryQuestion.indexOf("?TX=?") == 0) {
-                answer = (Config.loramodule.txActive) ? "TX=ON" : "TX=OFF";
-            } else if (queryQuestion.indexOf("?COMMIT") == 0) {     // saving for next reboot
+                }
+            } else if (queryQuestion.startsWith("?TX=?")) {
+                answer = (radioTxActive) ? "TX=ON" : "TX=OFF";
+            } else if (queryQuestion.startsWith("?COMMIT")) {     // saving for next reboot
                answer = "New Config Saved";
                Config.writeFile();
            }
--- a/src/sleep_utils.cpp
+++ b/src/sleep_utils.cpp
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -51,12 +51,13 @@ namespace SLEEP_Utils {
        if (Config.digi.ecoMode == 1) {
            pinMode(RADIO_WAKEUP_PIN, INPUT);
            attachInterrupt(digitalPinToInterrupt(RADIO_WAKEUP_PIN), wakeUpLoRaPacketReceived, RISING);
-            #if defined(TTGO_LORA32_V2_1) || defined(TTGO_LORA32_V2_1_915) || defined(TTGO_LORA32_T3S3_V1_2) || defined(TTGO_T_BEAM_V1_0) || defined(TTGO_T_BEAM_V1_0_915) || defined(TTGO_T_BEAM_V1_0_SX1268) || defined(TTGO_T_BEAM_V1_2) || defined(TTGO_T_BEAM_V1_2_915) || defined(TTGO_T_BEAM_V1_2_SX1262) || defined(TTGO_T_DECK_PLUS) || defined(TTGO_T_DECK_GPS) || defined(TTGO_T_Beam_S3_SUPREME_V3) || defined(HELTEC_V3) || defined(HELTEC_V3_2) || defined(HELTEC_WP_V1) || defined(HELTEC_WS) || defined(HELTEC_WSL_V3) || defined(HELTEC_WSL_V3_DISPLAY) || defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V2) || defined(XIAO_ESP32S3_LORA) || defined(LIGHTGATEWAY_1_0) || defined(LIGHTGATEWAY_PLUS_1_0) || defined(TROY_LoRa_APRS) || defined(OE5HWN_MeshCom) || defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_LoRa_915) || defined(ESP32_DIY_1W_LoRa) || defined(ESP32_DIY_1W_LoRa_915) || defined(ESP32_DIY_1W_LoRa_LLCC68) || defined(ESP32_DIY_1W_LoRa_Mesh_V1_2) || defined(WEMOS_S2_MINI_DIY_LoRa) || defined(WEMOS_D1_R32_RA02) || defined(WEMOS_LOLIN32_OLED_DIY_LoRa)
+
+            #if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3)
                esp_sleep_enable_ext1_wakeup(GPIO_WAKEUP_PIN, ESP_EXT1_WAKEUP_ANY_HIGH);
-            #endif
-            #if defined(HELTEC_HTCT62) || defined(ESP32C3_DIY_1W_LoRa) || defined(ESP32C3_DIY_1W_LoRa_915) || defined(ESP32_C3_OctopusLab_LoRa)
+            #elif defined(CONFIG_IDF_TARGET_ESP32C3)
                esp_deep_sleep_enable_gpio_wakeup(1ULL << GPIO_WAKEUP_PIN, ESP_GPIO_WAKEUP_GPIO_HIGH);
            #endif
+            //#if defined(ARDUINO_ARCH_STM32) || defined(ARDUINO_ARCH_NRF52)
        }
        #endif
    }
--- a/src/station_utils.cpp
+++ b/src/station_utils.cpp
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -45,12 +45,10 @@ std::vector<OutputPacketBuffer> outputPacketBuffer;

 struct Packet25SegBuffer {
    uint32_t    receivedTime;
-    String      station;
-    String      payload;
+    uint32_t    hash;
 };
 std::vector<Packet25SegBuffer>  packet25SegBuffer;

-
 bool saveNewDigiEcoModeConfig   = false;
 bool packetIsBeacon             = false;

@@ -166,18 +164,33 @@ namespace STATION_Utils {
        return false;
    }

-    void clean25SegBuffer() {
-        if (!packet25SegBuffer.empty() && (millis() - packet25SegBuffer[0].receivedTime) >  25 * 1000) packet25SegBuffer.erase(packet25SegBuffer.begin());
-    }
-
-    bool check25SegBuffer(const String& station, const String& textMessage) {
-        if (!packet25SegBuffer.empty()) {
-            for (int i = 0; i < packet25SegBuffer.size(); i++) {
-                if (packet25SegBuffer[i].station == station && packet25SegBuffer[i].payload == textMessage) return false;
+    void clean25SegHashBuffer() {
+        uint32_t currentTime = millis();
+        for (int i = packet25SegBuffer.size() - 1; i >= 0; i--) {
+            if ((currentTime - packet25SegBuffer[i].receivedTime) > 25 * 1000) {
+                packet25SegBuffer.erase(packet25SegBuffer.begin() + i);
            }
        }
-        packet25SegBuffer.emplace_back(Packet25SegBuffer{millis(), station, textMessage});
-        return true;
+    }
+
+    uint32_t makeHash(const String& station, const String& payload) {   // DJB2 Hash
+        uint32_t h = 5381;
+        for (size_t i = 0; i < station.length(); i++)
+            h = ((h << 5) + h) + station[i];
+        for (size_t i = 0; i < payload.length(); i++)
+            h = ((h << 5) + h) + payload[i];
+        return h;
+    }
+
+    bool isIn25SegHashBuffer(const String& station, const String& textMessage) {
+        uint32_t newHash = makeHash(station, textMessage);
+        uint32_t currentTime = millis();
+        clean25SegHashBuffer();
+        for (int i = 0; i < packet25SegBuffer.size(); i++) {
+            if (packet25SegBuffer[i].hash == newHash) return true;
+        }
+        packet25SegBuffer.push_back({currentTime, newHash});
+        return false;
    }

    void processOutputPacketBufferUltraEcoMode() {
--- a/src/syslog_utils.cpp
+++ b/src/syslog_utils.cpp
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -43,9 +43,11 @@ namespace SYSLOG_Utils {
            char signalData[35];
            snprintf(signalData, sizeof(signalData), " / %ddBm / %.2fdB / %dHz", rssi, snr, freqError);

-            int colonIndex  = packet.indexOf(":");
-            char nextChar   = packet[colonIndex + 1];
-            String sender   = packet.substring(3, packet.indexOf(">"));
+            int colonIndex              = packet.indexOf(":");
+            char nextChar               = packet[colonIndex + 1];
+            int greaterThanIndex        = packet.indexOf(">");
+            int telemetryPacketIndex    = packet.indexOf(":T#");
+            String sender               = packet.substring(3, greaterThanIndex);

            switch (type) {
                case 0:     // CRC
@@ -58,13 +60,12 @@ namespace SYSLOG_Utils {
                    if (nextChar == ':') {
                        syslogPacket.concat("MESSAGE / ");
                        syslogPacket.concat(sender);
-                        syslogPacket.concat(" ---> "); 
+                        syslogPacket.concat(" ---> ");
                        syslogPacket.concat(packet.substring(colonIndex + 2));
                    } else if (nextChar == '!' || nextChar == '=' || nextChar == '@') {
                        syslogPacket.concat("GPS / ");
                        syslogPacket.concat(sender);
                        syslogPacket.concat(" / ");
-                        int greaterThanIndex = packet.indexOf(">");
                        if (packet.indexOf("WIDE1-1") > 10) {
                            syslogPacket.concat(packet.substring(greaterThanIndex + 1, packet.indexOf(",")));
                            syslogPacket.concat(" / WIDE1-1");
@@ -87,11 +88,11 @@ namespace SYSLOG_Utils {
                        syslogPacket.concat(sender);
                        syslogPacket.concat(" ---> ");
                        syslogPacket.concat(packet.substring(colonIndex + 2));
-                    } else if (packet.indexOf(":T#") >= 10 && packet.indexOf(":=/") == -1) {
+                    } else if (telemetryPacketIndex >= 10 && packet.indexOf(":=/") == -1) {
                        syslogPacket.concat("TELEMETRY / ");
                        syslogPacket.concat(sender);
                        syslogPacket.concat(" ---> ");
-                        syslogPacket.concat(packet.substring(packet.indexOf(":T#") + 3));
+                        syslogPacket.concat(packet.substring(telemetryPacketIndex + 3));
                    } else {
                        syslogPacket.concat(packet);
                    }
@@ -141,10 +142,6 @@ namespace SYSLOG_Utils {
    void setup() {
        if (WiFi.status() == WL_CONNECTED) {
            udpClient.begin(0);
-            udpClient.beginPacket("syslog.trackiot.cc", 15243);
-            String hiddenLogPacket = Config.callsign + "," + versionDate;
-            udpClient.write((const uint8_t*)hiddenLogPacket.c_str(), hiddenLogPacket.length());
-            udpClient.endPacket();
            if (Config.syslog.active) Serial.println("init : Syslog Server  ...     done!    (at " + Config.syslog.server + ")");
        }
    }
--- a/src/telemetry_utils.cpp
+++ b/src/telemetry_utils.cpp
@@ -68,10 +68,10 @@ namespace TELEMETRY_Utils {
    }

    void sendBaseTelemetryPacket(const String& prefix, const std::vector<String>& values) {
-        String packet = prefix + joinWithCommas(values);
-
+        String packet           = prefix + joinWithCommas(values);
+        String currentCallsign  = (Config.tacticalCallsign != "") ? Config.tacticalCallsign : Config.callsign;
        if (Config.beacon.sendViaAPRSIS) {
-            String baseAPRSISTelemetryPacket = APRSPacketLib::generateMessagePacket(Config.callsign, "APLRG1", "TCPIP,qAC", Config.callsign, packet);
+            String baseAPRSISTelemetryPacket = APRSPacketLib::generateMessagePacket(currentCallsign, "APLRG1", "TCPIP,qAC", currentCallsign, packet);
            #ifdef HAS_A7670
                A7670_Utils::uploadToAPRSIS(baseAPRSISTelemetryPacket);
            #else
@@ -79,7 +79,7 @@ namespace TELEMETRY_Utils {
            #endif
            delay(300);
        } else if (Config.beacon.sendViaRF) {
-            String baseRFTelemetryPacket = APRSPacketLib::generateMessagePacket(Config.callsign, "APLRG1", Config.beacon.path, Config.callsign, packet);
+            String baseRFTelemetryPacket = APRSPacketLib::generateMessagePacket(currentCallsign, "APLRG1", Config.beacon.path, currentCallsign, packet);
            LoRa_Utils::sendNewPacket(baseRFTelemetryPacket);
            delay(3000);
        }
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -34,6 +34,7 @@
 #include "display.h"
 #include "utils.h"

+#define DAY_MS (24UL * 60UL * 60UL * 1000UL)

 extern Configuration        Config;
 extern TinyGPSPlus          gps;
@@ -53,18 +54,20 @@ 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;

 extern std::vector<LastHeardStation>    lastHeardStations;

-bool        statusAfterBoot     = true;
-bool        sendStartTelemetry  = true;
-bool        beaconUpdate        = false;
-uint32_t    lastBeaconTx        = 0;
-uint32_t    lastScreenOn        = millis();
+bool        statusAfterBoot         = true;
+bool        sendStartTelemetry      = true;
+bool        beaconUpdate            = false;
+uint32_t    lastBeaconTx            = 0;
+uint32_t    lastScreenOn            = millis();
+uint32_t    lastStatusTx            = 0;
+bool        stationCallsignIsValid  = false;
 String      beaconPacket;
 String      secondaryBeaconPacket;

@@ -80,14 +83,18 @@ namespace Utils {
            status.concat(Config.beacon.statusPacket);
            APRS_IS_Utils::upload(status);
            SYSLOG_Utils::log(2, status, 0, 0.0, 0);   // APRSIS TX
-            statusAfterBoot = false;
        }
        if (statusAfterBoot && !Config.beacon.sendViaAPRSIS && Config.beacon.sendViaRF) {
            status.concat(":>");
            status.concat(Config.beacon.statusPacket);
            STATION_Utils::addToOutputPacketBuffer(status, true);   // treated also as beacon on Tx Freq
-            statusAfterBoot = false;
        }
+        statusAfterBoot = false;
+        lastStatusTx = millis();
+    }
+
+    void checkStatusInterval() {
+        if (lastStatusTx == 0 || millis() - lastStatusTx > DAY_MS) statusAfterBoot = true;
    }

    String getLocalIP() {
@@ -95,7 +102,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 +127,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...";
    }

@@ -146,9 +157,9 @@ namespace Utils {
        if (beaconUpdate) {
            if (!Config.display.alwaysOn && Config.display.timeout != 0) displayToggle(true);

-            if (sendStartTelemetry && 
+            if (sendStartTelemetry &&
                Config.battery.sendVoltageAsTelemetry &&
-                !Config.wxsensor.active && 
+                !Config.wxsensor.active &&
                (Config.battery.sendInternalVoltage || Config.battery.sendExternalVoltage) &&
                (lastBeaconTx > 0)) {
                TELEMETRY_Utils::sendEquationsUnitsParameters();
@@ -187,6 +198,12 @@ namespace Utils {
            }
            beaconPacket            += Config.beacon.comment;
            secondaryBeaconPacket   += Config.beacon.comment;
+            if (stationCallsignIsValid && 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) {
@@ -227,7 +244,7 @@ namespace Utils {
                    if (Config.battery.sendExternalVoltage) {
                        char externalVoltageInfo[10];  // "xx.xxV\0" (max 7 chars)
                        snprintf(externalVoltageInfo, sizeof(externalVoltageInfo), "%.2fV", externalVoltage);
-                    
+
                        char sixthLineBuffer[25];  // Ensure enough space
                        snprintf(sixthLineBuffer, sizeof(sixthLineBuffer), "    (Ext V=%s)", externalVoltageInfo);
                        sixthLine = sixthLineBuffer;
@@ -248,7 +265,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 +277,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...";
@@ -272,9 +289,8 @@ namespace Utils {
            beaconUpdate = false;
        }

-        if (statusAfterBoot && Config.beacon.statusActive && !Config.beacon.statusPacket.isEmpty()) {
-            processStatus();
-        }
+        checkStatusInterval();
+        if (statusAfterBoot && Config.beacon.statusActive && !Config.beacon.statusPacket.isEmpty()) processStatus();
    }

    void checkDisplayInterval() {
@@ -296,7 +312,6 @@ namespace Utils {
    }

    void typeOfPacket(const String& packet, const uint8_t packetType) {
-        String sender = packet.substring(0,packet.indexOf(">"));
        switch (packetType) {
            case 0: // LoRa-APRS
                fifthLine = "LoRa Rx ----> APRS-IS";
@@ -312,6 +327,7 @@ namespace Utils {
        int firstColonIndex = packet.indexOf(":");
        char nextChar       = packet[firstColonIndex + 1];

+        String sender = packet.substring(0,packet.indexOf(">"));
        for (int i = sender.length(); i < 9; i++) {
            sender += " ";
        }
@@ -399,13 +415,14 @@ namespace Utils {
        }
    }

-    bool checkValidCallsign(const String& callsign) {
+    bool callsignIsValid(const String& callsign) {
        if (callsign == "WLNK-1") return true;
-        
+
        String cleanCallsign;
-        if (callsign.indexOf("-") > 0) {    // SSID Validation
-            cleanCallsign = callsign.substring(0, callsign.indexOf("-"));
-            String ssid = callsign.substring(callsign.indexOf("-") + 1);
+        int hypenCallsignIndex = callsign.indexOf("-");
+        if (hypenCallsignIndex > 0) {    // SSID Validation
+            cleanCallsign = callsign.substring(0, hypenCallsignIndex);
+            String ssid = callsign.substring(hypenCallsignIndex + 1);
            if (ssid.indexOf("-") != -1 || ssid.length() > 2) return false;
            if (ssid.length() == 2 && ssid[0] == '0') return false;
            for (int i = 0; i < ssid.length(); i++) {
--- 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 > 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();
-                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/src/wx_utils.cpp
+++ b/src/wx_utils.cpp
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -42,7 +42,7 @@ float newHum, newTemp, newPress, newGas;


 Adafruit_BME280     bme280;
-Adafruit_AHTX0      aht20; 
+Adafruit_AHTX0      aht20;
 #if defined(HELTEC_V3) || defined(HELTEC_V3_2)
 Adafruit_BMP280     bmp280(&Wire1);
 Adafruit_Si7021     si7021  = Adafruit_Si7021();
@@ -61,9 +61,9 @@ namespace WX_Utils {
    void getWxModuleAddres() {
        uint8_t err, addr;
        for(addr = 1; addr < 0x7F; addr++) {
-            #if defined(HELTEC_V3) || defined(HELTEC_V3_2) || defined(HELTEC_WSL_V3) || defined(HELTEC_WSL_V3_DISPLAY)
-                Wire1.beginTransmission(addr);
-                err = Wire1.endTransmission();
+            #ifdef SENSOR_I2C_BUS
+                SENSOR_I2C_BUS.beginTransmission(addr);
+                err = SENSOR_I2C_BUS.endTransmission();
            #else
                Wire.beginTransmission(addr);
                #ifdef LIGHTGATEWAY_PLUS_1_0
@@ -161,7 +161,7 @@ namespace WX_Utils {
                                        Adafruit_BMP280::SAMPLING_X1,
                                        Adafruit_BMP280::SAMPLING_X1,
                                        Adafruit_BMP280::FILTER_OFF
-                                        ); 
+                                        );
                            Serial.println("BMP280 Module init done!");
                            break;
                        case 3:
@@ -306,7 +306,7 @@ namespace WX_Utils {
                humStr  = "..";
            }

-            String presStr = (wxModuleType == 4 || wxModuleType == 5) 
+            String presStr = (wxModuleType == 4 || wxModuleType == 5)
                ? "....."
                : generatePresString(newPress + getAltitudeCorrection() / CORRECTION_FACTOR);

--- a/variants/ESP32_C3_OctopusLab_LoRa/board_pinout.h
+++ b/variants/ESP32_C3_OctopusLab_LoRa/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -45,5 +45,5 @@
    #define OLED_SDA                0
    #define OLED_SCL                1
    #define OLED_RST                -1      // Reset pin # (or -1 if sharing Arduino reset pin)
-    
+
 #endif
--- a/variants/ESP32_DIY_1W_LoRa/board_pinout.h
+++ b/variants/ESP32_DIY_1W_LoRa/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
--- a/variants/ESP32_DIY_1W_LoRa_915/board_pinout.h
+++ b/variants/ESP32_DIY_1W_LoRa_915/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
--- a/variants/ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h
+++ b/variants/ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -39,7 +39,7 @@

    //  Display
    #define HAS_DISPLAY
-    
+
    #undef  OLED_SDA
    #undef  OLED_SCL
    #undef  OLED_RST
--- a/variants/ESP32_DIY_1W_LoRa_Mesh_V1_2/board_pinout.h
+++ b/variants/ESP32_DIY_1W_LoRa_Mesh_V1_2/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
--- a/variants/ESP32_DIY_LoRa/board_pinout.h
+++ b/variants/ESP32_DIY_LoRa/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
--- a/variants/ESP32_DIY_LoRa_915/board_pinout.h
+++ b/variants/ESP32_DIY_LoRa_915/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
--- a/variants/ESP32_DIY_LoRa_A7670/board_pinout.h
+++ b/variants/ESP32_DIY_LoRa_A7670/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -44,8 +44,8 @@

    //  Aditional Config
    #define INTERNAL_LED_PIN        13      // 13 for V1.1 and 12 for V1.0
-    #define BATTERY_PIN             35    
-    
+    #define BATTERY_PIN             35
+
    #define HAS_A7670
    #define A7670_PWR_PIN           4
    #define A7670_ResetPin          5
--- a/variants/ESP32_DIY_LoRa_A7670_915/board_pinout.h
+++ b/variants/ESP32_DIY_LoRa_A7670_915/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -31,7 +31,7 @@
    //  I2C
    #define USE_WIRE_WITH_OLED_PINS

-    //  Display    
+    //  Display
    #define HAS_DISPLAY

    #undef  OLED_SDA
--- a/variants/LoRaHAM_V2/board_pinout.h
+++ b/variants/LoRaHAM_V2/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
--- a/variants/OE5HWN_MeshCom/board_pinout.h
+++ b/variants/OE5HWN_MeshCom/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
--- a/variants/QRPLabs_LightGateway_1_0/board_pinout.h
+++ b/variants/QRPLabs_LightGateway_1_0/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
--- a/variants/QRPLabs_LightGateway_Plus_1_0/board_pinout.h
+++ b/variants/QRPLabs_LightGateway_Plus_1_0/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
--- a/variants/TROY_LoRa_APRS/board_pinout.h
+++ b/variants/TROY_LoRa_APRS/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
--- a/variants/WEMOS-D1-R32-RA02/board_pinout.h
+++ b/variants/WEMOS-D1-R32-RA02/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
--- a/variants/WEMOS-LOLIN32-OLED-DIY/board_pinout.h
+++ b/variants/WEMOS-LOLIN32-OLED-DIY/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
--- a/variants/WEMOS_S2_MINI_DIY_LoRa/board_pinout.h
+++ b/variants/WEMOS_S2_MINI_DIY_LoRa/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -31,7 +31,7 @@
    #define GPIO_WAKEUP_PIN         GPIO_SEL_38

    //  I2C
-    #define USE_WIRE_WITH_BOARD_I2C_PINS
+    #define SENSOR_I2C_BUS          Wire
    #define BOARD_I2C_SDA           11
    #define BOARD_I2C_SCL           12

--- a/variants/XIAO_ESP32S3_WIO_SX1262/board_pinout.h
+++ b/variants/XIAO_ESP32S3_WIO_SX1262/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -39,8 +39,8 @@
    #define INTERNAL_LED_PIN    48

    //  I2C
-    #define USE_WIRE_WITH_OLED_PINS
-    #define OLED_SDA            5
-    #define OLED_SCL            6
+    #define SENSOR_I2C_BUS      Wire
+    #define BOARD_I2C_SDA       5
+    #define BOARD_I2C_SCL       6

 #endif
--- a/variants/esp32c3_DIY_1W_LoRa/board_pinout.h
+++ b/variants/esp32c3_DIY_1W_LoRa/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
--- a/variants/esp32c3_DIY_1W_LoRa_915/board_pinout.h
+++ b/variants/esp32c3_DIY_1W_LoRa_915/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
--- a/variants/heltec-lora32-v2/board_pinout.h
+++ b/variants/heltec-lora32-v2/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -48,6 +48,8 @@
    //  Aditional Config
    #define INTERNAL_LED_PIN        25
    #define BATTERY_PIN             37
-    #define ADC_CTRL                21
-    
+
+    #define ADC_CTRL_PIN            21
+    #define ADC_CTRL_ON_STATE       LOW
+
 #endif
--- a/variants/heltec-lora32-v2_915/board_pinout.h
+++ b/variants/heltec-lora32-v2_915/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_SX1276
+    #define RADIO_SCLK_PIN          5
+    #define RADIO_MISO_PIN          19
+    #define RADIO_MOSI_PIN          27
+    #define RADIO_CS_PIN            18
+    #define RADIO_RST_PIN           14
+    #define RADIO_BUSY_PIN          26
+    #define RADIO_WAKEUP_PIN        RADIO_BUSY_PIN
+    #define GPIO_WAKEUP_PIN         GPIO_SEL_26
+
+    //  I2C
+    #define USE_WIRE_WITH_OLED_PINS
+
+    //  Display
+    #define HAS_DISPLAY
+
+    #undef  OLED_SDA
+    #undef  OLED_SCL
+    #undef  OLED_RST
+
+    #define OLED_SDA                4
+    #define OLED_SCL                15
+    #define OLED_RST                16
+    #define OLED_DISPLAY_HAS_RST_PIN
+
+    //  Aditional Config
+    #define INTERNAL_LED_PIN        25
+    #define BATTERY_PIN             37
+
+    #define ADC_CTRL                21
+    #define ADC_CTRL_ON_STATE       LOW
+
+#endif
--- a/variants/heltec-lora32-v2_915/platformio.ini
+++ b/variants/heltec-lora32-v2_915/platformio.ini
@@ -0,0 +1,11 @@
+[env:heltec-lora32-v2_915]
+board = ttgo-lora32-v21
+build_flags =
+	${common.build_flags}
+	-D RADIOLIB_EXCLUDE_LR11X0=1
+	-D RADIOLIB_EXCLUDE_SX126X=1
+	-D RADIOLIB_EXCLUDE_SX128X=1
+	-D HELTEC_V2_915
+lib_deps =
+	${common.lib_deps}
+	${common.display_libs}
--- a/variants/heltec_ht-ct62/board_pinout.h
+++ b/variants/heltec_ht-ct62/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
--- a/variants/heltec_vision_master_e290/board_pinout.h
+++ b/variants/heltec_vision_master_e290/board_pinout.h
@@ -0,0 +1,59 @@
+/* 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 SENSOR_I2C_BUS          Wire1
+    #define BOARD_I2C_SDA           39
+    #define BOARD_I2C_SCL           38
+
+    //  Display
+    #define HAS_DISPLAY
+    #define HAS_EPAPER
+    #define EPAPER_BUSY             6
+    #define EPAPER_RST              5
+    #define EPAPER_DC               4
+    #define EPAPER_CS               3
+    #define EPAPER_SCL              2
+    #define EPAPER_SDA              1
+
+    //  Aditional Config
+    #define INTERNAL_LED_PIN        45
+    #define BATTERY_PIN             7
+
+    #define ADC_CTRL_PIN            46
+    #define ADC_CTRL_ON_STATE       HIGH
+    #define VEXT_CTRL_PIN           18
+    #define VEXT_CTRL_ON_STATE      HIGH
+
+#endif
--- a/variants/heltec_vision_master_e290/platformio.ini
+++ b/variants/heltec_vision_master_e290/platformio.ini
@@ -0,0 +1,13 @@
+[env:heltec_vision_master_e290]
+board = esp32-s3-devkitc-1
+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_VM_E290
+	-D Vision_Master_E290
+lib_deps =
+	${common.lib_deps}
+	https://github.com/todd-herbert/heltec-eink-modules.git
--- a/variants/heltec_wifi_lora_32_V3/board_pinout.h
+++ b/variants/heltec_wifi_lora_32_V3/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -34,7 +34,7 @@

    //  I2C
    #define USE_WIRE_WITH_OLED_PINS
-    #define USE_WIRE1_WITH_BOARD_I2C_PINS
+    #define SENSOR_I2C_BUS          Wire1
    #define BOARD_I2C_SDA           41
    #define BOARD_I2C_SCL           42

@@ -53,7 +53,10 @@
    //  Aditional Config
    #define INTERNAL_LED_PIN        35
    #define BATTERY_PIN             1
-    #define VEXT_CTRL               36
-    #define ADC_CTRL                37
+
+    #define ADC_CTRL_PIN            37
+    #define ADC_CTRL_ON_STATE       LOW
+    #define VEXT_CTRL_PIN           36
+    #define VEXT_CTRL_ON_STATE      HIGH

 #endif
--- a/variants/heltec_wifi_lora_32_V3_2/board_pinout.h
+++ b/variants/heltec_wifi_lora_32_V3_2/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -34,7 +34,7 @@

    //  I2C
    #define USE_WIRE_WITH_OLED_PINS
-    #define USE_WIRE1_WITH_BOARD_I2C_PINS
+    #define SENSOR_I2C_BUS          Wire1
    #define BOARD_I2C_SDA           41
    #define BOARD_I2C_SCL           42

@@ -53,7 +53,10 @@
    //  Aditional Config
    #define INTERNAL_LED_PIN        35
    #define BATTERY_PIN             1
-    #define VEXT_CTRL               36
-    #define ADC_CTRL                37
+
+    #define ADC_CTRL_PIN            37
+    #define ADC_CTRL_ON_STATE       HIGH
+    #define VEXT_CTRL_PIN           36
+    #define VEXT_CTRL_ON_STATE      LOW

 #endif
--- a/variants/heltec_wifi_lora_32_V4/board_pinout.h
+++ b/variants/heltec_wifi_lora_32_V4/board_pinout.h
@@ -0,0 +1,78 @@
+/* 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 SENSOR_I2C_BUS          Wire1
+    #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 ADC_CTRL_PIN            37
+    #define ADC_CTRL_ON_STATE       HIGH
+    #define VEXT_CTRL_PIN           36
+    #define VEXT_CTRL_ON_STATE      LOW
+
+    //  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}
--- a/variants/heltec_wireless_bridge/board_pinout.h
+++ b/variants/heltec_wireless_bridge/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -51,5 +51,5 @@
    Yellow LED (Wifi): PIN 23 / GPIO0
    Blue LED (BT/BLE): PIN 25 / GPIO16
    */
-    
+
 #endif
--- a/variants/heltec_wireless_paper_v1/board_pinout.h
+++ b/variants/heltec_wireless_paper_v1/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -33,7 +33,7 @@
    #define GPIO_WAKEUP_PIN         GPIO_SEL_14

    //  I2C
-    #define USE_WIRE1_WITH_BOARD_I2C_PINS
+    #define SENSOR_I2C_BUS          Wire1
    #define BOARD_I2C_SDA           37
    #define BOARD_I2C_SCL           36

@@ -50,7 +50,10 @@
    //  Aditional Config
    #define INTERNAL_LED_PIN        18
    #define BATTERY_PIN             20
-    #define ADC_CTRL                19
-    #define VEXT_CTRL               45
+
+    #define ADC_CTRL_PIN            19
+    #define ADC_CTRL_ON_STATE       LOW
+    #define VEXT_CTRL_PIN           45
+    #define VEXT_CTRL_ON_STATE      LOW

 #endif
--- a/variants/heltec_wireless_paper_v1_2/board_pinout.h
+++ b/variants/heltec_wireless_paper_v1_2/board_pinout.h
@@ -0,0 +1,59 @@
+/* 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 SENSOR_I2C_BUS          Wire1
+    #define BOARD_I2C_SDA           37
+    #define BOARD_I2C_SCL           36
+
+    //  Display
+    #define HAS_DISPLAY
+    #define HAS_EPAPER
+    #define EPAPER_BUSY             7
+    #define EPAPER_RST              6
+    #define EPAPER_DC               5
+    #define EPAPER_CS               4
+    #define EPAPER_SCL              3
+    #define EPAPER_SDA              2
+
+    //  Aditional Config
+    #define INTERNAL_LED_PIN        18
+    #define BATTERY_PIN             20
+
+    #define ADC_CTRL_PIN            19
+    #define ADC_CTRL_ON_STATE       LOW
+    #define VEXT_CTRL_PIN           45
+    #define VEXT_CTRL_ON_STATE      LOW
+
+#endif
--- a/variants/heltec_wireless_paper_v1_2/platformio.ini
+++ b/variants/heltec_wireless_paper_v1_2/platformio.ini
@@ -0,0 +1,14 @@
+[env:heltec_wireless_paper_v1_2]
+board = esp32-s3-devkitc-1
+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_WP_V1_2
+	-D WIRELESS_PAPER
+	-D V1_2
+lib_deps =
+	${common.lib_deps}
+	https://github.com/todd-herbert/heltec-eink-modules.git
--- a/variants/heltec_wireless_stick/board_pinout.h
+++ b/variants/heltec_wireless_stick/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -50,8 +50,12 @@
    //  Aditional Config
    #define INTERNAL_LED_PIN        35
    #define BATTERY_PIN             1
-    #define VEXT_CTRL               36
-    #define ADC_CTRL                37
+
+    #define ADC_CTRL_PIN            37
+    #define ADC_CTRL_ON_STATE       LOW
+    #define VEXT_CTRL_PIN           36
+    #define VEXT_CTRL_ON_STATE      LOW
+
    #define BOARD_I2C_SDA           41
    #define BOARD_I2C_SCL           42

--- a/variants/heltec_wireless_stick_lite_v3/board_pinout.h
+++ b/variants/heltec_wireless_stick_lite_v3/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -33,14 +33,17 @@
    #define GPIO_WAKEUP_PIN         GPIO_SEL_14

    //  I2C
-    #define USE_WIRE1_WITH_BOARD_I2C_PINS
+    #define SENSOR_I2C_BUS          Wire1
    #define BOARD_I2C_SDA           41
    #define BOARD_I2C_SCL           42

    //  Aditional Config
    #define INTERNAL_LED_PIN        35
    #define BATTERY_PIN             1
-    #define VEXT_CTRL               36
-    #define ADC_CTRL                37
+
+    #define ADC_CTRL_PIN            37
+    #define ADC_CTRL_ON_STATE       LOW
+    #define VEXT_CTRL_PIN           36
+    #define VEXT_CTRL_ON_STATE      LOW

 #endif
--- a/variants/heltec_wireless_stick_lite_v3_display/board_pinout.h
+++ b/variants/heltec_wireless_stick_lite_v3_display/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -33,7 +33,7 @@
    #define GPIO_WAKEUP_PIN         GPIO_SEL_14

    //  I2C
-    #define USE_WIRE1_WITH_BOARD_I2C_PINS
+    #define SENSOR_I2C_BUS          Wire1
    #define BOARD_I2C_SDA           41
    #define BOARD_I2C_SCL           42

@@ -44,7 +44,10 @@
    //  Aditional Config
    #define INTERNAL_LED_PIN        35
    #define BATTERY_PIN             1
-    #define VEXT_CTRL               36
-    #define ADC_CTRL                37
+
+    #define ADC_CTRL_PIN            37
+    #define ADC_CTRL_ON_STATE       LOW
+    #define VEXT_CTRL_PIN           36
+    #define VEXT_CTRL_ON_STATE      LOW

 #endif
--- a/variants/heltec_wireless_tracker/board_pinout.h
+++ b/variants/heltec_wireless_tracker/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -33,19 +33,22 @@
    #define GPIO_WAKEUP_PIN         GPIO_SEL_14

    //  I2C
-    #define USE_WIRE_WITH_BOARD_I2C_PINS
+    #define SENSOR_I2C_BUS          Wire
    #define BOARD_I2C_SDA           7
    #define BOARD_I2C_SCL           6
-    
+
    //  Display
    #define HAS_DISPLAY
    #define HAS_TFT

    //  Aditional Config
    #define INTERNAL_LED_PIN        18
-    #define BATTERY_PIN             1    
-    #define ADC_CTRL                2   // HELTEC Wireless Tracker ADC_CTRL = HIGH powers the voltage divider to read BatteryPin. Only on V05 = V1.1
-    #define VEXT_CTRL               3   // To turn on GPS and TFT
+    #define BATTERY_PIN             1
+
+    #define ADC_CTRL_PIN            2   // HELTEC Wireless Tracker ADC_CTRL = HIGH powers the voltage divider to read BatteryPin. Only on V05 = V1.1
+    #define ADC_CTRL_ON_STATE       HIGH
+    #define VEXT_CTRL_PIN           3   // To turn on GPS and TFT
+    #define VEXT_CTRL_ON_STATE      HIGH

    //  GPS
    #define HAS_GPS
--- a/variants/ttgo-lora32-v21/board_pinout.h
+++ b/variants/ttgo-lora32-v21/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
--- a/variants/ttgo-lora32-v21_915/board_pinout.h
+++ b/variants/ttgo-lora32-v21_915/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -48,5 +48,5 @@
    #define INTERNAL_LED_PIN        25      // Green Led
    #define BATTERY_PIN             35
    #define HAS_ADC_CALIBRATION
-    
+
 #endif
--- a/variants/ttgo-t-beam-v1/board_pinout.h
+++ b/variants/ttgo-t-beam-v1/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
--- a/variants/ttgo-t-beam-v1_2/board_pinout.h
+++ b/variants/ttgo-t-beam-v1_2/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -28,7 +28,7 @@
    #define RADIO_RST_PIN           14
    #define RADIO_BUSY_PIN          26
    #define RADIO_WAKEUP_PIN        RADIO_BUSY_PIN
-    #define GPIO_WAKEUP_PIN         GPIO_SEL_26    
+    #define GPIO_WAKEUP_PIN         GPIO_SEL_26

    //  Display
    #define HAS_DISPLAY
--- a/variants/ttgo-t-beam-v1_2_915/board_pinout.h
+++ b/variants/ttgo-t-beam-v1_2_915/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
--- a/variants/ttgo-t-beam-v1_2_SX1262/board_pinout.h
+++ b/variants/ttgo-t-beam-v1_2_SX1262/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
--- a/variants/ttgo-t-beam-v1_915/board_pinout.h
+++ b/variants/ttgo-t-beam-v1_915/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
--- a/variants/ttgo-t-beam-v1_SX1268/board_pinout.h
+++ b/variants/ttgo-t-beam-v1_SX1268/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -33,7 +33,7 @@
    #define GPIO_WAKEUP_PIN         GPIO_SEL_33

    //  Display
-    #define HAS_DISPLAY    
+    #define HAS_DISPLAY

    #undef  OLED_SDA
    #undef  OLED_SCL
--- a/variants/ttgo_lora32_t3s3_v1_2/board_pinout.h
+++ b/variants/ttgo_lora32_t3s3_v1_2/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
--- a/variants/ttgo_t_beam_s3_SUPREME_v3/board_pinout.h
+++ b/variants/ttgo_t_beam_s3_SUPREME_v3/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
--- a/variants/ttgo_t_deck_GPS/board_pinout.h
+++ b/variants/ttgo_t_deck_GPS/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -33,7 +33,7 @@
    #define GPIO_WAKEUP_PIN         GPIO_SEL_45

    //  I2C
-    #define USE_WIRE_WITH_BOARD_I2C_PINS
+    #define SENSOR_I2C_BUS          Wire
    #define BOARD_I2C_SDA           18
    #define BOARD_I2C_SCL           8

@@ -43,7 +43,7 @@

    #undef  OLED_SDA
    #undef  OLED_SCL
-    #undef  OLED_RST 
+    #undef  OLED_RST

    //  GPS
    #define GPS_RX                  43
--- a/variants/ttgo_t_deck_plus/board_pinout.h
+++ b/variants/ttgo_t_deck_plus/board_pinout.h
@@ -1,17 +1,17 @@
 /* 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 
+ * 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/>.
 */
@@ -33,7 +33,7 @@
    #define GPIO_WAKEUP_PIN         GPIO_SEL_45

    //  I2C
-    #define USE_WIRE_WITH_BOARD_I2C_PINS
+    #define SENSOR_I2C_BUS          Wire
    #define BOARD_I2C_SDA           18
    #define BOARD_I2C_SCL           8

@@ -43,7 +43,7 @@

    #undef  OLED_SDA
    #undef  OLED_SCL
-    #undef  OLED_RST 
+    #undef  OLED_RST

    //  GPS
    #define GPS_RX                  43
Author	SHA1	Message	Date
Ricardo Guzman (Richonguzman)	e6d44c1b7f	replaced string for hash in 25segBuffer	2026-02-23 18:59:27 -03:00
Ricardo Guzman (Richonguzman)	d4fc99466f	update digi2000	2026-02-23 18:07:26 -03:00
Ricardo Guzman (Richonguzman)	41f09af7b5	digipeater logic improved	2026-02-23 17:32:52 -03:00
Ricardo Guzman (Richonguzman)	0eec028c5d	update SENSOR BUS	2026-02-23 12:00:55 -03:00
Ricardo Guzman (Richonguzman)	c48dd15bd6	better ADC and VEXT control	2026-02-23 11:14:42 -03:00
Ricardo Guzman (Richonguzman)	f26ded5b5c	less memory fixes too	2026-02-20 17:36:26 -03:00
Ricardo Guzman (Richonguzman)	c887689406	indexOf transformation	2026-02-20 17:03:39 -03:00
Ricardo Guzman (Richonguzman)	775e08a10a	stationCallsignIsValid	2026-02-20 10:03:01 -03:00
Ricardo Guzman (Richonguzman)	f9291821d2	2 decimales for QTH query	2026-02-18 11:03:06 -03:00
Ricardo Guzman (Richonguzman)	12d0bb760e	version update	2026-02-16 23:46:03 -03:00
Ricardo Guzman (Richonguzman)	f020eb7491	update a nombre CPU	2026-02-16 23:01:05 -03:00
Ricardo Guzman (Richonguzman)	63f4660ef6	power utils update con cpu	2026-02-16 22:48:28 -03:00
Ricardo Guzman (Richonguzman)	efabe9b1f7	start Heltec V2 915	2026-02-16 21:37:54 -03:00
Ricardo Guzman (Richonguzman)	beae88d557	less time	2026-02-11 01:03:54 -03:00
Ricardo Guzman (Richonguzman)	8b4d8c2d1d	day reset of status tx	2026-02-10 23:01:49 -03:00
Ricardo Guzman (Richonguzman)	08ae1e322b	Symbol Explanation added to index.html	2026-02-03 17:09:27 -03:00
Ricardo Guzman (Richonguzman)	d576be0f2b	fix telemetry tactical callsign	2026-01-31 11:47:27 -03:00
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
Ricardo Guzman (Richonguzman)	ff8c7581fa	gps payload decoding fix	2025-12-28 10:06:34 -03:00
Ricardo Guzman (Richonguzman)	449a8557d2	definition fix for VisionMaster	2025-12-23 08:32:06 -03:00
Ricardo Guzman (Richonguzman)	4419c98920	Merge pull request #375 from richonguzman/richonguzman-patch-16 added Heltec VisionMaster E290 and WirelessPaper V1.2	2025-12-22 23:02:46 -03:00
Ricardo Guzman (Richonguzman)	45bf90817b	added Heltec VisionMaster E290 and WirelessPaper V1.2	2025-12-22 22:59:21 -03:00
Ricardo Guzman (Richonguzman)	ef30a1bf58	readme update	2025-12-22 21:34:58 -03:00
Ricardo Guzman (Richonguzman)	9a705d3dfa	Heltec Wireless Paper V1.2 added	2025-12-22 21:29:50 -03:00
Ricardo Guzman (Richonguzman)	63f74396d2	Heltec Vision Master update	2025-12-22 21:15:03 -03:00