ADC_CTRL_PIN fix

VEXT_CTRL_PIN definition missing fix
aprsis.active update in digi.ecoMode == 1 ?
2026-03-28 16:52:33 +01:00 · 2026-03-05 10:06:22 -03:00 · 2026-03-04 12:24:16 -03:00 · 2026-03-04 11:21:26 -03:00 · 2026-03-03 11:22:41 -03:00 · 2026-02-26 12:28:52 -03:00
99 changed files with 1153 additions and 960 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,6 +19,8 @@ jobs:
                      chip: esp32s3
                    - name: heltec-lora32-v2
                      chip: esp32
+                    - name: heltec-lora32-v2_915
+                      chip: esp32
                    - name: heltec_wifi_lora_32_V3
                      chip: esp32s3
                    - name: heltec_wifi_lora_32_V3_2
@@ -96,7 +98,9 @@ jobs:
                    - name: XIAO_ESP32S3_WIO_SX1262
                      chip: esp32s3
                    - name: TROY_LoRa_APRS
-                      chip: esp32                    
+                      chip: esp32
+                    - name: ESP32_9M2IBR_1W_LoRa_GPS
+                      chip: esp32
        steps:
            - uses: actions/checkout@v3

--- a/README.md
+++ b/README.md
@@ -51,6 +51,11 @@ ____________________________________________________
 <br />

 # Timeline (Versions):
+- 2026-02-26 9M2IBR ESP32 1W (400M30S) + GPS board added.
+- 2026-02-25 Code Improvements: reduced String comparisons and improved logic for faster code execution.
+- 2026-02-15 Digipeater code/logic improved.
+- 2026-02-08 Heltec V2 915MHz added.
+- 2026-02-05 Improved "digiBackupMode" to check "APRS-IS" server connection.
 - 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.
@@ -85,7 +90,7 @@ ____________________________________________________
 - 2024.10.08 New EcoMode for Remote Digipeaters without WiFi/WiFiAP, Screen, Leds (Example: LILYGO LoRa32 uses only 24mA, with WifiAP 150mA). APRS Message/Queries can start/stop this mode too.
 - 2024.10.06 Cross Frequency Digipeater Rules added.
 - 2024.09.23 Libraries Update for SDK3
- 2024.09.23 Added Enconded Telemetry for Battery (+ External Voltage) in Station GPS Beacon Packet. 
+- 2024.09.23 Added Enconded Telemetry for Battery (+ External Voltage) in Station GPS Beacon Packet.
 - 2024.08.23 Wemos S2 Mini DIY LoRa added.
 - 2024.08.19 HELTEC Wireless Paper working (still missing Epaper code).
 - 2024.08.13 Web Authentication for WebUI. Thanks Mitja S57PNX.
--- a/include/A7670_utils.h
+++ b/include/A7670_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/>.
 */
--- a/include/aprs_is_utils.h
+++ b/include/aprs_is_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/>.
 */
--- a/include/battery_utils.h
+++ b/include/battery_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/>.
 */
--- a/include/configuration.h
+++ b/include/configuration.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,7 +44,7 @@ public:
    int     interval;
    String  overlay;
    String  symbol;
-    String  path;    
+    String  path;
    bool    sendViaAPRSIS;
    bool    sendViaRF;
    int     beaconFreq;
@@ -78,7 +78,7 @@ public:
    long    rxFreq;
    int     rxSpreadingFactor;
    int     rxCodingRate4;
-    long    rxSignalBandwidth;    
+    long    rxSignalBandwidth;
    bool    txActive;
    long    txFreq;
    int     txSpreadingFactor;
@@ -188,10 +188,10 @@ public:
    BATTERY                 battery;
    WXSENSOR                wxsensor;
    SYSLOG                  syslog;
-    TNC                     tnc;  
+    TNC                     tnc;
    OTA                     ota;
    WEBADMIN                webadmin;
-    NTP                     ntp;    
+    NTP                     ntp;
    REMOTE_MANAGEMENT       remoteManagement;
    MQTT                    mqtt;

--- a/include/digi_utils.h
+++ b/include/digi_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/>.
 */
--- a/include/display.h
+++ b/include/display.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/>.
 */
@@ -21,6 +21,7 @@

 #include <Arduino.h>

+
 #define SCREEN_ADDRESS  0x3C    ///< See datasheet for Address; 0x3D for 128x64, 0x3C for 128x32

 void displaySetup();
--- a/include/gps_utils.h
+++ b/include/gps_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/>.
 */
@@ -23,7 +23,7 @@


 namespace GPS_Utils {
-    
+
    String  getiGateLoRaBeaconPacket();
    char    *ax25_base91enc(char *s, uint8_t n, uint32_t v);
    String  encodeGPS(float latitude, float longitude, const String& overlay, const String& symbol);
--- a/include/kiss_protocol.h
+++ b/include/kiss_protocol.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/include/kiss_utils.h
+++ b/include/kiss_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/>.
 */
--- a/include/lora_utils.h
+++ b/include/lora_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/>.
 */
--- a/include/mqtt_utils.h
+++ b/include/mqtt_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/>.
 */
--- a/include/ntp_utils.h
+++ b/include/ntp_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/>.
 */
--- a/include/ota_utils.h
+++ b/include/ota_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/>.
 */
--- a/include/power_utils.h
+++ b/include/power_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/>.
 */
@@ -34,7 +34,7 @@ namespace POWER_Utils {
        void vext_ctrl_OFF();
    #endif

-    #ifdef ADC_CTRL
+    #ifdef ADC_CTRL_PIN
        void adc_ctrl_ON();
        void adc_ctrl_OFF();
    #endif
--- a/include/query_utils.h
+++ b/include/query_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/>.
 */
--- a/include/sleep_utils.h
+++ b/include/sleep_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/>.
 */
@@ -21,8 +21,9 @@

 #include <Arduino.h>

+
 namespace SLEEP_Utils {
-    
+
    void setup();
    void checkWakeUpFlag();
    void startSleeping();
--- 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/syslog_utils.h
+++ b/include/syslog_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/>.
 */
--- a/include/telemetry_utils.h
+++ b/include/telemetry_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/>.
 */
@@ -27,7 +27,8 @@ namespace TELEMETRY_Utils {
    void    sendEquationsUnitsParameters();
    String  generateEncodedTelemetryBytes(float value, bool counterBytes, byte telemetryType);
    String  generateEncodedTelemetry();
-    
+    void    checkEUPInterval();
+
 }

 #endif
--- a/include/tnc_utils.h
+++ b/include/tnc_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/>.
 */
--- 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/include/web_utils.h
+++ b/include/web_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/>.
 */
--- a/include/wifi_utils.h
+++ b/include/wifi_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/>.
 */
--- a/include/wx_utils.h
+++ b/include/wx_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/>.
 */
@@ -20,7 +20,7 @@
 #define WX_UTILS_H_

 #include <Adafruit_Sensor.h>
-#include <Adafruit_AHTX0.h> 
+#include <Adafruit_AHTX0.h>
 #include <Adafruit_BME280.h>
 #include <Adafruit_BMP280.h>
 #include <Adafruit_BME680.h>
--- 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             = "2026-01-21";
-String              versionNumber           = "3.2";
+String              versionDate             = "2026-03-05";
+String              versionNumber           = "3.2.2";
 Configuration       Config;
 WiFiClient          aprsIsClient;
 WiFiClient          mqttClient;
@@ -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 = "";
@@ -188,7 +188,6 @@ void loop() {
            }

            if (Config.loramodule.txActive && (Config.digi.mode == 2 || Config.digi.mode == 3 || backupDigiMode)) { // If Digi enabled
-                STATION_Utils::clean25SegBuffer();
                DIGI_Utils::processLoRaPacket(packet); // Send received packet to Digi
            }

--- a/src/aprs_is_utils.cpp
+++ b/src/aprs_is_utils.cpp
@@ -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"
@@ -135,30 +135,30 @@ namespace APRS_IS_Utils {
    }

    String checkForStartingBytes(const String& packet) {
-        if (packet.indexOf("\x3c\xff\x01") != -1) {
-            return packet.substring(0, packet.indexOf("\x3c\xff\x01"));
-        } else {
-            return packet;
-        }
+        int index = packet.indexOf("\x3c\xff\x01");
+        return (index != -1) ? packet.substring(0, index) : packet;
    }

    String buildPacketToUpload(const String& packet) {
-        String packetToUpload = packet.substring(3, packet.indexOf(":"));
+        int colonIndex = packet.indexOf(":");
+        String packetToUpload = packet.substring(3, colonIndex);
        if (Config.aprs_is.active && passcodeValid && Config.aprs_is.messagesToRF) {
            packetToUpload += ",qAR,";
        } else {
            packetToUpload += ",qAO,";
        }
        packetToUpload += Config.callsign;
-        packetToUpload += checkForStartingBytes(packet.substring(packet.indexOf(":")));
+        packetToUpload += checkForStartingBytes(packet.substring(colonIndex));
        return packetToUpload;
    }

    bool processReceivedLoRaMessage(const String& sender, const String& packet, bool thirdParty) {
        String receivedMessage;
-        if (packet.indexOf("{") > 0) {     // ack?
+        int leftCurlyBraceIndex = packet.indexOf("{");
+        int colonIndex          = packet.indexOf(":");
+        if (leftCurlyBraceIndex > 0) {     // ack?
            String ackMessage = "ack";
-            ackMessage.concat(packet.substring(packet.indexOf("{") + 1));
+            ackMessage.concat(packet.substring(leftCurlyBraceIndex + 1));
            ackMessage.trim();
            //Serial.println(ackMessage);

@@ -180,9 +180,9 @@ namespace APRS_IS_Utils {
            addToBuffer += ":";
            addToBuffer += ackMessage;
            STATION_Utils::addToOutputPacketBuffer(addToBuffer);
-            receivedMessage = packet.substring(packet.indexOf(":") + 1, packet.indexOf("{"));
+            receivedMessage = packet.substring(colonIndex + 1, leftCurlyBraceIndex);
        } else {
-            receivedMessage = packet.substring(packet.indexOf(":") + 1);
+            receivedMessage = packet.substring(colonIndex + 1);
        }
        if (receivedMessage.indexOf("?") == 0) {
            if (!Config.display.alwaysOn && Config.display.timeout != 0) {
@@ -204,32 +204,33 @@ 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);
+                        int doubleColonIndex = packet.indexOf("::");
+                        const String& AddresseeAndMessage = packet.substring(doubleColonIndex + 2);
                        String Addressee = AddresseeAndMessage.substring(0, AddresseeAndMessage.indexOf(":"));
                        Addressee.trim();
                        bool queryMessage = false;
-                        if (packet.indexOf("::") > 10 && Addressee == Config.callsign) {      // its a message for me!
+                        if (doubleColonIndex > 10 && Addressee == Config.callsign) {      // its a message for me!
                            queryMessage = processReceivedLoRaMessage(Sender, checkForStartingBytes(AddresseeAndMessage), false);
                        }
-                        if (!queryMessage) {
-                            const String& aprsPacket = buildPacketToUpload(packet);
-                            if (!Config.display.alwaysOn && Config.display.timeout != 0) {
-                                displayToggle(true);
-                            }
-                            lastScreenOn = millis();
-                            #ifdef HAS_A7670
-                                stationBeacon = true;
-                                A7670_Utils::uploadToAPRSIS(aprsPacket);
-                                stationBeacon = false;
-                            #else
-                                upload(aprsPacket);
-                            #endif
-                            Utils::println("---> Uploaded to APRS-IS");
-                            displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
+                        if (queryMessage) return;
+
+                        const String& aprsPacket = buildPacketToUpload(packet);
+                        if (!Config.display.alwaysOn && Config.display.timeout != 0) {
+                            displayToggle(true);
                        }
+                        lastScreenOn = millis();
+                        #ifdef HAS_A7670
+                            stationBeacon = true;
+                            A7670_Utils::uploadToAPRSIS(aprsPacket);
+                            stationBeacon = false;
+                        #else
+                            upload(aprsPacket);
+                        #endif
+                        Utils::println("---> Uploaded to APRS-IS");
+                        displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
                    }
                }
            }
@@ -245,26 +246,30 @@ namespace APRS_IS_Utils {
        outputPacket.concat(",TCPIP,");
        outputPacket.concat(Config.callsign);
        outputPacket.concat("*");
+        int colonEqualIndex         = packet.indexOf(":=");
+        int doubleColonIndex        = packet.indexOf("::");
+        int colonInvAccentIndex     = packet.indexOf(":`");
+
        switch (packetType) {
            case 0: // gps
-                if (packet.indexOf(":=") > 0) {
-                    outputPacket += packet.substring(packet.indexOf(":="));
+                if (colonEqualIndex > 0) {
+                    outputPacket += packet.substring(colonEqualIndex);
                } else {
                    outputPacket += packet.substring(packet.indexOf(":!"));
                }
                break;
            case 1: // messages
-                outputPacket += packet.substring(packet.indexOf("::"));
+                outputPacket += packet.substring(doubleColonIndex);
                break;
            case 2: // status
                outputPacket += packet.substring(packet.indexOf(":>"));
                break;
            case 3: // telemetry
-                outputPacket += packet.substring(packet.indexOf("::"));
+                outputPacket += packet.substring(doubleColonIndex);
                break;
            case 4: // mic-e
-                if (packet.indexOf(":`") > 0) {
-                    outputPacket += packet.substring(packet.indexOf(":`"));
+                if (colonInvAccentIndex > 0) {
+                    outputPacket += packet.substring(colonInvAccentIndex);
                } else {
                    outputPacket += packet.substring(packet.indexOf(":'"));
                }
@@ -316,18 +321,21 @@ namespace APRS_IS_Utils {
            if (packet.startsWith("#")) {
                if (Config.digi.backupDigiMode) lastServerCheck = currentTime;
            } else {
-                if (Config.aprs_is.messagesToRF && packet.indexOf("::") > 0) {
+                int doubleColonIndex = packet.indexOf("::");
+                if (Config.aprs_is.messagesToRF && doubleColonIndex > 0) {
                    String Sender = packet.substring(0, packet.indexOf(">"));
-                    const String& AddresseeAndMessage = packet.substring(packet.indexOf("::") + 2);
-                    String Addressee = AddresseeAndMessage.substring(0, AddresseeAndMessage.indexOf(":"));
+                    const String& AddresseeAndMessage = packet.substring(doubleColonIndex + 2);
+                    int colonIndex = AddresseeAndMessage.indexOf(":");
+                    String Addressee = AddresseeAndMessage.substring(0, colonIndex);
                    Addressee.trim();
                    if (Addressee == Config.callsign) {                 // its for me!
                        String receivedMessage;
-                        if (AddresseeAndMessage.indexOf("{") > 0) {     // ack?
+                        int curlyBraceIndex = AddresseeAndMessage.indexOf("{");
+                        if (curlyBraceIndex > 0) {     // ack?
                            processAckMessage(Sender, AddresseeAndMessage);
-                            receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":") + 1, AddresseeAndMessage.indexOf("{"));
+                            receivedMessage = AddresseeAndMessage.substring(colonIndex + 1, curlyBraceIndex);
                        } else {
-                            receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":") + 1);
+                            receivedMessage = AddresseeAndMessage.substring(colonIndex + 1);
                        }
                        if (receivedMessage.indexOf("?") == 0) {
                            Utils::println("Rx Query (APRS-IS)  : " + packet);
--- 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,8 +153,8 @@ namespace BATTERY_Utils {
                return 0.0;
            }
        #else
-            
-            #ifdef ADC_CTRL
+
+            #ifdef ADC_CTRL_PIN
                POWER_Utils::adc_ctrl_ON();
            #endif

@@ -177,10 +177,10 @@ namespace BATTERY_Utils {
                        #endif
                    #endif
                #endif
-                delay(3); 
+                delay(3);
            }

-            #ifdef ADC_CTRL
+            #ifdef ADC_CTRL_PIN
                POWER_Utils::adc_ctrl_OFF();

                #ifdef HELTEC_WP_V1
@@ -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
@@ -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/>.
 */
@@ -87,6 +87,7 @@ bool Configuration::writeFile() {

        data["digi"]["mode"]                        = digi.mode;
        data["digi"]["ecoMode"]                     = digi.ecoMode;
+        if (digi.ecoMode == 1) data["aprs_is"]["active"] = false;
        #if defined(HAS_A7670)
            if (digi.ecoMode == 1) data["digi"]["ecoMode"] = 2;
        #endif
@@ -96,12 +97,12 @@ bool Configuration::writeFile() {
        data["lora"]["rxFreq"]                      = loramodule.rxFreq;
        data["lora"]["rxCodingRate4"]               = loramodule.rxCodingRate4;
        data["lora"]["rxSignalBandwidth"]           = loramodule.rxSignalBandwidth;
-        data["lora"]["txActive"]                    = loramodule.txActive;      
+        data["lora"]["txActive"]                    = loramodule.txActive;
        data["lora"]["txFreq"]                      = loramodule.txFreq;
        data["lora"]["txCodingRate4"]               = loramodule.txCodingRate4;
-        data["lora"]["txSignalBandwidth"]           = loramodule.txSignalBandwidth;        
-        data["lora"]["power"]                       = loramodule.power;       
-        
+        data["lora"]["txSignalBandwidth"]           = loramodule.txSignalBandwidth;
+        data["lora"]["power"]                       = loramodule.power;
+
        int rxSpreadingFactor = loramodule.rxSpreadingFactor;
        int txSpreadingFactor = loramodule.txSpreadingFactor;
        #if defined(HAS_SX1276) || defined(HAS_SX1278)
@@ -222,7 +223,7 @@ bool Configuration::readFile() {
        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") ||
            !data["aprs_is"].containsKey("server") ||
@@ -300,14 +301,14 @@ bool Configuration::readFile() {
        loramodule.rxFreq               = data["lora"]["rxFreq"] | 433775000;
        loramodule.rxSpreadingFactor    = data["lora"]["rxSpreadingFactor"] | 12;
        loramodule.rxCodingRate4        = data["lora"]["rxCodingRate4"] | 5;
-        loramodule.rxSignalBandwidth    = data["lora"]["rxSignalBandwidth"] | 125000;        
+        loramodule.rxSignalBandwidth    = data["lora"]["rxSignalBandwidth"] | 125000;
        loramodule.txActive             = data["lora"]["txActive"] | false;
        loramodule.txFreq               = data["lora"]["txFreq"] | 433775000;
        loramodule.txSpreadingFactor    = data["lora"]["txSpreadingFactor"] | 12;
        loramodule.txCodingRate4        = data["lora"]["txCodingRate4"] | 5;
        loramodule.txSignalBandwidth    = data["lora"]["txSignalBandwidth"] | 125000;
        loramodule.power                = data["lora"]["power"] | 20;
-        
+
        if (!data["display"].containsKey("alwaysOn") ||
            !data["display"].containsKey("timeout") ||
            !data["display"].containsKey("turn180")) needsRewrite = true;
@@ -381,7 +382,7 @@ bool Configuration::readFile() {
        mqtt.password                   = data["mqtt"]["password"] | "";
        mqtt.port                       = data["mqtt"]["port"] | 1883;
        mqtt.beaconOverMqtt             = data["mqtt"]["beaconOverMqtt"] | false;
-        
+
        if (!data["ota"].containsKey("username") ||
            !data["ota"].containsKey("password")) needsRewrite = true;
        ota.username                    = data["ota"]["username"] | "";
@@ -426,7 +427,7 @@ bool Configuration::readFile() {
            writeFile();
            delay(1000);
            ESP.restart();
-        } 
+        }
        Serial.println("Config read successfuly");
        return true;
    } else {
@@ -434,7 +435,7 @@ bool Configuration::readFile() {
        return false;
    }
 }
-    
+
 void Configuration::setDefaultValues() {

    WiFi_AP wifiap;
@@ -470,14 +471,14 @@ void Configuration::setDefaultValues() {
    beacon.sendViaAPRSIS            = true;
    beacon.sendViaRF                = false;
    beacon.beaconFreq               = 1;
-    
+
    beacon.statusActive             = false;
-    beacon.statusPacket             = "";    
+    beacon.statusPacket             = "";

    beacon.gpsActive                = false;
    beacon.ambiguityLevel           = 0;

-    personalNote                    = "";   
+    personalNote                    = "";

    blacklist                       = "";

@@ -500,7 +501,7 @@ void Configuration::setDefaultValues() {
    display.alwaysOn                = true;
    display.timeout                 = 4;
    display.turn180                 = false;
-    
+
    battery.sendInternalVoltage     = false;
    battery.monitorInternalVoltage  = false;
    battery.internalSleepVoltage    = 2.9;
--- 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/>.
 */
@@ -43,137 +43,134 @@ 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.tacticalCallsign == "" ? Config.callsign : Config.tacticalCallsign) + "*");
-            } else if (path.indexOf("WIDE2-") != -1 && Config.digi.mode == 3) {
-                if (path.indexOf(",WIDE1*") != -1) {
-                    tempPath.remove(path.indexOf(",WIDE1*"), 7);
-                }
-                if (path.indexOf("*") != -1) {
-                    tempPath.remove(path.indexOf("*"), 1);
-                }
-                if (path.indexOf("WIDE2-1") != -1) {
-                    tempPath.replace("WIDE2-1", (Config.tacticalCallsign == "" ? Config.callsign : Config.tacticalCallsign) + "*");
-                } else if (path.indexOf("WIDE2-2") != -1) {
-                    tempPath.replace("WIDE2-2", (Config.tacticalCallsign == "" ? Config.callsign : Config.tacticalCallsign) + "*,WIDE2-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
+                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 (tempPath.indexOf("WIDE2-1") != -1) {
+                    tempPath.replace("WIDE2-1", stationCallsign + "*");
+                } else if (tempPath.indexOf("WIDE2-2") != -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.tacticalCallsign == "" ? Config.callsign : Config.tacticalCallsign);
+            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.tacticalCallsign == "" ? Config.callsign : Config.tacticalCallsign)) {    // Avoid listening to own packets
-                if (!thirdPartyPacket && Config.tacticalCallsign == "" && !Utils::checkValidCallsign(Sender)) {
-                    return;
-                }
-                if (STATION_Utils::check25SegBuffer(Sender, temp.substring(temp.indexOf(":") + 2))) {
-                    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.tacticalCallsign == "" ? Config.callsign : Config.tacticalCallsign)) {     // 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
@@ -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_TFT
        #include <TFT_eSPI.h>

-        TFT_eSPI tft = TFT_eSPI(); 
+        TFT_eSPI tft = TFT_eSPI();
        TFT_eSprite sprite  = TFT_eSprite(&tft);

        #ifdef HELTEC_WIRELESS_TRACKER
@@ -57,7 +57,7 @@
            String lastEpaperText;
        #else
            #include <Adafruit_GFX.h>
-            #if defined(TTGO_T_Beam_S3_SUPREME_V3)
+            #ifdef HAS_SH1106
                #include <Adafruit_SH110X.h>
                Adafruit_SH1106G display(128, 64, &Wire, OLED_RST);
            #else
@@ -117,7 +117,7 @@ void displaySetup() {
                    digitalWrite(OLED_RST, HIGH);
                #endif

-                #if defined(TTGO_T_Beam_S3_SUPREME_V3)
+                #ifdef HAS_SH1106
                    if (display.begin(0x3c, false)) {
                        displayFound = true;
                        if (Config.display.turn180) display.setRotation(2);
@@ -157,7 +157,7 @@ void displayToggle(bool toggle) {
                    display.printCenter("EPAPER Display Disabled by toggle...");
                    display.update();
                #else
-                    #if defined(TTGO_T_Beam_S3_SUPREME_V3)
+                    #ifdef HAS_SH1106
                        if (displayFound) display.oled_command(SH110X_DISPLAYON);
                    #else
                        if (displayFound) display.ssd1306_command(SSD1306_DISPLAYON);
@@ -171,12 +171,12 @@ void displayToggle(bool toggle) {
                #ifdef HAS_EPAPER
                    display.update();
                #else
-                    #if defined(TTGO_T_Beam_S3_SUPREME_V3)
+                    #ifdef HAS_SH1106
                        if (displayFound) display.oled_command(SH110X_DISPLAYOFF);
                    #else
                        if (displayFound) display.ssd1306_command(SSD1306_DISPLAYOFF);
                    #endif
-                    
+
                #endif
            #endif
        }
@@ -222,7 +222,7 @@ void displayShow(const String& header, const String& line1, const String& line2,
            #else
                if (displayFound) {
                    display.clearDisplay();
-                    #if defined(TTGO_T_Beam_S3_SUPREME_V3)
+                    #ifdef HAS_SH1106
                        display.setTextColor(SH110X_WHITE);
                    #else
                        display.setTextColor(WHITE);
@@ -234,7 +234,7 @@ void displayShow(const String& header, const String& line1, const String& line2,
                        display.setCursor(0, 8 + (8 * i));
                        display.println(*lines[i]);
                    }
-                    #if defined(TTGO_T_Beam_S3_SUPREME_V3)
+                    #ifdef HAS_SH1106
                        display.setContrast(1);
                    #else
                        display.ssd1306_command(SSD1306_SETCONTRAST);
@@ -288,7 +288,7 @@ void displayShow(const String& header, const String& line1, const String& line2,
            #else
                if (displayFound) {
                    display.clearDisplay();
-                    #if defined(TTGO_T_Beam_S3_SUPREME_V3)
+                    #ifdef HAS_SH1106
                        display.setTextColor(SH110X_WHITE);
                    #else
                        display.setTextColor(WHITE);
@@ -301,7 +301,7 @@ void displayShow(const String& header, const String& line1, const String& line2,
                        display.setCursor(0, 16 + (8 * i));
                        display.println(*lines[i]);
                    }
-                    #if defined(TTGO_T_Beam_S3_SUPREME_V3)
+                    #ifdef HAS_SH1106
                        display.setContrast(1);
                    #else
                        display.ssd1306_command(SSD1306_SETCONTRAST);
--- 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,7 +34,7 @@
 extern Configuration    Config;
 extern HardwareSerial   gpsSerial;
 extern TinyGPSPlus      gps;
-extern bool             callsignIsValid;
+extern bool             stationCallsignIsValid;
 String                  distance, iGateBeaconPacket, iGateLoRaBeaconPacket;


@@ -49,7 +49,7 @@ namespace GPS_Utils {
        String encodedGPS   = APRSPacketLib::encodeGPSIntoBase91(Config.beacon.latitude, Config.beacon.longitude, 0, 0, Config.beacon.symbol, false, 0, true, Config.beacon.ambiguityLevel);

        if (Config.callsign.indexOf("NOCALL-10") != 0) {
-            if (!callsignIsValid) {
+            if (!stationCallsignIsValid) {
                displayShow("***** ERROR ******", "CALLSIGN = NOT VALID!", "", "Only Rx Mode Active", 3000);
                Config.loramodule.txActive  = false;
                Config.aprs_is.messagesToRF = false;
@@ -57,7 +57,7 @@ namespace GPS_Utils {
                Config.beacon.sendViaRF     = false;
                Config.digi.mode            = 0;
                Config.digi.backupDigiMode  = false;
-            } else if (callsignIsValid && Config.tacticalCallsign != "") {
+            } else if (stationCallsignIsValid && Config.tacticalCallsign != "") {
                beaconPacket = APRSPacketLib::generateBasePacket(Config.tacticalCallsign, "APLRG1", Config.beacon.path);
                Config.aprs_is.active       = false;
                Config.beacon.sendViaAPRSIS = false;
@@ -134,15 +134,17 @@ 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));
@@ -155,7 +157,7 @@ namespace GPS_Utils {
        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;
--- 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/>.
 */
@@ -30,29 +30,19 @@ bool validateKISSFrame(const String& kissFormattedFrame) {

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

-    int separatorIndex = tnc2Address.indexOf('-');
-    int ssid = tnc2Address.substring(separatorIndex + 1).toInt();
-
+    int separatorIndex  = tnc2Address.indexOf('-');;
+    int ssid            = tnc2Address.substring(separatorIndex + 1).toInt();
    String kissAddress = "";
    for (int i = 0; i < 6; ++i) {
-        char addressChar;
-        if (tnc2Address.length() > i && i < separatorIndex) {
-            addressChar = tnc2Address.charAt(i);
-        } else {
-            addressChar = ' ';
-        }
+        char addressChar = ' ';
+        if (tnc2Address.length() > i && i < separatorIndex) addressChar = tnc2Address.charAt(i);
        kissAddress += (char)(addressChar << 1);
    }
-
    kissAddress += (char)((ssid << 1) | 0b01100000 | (hasBeenDigipited ? HAS_BEEN_DIGIPITED_MASK : 0));
    return kissAddress;
 }
@@ -131,8 +121,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 +142,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
@@ -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,7 +43,7 @@ bool transmitFlag    = true;
 #ifdef HAS_SX1268
    #if defined(LIGHTGATEWAY_1_0) || defined(LIGHTGATEWAY_PLUS_1_0)
        SPIClass loraSPI(FSPI);
-        SX1268 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN, loraSPI); 
+        SX1268 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN, loraSPI);
    #else
        SX1268 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN);
    #endif
@@ -100,11 +100,11 @@ namespace LoRa_Utils {
                while (true);
        }
         #endif*/
-         
+
        radio.setSpreadingFactor(Config.loramodule.rxSpreadingFactor);
        radio.setCodingRate(Config.loramodule.rxCodingRate4);
        float signalBandwidth = Config.loramodule.rxSignalBandwidth / 1000;
-        radio.setBandwidth(signalBandwidth);        
+        radio.setBandwidth(signalBandwidth);
        radio.setCRC(true);

        #if (defined(RADIO_RXEN) && defined(RADIO_TXEN))    // QRP Labs LightGateway has 400M22S (SX1268)
@@ -174,7 +174,7 @@ namespace LoRa_Utils {
                changeFreqTx();
            }
        }
-        
+
        #ifdef INTERNAL_LED_PIN
            if (Config.digi.ecoMode != 1) digitalWrite(INTERNAL_LED_PIN, HIGH);     // disabled in Ultra Eco Mode
        #endif
--- a/src/mqtt_utils.cpp
+++ b/src/mqtt_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/>.
 */
@@ -95,7 +95,7 @@ namespace MQTT_Utils {
    void setup() {
        if (!Config.mqtt.active) return;
        pubSub.setClient(mqttClient);
-        pubSub.setCallback(receivedFromMqtt);       
+        pubSub.setCallback(receivedFromMqtt);
    }

 }
--- a/src/ntp_utils.cpp
+++ b/src/ntp_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/>.
 */
--- a/src/ota_utils.cpp
+++ b/src/ota_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/>.
 */
--- 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/>.
 */
@@ -44,49 +44,28 @@
 #endif

 extern Configuration    Config;
-extern bool             callsignIsValid;
+extern bool             stationCallsignIsValid;


 namespace POWER_Utils {

-    #ifdef VEXT_CTRL
-        void vext_ctrl_ON() {
-            #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3) || defined(HELTEC_VM_E290)
-                digitalWrite(VEXT_CTRL, Config.digi.ecoMode == 1 ? LOW : HIGH);
-            #endif
-            #if defined(HELTEC_WP_V1) || defined(HELTEC_WP_V1_2) || 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) || defined(HELTEC_VM_E290)
-                digitalWrite(VEXT_CTRL, Config.digi.ecoMode == 1 ? HIGH : LOW);
-            #endif
-            #if defined(HELTEC_WP_V1) || defined(HELTEC_WP_V1_2) || 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) || defined(HELTEC_VM_E290)
-                digitalWrite(ADC_CTRL, HIGH);
-            #endif
-            #if defined(HELTEC_V3) || defined(HELTEC_V2) || defined(HELTEC_WSL_V3) || defined(HELTEC_WP_V1) || defined(HELTEC_WP_V1_2)
-                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) || defined(HELTEC_VM_E290)
-                digitalWrite(ADC_CTRL, LOW);
-            #endif
-            #if defined(HELTEC_V3) || defined(HELTEC_V2) || defined(HELTEC_WSL_V3) || defined(HELTEC_WP_V1) || defined(HELTEC_WP_V1_2)
-                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

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

    void activateGPS() {
        #ifdef HAS_AXP192
@@ -284,8 +263,8 @@ namespace POWER_Utils {
            pinMode(Config.battery.externalVoltagePin, INPUT);
        }

-        #ifdef VEXT_CTRL
-            pinMode(VEXT_CTRL,OUTPUT); // GPS + TFT on HELTEC Wireless_Tracker and only for Oled in HELTEC V3
+        #ifdef VEXT_CTRL_PIN
+            pinMode(VEXT_CTRL_PIN,OUTPUT); // GPS + TFT on HELTEC Wireless_Tracker and only for Oled in HELTEC V3
            vext_ctrl_ON();
        #endif

@@ -293,8 +272,8 @@ namespace POWER_Utils {
            if (Config.beacon.gpsActive && Config.digi.ecoMode != 1) activateGPS();
        #endif

-        #ifdef ADC_CTRL
-            pinMode(ADC_CTRL, OUTPUT);
+        #ifdef ADC_CTRL_PIN
+            pinMode(ADC_CTRL_PIN, OUTPUT);
            adc_ctrl_OFF();
        #endif

@@ -317,18 +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();
-        callsignIsValid = Utils::checkValidCallsign(Config.callsign);
+        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/>.
 */
@@ -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/>.
 */
@@ -25,6 +25,8 @@
 #include "utils.h"
 #include <vector>

+#define SECS_TO_WAIT            3   // soon to be deleted...
+

 extern Configuration            Config;
 extern uint32_t                 lastRxTime;
@@ -40,17 +42,16 @@ std::vector<LastHeardStation>   lastHeardObjects;
 struct OutputPacketBuffer {
    String      packet;
    bool        isBeacon;
+    OutputPacketBuffer(const String& p, bool b) : packet(p), isBeacon(b) {}
 };
 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;

@@ -59,19 +60,18 @@ namespace STATION_Utils {

    std::vector<String> loadCallsignList(const String& list) {
        std::vector<String> loadedList;
+        int start       = 0;
+        int listLength  = list.length();

-        String callsigns = list;
-        callsigns.trim();
+        while (start < listLength) {
+            while (start < listLength && list[start] == ' ') start++;  // avoid blank spaces
+            if (start >= listLength) break;

-        while (callsigns.length() > 0) {    // != ""
-            int spaceIndex = callsigns.indexOf(" ");
-            if (spaceIndex == -1) {         // No more spaces, add the last part
-                loadedList.push_back(callsigns);
-                break;
-            }
-            loadedList.push_back(callsigns.substring(0, spaceIndex));
-            callsigns = callsigns.substring(spaceIndex + 1);
-            callsigns.trim();               // Trim in case of multiple spaces
+            int end = start;
+            while (end < listLength && list[end] != ' ') end++;         // find another blank space or reach listLength
+
+            loadedList.emplace_back(list.substring(start, end));
+            start = end + 1;                                            // keep on searching if listLength not reached
        }
        return loadedList;
    }
@@ -85,8 +85,9 @@ namespace STATION_Utils {
        for (size_t i = 0; i < list.size(); i++) {
            int wildcardIndex = list[i].indexOf("*");
            if (wildcardIndex >= 0) {
-                String wildcard = list[i].substring(0, wildcardIndex);
-                if (callsign.startsWith(wildcard)) return true;
+                if (wildcardIndex >= 2 && callsign.length() >= wildcardIndex && strncmp(callsign.c_str(), list[i].c_str(), wildcardIndex) == 0) {
+                    return true;
+                }
            } else {
                if (list[i] == callsign) return true;
            }
@@ -127,36 +128,33 @@ namespace STATION_Utils {
    }

    void deleteNotHeard() {
-        std::vector<LastHeardStation>  lastHeardStation_temp;
-        for (int i = 0; i < lastHeardStations.size(); i++) {
-            if (millis() - lastHeardStations[i].lastHeardTime < Config.rememberStationTime * 60 * 1000) {
-                lastHeardStation_temp.push_back(lastHeardStations[i]);
+        uint32_t currentTime    = millis();
+        uint32_t timeout        = Config.rememberStationTime * 60UL * 1000UL;
+
+        for (int i = lastHeardStations.size() - 1; i >= 0; i--) {
+            if (currentTime - lastHeardStations[i].lastHeardTime >= timeout) {
+                lastHeardStations.erase(lastHeardStations.begin() + i);
            }
        }
-        lastHeardStations.clear();
-        for (int j = 0; j < lastHeardStation_temp.size(); j++) {
-            lastHeardStations.push_back(lastHeardStation_temp[j]);
-        }
-        lastHeardStation_temp.clear();
    }

    void updateLastHeard(const String& station) {
        deleteNotHeard();
-        bool stationHeard = false;
-        for (int i = 0; i < lastHeardStations.size(); i++) {
+        uint32_t currentTime = millis();
+        for (size_t i = 0; i < lastHeardStations.size(); i++) {
            if (lastHeardStations[i].station == station) {
-                lastHeardStations[i].lastHeardTime = millis();
-                stationHeard = true;
-                break;
+                lastHeardStations[i].lastHeardTime = currentTime;
+                Utils::showActiveStations();
+                return;
            }
        }
-        if (!stationHeard) lastHeardStations.emplace_back(LastHeardStation{millis(), station});
+        lastHeardStations.emplace_back(LastHeardStation{currentTime, station});
        Utils::showActiveStations();
    }

    bool wasHeard(const String& station) {
        deleteNotHeard();
-        for (int i = 0; i < lastHeardStations.size(); i++) {
+        for (size_t i = 0; i < lastHeardStations.size(); i++) {
            if (lastHeardStations[i].station == station) {
                Utils::println(" ---> Listened Station");
                return true;
@@ -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) {
+        clean25SegHashBuffer();
+        uint32_t newHash        = makeHash(station, textMessage);
+        uint32_t currentTime    = millis();
+        for (int i = 0; i < packet25SegBuffer.size(); i++) {
+            if (packet25SegBuffer[i].hash == newHash) return true;
+        }
+        packet25SegBuffer.push_back({currentTime, newHash});
+        return false;
    }

    void processOutputPacketBufferUltraEcoMode() {
@@ -201,7 +214,7 @@ namespace STATION_Utils {
    }

    void processOutputPacketBuffer() {
-        int timeToWait                  = 3 * 1000;      // 3 segs between packet Tx and also Rx ???
+        int timeToWait                  = SECS_TO_WAIT * 1000;          // 3 segs between packet Tx and also Rx ???
        uint32_t lastRx                 = millis() - lastRxTime;
        uint32_t lastTx                 = millis() - lastTxTime;
        if (outputPacketBuffer.size() > 0 && lastTx > timeToWait && lastRx > timeToWait) {
@@ -229,11 +242,7 @@ namespace STATION_Utils {
    }

    void addToOutputPacketBuffer(const String& packet, bool flag) {
-        OutputPacketBuffer entry;
-        entry.packet    = packet;
-        entry.isBeacon  = flag;
-
-        outputPacketBuffer.push_back(entry);
+        outputPacketBuffer.emplace_back(OutputPacketBuffer{packet, flag});
    }

 }
--- 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
@@ -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,10 +29,11 @@
 #include "display.h"


-extern  Configuration       Config;
-extern  bool                sendStartTelemetry;
+extern      Configuration       Config;

-int     telemetryCounter    = random(1,999);
+int         telemetryCounter    = random(1,999);
+uint32_t    telemetryEUPTime    = 0;
+bool        sendEUP             = false;    // Equations Units Parameters


 namespace TELEMETRY_Utils {
@@ -89,7 +90,7 @@ namespace TELEMETRY_Utils {
        sendBaseTelemetryPacket("EQNS.", getEquationCoefficients());
        sendBaseTelemetryPacket("UNIT.", getUnitLabels());
        sendBaseTelemetryPacket("PARM.", getParameterNames());
-        sendStartTelemetry = false;
+        sendEUP = false;
    }

    String generateEncodedTelemetryBytes(float value, bool counterBytes, byte telemetryType) {
@@ -106,7 +107,7 @@ namespace TELEMETRY_Utils {
                case 3: tempValue = (value * 8); break;         // Pressure
                default: tempValue = value; break;
            }
-        }        
+        }

        int firstByte   = tempValue / 91;
        tempValue       -= firstByte * 91;
@@ -127,4 +128,11 @@ namespace TELEMETRY_Utils {
        return telemetry;
    }

+    void checkEUPInterval() {
+        if (telemetryEUPTime == 0 || millis() - telemetryEUPTime > 24UL * 60UL * 60UL * 1000UL) {
+            sendEUP = true;
+            telemetryEUPTime = millis();
+        }
+    }
+
 }
--- a/src/tnc_utils.cpp
+++ b/src/tnc_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,7 +45,7 @@ String inputSerialBuffer = "";


 namespace TNC_Utils {
-    
+
    void setup() {
        if (Config.tnc.enableServer && Config.digi.ecoMode == 0) {
            tncServer.stop();
--- 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/>.
 */
@@ -58,16 +58,16 @@ extern bool                 backupDigiMode;
 extern bool                 shouldSleepLowVoltage;
 extern bool                 transmitFlag;
 extern bool                 passcodeValid;
+extern bool                 sendEUP;    // Equations Units Parameters

 extern std::vector<LastHeardStation>    lastHeardStations;

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

@@ -75,26 +75,30 @@ String      secondaryBeaconPacket;
 namespace Utils {

    void processStatus() {
-        String status = APRSPacketLib::generateBasePacket(Config.callsign, "APLRG1", Config.beacon.path);
+        bool sendOverAPRSIS = Config.beacon.sendViaAPRSIS && Config.aprs_is.active && WiFi.status() == WL_CONNECTED;
+        bool sendOverRF     = !Config.beacon.sendViaAPRSIS && Config.beacon.sendViaRF;

-        if (WiFi.status() == WL_CONNECTED && Config.aprs_is.active && Config.beacon.sendViaAPRSIS) {
-            delay(1000);
-            status.concat(",qAC:>");
-            status.concat(Config.beacon.statusPacket);
-            APRS_IS_Utils::upload(status);
-            SYSLOG_Utils::log(2, status, 0, 0.0, 0);   // APRSIS TX
+        if (!sendOverAPRSIS && !sendOverRF) {
+            statusUpdate = false;
+            return;
        }
-        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
+
+        String statusPacket = APRSPacketLib::generateBasePacket(Config.callsign, "APLRG1", Config.beacon.path);
+        statusPacket += sendOverAPRSIS ? ",qAC:>" : ":>";
+        statusPacket += Config.beacon.statusPacket;
+
+        if (sendOverAPRSIS) {
+            APRS_IS_Utils::upload(statusPacket);
+            SYSLOG_Utils::log(2, statusPacket, 0, 0.0, 0);              // APRSIS TX
+        } else {
+            STATION_Utils::addToOutputPacketBuffer(statusPacket, true); // treated also as beacon on Tx Freq
        }
-        statusAfterBoot = false;
+        statusUpdate = false;
        lastStatusTx = millis();
    }

    void checkStatusInterval() {
-        if (lastStatusTx == 0 || millis() - lastStatusTx > DAY_MS) statusAfterBoot = true;
+        if (lastStatusTx == 0 || millis() - lastStatusTx > DAY_MS) statusUpdate = true;
    }

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

-            if (sendStartTelemetry && 
+            TELEMETRY_Utils::checkEUPInterval();
+            if (sendEUP &&
                Config.battery.sendVoltageAsTelemetry &&
-                !Config.wxsensor.active && 
+                !Config.wxsensor.active &&
                (Config.battery.sendInternalVoltage || Config.battery.sendExternalVoltage) &&
                (lastBeaconTx > 0)) {
                TELEMETRY_Utils::sendEquationsUnitsParameters();
@@ -198,7 +203,7 @@ namespace Utils {
            }
            beaconPacket            += Config.beacon.comment;
            secondaryBeaconPacket   += Config.beacon.comment;
-            if (callsignIsValid && Config.tacticalCallsign != "") {
+            if (stationCallsignIsValid && Config.tacticalCallsign != "") {
                beaconPacket            += " de ";
                beaconPacket            += Config.callsign;
                secondaryBeaconPacket   += " de ";
@@ -244,7 +249,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;
@@ -290,7 +295,7 @@ namespace Utils {
        }

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

    void checkDisplayInterval() {
@@ -312,7 +317,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";
@@ -328,6 +332,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 += " ";
        }
@@ -403,9 +408,9 @@ namespace Utils {
            if (mode == 1) {    // low voltage detected after a while
                displayToggle(false);
            }
-            #ifdef VEXT_CTRL
+            #ifdef VEXT_CTRL_PIN
                #ifndef HELTEC_WSL_V3
-                    digitalWrite(VEXT_CTRL, LOW);
+                    digitalWrite(VEXT_CTRL_PIN, LOW);
                #endif
            #endif
            LoRa_Utils::sleepRadio();
@@ -415,45 +420,55 @@ 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);
-            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++) {
-                if (!isAlphaNumeric(ssid[i])) return false;
+        int totalCallsignLength = callsign.length();
+        if (totalCallsignLength < 4) return false;
+
+        int hyphenIndex         = callsign.indexOf("-");
+        int baseCallsignLength  = (hyphenIndex > 0) ? hyphenIndex : totalCallsignLength;
+
+        if (hyphenIndex > 0) {    // SSID Validation
+            if (hyphenIndex < 4) return false;                                  // base Callsign must have at least 4 characters
+            int ssidStart   = hyphenIndex + 1;
+            int ssidLength  = totalCallsignLength - ssidStart;
+            if (ssidLength == 0 || ssidLength > 2) return false;
+            if (callsign.indexOf('-', ssidStart) != -1) return false;           // avoid another "-" in ssid
+            if (ssidLength == 2 && callsign[ssidStart] == '0') return false;    // ssid can't start with "0"
+            for (int i = ssidStart; i < totalCallsignLength; i++) {
+                if (!isDigit(callsign[i])) return false;
            }
+        }
+
+        if (baseCallsignLength < 4 || baseCallsignLength > 6) return false;
+
+        bool padded = false;    // Callsigns with 4 characters like A0AA are padded into 5 characters for further analisis : A0AA --> _A0AA
+        if (baseCallsignLength == 4 && isAlpha(callsign[0]) && isDigit(callsign[1]) && isAlpha(callsign[2]) && isAlpha(callsign[3])) padded = true;
+        char c0, c1, c2, c3;
+        if (padded) {
+            c0 = ' ';
+            c1 = callsign[0];
+            c2 = callsign[1];
+            c3 = callsign[2];
        } else {
-            cleanCallsign = callsign;
+            c0 = callsign[0];
+            c1 = callsign[1];
+            c2 = callsign[2];
+            c3 = callsign[3];
+        }
+        if (!isDigit(c2) || !isAlpha(c3)) {                                     // __0A__ must be validated
+            if (c0 != 'R' && !isDigit(c1) && !isAlpha(c2)) return false;        // to accepto R0A___
        }

-        if (cleanCallsign.length() < 4 || cleanCallsign.length() > 6) return false;
+        bool isValid =
+            ((isAlphaNumeric(c0) || c0 == ' ') && isAlpha(c1)) ||               //  AA0A (+A+A) + _A0AA (+A) + 0A0A (+A+A)
+            (isAlpha(c0) && isDigit(c1)) ||                                     //  A00A (+A+A)
+            (c0 == 'R' && baseCallsignLength == 6 && isDigit(c1) && isAlpha(c2) && isAlpha(c3) && isAlpha(callsign[4]));  //  R0AA (+A+A)
+        if (!isValid) return false;                                             // also 00__ avoided

-        if (cleanCallsign.length() < 6 && isAlpha(cleanCallsign[0]) && isDigit(cleanCallsign[1]) && isAlpha(cleanCallsign[2]) && isAlpha(cleanCallsign[3]) ) {
-            cleanCallsign = " " + cleanCallsign;    // A0AA --> _A0AA
-        }
-
-        if (!isDigit(cleanCallsign[2]) || !isAlpha(cleanCallsign[3])) {     // __0A__ must be validated
-            if (cleanCallsign[0] != 'R' && !isDigit(cleanCallsign[1]) && !isAlpha(cleanCallsign[2])) return false;    // to accepto R0A___
-        }
-
-        bool isValid = false;
-        if ((isAlphaNumeric(cleanCallsign[0]) || cleanCallsign[0] == ' ') && isAlpha(cleanCallsign[1])) {
-            isValid = true;     //  AA0A (+A+A) + _A0AA (+A) + 0A0A (+A+A)
-        } else if (isAlpha(cleanCallsign[0]) && isDigit(cleanCallsign[1])) {
-            isValid = true;     //  A00A (+A+A)
-        } else if (cleanCallsign[0] == 'R' && cleanCallsign.length() == 6 && isDigit(cleanCallsign[1]) && isAlpha(cleanCallsign[2]) && isAlpha(cleanCallsign[3]) && isAlpha(cleanCallsign[4])) {
-            isValid = true;     //  R0AA (+A+A)
-        }
-        if (!isValid) return false;   // also 00__ avoided
-
-        if (cleanCallsign.length() > 4) {   // to validate ____AA
-            for (int i = 5; i <= cleanCallsign.length(); i++) {
-                if (!isAlpha(cleanCallsign[i - 1])) return false;
+        if (baseCallsignLength > 4 ) {                                          // to validate ____AA
+            for (int i = 4; i < baseCallsignLength; i++) {
+                if (!isAlpha(callsign[i])) return false;
            }
        }
        return true;
--- a/src/web_utils.cpp
+++ b/src/web_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/>.
 */
@@ -88,7 +88,7 @@ namespace WEB_Utils {
            return request->requestAuthentication();

        File file = SPIFFS.open("/igate_conf.json");
-        
+
        String fileContent;
        while(file.available()){
            fileContent += String((char)file.read());
@@ -161,7 +161,7 @@ namespace WEB_Utils {

        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);

@@ -299,7 +299,7 @@ namespace WEB_Utils {
            AsyncWebServerResponse *response = request->beginResponse(302, "text/html", "");
            response->addHeader("Location", "/?success=1");
            request->send(response);
-            
+
            displayToggle(false);
            delay(500);
            ESP.restart();
@@ -309,7 +309,7 @@ namespace WEB_Utils {
            errorPage += "<h1>Configuration Error:</h1>";
            errorPage += "<p>Couldn't save new configuration. Please try again.</p>";
            errorPage += "<a href='/'>Back</a></body></html>";
-            
+
            AsyncWebServerResponse *response = request->beginResponse(500, "text/html", errorPage);
            request->send(response);
        }
--- a/src/wifi_utils.cpp
+++ b/src/wifi_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/>.
 */
@@ -66,7 +66,7 @@ namespace WIFI_Utils {
                    backupDigiMode = true;
                    WiFi.disconnect();
                    lastBackupDigiTime = currentTime;
-                }                
+                }
            } else {
                Serial.println("Reconnecting to WiFi...");
                WiFi.disconnect();
--- 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_9M2IBR_1W_LoRa_GPS/board_pinout.h
+++ b/variants/ESP32_9M2IBR_1W_LoRa_GPS/board_pinout.h
@@ -0,0 +1,63 @@
+/* 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_SX1268
+    #define HAS_1W_LORA
+    #define HAS_TCXO
+    #define RADIO_SCLK_PIN          18
+    #define RADIO_MISO_PIN          19
+    #define RADIO_MOSI_PIN          23
+    #define RADIO_CS_PIN            5
+    #define RADIO_RST_PIN           27
+    #define RADIO_DIO1_PIN          12
+    #define RADIO_BUSY_PIN          14
+    #define RADIO_RXEN              32
+    #define RADIO_TXEN              25
+    #define RADIO_WAKEUP_PIN        RADIO_DIO1_PIN
+    #define GPIO_WAKEUP_PIN         GPIO_SEL_12
+
+    //  I2C
+    #define USE_WIRE_WITH_OLED_PINS
+
+    //  Display
+    #define HAS_DISPLAY
+    #define HAS_SH1106
+
+    #undef  OLED_SDA
+    #undef  OLED_SCL
+    #undef  OLED_RST
+
+    #define OLED_SDA                21
+    #define OLED_SCL                22
+    #define OLED_RST                -1      // Reset pin # (or -1 if sharing Arduino reset pin)
+
+    //  GPS
+    #define HAS_GPS
+    #define GPS_BAUDRATE            9600
+    #define GPS_RX                  17
+    #define GPS_TX                  16
+
+    //  Aditional Config
+    #define INTERNAL_LED_PIN        2
+    #define BATTERY_PIN             35
+
+#endif
--- a/variants/ESP32_9M2IBR_1W_LoRa_GPS/platformio.ini
+++ b/variants/ESP32_9M2IBR_1W_LoRa_GPS/platformio.ini
@@ -0,0 +1,12 @@
+[env:ESP32_9M2IBR_1W_LoRa_GPS]
+board = esp32dev
+build_flags =
+	${common.build_flags}
+	-D RADIOLIB_EXCLUDE_LR11X0=1
+	-D RADIOLIB_EXCLUDE_SX127X=1
+	-D RADIOLIB_EXCLUDE_SX128X=1
+	-D ESP32_9M2IBR_1W_LoRa_GPS
+lib_deps =
+	${common.lib_deps}
+	${common.display_libs}
+	adafruit/Adafruit SH110X @ 2.1.10
--- 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_PIN            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
@@ -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           39
    #define BOARD_I2C_SCL           38

@@ -50,7 +50,10 @@
    //  Aditional Config
    #define INTERNAL_LED_PIN        45
    #define BATTERY_PIN             7
-    #define ADC_CTRL                46
-    #define VEXT_CTRL               18
+
+    #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_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
@@ -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,8 +53,11 @@
    //  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

    //  GPS   ??
    #define VGNS_CTRL               34  // cambiar nombre para prender GPS ?
--- 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
@@ -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_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/>.
 */
@@ -35,6 +35,7 @@

    //  Display
    #define HAS_DISPLAY
+    #define HAS_SH1106

    #undef  OLED_SDA
    #undef  OLED_SCL
--- 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)	b448e2fc6b	ADC_CTRL_PIN fix	2026-03-05 10:06:22 -03:00
Ricardo Guzman (Richonguzman)	c33720a5fb	VEXT_CTRL_PIN definition missing fix	2026-03-04 12:24:16 -03:00
Ricardo Guzman (Richonguzman)	e57fad6666	aprsis.active update in digi.ecoMode == 1 ?	2026-03-04 11:21:26 -03:00
Ricardo Guzman (Richonguzman)	2418291ac9	digiEcoMode forces APRS.active = false	2026-03-03 11:22:41 -03:00
Ricardo Guzman (Richonguzman)	796ba35357	add new ESP32 device 9M2IBR	2026-02-26 12:28:52 -03:00
Ricardo Guzman (Richonguzman)	57873e4181	readme and date update	2026-02-26 11:51:59 -03:00
Ricardo Guzman (Richonguzman)	453222d69f	new board added 9M2IBR	2026-02-26 11:08:49 -03:00
Ricardo Guzman (Richonguzman)	fbb347fb7f	new update to kiss utils	2026-02-26 10:31:45 -03:00
Ricardo Guzman (Richonguzman)	50fd831fdb	kiss correction of missing new indexOf	2026-02-26 10:23:40 -03:00
Ricardo Guzman (Richonguzman)	3a2c0304d0	status logic improved	2026-02-25 12:25:40 -03:00
Ricardo Guzman (Richonguzman)	b24c2b2527	update build for heltec v2 915	2026-02-25 10:57:07 -03:00
Ricardo Guzman (Richonguzman)	db0da96d7f	ReadMe update	2026-02-25 10:45:49 -03:00
Ricardo Guzman (Richonguzman)	bf6a0faa90	killing blank spaces	2026-02-24 23:33:58 -03:00
Ricardo Guzman (Richonguzman)	61cf118a3b	cleaning Headers	2026-02-24 23:27:36 -03:00
Ricardo Guzman (Richonguzman)	44719083a6	new callsignIsValid update	2026-02-24 21:26:20 -03:00
Ricardo Guzman (Richonguzman)	808d740477	update indexOf kill	2026-02-24 19:29:20 -03:00
Ricardo Guzman (Richonguzman)	23c8257c80	date update	2026-02-24 07:55:53 -03:00
Ricardo Guzman (Richonguzman)	db4582db13	telemetry EUP beacon update	2026-02-24 07:55:32 -03:00
Ricardo Guzman (Richonguzman)	09e06d36e8	checkCallsignList update	2026-02-24 06:50:27 -03:00
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