gps payload decoding fix

added Heltec VisionMaster E290 and WirelessPaper V1.2

.github/workflows/build.yml

@@ -71,6 +71,10 @@ jobs:
                       chip: esp32c3
                     - name: heltec_wireless_paper_v1
                       chip: esp32s3
+                    - name: heltec_wireless_paper_v1_2
+                      chip: esp32s3
+                    - name: heltec_vision_master_e290
+                      chip: esp32s3
                     - name: OE5HWN_MeshCom
                       chip: esp32
                     - name: WEMOS-LOLIN32-OLED-DIY

README.md

@@ -51,6 +51,7 @@ ____________________________________________________
 <br />
 
 # Timeline (Versions):
+- 2025-12-22 Heltec Wireless Paper V1.2 and VisionMaster E290 Added. Thanks HA5SZI.
 - 2025-12-18 TCXO and packet decoding updates.
 - 2025-12-01 APRSPacketLib updates, AHT20 sensor added, INA219 support added.
 - 2025-10-15 APRS Bridge for TNC added.

src/LoRa_APRS_iGate.cpp

@@ -67,8 +67,8 @@ ___________________________________________________________________*/
 #endif
 
 
-String              versionDate             = "2025-12-22";
-String              versionNumber           = "3.1.6.2";
+String              versionDate             = "2025-12-28";
+String              versionNumber           = "3.1.6.3";
 Configuration       Config;
 WiFiClient          aprsIsClient;
 WiFiClient          mqttClient;

src/display.cpp

@@ -47,9 +47,9 @@
             #ifdef HELTEC_WP_V1
                 EInkDisplay_WirelessPaperV1_1 display;
             #endif
-            /*#ifdef HELTEC_WP_V1_2
+            #ifdef HELTEC_WP_V1_2
                 EInkDisplay_WirelessPaperV1_2 display;
-            #endif*/
+            #endif
             #ifdef HELTEC_VM_E290
                 EInkDisplay_VisionMasterE290 display;
             #endif
@@ -100,17 +100,14 @@ void displaySetup() {
             #ifdef HAS_EPAPER
                 display.landscape();
                 display.printCenter("LoRa APRS iGate Initialising...");
-                if (Config.display.turn180) 
-                    #ifdef HELTEC_VM_E290 
+                if (Config.display.turn180) {
+                    #if defined(HELTEC_VM_E290) || defined(HELTEC_WP_V1)
                         display.setRotation(3);
-                    #else
-                        #ifdef HELTEC_WP_V1_2
-                            display.setRotation(1);
-                        #else
-                            display.setRotation(3)
-                        #endif
                     #endif
-
+                    #if defined(HELTEC_WP_V1_2)
+                        display.setRotation(1);
+                    #endif
+                }
                 display.update();
             #else
                 #ifdef OLED_DISPLAY_HAS_RST_PIN

src/gps_utils.cpp

@@ -138,30 +138,37 @@ namespace GPS_Utils {
 
     String getDistanceAndComment(const String& packet) {
         int indexOfAt = packet.indexOf(":@");
-        if (indexOfAt > 10) {
-            return getReceivedGPS(packet);
-        } else {
-            const uint8_t ENCODED_BYTE_OFFSET = 14;     // Offset for encoded data in the packet
-            int indexOfExclamation  = packet.indexOf(":!");
-            int indexOfEqual        = packet.indexOf(":=");
-            uint8_t encodedBytePosition = 0;
-            if (indexOfExclamation > 10) {              // Determine the position where encoded data starts
-                encodedBytePosition = indexOfExclamation + ENCODED_BYTE_OFFSET;
-            } else if (indexOfEqual > 10) {
-                encodedBytePosition = indexOfEqual + ENCODED_BYTE_OFFSET;
-            }
+        if (indexOfAt > 10) return getReceivedGPS(packet);
 
-            if (encodedBytePosition != 0) {
-                char currentChar = packet[encodedBytePosition];
-                if (currentChar == 'G' || currentChar == 'Q' || currentChar == '[' || currentChar == 'H' || currentChar == 'X' || currentChar == '3') {
-                    return decodeEncodedGPS(packet);    // If valid encoded data position is found, decode it
-                } else {
-                    return getReceivedGPS(packet);
-                }
-            } else {
-                return " _ / _ / _ ";
-            }
+        const uint8_t nonEncondedLatitudeOffset     = 9;    // "N" / "S"
+        const uint8_t nonEncondedLongitudeOffset    = 19;   // "E" / "W"
+        const uint8_t encondedByteOffset            = 14;
+        
+        int indexOfExclamation  = packet.indexOf(":!");
+        int indexOfEqual        = packet.indexOf(":=");
+        int baseIndex           = - 1;
+        if (indexOfExclamation > 10) {
+            baseIndex = indexOfExclamation;
+        } else if (indexOfEqual > 10) {
+            baseIndex = indexOfEqual;
         }
+        if (baseIndex == -1) return " _ / _ / _ ";
+
+        int latitudeIndex       = baseIndex + nonEncondedLatitudeOffset;
+        int longitudeIndex      = baseIndex + nonEncondedLongitudeOffset;
+        int encondedByteIndex   = baseIndex + encondedByteOffset;
+        int packetLength        = packet.length();
+
+        if (latitudeIndex >= packetLength || longitudeIndex >= packetLength || encondedByteIndex >= packetLength) return " _ / _ / _ ";
+
+        char latChar = packet[latitudeIndex];
+        char lngChar = packet[longitudeIndex];
+        if ((latChar == 'N' || latChar == 'S') && (lngChar == 'E' || lngChar == 'W')) return getReceivedGPS(packet);
+        
+        char byteChar = packet[encondedByteIndex];
+        if (byteChar == 'G' || byteChar == 'Q' || byteChar == '[' || byteChar == 'H' || byteChar == 'X' || byteChar == '3') return decodeEncodedGPS(packet);
+
+        return " _ / _ / _ ";
     }
 
     void setup() {

src/power_utils.cpp

@@ -52,7 +52,7 @@ namespace POWER_Utils {
             #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3) || defined(HELTEC_VM_E290)
                 digitalWrite(VEXT_CTRL, Config.digi.ecoMode == 1 ? LOW : HIGH);
             #endif
-            #if defined(HELTEC_WP_V1) || defined(HELTEC_WS) || defined(HELTEC_V3_2) || defined(HELTEC_WSL_V3)
+            #if defined(HELTEC_WP_V1) || defined(HELTEC_WP_V1_2) || defined(HELTEC_WS) || defined(HELTEC_V3_2) || defined(HELTEC_WSL_V3)
                 digitalWrite(VEXT_CTRL, Config.digi.ecoMode == 1 ? HIGH : LOW);
             #endif
         }
@@ -61,7 +61,7 @@ namespace POWER_Utils {
             #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3) || defined(HELTEC_VM_E290)
                 digitalWrite(VEXT_CTRL, Config.digi.ecoMode == 1 ? HIGH : LOW);
             #endif
-            #if defined(HELTEC_WP_V1) || defined(HELTEC_WS) || defined(HELTEC_V3_2) || defined(HELTEC_WSL_V3)
+            #if defined(HELTEC_WP_V1) || defined(HELTEC_WP_V1_2) || defined(HELTEC_WS) || defined(HELTEC_V3_2) || defined(HELTEC_WSL_V3)
                 digitalWrite(VEXT_CTRL, Config.digi.ecoMode == 1 ? LOW : HIGH);
             #endif
         }
@@ -73,7 +73,7 @@ namespace POWER_Utils {
             #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3_2) || defined(HELTEC_VM_E290)
                 digitalWrite(ADC_CTRL, HIGH);
             #endif
-            #if defined(HELTEC_V3) || defined(HELTEC_V2) || defined(HELTEC_WSL_V3) || defined(HELTEC_WP_V1)
+            #if defined(HELTEC_V3) || defined(HELTEC_V2) || defined(HELTEC_WSL_V3) || defined(HELTEC_WP_V1) || defined(HELTEC_WP_V1_2)
                 digitalWrite(ADC_CTRL, LOW);
             #endif
         }
@@ -82,7 +82,7 @@ namespace POWER_Utils {
             #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3_2) || defined(HELTEC_VM_E290)
                 digitalWrite(ADC_CTRL, LOW);
             #endif
-            #if defined(HELTEC_V3) || defined(HELTEC_V2) || defined(HELTEC_WSL_V3) || defined(HELTEC_WP_V1)
+            #if defined(HELTEC_V3) || defined(HELTEC_V2) || defined(HELTEC_WSL_V3) || defined(HELTEC_WP_V1) || defined(HELTEC_WP_V1_2)
                 digitalWrite(ADC_CTRL, HIGH);
             #endif
         }

variants/heltec_vision_master_e290/platformio.ini

@@ -7,10 +7,7 @@ build_flags =
 	-D RADIOLIB_EXCLUDE_SX127X=1
 	-D RADIOLIB_EXCLUDE_SX128X=1
 	-D HELTEC_VM_E290
-	-D Vision_Master_E290 ; Todd Herbert eink display driver constructor
-	-D USE_EINK_DYNAMICDISPLAY            ; Enable Dynamic EInk
-	-D EINK_LIMIT_FASTREFRESH=10          ; How many consecutive fast-refreshes are permitted
-	-D EINK_HASQUIRK_GHOSTING             ; Display model is identified as "prone to ghosting"
+	-D Vision_Master_E290
 lib_deps =
 	${common.lib_deps}
 	https://github.com/todd-herbert/heltec-eink-modules.git

variants/heltec_wireless_paper_v1_2/board_pinout.h

@@ -0,0 +1,56 @@
+/* Copyright (C) 2025 Ricardo Guzman - CA2RXU
+ * 
+ * This file is part of LoRa APRS iGate.
+ * 
+ * LoRa APRS iGate is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or 
+ * (at your option) any later version.
+ * 
+ * LoRa APRS iGate is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with LoRa APRS iGate. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1262
+    #define HAS_TCXO
+    #define RADIO_SCLK_PIN          9
+    #define RADIO_MISO_PIN          11
+    #define RADIO_MOSI_PIN          10
+    #define RADIO_CS_PIN            8
+    #define RADIO_RST_PIN           12
+    #define RADIO_DIO1_PIN          14
+    #define RADIO_BUSY_PIN          13
+    #define RADIO_WAKEUP_PIN        RADIO_DIO1_PIN
+    #define GPIO_WAKEUP_PIN         GPIO_SEL_14
+
+    //  I2C
+    #define USE_WIRE1_WITH_BOARD_I2C_PINS
+    #define BOARD_I2C_SDA           37
+    #define BOARD_I2C_SCL           36
+
+    //  Display
+    #define HAS_DISPLAY
+    #define HAS_EPAPER
+    #define EPAPER_BUSY             7
+    #define EPAPER_RST              6
+    #define EPAPER_DC               5
+    #define EPAPER_CS               4
+    #define EPAPER_SCL              3
+    #define EPAPER_SDA              2
+
+    //  Aditional Config
+    #define INTERNAL_LED_PIN        18
+    #define BATTERY_PIN             20
+    #define ADC_CTRL                19
+    #define VEXT_CTRL               45
+
+#endif

variants/heltec_wireless_paper_v1_2/platformio.ini

@@ -0,0 +1,14 @@
+[env:heltec_wireless_paper_v1_2]
+board = esp32-s3-devkitc-1
+board_build.mcu = esp32s3
+build_flags =
+	${common.build_flags}
+	-D RADIOLIB_EXCLUDE_LR11X0=1
+	-D RADIOLIB_EXCLUDE_SX127X=1
+	-D RADIOLIB_EXCLUDE_SX128X=1
+	-D HELTEC_WP_V1_2
+	-D WIRELESS_PAPER
+	-D V1_2
+lib_deps =
+	${common.lib_deps}
+	https://github.com/todd-herbert/heltec-eink-modules.git