testing1

Back before fix ota

.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
 

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.

common_settings.ini

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

include/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/>.
  */

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/>.
  */

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/>.
  */

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,20 +188,20 @@ public:
     BATTERY                 battery;
     WXSENSOR                wxsensor;
     SYSLOG                  syslog;
-    TNC                     tnc;  
+    TNC                     tnc;
     OTA                     ota;
     WEBADMIN                webadmin;
-    NTP                     ntp;    
+    NTP                     ntp;
     REMOTE_MANAGEMENT       remoteManagement;
     MQTT                    mqtt;
 
+    void setup();
     void setDefaultValues();
     bool writeFile();
-    Configuration();
 
 private:
     bool readFile();
     String _filePath;
 };
 
-#endif
+#endif

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/>.
  */

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

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

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/>.
  */

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/>.
  */

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/>.
  */

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/>.
  */

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/>.
  */

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/>.
  */

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

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/>.
  */

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

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 isIn25SegHashBuffer(const String& station, const String& textMessage);
-    bool check25SegBuffer(const String& station, const String& textMessage);
     void processOutputPacketBufferUltraEcoMode();
     void processOutputPacketBuffer();
     void addToOutputPacketBuffer(const String& packet, bool flag = false);

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/>.
  */

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

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/>.
  */

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/>.
  */

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/>.
  */

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>

platformio.ini

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

src/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

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-02-16";
+String              versionDate             = "2026-03-08";
-String              versionNumber           = "3.2";
+String              versionNumber           = "3.2.103";
 Configuration       Config;
 WiFiClient          aprsIsClient;
 WiFiClient          mqttClient;
@@ -101,6 +101,7 @@ String firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seven
 
 void setup() {
     Serial.begin(115200);
+    Config.setup();
     POWER_Utils::setup();
     Utils::setupDisplay();
     LoRa_Utils::setup();
@@ -138,7 +139,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 +175,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 +189,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
             }
 
@@ -217,4 +217,4 @@ void loop() {
         Utils::checkRebootTime();
         Utils::checkSleepByLowBatteryVoltage(1);
     }
-}
+}

src/aprs_is_utils.cpp

@@ -135,30 +135,30 @@ namespace APRS_IS_Utils {
     }
 
     String checkForStartingBytes(const String& packet) {
-        if (packet.indexOf("\x3c\xff\x01") != -1) {
+        int index = packet.indexOf("\x3c\xff\x01");
-            return packet.substring(0, packet.indexOf("\x3c\xff\x01"));
+        return (index != -1) ? packet.substring(0, index) : packet;
-        } else {
-            return 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) {
@@ -207,29 +207,30 @@ namespace APRS_IS_Utils {
                     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) {
+                        if (queryMessage) return;
-                            const String& aprsPacket = buildPacketToUpload(packet);
+
-                            if (!Config.display.alwaysOn && Config.display.timeout != 0) {
+                        const String& aprsPacket = buildPacketToUpload(packet);
-                                displayToggle(true);
+                        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);
                         }
+                        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) {
+                if (colonEqualIndex > 0) {
-                    outputPacket += packet.substring(packet.indexOf(":="));
+                    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) {
+                if (colonInvAccentIndex > 0) {
-                    outputPacket += packet.substring(packet.indexOf(":`"));
+                    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);
+                    const String& AddresseeAndMessage = packet.substring(doubleColonIndex + 2);
-                    String Addressee = AddresseeAndMessage.substring(0, AddresseeAndMessage.indexOf(":"));
+                    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);

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)
+            #ifdef SENSOR_I2C_BUS
-                Wire1.beginTransmission(addr);
+                SENSOR_I2C_BUS.beginTransmission(addr);
-                err = Wire1.endTransmission();
+                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

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/>.
  */
@@ -26,6 +26,25 @@
 bool shouldSleepStop = true;
 
 
+void Configuration::setup() {
+    if (!SPIFFS.begin(false)) {
+        Serial.println("SPIFFS Mount Failed");
+        return;
+    } else {
+        Serial.println("SPIFFS Mounted");
+    }
+
+    bool exists = SPIFFS.exists("/igate_conf.json");
+    if (!exists) {
+        setDefaultValues();
+        writeFile();
+        delay(1000);
+        ESP.restart();
+    }
+
+    readFile();
+}
+
 bool Configuration::writeFile() {
     Serial.println("Saving configuration...");
 
@@ -87,6 +106,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 +116,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"]["txSignalBandwidth"]           = loramodule.txSignalBandwidth;
-        data["lora"]["power"]                       = loramodule.power;       
+        data["lora"]["power"]                       = loramodule.power;
-        
+
         int rxSpreadingFactor = loramodule.rxSpreadingFactor;
         int txSpreadingFactor = loramodule.txSpreadingFactor;
         #if defined(HAS_SX1276) || defined(HAS_SX1278)
@@ -222,7 +242,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 +320,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 +401,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 +446,7 @@ bool Configuration::readFile() {
             writeFile();
             delay(1000);
             ESP.restart();
-        } 
+        }
         Serial.println("Config read successfuly");
         return true;
     } else {
@@ -434,7 +454,7 @@ bool Configuration::readFile() {
         return false;
     }
 }
-    
+
 void Configuration::setDefaultValues() {
 
     WiFi_AP wifiap;
@@ -470,14 +490,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 +520,7 @@ void Configuration::setDefaultValues() {
     display.alwaysOn                = true;
     display.timeout                 = 4;
     display.turn180                 = false;
-    
+
     battery.sendInternalVoltage     = false;
     battery.monitorInternalVoltage  = false;
     battery.internalSleepVoltage    = 2.9;
@@ -556,23 +576,4 @@ void Configuration::setDefaultValues() {
     rememberStationTime             = 30;
 
     Serial.println("New Data Created... All is Written!");
-}
-
-Configuration::Configuration() {
-    if (!SPIFFS.begin(false)) {
-        Serial.println("SPIFFS Mount Failed");
-        return;
-    } else {
-        Serial.println("SPIFFS Mounted");
-    }
-
-    bool exists = SPIFFS.exists("/igate_conf.json");
-    if (!exists) {
-        setDefaultValues();
-        writeFile();
-        delay(1000);
-        ESP.restart();
-    }
-
-    readFile();
 }

src/digi_utils.cpp

@@ -43,95 +43,91 @@ extern bool             backupDigiMode;
 
 namespace DIGI_Utils {
 
-    String buildPacket(const String& path, const String& packet, bool thirdParty, bool crossFreq) {
+    String cleanPathAsterisks(String path) {
-        if (!crossFreq) {
+        String terms[] = {",WIDE1*", ",WIDE2*", "*"};
-            String packetToRepeat = packet.substring(0, packet.indexOf(",") + 1);
+        for (String term : terms) {
-            String tempPath = path;
+            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)) {
+    String buildPacket(const String& path, const String& packet, bool thirdParty, bool crossFreq) {
-                tempPath.replace("WIDE1-1", (Config.tacticalCallsign == "" ? Config.callsign : Config.tacticalCallsign) + "*");
+        String stationCallsign  = (Config.tacticalCallsign == "" ? Config.callsign : Config.tacticalCallsign);
-            } else if (path.indexOf("WIDE2-") != -1 && Config.digi.mode == 3) {
+        String suffix           = thirdParty ? ":}" : ":";
-                if (path.indexOf(",WIDE1*") != -1) {
+        int suffixIndex         = packet.indexOf(suffix);
-                    tempPath.remove(path.indexOf(",WIDE1*"), 7);
+        String packetToRepeat;
-                }
+        if (!crossFreq) {
-                if (path.indexOf("*") != -1) {
+            int digiMode        = Config.digi.mode;
-                    tempPath.remove(path.indexOf("*"), 1);
+            String tempPath     = path;
-                }
+
-                if (path.indexOf("WIDE2-1") != -1) {
+            if (tempPath.indexOf("WIDE1-1") != -1 && (digiMode == 2 || digiMode == 3)) {    // WIDE1-1
-                    tempPath.replace("WIDE2-1", (Config.tacticalCallsign == "" ? Config.callsign : Config.tacticalCallsign) + "*");
+                if (tempPath.indexOf("*") != -1 ) return "";                                // "*" shouldn't be in WIDE1-1 (only) type of packet
-                } else if (path.indexOf("WIDE2-2") != -1) {
+                tempPath.replace("WIDE1-1", stationCallsign + "*");
-                    tempPath.replace("WIDE2-2", (Config.tacticalCallsign == "" ? Config.callsign : Config.tacticalCallsign) + "*,WIDE2-1");
+            } 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 ? ":}" : ":";
+            packetToRepeat = cleanPathAsterisks(packet.substring(0, suffixIndex));
-            String packetToRepeat = packet.substring(0, packet.indexOf(suffix));
+            if (packetToRepeat.indexOf(stationCallsign) != -1) return "";                   // stationCallsign shouldn't be in path
-
-            String terms[] = {",WIDE1*", ",WIDE2*", "*"};
-            for (String term : terms) {
-                int index = packetToRepeat.indexOf(term);
-                if (index != -1) {
-                    packetToRepeat.remove(index, term.length());
-                }
-            }
             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 in temp
+        int commaIndex      = temp.indexOf(",");
-            const String& path = temp.substring(temp.indexOf(",") + 1); // extract path after tocall
+        int digiMode        = Config.digi.mode;
-            if (Config.digi.mode == 2 || backupDigiMode) {
+        bool crossFreq      = abs(Config.loramodule.txFreq - Config.loramodule.rxFreq) >= 125000;   // CrossFreq Digi
-                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-");
 
-                    // WIDE1-1 && WIDE2-n   /   only WIDE1-1    /   only WIDE2-n
+        if (commaIndex > 2) {   // "path" found
-                    if ((wide1Index != -1 && wide2Index != -1 && wide1Index < wide2Index) || (wide1Index != -1 && wide2Index == -1) || (wide1Index == -1 && wide2Index != -1)) {
+            const String& path  = temp.substring(commaIndex + 1);
-                        return buildPacket(path, packet, thirdParty, false);
+            if (digiMode == 2 || backupDigiMode) {
-                    }
+                bool hasWide = path.indexOf("WIDE1-1") != -1;
-                    return "";
+                if (hasWide || crossFreq) {
-                } 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, !hasWide);
-                    return buildPacket(path, packet, thirdParty, true);
-                } else {
-                    return "";
                 }
-            } else {
                 return "";
             }
-        } else if (temp.indexOf(",") == -1 && (Config.digi.mode == 2 || backupDigiMode || Config.digi.mode == 3) && (abs(Config.loramodule.txFreq - Config.loramodule.rxFreq) >= 125000)) {
+            if (digiMode == 3) {
-            return buildPacket("", packet, thirdParty, true);
+                int wide1Index = path.indexOf("WIDE1-1");
-        } else {
+                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) {
@@ -149,31 +145,32 @@ namespace DIGI_Utils {
             Sender  = packet.substring(3, packet.indexOf(">"));
         }
 
-        if (Sender == (Config.tacticalCallsign == "" ? Config.callsign : Config.tacticalCallsign)) return;  // Avoid listening to self packets
+        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::check25SegBuffer(Sender, temp.substring(temp.indexOf(":") + 2))) {
+        if (STATION_Utils::isIn25SegHashBuffer(Sender, temp.substring(temp.indexOf(":") + 2))) return;
-            STATION_Utils::updateLastHeard(Sender);
+
-            Utils::typeOfPacket(temp, 2);    // Digi
+        STATION_Utils::updateLastHeard(Sender);
-            bool queryMessage = false;
+        Utils::typeOfPacket(temp, 2);               // Digi
-            if (temp.indexOf("::") > 10) {   // it's a message
+        bool queryMessage       = false;
-                String AddresseeAndMessage  = temp.substring(temp.indexOf("::") + 2);
+        int doubleColonIndex    = temp.indexOf("::");
-                String Addressee            = AddresseeAndMessage.substring(0, AddresseeAndMessage.indexOf(":"));
+        if (doubleColonIndex > 10) {                // it's a message
-                Addressee.trim();
+            String AddresseeAndMessage  = temp.substring(doubleColonIndex + 2);
-                if (Addressee == (Config.tacticalCallsign == "" ? Config.callsign : Config.tacticalCallsign)) {     // it's a message for me!
+            String Addressee            = AddresseeAndMessage.substring(0, AddresseeAndMessage.indexOf(":"));
-                    queryMessage = APRS_IS_Utils::processReceivedLoRaMessage(Sender, AddresseeAndMessage, thirdPartyPacket);
+            Addressee.trim();
-                }
+            if (Addressee == stationCallsign) {     // 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 (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();
+        }
     }
 
 }

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

src/gps_utils.cpp

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

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) {
+        if (hasBeenDigipited) tnc2Address = tnc2Address.substring(0, tnc2Address.length() - 1);
-            tnc2Address = tnc2Address.substring(0, tnc2Address.length() - 1);
-        }
-
         tnc2Address += "-0";
     }
 
-    int separatorIndex = tnc2Address.indexOf('-');
+    int separatorIndex  = tnc2Address.indexOf('-');;
-    int ssid = tnc2Address.substring(separatorIndex + 1).toInt();
+    int ssid            = tnc2Address.substring(separatorIndex + 1).toInt();
-
     String kissAddress = "";
     for (int i = 0; i < 6; ++i) {
-        char addressChar;
+        char addressChar = ' ';
-        if (tnc2Address.length() > i && i < separatorIndex) {
+        if (tnc2Address.length() > i && i < separatorIndex) addressChar = tnc2Address.charAt(i);
-            addressChar = tnc2Address.charAt(i);
-        } else {
-            addressChar = ' ';
-        }
         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;
+        bool dstAddresWritten   = false;
-        for (int p = 0; p <= frame.indexOf(':'); p++) {
+        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);

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

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

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/>.
  */

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/>.
  */

src/power_utils.cpp

@@ -49,40 +49,23 @@ extern bool             stationCallsignIsValid;
 
 namespace POWER_Utils {
 
-    #ifdef VEXT_CTRL
+    #ifdef ADC_CTRL_PIN
-        void vext_ctrl_ON() {
-            #if VEXT_CTRL_INVERTED == 1
-                digitalWrite(VEXT_CTRL, Config.digi.ecoMode == 1 ? HIGH : LOW);
-            #else
-                digitalWrite(VEXT_CTRL, Config.digi.ecoMode == 1 ? LOW : HIGH);
-            #endif
-        }
-
-        void vext_ctrl_OFF() {
-            #if VEXT_CTRL_INVERTED == 1
-                digitalWrite(VEXT_CTRL, Config.digi.ecoMode == 1 ? LOW : HIGH);
-            #else
-                digitalWrite(VEXT_CTRL, Config.digi.ecoMode == 1 ? HIGH : LOW);
-            #endif
-        }
-    #endif
-
-
-    #ifdef ADC_CTRL
         void adc_ctrl_ON() {
-            #if ADC_CTRL_INVERTED == 1
+            digitalWrite(ADC_CTRL_PIN, ADC_CTRL_ON_STATE);
-                digitalWrite(ADC_CTRL, LOW);
-            #else
-                digitalWrite(ADC_CTRL, HIGH);
-            #endif
         }
 
         void adc_ctrl_OFF() {
-            #if ADC_CTRL_INVERTED == 1
+            digitalWrite(ADC_CTRL_PIN, !ADC_CTRL_ON_STATE);
-                digitalWrite(ADC_CTRL, HIGH);
+        }
-            #else
+    #endif
-                digitalWrite(ADC_CTRL, LOW);
+
-            #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
 
@@ -280,8 +263,8 @@ namespace POWER_Utils {
             pinMode(Config.battery.externalVoltagePin, INPUT);
         }
 
-        #ifdef VEXT_CTRL
+        #ifdef VEXT_CTRL_PIN
-            pinMode(VEXT_CTRL,OUTPUT); // GPS + TFT on HELTEC Wireless_Tracker and only for Oled in HELTEC V3
+            pinMode(VEXT_CTRL_PIN,OUTPUT); // GPS + TFT on HELTEC Wireless_Tracker and only for Oled in HELTEC V3
             vext_ctrl_ON();
         #endif
 
@@ -289,8 +272,8 @@ namespace POWER_Utils {
             if (Config.beacon.gpsActive && Config.digi.ecoMode != 1) activateGPS();
         #endif
 
-        #ifdef ADC_CTRL
+        #ifdef ADC_CTRL_PIN
-            pinMode(ADC_CTRL, OUTPUT);
+            pinMode(ADC_CTRL_PIN, OUTPUT);
             adc_ctrl_OFF();
         #endif
 
@@ -313,12 +296,8 @@ namespace POWER_Utils {
             Wire.begin(OLED_SDA, OLED_SCL);
         #endif
 
-        #ifdef USE_WIRE_WITH_BOARD_I2C_PINS
+        #ifdef SENSOR_I2C_BUS
-            Wire.begin(BOARD_I2C_SDA, BOARD_I2C_SCL);
+            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);

src/query_utils.cpp

@@ -77,10 +77,14 @@ namespace QUERY_Utils {
             answer.concat("?WHERE on development 73!");
         } */
         else if (STATION_Utils::isManager(station) && (!queryFromAPRSIS || !Config.remoteManagement.rfOnly)) {
-            if (queryQuestion.indexOf("?EM=OFF") == 0) {
+            int digiMode            = Config.digi.mode;
-                if ((Config.digi.mode == 2 || Config.digi.mode == 3) && Config.loramodule.txActive && Config.loramodule.rxActive && !Config.aprs_is.active) {
+            int digiEcoMode         = Config.digi.ecoMode;
-                    if (Config.digi.ecoMode == 1 || Config.digi.ecoMode == 2) { // Exit Digipeater EcoMode or Digipeater without WiFiAP
+            int radioTxActive       = Config.loramodule.txActive;
-                        answer = (Config.digi.ecoMode == 1) ? "DigiEcoMode:OFF" : "Digipeater + WiFiAP enabled";
+            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) {
+            } else if (queryQuestion.startsWith("?EM=ON")) {
-                if ((Config.digi.mode == 2 || Config.digi.mode == 3) && Config.loramodule.txActive && Config.loramodule.rxActive && !Config.aprs_is.active) {
+                if ((digiMode == 2 || digiMode == 3) && onlyRadioActive) {
-                    if (Config.digi.ecoMode == 0) {     // Start Digipeater EcoMode
+                    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
+            } else if (queryQuestion.startsWith("?EM=?")) {    // Digipeater EcoMode Status
-                if (Config.digi.ecoMode == 0) {
+                switch (digiEcoMode) {
-                    answer = "DigiEcoMode:OFF";
+                    case 0:  answer = "DigiEcoMode:OFF"; break;
-                } else if (Config.digi.ecoMode == 1) {
+                    case 1:  answer = "DigiEcoMode:ON"; break;
-                    answer = "DigiEcoMode:ON";
+                    default: answer = "DigiEcoMode:OFF/Only Serial Output";
-                } else {
-                    answer = "DigiEcoMode:OFF/Only Serial Output";
                 }
-            } else  if (queryQuestion.indexOf("?TX=ON") == 0) {
+            } else  if (queryQuestion.startsWith("?TX=ON")) {
-                if (Config.loramodule.txActive) {
+                if (radioTxActive) {
                     answer = "TX was ON";
                 } else {
                     Config.loramodule.txActive = true;
                     answer = "TX=ON";
                 }
-            } else if (queryQuestion.indexOf("?TX=OFF") == 0) {
+            } else if (queryQuestion.startsWith("?TX=OFF")) {
-                if (!Config.loramodule.txActive) {
+                if (!radioTxActive) {
                     answer = "TX was OFF";
                 } else {
                     Config.loramodule.txActive = false;
                     answer = "TX=OFF";
                 }
-            } else if (queryQuestion.indexOf("?TX=?") == 0) {
+            } else if (queryQuestion.startsWith("?TX=?")) {
-                answer = (Config.loramodule.txActive) ? "TX=ON" : "TX=OFF";
+                answer = (radioTxActive) ? "TX=ON" : "TX=OFF";
-            } else if (queryQuestion.indexOf("?COMMIT") == 0) {     // saving for next reboot
+            } else if (queryQuestion.startsWith("?COMMIT")) {     // saving for next reboot
                 answer = "New Config Saved";
                 Config.writeFile();
             }

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;
+    uint32_t    hash;
-    String      payload;
 };
 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;
+        while (start < listLength) {
-        callsigns.trim();
+            while (start < listLength && list[start] == ' ') start++;  // avoid blank spaces
+            if (start >= listLength) break;
 
-        while (callsigns.length() > 0) {    // != ""
+            int end = start;
-            int spaceIndex = callsigns.indexOf(" ");
+            while (end < listLength && list[end] != ' ') end++;         // find another blank space or reach listLength
-            if (spaceIndex == -1) {         // No more spaces, add the last part
+
-                loadedList.push_back(callsigns);
+            loadedList.emplace_back(list.substring(start, end));
-                break;
+            start = end + 1;                                            // keep on searching if listLength not reached
-            }
-            loadedList.push_back(callsigns.substring(0, spaceIndex));
-            callsigns = callsigns.substring(spaceIndex + 1);
-            callsigns.trim();               // Trim in case of multiple spaces
         }
         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 (wildcardIndex >= 2 && callsign.length() >= wildcardIndex && strncmp(callsign.c_str(), list[i].c_str(), wildcardIndex) == 0) {
-                if (callsign.startsWith(wildcard)) return true;
+                    return true;
+                }
             } else {
                 if (list[i] == callsign) return true;
             }
@@ -127,36 +128,33 @@ namespace STATION_Utils {
     }
 
     void deleteNotHeard() {
-        std::vector<LastHeardStation>  lastHeardStation_temp;
+        uint32_t currentTime    = millis();
-        for (int i = 0; i < lastHeardStations.size(); i++) {
+        uint32_t timeout        = Config.rememberStationTime * 60UL * 1000UL;
-            if (millis() - lastHeardStations[i].lastHeardTime < Config.rememberStationTime * 60 * 1000) {
+
-                lastHeardStation_temp.push_back(lastHeardStations[i]);
+        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;
+        uint32_t currentTime = millis();
-        for (int i = 0; i < lastHeardStations.size(); i++) {
+        for (size_t i = 0; i < lastHeardStations.size(); i++) {
             if (lastHeardStations[i].station == station) {
-                lastHeardStations[i].lastHeardTime = millis();
+                lastHeardStations[i].lastHeardTime = currentTime;
-                stationHeard = true;
+                Utils::showActiveStations();
-                break;
+                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() {
+    void clean25SegHashBuffer() {
-        if (!packet25SegBuffer.empty() && (millis() - packet25SegBuffer[0].receivedTime) >  25 * 1000) packet25SegBuffer.erase(packet25SegBuffer.begin());
+        uint32_t currentTime = millis();
-    }
+        for (int i = packet25SegBuffer.size() - 1; i >= 0; i--) {
-
+            if ((currentTime - packet25SegBuffer[i].receivedTime) > 25 * 1000) {
-    bool check25SegBuffer(const String& station, const String& textMessage) {
+                packet25SegBuffer.erase(packet25SegBuffer.begin() + i);
-        if (!packet25SegBuffer.empty()) {
-            for (int i = 0; i < packet25SegBuffer.size(); i++) {
-                if (packet25SegBuffer[i].station == station && packet25SegBuffer[i].payload == textMessage) return false;
             }
         }
-        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;
+        outputPacketBuffer.emplace_back(OutputPacketBuffer{packet, flag});
-        entry.packet    = packet;
-        entry.isBeacon  = flag;
-
-        outputPacketBuffer.push_back(entry);
     }
 
 }

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(":");
+            int colonIndex              = packet.indexOf(":");
-            char nextChar   = packet[colonIndex + 1];
+            char nextChar               = packet[colonIndex + 1];
-            String sender   = packet.substring(3, packet.indexOf(">"));
+            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);
                     }

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      Configuration       Config;
-extern  bool                sendStartTelemetry;
 
-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();
+        }
+    }
+
 }

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

src/utils.cpp

@@ -58,11 +58,11 @@ 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        statusUpdate            = true;
-bool        sendStartTelemetry      = true;
 bool        beaconUpdate            = false;
 uint32_t    lastBeaconTx            = 0;
 uint32_t    lastScreenOn            = millis();
@@ -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) {
+        if (!sendOverAPRSIS && !sendOverRF) {
-            delay(1000);
+            statusUpdate = false;
-            status.concat(",qAC:>");
+            return;
-            status.concat(Config.beacon.statusPacket);
-            APRS_IS_Utils::upload(status);
-            SYSLOG_Utils::log(2, status, 0, 0.0, 0);   // APRSIS TX
         }
-        if (statusAfterBoot && !Config.beacon.sendViaAPRSIS && Config.beacon.sendViaRF) {
+
-            status.concat(":>");
+        String statusPacket = APRSPacketLib::generateBasePacket(Config.callsign, "APLRG1", Config.beacon.path);
-            status.concat(Config.beacon.statusPacket);
+        statusPacket += sendOverAPRSIS ? ",qAC:>" : ":>";
-            STATION_Utils::addToOutputPacketBuffer(status, true);   // treated also as beacon on Tx Freq
+        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,7 +161,8 @@ 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.battery.sendInternalVoltage || Config.battery.sendExternalVoltage) &&
@@ -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();
@@ -417,43 +422,53 @@ namespace Utils {
 
     bool callsignIsValid(const String& callsign) {
         if (callsign == "WLNK-1") return true;
+        int totalCallsignLength = callsign.length();
+        if (totalCallsignLength < 4) return false;
 
-        String cleanCallsign;
+        int hyphenIndex         = callsign.indexOf("-");
-        if (callsign.indexOf("-") > 0) {    // SSID Validation
+        int baseCallsignLength  = (hyphenIndex > 0) ? hyphenIndex : totalCallsignLength;
-            cleanCallsign = callsign.substring(0, callsign.indexOf("-"));
+
-            String ssid = callsign.substring(callsign.indexOf("-") + 1);
+        if (hyphenIndex > 0) {    // SSID Validation
-            if (ssid.indexOf("-") != -1 || ssid.length() > 2) return false;
+            if (hyphenIndex < 4) return false;                                  // base Callsign must have at least 4 characters
-            if (ssid.length() == 2 && ssid[0] == '0') return false;
+            int ssidStart   = hyphenIndex + 1;
-            for (int i = 0; i < ssid.length(); i++) {
+            int ssidLength  = totalCallsignLength - ssidStart;
-                if (!isAlphaNumeric(ssid[i])) return false;
+            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]) ) {
+        if (baseCallsignLength > 4 ) {                                          // to validate ____AA
-            cleanCallsign = " " + cleanCallsign;    // A0AA --> _A0AA
+            for (int i = 4; i < baseCallsignLength; i++) {
-        }
+                if (!isAlpha(callsign[i])) return false;
-
-        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;
             }
         }
         return true;

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

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

src/wx_utils.cpp

@@ -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)
+            #ifdef SENSOR_I2C_BUS
-                Wire1.beginTransmission(addr);
+                SENSOR_I2C_BUS.beginTransmission(addr);
-                err = Wire1.endTransmission();
+                err = SENSOR_I2C_BUS.endTransmission();
             #else
                 Wire.beginTransmission(addr);
                 #ifdef LIGHTGATEWAY_PLUS_1_0

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

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

variants/WEMOS_S2_MINI_DIY_LoRa/board_pinout.h

@@ -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
 

variants/XIAO_ESP32S3_WIO_SX1262/board_pinout.h

@@ -39,8 +39,8 @@
     #define INTERNAL_LED_PIN    48
 
     //  I2C
-    #define USE_WIRE_WITH_OLED_PINS
+    #define SENSOR_I2C_BUS      Wire
-    #define OLED_SDA            5
+    #define BOARD_I2C_SDA       5
-    #define OLED_SCL            6
+    #define BOARD_I2C_SCL       6
 
 #endif

variants/heltec-lora32-v2/board_pinout.h

@@ -48,7 +48,8 @@
     //  Aditional Config
     #define INTERNAL_LED_PIN        25
     #define BATTERY_PIN             37
-    #define ADC_CTRL                21
+
-    #define ADC_CTRL_INVERTED       1
+    #define ADC_CTRL_PIN            21
+    #define ADC_CTRL_ON_STATE       LOW
 
 #endif

variants/heltec-lora32-v2_915/board_pinout.h

@@ -48,7 +48,8 @@
     //  Aditional Config
     #define INTERNAL_LED_PIN        25
     #define BATTERY_PIN             37
-    #define ADC_CTRL                21
+
-    #define ADC_CTRL_INVERTED       1
+    #define ADC_CTRL_PIN            21
+    #define ADC_CTRL_ON_STATE       LOW
 
 #endif

variants/heltec_vision_master_e290/board_pinout.h

@@ -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,9 +50,10 @@
     //  Aditional Config
     #define INTERNAL_LED_PIN        45
     #define BATTERY_PIN             7
-    #define ADC_CTRL                46
+
-    #define ADC_CTRL_INVERTED       0
+    #define ADC_CTRL_PIN            46
-    #define VEXT_CTRL               18
+    #define ADC_CTRL_ON_STATE       HIGH
-    #define VEXT_CTRL_INVERTED      0
+    #define VEXT_CTRL_PIN           18
+    #define VEXT_CTRL_ON_STATE      HIGH
 
 #endif

variants/heltec_wifi_lora_32_V3/board_pinout.h

@@ -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,9 +53,10 @@
     //  Aditional Config
     #define INTERNAL_LED_PIN        35
     #define BATTERY_PIN             1
-    #define VEXT_CTRL               36
+
-    #define VEXT_CTRL_INVERTED      0
+    #define ADC_CTRL_PIN            37
-    #define ADC_CTRL                37
+    #define ADC_CTRL_ON_STATE       LOW
-    #define ADC_CTRL_INVERTED       1
+    #define VEXT_CTRL_PIN           36
+    #define VEXT_CTRL_ON_STATE      HIGH
 
 #endif

variants/heltec_wifi_lora_32_V3_2/board_pinout.h

@@ -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,9 +53,10 @@
     //  Aditional Config
     #define INTERNAL_LED_PIN        35
     #define BATTERY_PIN             1
-    #define VEXT_CTRL               36
+
-    #define VEXT_CTRL_INVERTED      1
+    #define ADC_CTRL_PIN            37
-    #define ADC_CTRL                37
+    #define ADC_CTRL_ON_STATE       HIGH
-    #define ADC_CTRL_INVERTED       0
+    #define VEXT_CTRL_PIN           36
+    #define VEXT_CTRL_ON_STATE      LOW
 
 #endif

variants/heltec_wifi_lora_32_V4/board_pinout.h

@@ -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,10 +53,11 @@
     //  Aditional Config
     #define INTERNAL_LED_PIN        35
     #define BATTERY_PIN             1
-    #define VEXT_CTRL               36
+
-    #define VEXT_CTRL_INVERTED      1
+    #define ADC_CTRL_PIN            37
-    #define ADC_CTRL                37
+    #define ADC_CTRL_ON_STATE       HIGH
-    #define ADC_CTRL_INVERTED       0
+    #define VEXT_CTRL_PIN           36
+    #define VEXT_CTRL_ON_STATE      LOW
 
     //  GPS   ??
     #define VGNS_CTRL               34  // cambiar nombre para prender GPS ?

variants/heltec_wireless_paper_v1/board_pinout.h

@@ -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,9 +50,10 @@
     //  Aditional Config
     #define INTERNAL_LED_PIN        18
     #define BATTERY_PIN             20
-    #define ADC_CTRL                19
+
-    #define ADC_CTRL_INVERTED       1
+    #define ADC_CTRL_PIN            19
-    #define VEXT_CTRL               45
+    #define ADC_CTRL_ON_STATE       LOW
-    #define VEXT_CTRL_INVERTED      1
+    #define VEXT_CTRL_PIN           45
+    #define VEXT_CTRL_ON_STATE      LOW
 
 #endif

variants/heltec_wireless_paper_v1_2/board_pinout.h

@@ -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,9 +50,10 @@
     //  Aditional Config
     #define INTERNAL_LED_PIN        18
     #define BATTERY_PIN             20
-    #define ADC_CTRL                19
+
-    #define ADC_CTRL_INVERTED       1
+    #define ADC_CTRL_PIN            19
-    #define VEXT_CTRL               45
+    #define ADC_CTRL_ON_STATE       LOW
-    #define VEXT_CTRL_INVERTED      1
+    #define VEXT_CTRL_PIN           45
+    #define VEXT_CTRL_ON_STATE      LOW
 
 #endif

variants/heltec_wireless_stick/board_pinout.h

@@ -50,9 +50,11 @@
     //  Aditional Config
     #define INTERNAL_LED_PIN        35
     #define BATTERY_PIN             1
-    #define ADC_CTRL                37
+
-    #define VEXT_CTRL               36
+    #define ADC_CTRL_PIN            37
-    #define VEXT_CTRL_INVERTED      1
+    #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

variants/heltec_wireless_stick_lite_v3/board_pinout.h

@@ -33,16 +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 ADC_CTRL                37
+
-    #define ADC_CTRL_INVERTED       1
+    #define ADC_CTRL_PIN            37
-    #define VEXT_CTRL               36
+    #define ADC_CTRL_ON_STATE       LOW
-    #define VEXT_CTRL_INVERTED      1
+    #define VEXT_CTRL_PIN           36
+    #define VEXT_CTRL_ON_STATE      LOW
 
 #endif

variants/heltec_wireless_stick_lite_v3_display/board_pinout.h

@@ -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,9 +44,10 @@
     //  Aditional Config
     #define INTERNAL_LED_PIN        35
     #define BATTERY_PIN             1
-    #define ADC_CTRL                37
+
-    #define ADC_CTRL_INVERTED       1
+    #define ADC_CTRL_PIN            37
-    #define VEXT_CTRL               36
+    #define ADC_CTRL_ON_STATE       LOW
-    #define VEXT_CTRL_INVERTED      1
+    #define VEXT_CTRL_PIN           36
+    #define VEXT_CTRL_ON_STATE      LOW
 
 #endif

variants/heltec_wireless_tracker/board_pinout.h

@@ -33,7 +33,7 @@
     #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
 
@@ -44,10 +44,11 @@
     //  Aditional Config
     #define INTERNAL_LED_PIN        18
     #define BATTERY_PIN             1
-    #define VEXT_CTRL               3   // To turn on GPS and TFT
+
-    #define VEXT_CTRL_INVERTED      0
+    #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                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 ADC_CTRL_INVERTED       0
+    #define VEXT_CTRL_PIN           3   // To turn on GPS and TFT
+    #define VEXT_CTRL_ON_STATE      HIGH
 
     //  GPS
     #define HAS_GPS

variants/ttgo_t_beam_s3_SUPREME_v3/board_pinout.h

@@ -35,6 +35,7 @@
 
     //  Display
     #define HAS_DISPLAY
+    #define HAS_SH1106
 
     #undef  OLED_SDA
     #undef  OLED_SCL

variants/ttgo_t_deck_GPS/board_pinout.h

@@ -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
 

variants/ttgo_t_deck_plus/board_pinout.h

@@ -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