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

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/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() {

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