HeltecWSL V3 battery reading fix

.github/workflows/build.yml

@@ -13,6 +13,8 @@ jobs:
                 target:
                     - name: ttgo-lora32-v21
                       chip: esp32
+                    - name: ttgo-lora32-v21_915
+                      chip: esp32
                     - name: heltec-lora32-v2
                       chip: esp32
                     - name: heltec_wifi_lora_32_V3
@@ -23,32 +25,42 @@ jobs:
                       chip: esp32s3
                     - name: ESP32_DIY_LoRa
                       chip: esp32
+                    - name: ESP32_DIY_LoRa_915
+                      chip: esp32
                     - name: ESP32_DIY_1W_LoRa
                       chip: esp32
+                    - name: ESP32_DIY_1W_LoRa_915
+                      chip: esp32
                     - name: ttgo-t-beam-v1_2
                       chip: esp32
+                    - name: ttgo-t-beam-v1_2_915
+                      chip: esp32
                     - name: ttgo-t-beam-v1
                       chip: esp32
+                    - name: ttgo-t-beam-v1_915
+                      chip: esp32
                     - name: ttgo-t-beam-v1_SX1268
                       chip: esp32
                     - name: ttgo-t-beam-v1_2_SX1262
                       chip: esp32
                     - name: ESP32_DIY_LoRa_A7670
                       chip: esp32
+                    - name: ESP32_DIY_LoRa_A7670_915
+                      chip: esp32
                     - name: heltec_wireless_tracker
                       chip: esp32s3
+                    - name: heltec_ht-ct62
+                      chip: esp32c3
                     - name: OE5HWN_MeshCom
                       chip: esp32
                     - name: WEMOS-LOLIN32-OLED-DIY
                       chip: esp32
                     - name: WEMOS-D1-R32-RA02
                       chip: esp32
-                    - name: ttgo-lora32-v21-915
-                      chip: esp32
-                    - name: heltec_ht-ct62
-                      chip: esp32c3
                     - name: esp32c3_DIY_1W_LoRa
                       chip: esp32c3
+                    - name: esp32c3_DIY_1W_LoRa_915
+                      chip: esp32c3
         steps:
             - uses: actions/checkout@v3
 
@@ -81,7 +93,7 @@ jobs:
               run: |
                   if [ "${{ matrix.target.chip }}" == "esp32" ]; then
                     python installer/bin/esptool/esptool.py --chip esp32 merge_bin \
-                      -o installer/web_factory_${{ matrix.target.name }}.bin \
+                      -o installer/web_factory.bin \
                       --flash_mode dio \
                       --flash_freq 40m \
                       --flash_size 4MB \
@@ -92,7 +104,7 @@ jobs:
                       0x3D0000 installer/firmware/spiffs.bin
                   elif [ "${{ matrix.target.chip }}" == "esp32s3" ]; then
                     python installer/bin/esptool/esptool.py --chip esp32s3 merge_bin \
-                      -o installer/web_factory_${{ matrix.target.name }}.bin \
+                      -o installer/web_factory.bin \
                       --flash_mode dio \
                       --flash_freq 40m \
                       --flash_size 8MB \
@@ -103,7 +115,7 @@ jobs:
                       0x3D0000 installer/firmware/spiffs.bin
                   elif [ "${{ matrix.target.chip }}" == "esp32c3" ]; then
                     python installer/bin/esptool/esptool.py --chip esp32c3 merge_bin \
-                      -o installer/web_factory_${{ matrix.target.name }}.bin \
+                      -o installer/web_factory.bin \
                       --flash_mode dio \
                       --flash_freq 40m \
                       --flash_size 4MB \

README.md

@@ -4,7 +4,7 @@ This firmware is for using ESP32 based boards with LoRa Modules and GPS to live
 
 ![Screenshot](https://github.com/richonguzman/LoRa_APRS_iGate/blob/main/images/iGateOledScreen.jpeg)
 
-__(NOTE: This iGate Firmware was develop to work with all LoRa APRS Trackers and specially with this firmware <a href="https://github.com/richonguzman/LoRa_APRS_Tracker" target="_blank">LoRa APRS Tracker</a>)__
+__(This iGate Firmware works with all LoRa Tracker Firmwares (specially this <a href="https://github.com/richonguzman/LoRa_APRS_Tracker" target="_blank">LoRa APRS Tracker Firmware</a>))__
 
 ___________________________________________________
 
@@ -14,45 +14,47 @@ ___________________________________________________
 
 ____________________________________________________
 
-# WEB INSTALLER
-
-As easy as it gets, the new <a href="https://sq2cpa.github.io/lora-flasher/ca2rxu.html" target="_blank">Web Installer</a> (thanks Damian SQ2CPA)
-
-[<img src="https://github.com/richonguzman/LoRa_APRS_iGate/blob/main/images/WebFlasher.png">](https://sq2cpa.github.io/lora-flasher/ca2rxu.html)
-
-____________________________________________________
-
-# SUPPORTED BOARDS
-
-- TTGO Lilygo LoRa32 v2.1 / v1.6 (they work the same)
-
-- TTGO T-Beam v1.0 , v1.1, v1.2 (also variations with SX1262 and SX1268 LoRa Modules)
-
-- HELTEC V2, V3 , Wireless Stick, HT-CT62, Wireless Tracker
-
-- ESP32 Wroom + SX1278 LoRa Module or 400M30S 1W LoRa Module for a DIY Versions.
-
-- ESP32 + 4G/LTE A7670 Modem + SX1278 DIY Version.
-
-- Wemos Lolin32 Oled + SX1278 DIY Version.
-
-
-### Buying links --> <a href="https://github.com/richonguzman/LoRa_APRS_iGate/wiki/Z.-------Supported-Boards-and-Buying-Links" target="_blank">here</a>.
+# WEB FLASHER/INSTALLER is <a href="https://richonguzman.github.io/lora-igate-web-flasher/installer.html" target="_blank">here</a>
 
 ____________________________________________________
 
 # WIKI
 
+### FAQ, BME280, TNC and more --> <a href="https://github.com/richonguzman/LoRa_APRS_iGate/wiki/00.-FAQ-(frequently-asked-questions)" target="_blank">here</a>.
+
 ### Installation Guide --> <a href="https://github.com/richonguzman/LoRa_APRS_iGate/wiki/01.-Installation-Guide" target="_blank">here</a>.
 
-*(Wiki has all configuration explanation, supported boards list, adding BME/BMP Wx modules and more)*
+
+____________________________________________________
+
+# SUPPORTED BOARDS
+
+### Buying links --> <a href="https://github.com/richonguzman/LoRa_APRS_iGate/wiki/108.-Supported-Boards-and-Buying-Links" target="_blank">here</a>.
+
+(NOTE: all boards with 433-868-915 MHz versions)
+
+- TTGO Lilygo LoRa32 v2.1 / v1.6 (they work the same).
+
+- TTGO T-Beam v1.0 , v1.1, v1.2 (also variations with SX1262 and SX1268 LoRa Modules).
+
+- HELTEC V2, V3 , Wireless Stick, Wireless Stick Lite, HT-CT62, Wireless Tracker.
+
+- ESP32 Wroom + SX1278 LoRa Module or Ebyte 400M30S (or 900M30S) 1W LoRa Module for a DIY Versions.
+
+- ESP32C3 + Ebyte 400M30S(or 900M30S) 1W LoRa Module for another DIY version.
+
+- ESP32 + 4G/LTE A7670 Modem + SX1278 DIY Version.
+
+- Wemos Lolin32 Oled + SX1278 DIY Version.
 
 ____________________________________________________
 ## Timeline (Versions):
 
+- 2024.06.21 Tx packets coming from APRS-IS are (now) formatted into 3rd Party (as they should have been since the beginning).
+- 2024.06.18 All boards with 433 / 868 / 915 MHz versions.
 - 2024.06.10 ESP32C3 + 1W LoRa Module (E22 400M30S) support added.
 - 2024.06.09 Si7021 module added (with autodetected I2C Address)
-- 2024.06.08 Callsign Validation for all Rx and Tx Station that iGate/Digi hears.
+- 2024.06.08 Callsign Validation for all Station that iGate/Digi hears.
 - 2024.05.27 Battery Monitor for internal and External Voltages (to make board sleep and avoid low discharge of batterys) T-Beam boards now with Battery readings as well.
 - 2024.05.23 Forced Reboot Mode added.
 - 2024.05.22 Experimental backup-Digirepeater-Mode when "only" iGate mode loses WiFi connection added.

platformio.ini

@@ -50,7 +50,19 @@ build_flags =
 lib_deps = 
 	${common.lib_deps}
 	adafruit/Adafruit GFX Library @ 1.11.9
-	adafruit/Adafruit SSD1306 @ 2.5.10	
+	adafruit/Adafruit SSD1306 @ 2.5.10
+
+[env:ttgo-lora32-v21_915]
+board = ttgo-lora32-v21
+build_flags = 
+	-Werror -Wall
+	-DTTGO_T_LORA32_V2_1_915
+	-DHAS_SX1276
+	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
+lib_deps = 
+	${common.lib_deps}
+	adafruit/Adafruit GFX Library @ 1.11.9
+	adafruit/Adafruit SSD1306 @ 2.5.10
 
 [env:heltec-lora32-v2]
 board = ttgo-lora32-v21
@@ -101,19 +113,6 @@ build_flags =
 lib_deps = 
 	${common.lib_deps}
 
-[env:heltec_ht-ct62]
-board = heltec_wireless_stick_lite
-board_build.mcu = esp32c3
-build_flags = 
-	-Werror -Wall
-	-DHELTEC_HTCT62
-	-DHAS_SX1262
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps = 
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.9
-	adafruit/Adafruit SSD1306 @ 2.5.10
-
 [env:ESP32_DIY_LoRa]
 board = esp32dev
 build_flags = 
@@ -126,12 +125,38 @@ lib_deps =
 	adafruit/Adafruit GFX Library @ 1.11.9
 	adafruit/Adafruit SSD1306 @ 2.5.10
 
+[env:ESP32_DIY_LoRa_915]
+board = esp32dev
+build_flags = 
+	-Werror -Wall
+	-DESP32_DIY_LoRa_915
+	-DHAS_SX1276
+	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
+lib_deps = 
+	${common.lib_deps}
+	adafruit/Adafruit GFX Library @ 1.11.9
+	adafruit/Adafruit SSD1306 @ 2.5.10
+
 [env:ESP32_DIY_1W_LoRa]
 board = esp32dev
 build_flags = 
 	-Werror -Wall
 	-DESP32_DIY_1W_LoRa
 	-DHAS_SX1268
+	-DHAS_1W_LORA
+	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
+lib_deps = 
+	${common.lib_deps}
+	adafruit/Adafruit GFX Library @ 1.11.9
+	adafruit/Adafruit SSD1306 @ 2.5.10
+
+[env:ESP32_DIY_1W_LoRa_915]
+board = esp32dev
+build_flags = 
+	-Werror -Wall
+	-DESP32_DIY_1W_LoRa_915
+	-DHAS_SX1262
+	-DHAS_1W_LORA
 	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
 lib_deps = 
 	${common.lib_deps}
@@ -152,6 +177,20 @@ lib_deps =
 	adafruit/Adafruit SSD1306 @ 2.5.10
 	lewisxhe/XPowersLib @ 0.2.4
 
+[env:ttgo-t-beam-v1_2_915]
+board = ttgo-t-beam
+build_flags = 
+	-Werror -Wall
+	-DTTGO_T_Beam_V1_2_915
+	-DHAS_SX1276
+	-DHAS_AXP2101
+	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
+lib_deps = 
+	${common.lib_deps}
+	adafruit/Adafruit GFX Library @ 1.11.9
+	adafruit/Adafruit SSD1306 @ 2.5.10
+	lewisxhe/XPowersLib @ 0.2.4
+
 [env:ttgo-t-beam-v1]
 board = ttgo-t-beam
 build_flags = 
@@ -166,6 +205,20 @@ lib_deps =
 	adafruit/Adafruit SSD1306 @ 2.5.10
 	lewisxhe/XPowersLib @ 0.2.4
 
+[env:ttgo-t-beam-v1_915]
+board = ttgo-t-beam
+build_flags = 
+	-Werror -Wall
+	-DTTGO_T_Beam_V1_0_915
+	-DHAS_SX1276
+	-DHAS_AXP192
+	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
+lib_deps = 
+	${common.lib_deps}
+	adafruit/Adafruit GFX Library @ 1.11.9
+	adafruit/Adafruit SSD1306 @ 2.5.10
+	lewisxhe/XPowersLib @ 0.2.4
+
 [env:ttgo-t-beam-v1_SX1268]
 board = ttgo-t-beam
 build_flags = 
@@ -200,6 +253,22 @@ build_flags =
 	-Werror -Wall
 	-DESP32_DIY_LoRa_A7670
 	-DHAS_SX1278
+	-DHAS_A7670
+	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
+lib_deps = 
+	${common.lib_deps}
+	adafruit/Adafruit GFX Library @ 1.11.9
+	adafruit/Adafruit SSD1306 @ 2.5.10
+	vshymanskyy/TinyGSM @ 0.12.0
+	vshymanskyy/StreamDebugger @ 1.0.1
+
+[env:ESP32_DIY_LoRa_A7670_915]
+board = esp32dev
+build_flags = 
+	-Werror -Wall
+	-DESP32_DIY_LoRa_A7670_915
+	-DHAS_SX1276
+	-DHAS_A7670
 	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
 lib_deps = 
 	${common.lib_deps}
@@ -245,12 +314,26 @@ lib_deps =
 	${common.lib_deps}
 	bodmer/TFT_eSPI @ 2.5.43
 
+[env:heltec_ht-ct62]
+board = heltec_wireless_stick_lite
+board_build.mcu = esp32c3
+build_flags = 
+	-Werror -Wall
+	-DHELTEC_HTCT62
+	-DHAS_SX1262
+	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
+lib_deps = 
+	${common.lib_deps}
+	adafruit/Adafruit GFX Library @ 1.11.9
+	adafruit/Adafruit SSD1306 @ 2.5.10
+
 [env:OE5HWN_MeshCom]
 board = esp32dev
 build_flags = 
 	-Werror -Wall
 	-DOE5HWN_MeshCom
 	-DHAS_SX1268
+	-DHAS_1W_LORA
 	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
 lib_deps = 
 	${common.lib_deps}
@@ -281,26 +364,30 @@ lib_deps =
 	adafruit/Adafruit GFX Library @ 1.11.9
 	adafruit/Adafruit SSD1306 @ 2.5.10
 
-[env:ttgo-lora32-v21-915]
-board = ttgo-lora32-v21
-build_flags = 
-	-Werror -Wall
-	-DTTGO_T_LORA32_V2_1_915
-	-DHAS_SX1276
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-lib_deps = 
-	${common.lib_deps}
-	adafruit/Adafruit GFX Library @ 1.11.9
-	adafruit/Adafruit SSD1306 @ 2.5.10
-
 [env:esp32c3_DIY_1W_LoRa]
-extends = env:esp32
 board = esp32-c3-devkitm-1
 board_build.mcu = esp32c3
 build_flags =
 	-Werror -Wall
 	-DESP32C3_DIY_1W_LoRa
 	-DHAS_SX1268
+	-DHAS_1W_LORA
+	-DARDUINO_USB_MODE=1
+	-DARDUINO_USB_CDC_ON_BOOT=1
+	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
+lib_deps =
+	${common.lib_deps}
+	adafruit/Adafruit GFX Library @ 1.11.9
+	adafruit/Adafruit SSD1306 @ 2.5.10
+
+[env:esp32c3_DIY_1W_LoRa_915]
+board = esp32-c3-devkitm-1
+board_build.mcu = esp32c3
+build_flags =
+	-Werror -Wall
+	-DESP32C3_DIY_1W_LoRa_915
+	-DHAS_SX1262
+	-DHAS_1W_LORA
 	-DARDUINO_USB_MODE=1
 	-DARDUINO_USB_CDC_ON_BOOT=1
 	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1

src/A7670_utils.cpp

@@ -6,7 +6,7 @@
 #include "display.h"
 #include "utils.h"
 
-#if defined(ESP32_DIY_LoRa_A7670)
+#ifdef HAS_A7670
     #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
@@ -146,7 +146,12 @@
         }
 
         void APRS_IS_connect() {
-            String loginInfo = "user " + Config.callsign + " pass " + String(Config.aprs_is.passcode) + " vers CA2RXU_LoRa_iGate 1.3 filter " + Config.aprs_is.filter;
+            String loginInfo = "user ";
+            loginInfo += Config.callsign;
+            loginInfo += " pass ";
+            loginInfo += String(Config.aprs_is.passcode);
+            loginInfo += " vers CA2RXU_LoRa_iGate 1.3 filter ";
+            loginInfo += Config.aprs_is.filter;
             Serial.println("-----> Connecting to APRS IS");
             while (!modemStartUp) {
                 Serial.print("Opening Port...                 ");

src/LoRa_APRS_iGate.cpp

@@ -33,11 +33,11 @@ ________________________________________________________________________________
 #include "tnc_utils.h"
 #include "display.h"
 #include "utils.h"
-#ifdef ESP32_DIY_LoRa_A7670
+#ifdef HAS_A7670
     #include "A7670_utils.h"
 #endif
 
-String          versionDate             = "2024.06.15";
+String          versionDate             = "2024.06.21";
 Configuration   Config;
 WiFiClient      espClient;
 
@@ -116,7 +116,7 @@ void setup() {
     BME_Utils::setup();
     WEB_Utils::setup();
     TNC_Utils::setup();
-    #ifdef ESP32_DIY_LoRa_A7670
+    #ifdef HAS_A7670
         A7670_Utils::setup();
     #endif
     Utils::checkRebootMode();
@@ -138,7 +138,7 @@ void loop() {
 
     WIFI_Utils::checkWiFi(); // Always use WiFi, not related to IGate/Digi mode
 
-    #ifdef ESP32_DIY_LoRa_A7670
+    #ifdef HAS_A7670
         if (Config.aprs_is.active && !modemLoggedToAPRSIS) A7670_Utils::APRS_IS_connect();
     #else
         if (Config.aprs_is.active && (WiFi.status() == WL_CONNECTED) && !espClient.connected()) APRS_IS_Utils::connect();
@@ -162,7 +162,8 @@ void loop() {
         }
 
         if (Config.digi.mode == 2 || backUpDigiMode) { // If Digi enabled
-            DIGI_Utils::processLoRaPacket(packet); // Send received packet to Digi
+            STATION_Utils::clean25SegBuffer();
+            DIGI_Utils::processLoRaPacket(packet); // Send received packet to Digi            
         }
 
         if (Config.tnc.enableServer) { // If TNC server enabled
@@ -176,9 +177,8 @@ void loop() {
     if (Config.aprs_is.active) { // If APRSIS enabled
         APRS_IS_Utils::listenAPRSIS(); // listen received packet from APRSIS
     }
-
-    STATION_Utils::processOutputPacketBuffer();
-    STATION_Utils::clean25SegBuffer();
+    
+    STATION_Utils::processOutputPacketBuffer();    
 
     show_display(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
     Utils::checkRebootTime();

src/aprs_is_utils.cpp

@@ -24,7 +24,7 @@ extern bool                 backUpDigiMode;
 
 uint32_t lastRxTime         = millis();
 
-#ifdef ESP32_DIY_LoRa_A7670
+#ifdef HAS_A7670
     extern bool                 stationBeacon;
 #endif
 
@@ -36,9 +36,8 @@ namespace APRS_IS_Utils {
     }
 
     void connect() {
-        uint8_t count = 0;
-        String aprsauth;
         Serial.print("Connecting to APRS-IS ...     ");
+        uint8_t count = 0;
         while (!espClient.connect(Config.aprs_is.server.c_str(), Config.aprs_is.port) && count < 20) {
             Serial.println("Didn't connect with server...");
             delay(1000);
@@ -54,10 +53,14 @@ namespace APRS_IS_Utils {
         }
         else {
             Serial.println("Connected!\n(Server: " + String(Config.aprs_is.server) + " / Port: " + String(Config.aprs_is.port) + ")");
-
             // String filter = "t/m/" + Config.callsign + "/" + (String)Config.aprs_is.reportingDistance;
 
-            aprsauth = "user " + Config.callsign + " pass " + Config.aprs_is.passcode + " vers CA2RXU_LoRa_iGate 1.3 filter " + Config.aprs_is.filter;
+            String aprsauth = "user ";
+            aprsauth += Config.callsign;
+            aprsauth += " pass ";
+            aprsauth += Config.aprs_is.passcode;
+            aprsauth += " vers CA2RXU_LoRa_iGate 1.3 filter ";
+            aprsauth += Config.aprs_is.filter;
             upload(aprsauth);
             delay(200);
         }
@@ -82,7 +85,7 @@ namespace APRS_IS_Utils {
         if (!Config.aprs_is.active) {
             aprsisState = "OFF";
         } else {
-            #ifdef ESP32_DIY_LoRa_A7670
+            #ifdef HAS_A7670
                 if (modemLoggedToAPRSIS) {
                     aprsisState = "OK";
                 } else {
@@ -106,24 +109,40 @@ namespace APRS_IS_Utils {
         secondLine += aprsisState;
     }
 
-    String buildPacketToUpload(const String& packet) {
-        String payload = packet.substring(packet.indexOf(":"));
-        if (payload.indexOf("\x3c\xff\x01") != -1) {
-            payload = payload.substring(0, payload.indexOf("\x3c\xff\x01"));
-        }
-        if (!(Config.aprs_is.active && Config.digi.mode == 0)) { // Check if NOT only IGate
-            return packet.substring(3, packet.indexOf(":")) + ",qAR," + Config.callsign + payload;
+    String checkForStartingBytes(const String& packet) {
+        if (packet.indexOf("\x3c\xff\x01") != -1) {
+            return packet.substring(0, packet.indexOf("\x3c\xff\x01"));
         } else {
-            return packet.substring(3, packet.indexOf(":")) + ",qAO," + Config.callsign + payload;
+            return packet;
         }
     }
 
+    String buildPacketToUpload(const String& packet) {
+        String buildedPacket = packet.substring(3, packet.indexOf(":"));
+        if (!(Config.aprs_is.active && Config.digi.mode == 0)) { // Check if NOT only IGate
+            buildedPacket += ",qAR,";
+        } else {
+            buildedPacket += ",qAO,";
+        }
+        buildedPacket += Config.callsign;
+        buildedPacket += checkForStartingBytes(packet.substring(packet.indexOf(":")));
+        return buildedPacket;
+    }
+
     String buildPacketToTx(const String& aprsisPacket, uint8_t packetType) {
         String packet = aprsisPacket;
         packet.trim();
-        String outputPacket = packet.substring(0, packet.indexOf(","));
-        outputPacket.concat(",TCPIP,WIDE1-1,");
+        String outputPacket = Config.callsign;
+        outputPacket += ">APLRG1";
+        if (Config.beacon.path != "") {
+            outputPacket += ",";
+            outputPacket += Config.beacon.path;
+        }
+        outputPacket += ":}";
+        outputPacket += packet.substring(0, packet.indexOf(",")); // Callsign>Tocall
+        outputPacket.concat(",TCPIP,");
         outputPacket.concat(Config.callsign);
+        outputPacket.concat("*");
         switch (packetType) {
             case 0: // gps
                 if (packet.indexOf(":=") > 0) {
@@ -162,22 +181,29 @@ namespace APRS_IS_Utils {
             ackMessage.concat(packet.substring(packet.indexOf("{") + 1));
             ackMessage.trim();
             //Serial.println(ackMessage);
+            
+            String addToBuffer = Config.callsign;
+            addToBuffer += ">APLRG1,RFONLY";
+            if (Config.beacon.path != "") {
+                addToBuffer += ",";
+                addToBuffer += Config.beacon.path;
+            }
+            addToBuffer += "::";
+
             String processedSender = sender;
             for (int i = sender.length(); i < 9; i++) {
                 processedSender += ' ';
             }
-            if (Config.beacon.path == "") {
-                STATION_Utils::addToOutputPacketBuffer(Config.callsign + ">APLRG1,RFONLY::" + processedSender + ":" + ackMessage);
-            } else {
-                STATION_Utils::addToOutputPacketBuffer(Config.callsign + ">APLRG1,RFONLY," + Config.beacon.path + "::" + processedSender + ":" + ackMessage);
-            }
+            addToBuffer += processedSender;
 
+            addToBuffer += ":";
+            addToBuffer += ackMessage;
+            STATION_Utils::addToOutputPacketBuffer(addToBuffer);
             receivedMessage = packet.substring(packet.indexOf(":") + 1, packet.indexOf("{"));
         } else {
             receivedMessage = packet.substring(packet.indexOf(":") + 1);
         }
         if (receivedMessage.indexOf("?") == 0) {
-            delay(2000);
             if (!Config.display.alwaysOn && Config.display.timeout != 0) {
                 display_toggle(true);
             }
@@ -193,40 +219,34 @@ namespace APRS_IS_Utils {
 
     void processLoRaPacket(const String& packet) {
         if (espClient.connected() || modemLoggedToAPRSIS) {
-            bool queryMessage = false;
-            String aprsPacket, Sender, AddresseeAndMessage, Addressee;
             if (packet != "") {
-                if ((packet.substring(0, 3) == "\x3c\xff\x01") && (packet.indexOf("TCPIP") == -1) && (packet.indexOf("NOGATE") == -1) && (packet.indexOf("RFONLY") == -1)) {
-                    Sender = packet.substring(3, packet.indexOf(">"));
+                if ((packet.substring(0, 3) == "\x3c\xff\x01")  && (packet.indexOf("}") == -1 && packet.indexOf("TCPIP") == -1) && (packet.indexOf("NOGATE") == -1) && (packet.indexOf("RFONLY") == -1)) {                    
+                    const String& Sender = packet.substring(3, packet.indexOf(">"));
                     if (Sender != Config.callsign && Utils::checkValidCallsign(Sender)) {
-                        if (STATION_Utils::check25SegBuffer(Sender, packet.substring(packet.indexOf(":")+2))) {
-                            STATION_Utils::updateLastHeard(Sender);
-                            Utils::typeOfPacket(packet.substring(3), 0);  // LoRa-APRS
-                            AddresseeAndMessage = packet.substring(packet.indexOf("::") + 2);
-                            Addressee = AddresseeAndMessage.substring(0, AddresseeAndMessage.indexOf(":"));
-                            Addressee.trim();
-                            if (packet.indexOf("::") > 10 && Addressee == Config.callsign) {      // its a message for me!
-                                if (AddresseeAndMessage.indexOf("\x3c\xff\x01") != -1) {
-                                    AddresseeAndMessage = AddresseeAndMessage.substring(0, AddresseeAndMessage.indexOf("\x3c\xff\x01"));
-                                }
-                                queryMessage = processReceivedLoRaMessage(Sender, AddresseeAndMessage);
-                            }
-                            if (!queryMessage) {
-                                aprsPacket = buildPacketToUpload(packet);
-                                if (!Config.display.alwaysOn && Config.display.timeout != 0) {
-                                    display_toggle(true);
-                                }
-                                lastScreenOn = millis();
-                                #ifdef ESP32_DIY_LoRa_A7670
-                                    stationBeacon = true;
-                                    A7670_Utils::uploadToAPRSIS(aprsPacket);
-                                    stationBeacon = false;
-                                #else
-                                    upload(aprsPacket);
-                                #endif
-                                Utils::println("---> Uploaded to APRS-IS");
-                                show_display(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
+                        STATION_Utils::updateLastHeard(Sender);
+                        Utils::typeOfPacket(packet.substring(3), 0);  // LoRa-APRS
+                        const String& AddresseeAndMessage = packet.substring(packet.indexOf("::") + 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!
+                            queryMessage = processReceivedLoRaMessage(Sender, checkForStartingBytes(AddresseeAndMessage));
+                        }
+                        if (!queryMessage) {
+                            const String& aprsPacket = buildPacketToUpload(packet);
+                            if (!Config.display.alwaysOn && Config.display.timeout != 0) {
+                                display_toggle(true);
                             }
+                            lastScreenOn = millis();
+                            #ifdef HAS_A7670
+                                stationBeacon = true;
+                                A7670_Utils::uploadToAPRSIS(aprsPacket);
+                                stationBeacon = false;
+                            #else
+                                upload(aprsPacket);
+                            #endif
+                            Utils::println("---> Uploaded to APRS-IS");
+                            show_display(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
                         }
                     }
                 }
@@ -235,68 +255,72 @@ namespace APRS_IS_Utils {
     }
 
     void processAPRSISPacket(const String& packet) {
-        String Sender, AddresseeAndMessage, Addressee, receivedMessage;
         if (!packet.startsWith("#")) {
             if (Config.aprs_is.messagesToRF && packet.indexOf("::") > 0) {
-                Sender = packet.substring(0, packet.indexOf(">"));
-                if (Utils::checkValidCallsign(Sender)) {
-                    AddresseeAndMessage = packet.substring(packet.indexOf("::") + 2);
-                    Addressee = AddresseeAndMessage.substring(0, AddresseeAndMessage.indexOf(":"));
-                    Addressee.trim();
-                    if (Addressee == Config.callsign) {             // its for me!
-                        if (AddresseeAndMessage.indexOf("{") > 0) {     // ack?
-                            String ackMessage = "ack" + AddresseeAndMessage.substring(AddresseeAndMessage.indexOf("{") + 1);
-                            ackMessage.trim();
-                            delay(4000);
-                            for (int i = Sender.length(); i < 9; i++) {
-                                Sender += ' ';
-                            }
-                            String ackPacket = Config.callsign + ">APLRG1,TCPIP,qAC::" + Sender + ":" + ackMessage;
-                            #ifdef ESP32_DIY_LoRa_A7670
-                                A7670_Utils::uploadToAPRSIS(ackPacket);
-                            #else
-                                upload(ackPacket);
-                            #endif                        
-                            receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":") + 1, AddresseeAndMessage.indexOf("{"));
-                        } else {
-                            receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":") + 1);
-                        }
-                        if (receivedMessage.indexOf("?") == 0) {
-                            Utils::println("Received Query APRS-IS : " + packet);
-                            String queryAnswer = QUERY_Utils::process(receivedMessage, Sender, 1); // APRSIS
-                            //Serial.println("---> QUERY Answer : " + queryAnswer.substring(0,queryAnswer.indexOf("\n")));
-                            if (!Config.display.alwaysOn && Config.display.timeout != 0) {
-                                display_toggle(true);
-                            }
-                            lastScreenOn = millis();
-                            delay(500);
-                            #ifdef ESP32_DIY_LoRa_A7670
-                                A7670_Utils::uploadToAPRSIS(queryAnswer);
-                            #else
-                                upload(queryAnswer);
-                            #endif                        
-                            SYSLOG_Utils::log(2, queryAnswer, 0, 0.0, 0); // APRSIS TX
-                            fifthLine = "APRS-IS ----> APRS-IS";
-                            sixthLine = Config.callsign;
-                            for (int j = sixthLine.length();j < 9;j++) {
-                                sixthLine += " ";
-                            }
-                            sixthLine += "> ";
-                            sixthLine += Sender;
-                            seventhLine = "QUERY = ";
-                            seventhLine += receivedMessage;
+                String Sender = packet.substring(0, packet.indexOf(">"));
+                const String& AddresseeAndMessage = packet.substring(packet.indexOf("::") + 2);
+                String Addressee = AddresseeAndMessage.substring(0, AddresseeAndMessage.indexOf(":"));
+                Addressee.trim();
+                if (Addressee == Config.callsign) {             // its for me!
+                    String receivedMessage;
+                    if (AddresseeAndMessage.indexOf("{") > 0) {     // ack?
+                        String ackMessage = "ack";
+                        ackMessage += AddresseeAndMessage.substring(AddresseeAndMessage.indexOf("{") + 1);
+                        ackMessage.trim();
+                        delay(4000);
+                        for (int i = Sender.length(); i < 9; i++) {
+                            Sender += ' ';
                         }
+
+                        String ackPacket = Config.callsign;
+                        ackPacket += ">APLRG1,TCPIP,qAC::";
+                        ackPacket += Sender;
+                        ackPacket += ":";
+                        ackPacket += ackMessage;
+                        #ifdef HAS_A7670
+                            A7670_Utils::uploadToAPRSIS(ackPacket);
+                        #else
+                            upload(ackPacket);
+                        #endif                        
+                        receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":") + 1, AddresseeAndMessage.indexOf("{"));
                     } else {
-                        Utils::print("Received Message from APRS-IS  : " + packet);
-                        if (STATION_Utils::wasHeard(Addressee) && Utils::checkValidCallsign(Addressee)) {
-                            STATION_Utils::addToOutputPacketBuffer(buildPacketToTx(packet, 1));
-                            display_toggle(true);
-                            lastScreenOn = millis();
-                            Utils::typeOfPacket(packet, 1); // APRS-LoRa
-                        }
+                        receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":") + 1);
+                    }
+                    if (receivedMessage.indexOf("?") == 0) {
+                        Utils::println("Received Query APRS-IS : " + packet);
+                        String queryAnswer = QUERY_Utils::process(receivedMessage, Sender, 1); // APRSIS
+                        //Serial.println("---> QUERY Answer : " + queryAnswer.substring(0,queryAnswer.indexOf("\n")));
+                        if (!Config.display.alwaysOn && Config.display.timeout != 0) {
+                            display_toggle(true);
+                        }
+                        lastScreenOn = millis();
+                        delay(500);
+                        #ifdef HAS_A7670
+                            A7670_Utils::uploadToAPRSIS(queryAnswer);
+                        #else
+                            upload(queryAnswer);
+                        #endif                        
+                        SYSLOG_Utils::log(2, queryAnswer, 0, 0.0, 0); // APRSIS TX
+                        fifthLine = "APRS-IS ----> APRS-IS";
+                        sixthLine = Config.callsign;
+                        for (int j = sixthLine.length();j < 9;j++) {
+                            sixthLine += " ";
+                        }
+                        sixthLine += "> ";
+                        sixthLine += Sender;
+                        seventhLine = "QUERY = ";
+                        seventhLine += receivedMessage;
+                    }
+                } else {
+                    Utils::print("Received Message from APRS-IS  : " + packet);
+                    if (STATION_Utils::wasHeard(Addressee)) {
+                        STATION_Utils::addToOutputPacketBuffer(buildPacketToTx(packet, 1));
+                        display_toggle(true);
+                        lastScreenOn = millis();
+                        Utils::typeOfPacket(packet, 1); // APRS-LoRa
                     }
-                    show_display(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
                 }
+                show_display(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);
             } else if (Config.aprs_is.objectsToRF && packet.indexOf(":;") > 0) {
                 Utils::println("Received Object from APRS-IS  : " + packet);
                 STATION_Utils::addToOutputPacketBuffer(buildPacketToTx(packet, 5));
@@ -308,7 +332,7 @@ namespace APRS_IS_Utils {
     }
 
     void listenAPRSIS() {
-        #ifdef ESP32_DIY_LoRa_A7670
+        #ifdef HAS_A7670
             A7670_Utils::listenAPRSIS();
         #else
             if (espClient.connected()) {

src/aprs_is_utils.h

@@ -9,6 +9,7 @@ namespace APRS_IS_Utils {
     void    upload(const String& line);
     void    connect();
     void    checkStatus();
+    String  checkForStartingBytes(const String& packet);
     String  buildPacketToUpload(const String& packet);
     String  buildPacketToTx(const String& aprsisPacket, uint8_t packetType);
     bool    processReceivedLoRaMessage(const String& sender, const String& packet);

src/battery_utils.cpp

@@ -37,10 +37,10 @@ namespace BATTERY_Utils {
             int sample;
             int sampleSum = 0;
             #ifdef ADC_CTRL
-                #if defined(HELTEC_WSL_V3) || defined(HELTEC_WIRELESS_TRACKER)
+                #if defined(HELTEC_WIRELESS_TRACKER)
                     digitalWrite(ADC_CTRL, HIGH);
                 #endif
-                #if defined(HELTEC_V3) || defined(HELTEC_V2)
+                #if defined(HELTEC_V3) || defined(HELTEC_V2) || defined(HELTEC_WSL_V3)
                     digitalWrite(ADC_CTRL, LOW);
                 #endif
             #endif
@@ -57,10 +57,10 @@ namespace BATTERY_Utils {
             }
 
             #ifdef ADC_CTRL
-                #if defined(HELTEC_WSL_V3) || defined(HELTEC_WIRELESS_TRACKER)
+                #if defined(HELTEC_WIRELESS_TRACKER)
                     digitalWrite(ADC_CTRL, LOW);
                 #endif
-                #if defined(HELTEC_V3) || defined(HELTEC_V2)
+                #if defined(HELTEC_V3) || defined(HELTEC_V2) || defined(HELTEC_WSL_V3)
                     digitalWrite(ADC_CTRL, HIGH);
                 #endif
                 double inputDivider = (1.0 / (390.0 + 100.0)) * 100.0;  // The voltage divider is a 390k + 100k resistor in series, 100k on the low side.
@@ -91,11 +91,8 @@ namespace BATTERY_Utils {
 
     void checkIfShouldSleep() {
         if (lastBatteryCheck == 0 || millis() - lastBatteryCheck >= 15 * 60 * 1000) {
-            lastBatteryCheck = millis();
-
-            float voltage = checkInternalVoltage();
-            
-            if (voltage < Config.lowVoltageCutOff) {
+            lastBatteryCheck = millis();            
+            if (checkInternalVoltage() < Config.lowVoltageCutOff) {
                 ESP.deepSleep(1800000000); // 30 min sleep (60s = 60e6)
             }
         }

src/bme_utils.cpp

@@ -130,8 +130,7 @@ namespace BME_Utils {
     }
 
     String generateTempString(const float bmeTemp) {
-        String strTemp;
-        strTemp = String((int)bmeTemp);
+        String strTemp = String((int)bmeTemp);
         switch (strTemp.length()) {
             case 1:
                 return "00" + strTemp;
@@ -145,8 +144,7 @@ namespace BME_Utils {
     }
 
     String generateHumString(const float bmeHum) {
-        String strHum;
-        strHum = String((int)bmeHum);
+        String strHum = String((int)bmeHum);
         switch (strHum.length()) {
             case 1:
                 return "0" + strHum;
@@ -183,7 +181,6 @@ namespace BME_Utils {
     }
 
     String readDataSensor() {
-        String wx, tempStr, humStr, presStr;
         switch (wxModuleType) {
             case 1: // BME280
                 bme280.takeForcedMeasurement();
@@ -216,20 +213,23 @@ namespace BME_Utils {
                 break;
         }    
 
+        String wx;
         if (isnan(newTemp) || isnan(newHum) || isnan(newPress)) {
             Serial.println("BME/BMP/Si7021 Module data failed");
             wx = ".../...g...t...r...p...P...h..b.....";
             fifthLine = "";
             return wx;
         } else {
-            tempStr = generateTempString(((newTemp + Config.bme.temperatureCorrection) * 1.8) + 32);
+            String tempStr = generateTempString(((newTemp + Config.bme.temperatureCorrection) * 1.8) + 32);
             
+            String humStr;
             if (wxModuleType == 1 || wxModuleType == 3 || wxModuleType == 4) {
                 humStr  = generateHumString(newHum);
             } else if (wxModuleType == 2) {
                 humStr  = "..";
             }
             
+            String presStr;
             if (wxModuleAddress == 4) {
                 presStr = ".....";
             } else {

src/boards_pinout.h

@@ -9,7 +9,7 @@
 
 
 // LORA MODULES
-#if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2) || defined(ESP32_DIY_LoRa) || defined(TTGO_T_Beam_V1_2) || defined(TTGO_T_Beam_V1_0) || defined(TTGO_T_LORA32_V2_1_915)
+#if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2) || defined(ESP32_DIY_LoRa) || defined(TTGO_T_Beam_V1_2) || defined(TTGO_T_Beam_V1_0) || defined(TTGO_T_LORA32_V2_1_915) || defined(ESP32_DIY_LoRa_915) || defined(TTGO_T_Beam_V1_2_915) || defined(TTGO_T_Beam_V1_0_915)
     #define RADIO_SCLK_PIN  5      // GPIO5    - SX1278 SCK
     #define RADIO_MISO_PIN  19      // GPIO19   - SX1278 MISO
     #define RADIO_MOSI_PIN  27      // GPIO27   - SX1278 MOSI
@@ -28,7 +28,7 @@
     #define RADIO_BUSY_PIN  13  // SX1262 BUSY
 #endif
 
-#ifdef ESP32_DIY_1W_LoRa    // Ebyte E22 400M30S / SX1268
+#if defined(ESP32_DIY_1W_LoRa) || defined(ESP32_DIY_1W_LoRa_915)    // Ebyte E22 400M30S (SX1268) or E22 900M30S (SX1262)
     #define RADIO_SCLK_PIN  18
     #define RADIO_MISO_PIN  19
     #define RADIO_MOSI_PIN  23
@@ -82,7 +82,7 @@
     #define RADIO_BUSY_PIN  4    // SX1262 BUSY
 #endif
 
-#ifdef ESP32_DIY_LoRa_A7670
+#if defined(ESP32_DIY_LoRa_A7670) || defined(ESP32_DIY_LoRa_A7670_915)
     #define RADIO_SCLK_PIN  18
     #define RADIO_MISO_PIN  19
     #define RADIO_MOSI_PIN  23
@@ -106,10 +106,23 @@
     #define OLED_SDA        21
     #define OLED_SCL        22
     #define OLED_RST        36
-#endif   
+#endif
+
+#if defined(ESP32C3_DIY_1W_LoRa) || defined(ESP32C3_DIY_1W_LoRa_915)
+    #define RADIO_SCLK_PIN      8
+    #define RADIO_MISO_PIN      9
+    #define RADIO_MOSI_PIN      10
+    #define RADIO_CS_PIN        5
+    #define RADIO_RST_PIN       4
+    #define RADIO_DIO1_PIN      2
+    #define RADIO_BUSY_PIN      3
+    #define RADIO_RXEN          6
+    #define RADIO_TXEN          7
+#endif
+
 
 // OLED 
-#if defined(TTGO_T_LORA32_V2_1) || defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_1W_LoRa) || defined(TTGO_T_Beam_V1_0) || defined(TTGO_T_Beam_V1_2) || defined(TTGO_T_Beam_V1_0_SX1268) || defined(TTGO_T_Beam_V1_2_SX1262) || defined(OE5HWN_MeshCom) || defined(ESP32_DIY_LoRa_A7670) || defined(TTGO_T_LORA32_V2_1_915)
+#if defined(TTGO_T_LORA32_V2_1) || defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_1W_LoRa) || defined(TTGO_T_Beam_V1_0) || defined(TTGO_T_Beam_V1_2) || defined(TTGO_T_Beam_V1_0_SX1268) || defined(TTGO_T_Beam_V1_2_SX1262) || defined(OE5HWN_MeshCom) || defined(ESP32_DIY_LoRa_A7670) || defined(TTGO_T_LORA32_V2_1_915) || defined(ESP32_DIY_LoRa_915) || defined(TTGO_T_Beam_V1_0_915) || defined(TTGO_T_Beam_V1_2_915) || defined(ESP32_DIY_LoRa_A7670_915) || defined(ESP32_DIY_1W_LoRa_915)
     #define OLED_SDA    21
     #define OLED_SCL    22
     #define OLED_RST    -1      // Reset pin # (or -1 if sharing Arduino reset pin)
@@ -133,7 +146,7 @@
     #define OLED_RST    -1
 #endif
 
-#if !defined(HELTEC_HTCT62) && !defined(HELTEC_WSL_V3) && !defined(ESP32C3_DIY_1W_LoRa)
+#if !defined(HELTEC_HTCT62) && !defined(HELTEC_WSL_V3) && !defined(ESP32C3_DIY_1W_LoRa) && !defined(ESP32C3_DIY_1W_LoRa_915)
         #define HAS_DISPLAY
 #endif
 
@@ -143,7 +156,7 @@
 #endif
 #if defined(TTGO_T_LORA32_V2_1) || defined(TTGO_T_LORA32_V2_1_915)
     #define INTERNAL_LED_PIN    25      // Green Led
-    #define BATTERY_PIN         35      // es 35 el led y 1 bateria?
+    #define BATTERY_PIN         35
 #endif
 #if defined(HELTEC_V2)
     #define INTERNAL_LED_PIN    25
@@ -159,10 +172,10 @@
     #define BOARD_I2C_SCL       42
 #endif
 
-#if defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_1W_LoRa)
+#if defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_LoRa_915) || defined(ESP32_DIY_1W_LoRa) || defined(ESP32_DIY_1W_LoRa_915)
     #define INTERNAL_LED_PIN    2
 #endif
-#if defined(ESP32_DIY_LoRa_A7670)
+#if defined(ESP32_DIY_LoRa_A7670) || defined(ESP32_DIY_LoRa_A7670_915)
     #define INTERNAL_LED_PIN    13      // 13 for V1.1 and 12 for V1.0
     #define BATTERY_PIN         35
 #endif
@@ -176,7 +189,7 @@
     #define BOARD_I2C_SCL       6
 #endif
 
-#ifdef ESP32_C3_DIY_LoRa
+#ifdef ESP32_C3_DIY_LoRa        // just testing!
     #define OLED_SDA         8
     #define OLED_SCL         9
     #define OLED_RST         10
@@ -188,18 +201,6 @@
     #define RADIO_IRQ_PIN    2
 #endif
 
-#ifdef ESP32C3_DIY_1W_LoRa
-    #define RADIO_SCLK_PIN      8
-    #define RADIO_MISO_PIN      9
-    #define RADIO_MOSI_PIN      10
-    #define RADIO_CS_PIN        5
-    #define RADIO_RST_PIN       4
-    #define RADIO_DIO1_PIN      2
-    #define RADIO_BUSY_PIN      3
-    #define RADIO_RXEN          6
-    #define RADIO_TXEN          7
-#endif
-
 /* (Same pins for LILYGO LoRa32 and ESP32 Wroom Dev )
 SX1278-------------------> ESP32 ttgo-lora32-v21 and ESP32 WROOM Dev
 GND                         GND

src/digi_utils.cpp

@@ -24,35 +24,31 @@ extern bool             backUpDigiMode;
 
 namespace DIGI_Utils {
 
-    String generateDigiRepeatedPacket(const String& packet){
-        String temp0, path;
-        temp0 = packet.substring(packet.indexOf(">") + 1, packet.indexOf(":"));
-        if (temp0.indexOf(",") > 2) {
-            path = temp0.substring(temp0.indexOf(",") + 1, temp0.indexOf(":"));
-            if (path.indexOf("WIDE1-") >= 0) {
-                String hop = path.substring(path.indexOf("WIDE1-") + 6, path.indexOf("WIDE1-") + 7);
-                if (hop.toInt() >= 1 && hop.toInt() <= 7) {
-                    if (hop.toInt() == 1) {
-                        path.replace("WIDE1-1", Config.callsign + "*");
-                    } else {
-                        path.replace("WIDE1-" + hop, Config.callsign + "*,WIDE1-" + String(hop.toInt() - 1));
-                    }
+    String buildPacket(const String& path, const String& packet, bool thirdParty) {
+        String packetToRepeat = packet.substring(0, packet.indexOf(",") + 1);
+        String tempPath = path;
+        tempPath.replace(Config.beacon.path, Config.callsign + "*");
+        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;
+    }
 
-                    String repeatedPacket = packet.substring(0, packet.indexOf(">"));   // sender
-                    repeatedPacket += ">";
-                    repeatedPacket += temp0.substring(0, temp0.indexOf(","));           // tocall
-                    repeatedPacket += ",";
-                    repeatedPacket += path;
-
-                    String payload = packet.substring(packet.indexOf(":"));
-                    if (payload.indexOf("\x3c\xff\x01") != -1) {
-                        payload = payload.substring(0, payload.indexOf("\x3c\xff\x01"));
-                    }
-                    repeatedPacket += payload;
-                    return repeatedPacket;
-                } else {
-                    return "";
-                }
+    String generateDigiRepeatedPacket(const String& packet, bool thirdParty){
+        String temp;
+        if (thirdParty) { // only header is used
+            const String& header = packet.substring(0, packet.indexOf(":}"));
+            temp = header.substring(header.indexOf(">") + 1);
+        } else {
+            temp = packet.substring(packet.indexOf(">") + 1, packet.indexOf(":"));
+        }
+        if (temp.indexOf(",") > 2) { // checks for path
+            const String& path = temp.substring(temp.indexOf(",") + 1); // after tocall
+            if (path.indexOf(Config.beacon.path) != -1) {
+                return buildPacket(path, packet, thirdParty);
             } else {
                 return "";
             }
@@ -61,24 +57,37 @@ namespace DIGI_Utils {
         }
     }
 
-    void processLoRaPacket(const String& packet) {
-        bool queryMessage = false;
-        String loraPacket, Sender, AddresseeAndMessage, Addressee;
+    void processLoRaPacket(const String& packet) {        
         if (packet != "") {
             if ((packet.substring(0, 3) == "\x3c\xff\x01") && (packet.indexOf("NOGATE") == -1)) {
-                Sender = packet.substring(3, packet.indexOf(">"));
-                if (Sender != Config.callsign && Utils::checkValidCallsign(Sender)) {
-                    if (STATION_Utils::check25SegBuffer(Sender, packet.substring(packet.indexOf(":") + 2))) {
+                bool thirdPartyPacket = false;
+                String temp, Sender;
+                if (packet.indexOf("}") > 0 && packet.indexOf("TCPIP") > 0) {   // 3rd Party 
+                    thirdPartyPacket = true;
+                    temp    = packet.substring(packet.indexOf(":}") + 2);
+                    Sender  = temp.substring(0, temp.indexOf(">"));
+                } else {
+                    temp    = packet.substring(3);
+                    Sender  = packet.substring(3, packet.indexOf(">"));
+                }
+                if (Sender != Config.callsign) {        // Avoid listening to own packets
+                    if (!thirdPartyPacket && !Utils::checkValidCallsign(Sender)) {
+                        return;
+                    }
+                    if (STATION_Utils::check25SegBuffer(Sender, temp.substring(temp.indexOf(":") + 2))) {
                         STATION_Utils::updateLastHeard(Sender);
-                        Utils::typeOfPacket(packet.substring(3), 2);    // Digi
-                        AddresseeAndMessage = packet.substring(packet.indexOf("::") + 2);
-                        Addressee = AddresseeAndMessage.substring(0, AddresseeAndMessage.indexOf(":"));
-                        Addressee.trim();
-                        if (packet.indexOf("::") > 10 && Addressee == Config.callsign) {      // its a message for me!
-                            queryMessage = APRS_IS_Utils::processReceivedLoRaMessage(Sender, AddresseeAndMessage);
+                        Utils::typeOfPacket(temp, 2);    // Digi
+                        bool queryMessage = false;
+                        if (temp.indexOf("::") > 10) {   // it's a message
+                            String AddresseeAndMessage  = temp.substring(temp.indexOf("::") + 2);
+                            String Addressee            = AddresseeAndMessage.substring(0, AddresseeAndMessage.indexOf(":"));
+                            Addressee.trim();
+                            if (Addressee == Config.callsign) {     // it's a message for me!
+                                queryMessage = APRS_IS_Utils::processReceivedLoRaMessage(Sender, AddresseeAndMessage);
+                            }
                         }
-                        if (!queryMessage && packet.indexOf("WIDE1-") > 10 && (Config.digi.mode == 2 || backUpDigiMode)) { // If should repeat packet (WIDE1 Digi)
-                            loraPacket = generateDigiRepeatedPacket(packet.substring(3));
+                        if (!queryMessage) {
+                            String loraPacket = generateDigiRepeatedPacket(packet.substring(3), thirdPartyPacket);
                             if (loraPacket != "") {
                                 STATION_Utils::addToOutputPacketBuffer(loraPacket);
                                 display_toggle(true);

src/digi_utils.h

@@ -6,7 +6,8 @@
 
 namespace DIGI_Utils {
 
-    String  generateDigiRepeatedPacket(const String& packet);
+    String  buildPacket(const String& path, const String& packet, bool thirdParty);
+    String  generateDigiRepeatedPacket(const String& packet, bool thirdParty);
     void    processLoRaPacket(const String& packet);
 
 }

src/gps_utils.cpp

@@ -49,7 +49,9 @@ namespace GPS_Utils {
         for (i = 0; i < 4; i++) {
             encodedData += helper_base91[i];
         }
-        encodedData += symbol + " x" + "\x47";
+        encodedData += symbol;
+        encodedData += " x";
+        encodedData += "\x47";
         return encodedData;
     }
 
@@ -80,10 +82,10 @@ namespace GPS_Utils {
     }
 
     String decodeEncodedGPS(const String& packet) {
-        String GPSPacket            = packet.substring(packet.indexOf(":!")+3);
-        String encodedLatitude      = GPSPacket.substring(0,4);
-        String encodedLongtitude    = GPSPacket.substring(4,8);
-        String comment              = GPSPacket.substring(12);
+        const String& GPSPacket         = packet.substring(packet.indexOf(":!")+3);
+        const String& encodedLatitude   = GPSPacket.substring(0,4);
+        const String& encodedLongtitude = GPSPacket.substring(4,8);
+        const String& comment           = GPSPacket.substring(12);
 
         int Y1 = int(encodedLatitude[0]);
         int Y2 = int(encodedLatitude[1]);
@@ -96,12 +98,21 @@ namespace GPS_Utils {
         int X3 = int(encodedLongtitude[2]);
         int X4 = int(encodedLongtitude[3]);
         float decodedLongitude = -180.0 + ((((X1-33) * pow(91,3)) + ((X2-33) * pow(91,2)) + ((X3-33) * 91) + X4-33) / 190463.0);
+
         distance = String(calculateDistanceTo(decodedLatitude, decodedLongitude),1);
+
+        String decodedGPS = String(decodedLatitude,5);
+        decodedGPS += "N / ";
+        decodedGPS += String(decodedLongitude,5);
+        decodedGPS += "E / ";
+        decodedGPS += distance;
+        decodedGPS += "km";
+
         if (comment != "") {
-            return String(decodedLatitude,5) + "N / " + String(decodedLongitude,5) + "E / " + distance + "km / " + comment;
-        } else {
-            return String(decodedLatitude,5) + "N / " + String(decodedLongitude,5) + "E / " + distance + "km";
+            decodedGPS += " / ";
+            decodedGPS += comment;
         }
+        return decodedGPS;
     }
 
     String getReceivedGPS(const String& packet) {
@@ -111,36 +122,43 @@ namespace GPS_Utils {
         } else if (packet.indexOf(":=") > 10) {
             infoGPS = packet.substring(packet.indexOf(":=") + 2);
         }
-        String Latitude       = infoGPS.substring(0,8);
-        String Longitude      = infoGPS.substring(9,18);
-        String comment        = infoGPS.substring(19);  
-
-        float convertedLatitude, convertedLongitude;
-        String firstLatPart   = Latitude.substring(0,2);
-        String secondLatPart  = Latitude.substring(2,4);
-        String thirdLatPart   = Latitude.substring(Latitude.indexOf(".") + 1, Latitude.indexOf(".") + 3);
-        String firstLngPart   = Longitude.substring(0,3);
-        String secondLngPart  = Longitude.substring(3,5);
-        String thirdLngPart   = Longitude.substring(Longitude.indexOf(".") + 1, Longitude.indexOf(".") + 3);
+        const String& Latitude      = infoGPS.substring(0,8);
+        const String& Longitude     = infoGPS.substring(9,18);
+        const String& comment       = infoGPS.substring(19);  
         
+        float convertedLatitude, convertedLongitude;
+        const String& firstLatPart   = Latitude.substring(0,2);
+        const String& secondLatPart  = Latitude.substring(2,4);
+        const String& thirdLatPart   = Latitude.substring(Latitude.indexOf(".") + 1, Latitude.indexOf(".") + 3);
         convertedLatitude     = firstLatPart.toFloat() + (secondLatPart.toFloat()/60) + (thirdLatPart.toFloat()/(60*100));
+
+        const String& firstLngPart   = Longitude.substring(0,3);
+        const String& secondLngPart  = Longitude.substring(3,5);
+        const String& thirdLngPart   = Longitude.substring(Longitude.indexOf(".") + 1, Longitude.indexOf(".") + 3);        
         convertedLongitude    = firstLngPart.toFloat() + (secondLngPart.toFloat()/60) + (thirdLngPart.toFloat()/(60*100));
         
-        String LatSign = String(Latitude[7]);
-        String LngSign = String(Longitude[8]);
-        if (LatSign == "S") {
+        if (String(Latitude[7]) == "S") {
             convertedLatitude = -convertedLatitude;
         } 
-        if (LngSign == "W") {
+        if (String(Longitude[8]) == "W") {
             convertedLongitude = -convertedLongitude;
         }
+        
         distance = String(calculateDistanceTo(convertedLatitude, convertedLongitude),1);
+
+        String decodedGPS = String(convertedLatitude,5);
+        decodedGPS += "N / ";
+        decodedGPS += String(convertedLongitude,5);
+        decodedGPS += "E / ";
+        decodedGPS += distance;
+        decodedGPS += "km";
+
         if (comment != "") {
-            return String(convertedLatitude,5) + "N / " + String(convertedLongitude,5) + "E / " + distance + "km / " + comment;
-        } else {
-            return String(convertedLatitude,5) + "N / " + String(convertedLongitude,5) + "E / " + distance + "km";
+            decodedGPS += " / ";
+            decodedGPS += comment;
         }
-    }      
+        return decodedGPS;
+    }
 
     String getDistanceAndComment(const String& packet) {
         uint8_t encodedBytePosition = 0;

src/lora_utils.cpp

@@ -70,15 +70,15 @@ namespace LoRa_Utils {
             radio.setRfSwitchPins(RADIO_RXEN, RADIO_TXEN);
         #endif
 
-        #if defined(ESP32_DIY_1W_LoRa) || defined(OE5HWN_MeshCom) || defined(ESP32C3_DIY_1W_LoRa)
-            state = radio.setOutputPower(Config.loramodule.power); // max value 20dB for 400M30S as it has Low Noise Amp
+        #ifdef HAS_1W_LORA  // Ebyte E22 400M30S (SX1268) / 900M30S (SX1262)
+            state = radio.setOutputPower(Config.loramodule.power); // max value 20dB for 1W modules as they have Low Noise Amp
             radio.setCurrentLimit(140); // to be validated (100 , 120, 140)?
         #endif
         #if defined(HAS_SX1278) || defined(HAS_SX1276)
             state = radio.setOutputPower(Config.loramodule.power); // max value 20dB for 400M30S as it has Low Noise Amp
             radio.setCurrentLimit(100); // to be validated (80 , 100)?
         #endif
-        #if defined(HELTEC_V3)  || defined(HELTEC_WSL_V3) || defined(HELTEC_WS) || defined(TTGO_T_Beam_V1_0_SX1268) || defined(TTGO_T_Beam_V1_2_SX1262)
+        #if (defined(HAS_SX1268) || defined(HAS_SX1262)) && !defined(HAS_1W_LORA)
             state = radio.setOutputPower(Config.loramodule.power + 2); // values available: 10, 17, 22 --> if 20 in tracker_conf.json it will be updated to 22.
             radio.setCurrentLimit(140);
         #endif

src/query_utils.cpp

@@ -15,7 +15,7 @@ namespace QUERY_Utils {
     String process(const String& query, const String& station, const uint8_t queryOrigin) {
         String answer;
         if (query=="?APRS?" || query=="?aprs?" || query=="?Aprs?" || query=="H" || query=="h" || query=="HELP" || query=="Help" || query=="help" || query=="?") {
-            answer = "?APRSV ?APRSP ?APRSL ?APRSH ?WHERE callsign";
+            answer.concat("?APRSV ?APRSP ?APRSL ?APRSH ?WHERE callsign");
         } else if (query=="?APRSV" || query=="?aprsv" || query=="?Aprsv") {
             answer = "CA2RXU_LoRa_iGate 1.3 v";
             answer.concat(versionDate);
@@ -42,25 +42,33 @@ namespace QUERY_Utils {
         } else if (query.indexOf("?APRSH") == 0 || query.indexOf("?aprsh") == 0 || query.indexOf("?Aprsh") == 0) {
             // sacar callsign despues de ?APRSH
             Serial.println("escuchaste a X estacion? en las ultimas 24 o 8 horas?");
-            answer = "?APRSH on development 73!";
+            answer.concat("?APRSH on development 73!");
         } else if (query.indexOf("?WHERE") == 0) { 
             // agregar callsign para completar donde esta X callsign --> posicion
             Serial.println("estaciones escuchadas directo (ultimos 30 min)");
-            answer = "?WHERE on development 73!";
+            answer.concat("?WHERE on development 73!");
         }
         String processedStation = station;
         for (int i = station.length(); i < 9; i++) {
             processedStation += ' ';
         }
+        String queryAnswer = Config.callsign;
+        queryAnswer += ">APLRG1,";
         if (queryOrigin == 1) { // from APRS-IS
-            return Config.callsign + ">APLRG1,TCPIP,qAC::" + processedStation + ":" + answer;
-        } else { // else == 0 , from LoRa
+            queryAnswer += "TCPIP,qAC::";
+        } else {                // else == 0 , from LoRa
             if (Config.beacon.path == "") {
-                return Config.callsign + ">APLRG1,RFONLY::" + processedStation + ":" + answer;
+                queryAnswer += "RFONLY::";
             } else {
-                return Config.callsign + ">APLRG1,RFONLY," + Config.beacon.path + "::" + processedStation + ":" + answer;
+                queryAnswer += "RFONLY,";
+                queryAnswer += Config.beacon.path;
+                queryAnswer += "::";
             }
         }
+        queryAnswer += processedStation;
+        queryAnswer += ":";
+        queryAnswer += answer;
+        return queryAnswer;
     }
 
 }

src/station_utils.cpp

@@ -81,9 +81,9 @@ namespace STATION_Utils {
         if (!packet25SegBuffer.empty()) {
             bool shouldBeIgnored = false;
             for (int i = 0; i < packet25SegBuffer.size(); i++) {
-                String temp = packet25SegBuffer[i].substring(packet25SegBuffer[i].indexOf(",") + 1);
-                String bufferStation = temp.substring(0, temp.indexOf(","));
-                String bufferMessage = temp.substring(temp.indexOf(",") + 1);
+                const String& temp          = packet25SegBuffer[i].substring(packet25SegBuffer[i].indexOf(",") + 1);
+                const String& bufferStation = temp.substring(0, temp.indexOf(","));
+                const String& bufferMessage = temp.substring(temp.indexOf(",") + 1);
                 if (bufferStation == station && bufferMessage == textMessage) {
                     shouldBeIgnored = true;
                 }
@@ -101,9 +101,9 @@ namespace STATION_Utils {
     }
 
     void processOutputPacketBuffer() {
-        int timeToWait = 3 * 1000;      // 3 segs between packet Tx and also Rx ???
-        uint32_t lastRx = millis() - lastRxTime;
-        uint32_t lastTx = millis() - lastTxTime;
+        int timeToWait   = 3 * 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) {
             LoRa_Utils::sendNewPacket(outputPacketBuffer[0]);
             outputPacketBuffer.erase(outputPacketBuffer.begin());

src/utils.cpp

@@ -104,9 +104,6 @@ namespace Utils {
 
     void checkBeaconInterval() {
         uint32_t lastTx = millis() - lastBeaconTx;
-        String beaconPacket             = iGateBeaconPacket;
-        String secondaryBeaconPacket    = iGateLoRaBeaconPacket;
-
         if (lastBeaconTx == 0 || lastTx >= Config.beacon.interval * 60 * 1000) {
             beaconUpdate = true;    
         }
@@ -121,6 +118,8 @@ namespace Utils {
 
             activeStations();
 
+            String beaconPacket             = iGateBeaconPacket;
+            String secondaryBeaconPacket    = iGateLoRaBeaconPacket;
             if (Config.bme.active && wxModuleType != 0) {
                 String sensorData = BME_Utils::readDataSensor();
                 beaconPacket += sensorData;
@@ -129,26 +128,26 @@ namespace Utils {
                 beaconPacket += ".../...g...t...r...p...P...h..b.....";
                 secondaryBeaconPacket += ".../...g...t...r...p...P...h..b.....";
             }
-            beaconPacket += Config.beacon.comment;
-            secondaryBeaconPacket += Config.beacon.comment;
+            beaconPacket            += Config.beacon.comment;
+            secondaryBeaconPacket   += Config.beacon.comment;
 
             #if defined(BATTERY_PIN) || defined(HAS_AXP192) || defined(HAS_AXP2101)
                 if (Config.battery.sendInternalVoltage || Config.battery.monitorInternalVoltage) {
                     float internalVoltage       = BATTERY_Utils::checkInternalVoltage();
                     String internalVoltageInfo  = String(internalVoltage,2) + "V";
                     if (Config.battery.sendInternalVoltage) {
-                        beaconPacket += " Batt=";
-                        beaconPacket += internalVoltageInfo;
-                        secondaryBeaconPacket += " Batt=";
-                        secondaryBeaconPacket += internalVoltageInfo;
-                        sixthLine = "    (Batt=";
-                        sixthLine += internalVoltageInfo;
-                        sixthLine += ")";
+                        beaconPacket            += " Batt=";
+                        beaconPacket            += internalVoltageInfo;
+                        secondaryBeaconPacket   += " Batt=";
+                        secondaryBeaconPacket   += internalVoltageInfo;
+                        sixthLine               = "    (Batt=";
+                        sixthLine               += internalVoltageInfo;
+                        sixthLine               += ")";
                     }
                     if (Config.battery.monitorInternalVoltage && internalVoltage < Config.battery.internalSleepVoltage) {
-                        beaconPacket += " **IntBatWarning:SLEEP**";
-                        secondaryBeaconPacket += " **IntBatWarning:SLEEP**";
-                        shouldSleepLowVoltage = true;
+                        beaconPacket            += " **IntBatWarning:SLEEP**";
+                        secondaryBeaconPacket   += " **IntBatWarning:SLEEP**";
+                        shouldSleepLowVoltage   = true;
                     }                    
                 }
             #endif
@@ -157,25 +156,25 @@ namespace Utils {
                 float externalVoltage       = BATTERY_Utils::checkExternalVoltage();
                 String externalVoltageInfo  = String(externalVoltage,2) + "V";
                 if (Config.battery.sendExternalVoltage) {
-                    beaconPacket += " Ext=";
-                    beaconPacket += externalVoltageInfo;
-                    secondaryBeaconPacket += " Ext=";
-                    secondaryBeaconPacket += externalVoltageInfo;
-                    sixthLine = "    (Ext V=";
-                    sixthLine += externalVoltageInfo;
-                    sixthLine += ")";
+                    beaconPacket            += " Ext=";
+                    beaconPacket            += externalVoltageInfo;
+                    secondaryBeaconPacket   += " Ext=";
+                    secondaryBeaconPacket   += externalVoltageInfo;
+                    sixthLine               = "    (Ext V=";
+                    sixthLine               += externalVoltageInfo;
+                    sixthLine               += ")";
                 }
                 if (Config.battery.monitorExternalVoltage && externalVoltage < Config.battery.externalSleepVoltage) {
-                    beaconPacket += " **ExtBatWarning:SLEEP**";
-                    secondaryBeaconPacket += " **ExtBatWarning:SLEEP**";
-                    shouldSleepLowVoltage = true;
+                    beaconPacket            += " **ExtBatWarning:SLEEP**";
+                    secondaryBeaconPacket   += " **ExtBatWarning:SLEEP**";
+                    shouldSleepLowVoltage   = true;
                 }
             }
 
             if (Config.aprs_is.active && Config.beacon.sendViaAPRSIS && !backUpDigiMode) {
                 show_display(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, "SENDING IGATE BEACON", 0); 
                 seventhLine = "     listening...";
-                #ifdef ESP32_DIY_LoRa_A7670
+                #ifdef HAS_A7670
                     A7670_Utils::uploadToAPRSIS(beaconPacket);
                 #else
                     APRS_IS_Utils::upload(beaconPacket);
@@ -334,11 +333,9 @@ namespace Utils {
         if (callsign.indexOf("-")) {    // SSID Validation
             cleanCallsign = callsign.substring(0, callsign.indexOf("-"));
             String ssid = callsign.substring(callsign.indexOf("-") + 1);
-            int ssidInt = ssid.toInt();
-            if (ssidInt == 0 && ssid != "0") {
-                return false;
-            } else if (ssidInt < 0 || ssidInt > 15) {
-                return false;
+            if (ssid.indexOf("-") != -1 || ssid.length() > 2) return false;
+            for (int i = 0; i < ssid.length(); i++) {
+                if (!isAlphaNumeric(ssid[i])) return false;
             }
         } else {
             cleanCallsign = callsign;