Merge pull request #649 from drowe67/ms-grid-square-math

Fix issue preventing usage of the 5th and 6th letter of the grid square.
drowe67 · Jan 12, 2024 · 7efb0e5 · 7efb0e5
2 parents 21fedeb + a66d58a
commit 7efb0e5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/USER_MANUAL.md b/USER_MANUAL.md
@@ -903,7 +903,7 @@ LDPC | Low Density Parity Check Codes - a family of powerful FEC codes
     * Update Filter dialog to better handle resizing. (PR #641)
     * Fix capitalization of distance units in FreeDV Reporter window. (PR #642)
     * Rename KHz to kHz in documentation and UI. (PR #643)
-    * Avoid calculating distances in FreeDV Reporter window for those with invalid grid squares. (PR #646)
+    * Avoid calculating distances in FreeDV Reporter window for those with invalid grid squares. (PR #646, #649)
     * Fix display bugs in FreeDV Reporter window when switching between dark and light mode. (PR #646)
 2. Enhancements:
     * Allow user to refresh status message even if it hasn't been changed. (PR #632)

diff --git a/src/freedv_reporter.cpp b/src/freedv_reporter.cpp
@@ -901,7 +901,7 @@ void FreeDVReporterDialog::calculateLatLonFromGridSquare_(wxString gridSquare, d
     // If grid square is 6 or more letters, THEN use the next two.
     // Otherwise, optional.
     wxString optionalSegment = gridSquare.Mid(4, 2);
-    wxRegEx allLetters(_("^[a-z]{2}$"));
+    wxRegEx allLetters(_("^[A-Z]{2}$"));
     if (gridSquare.Length() >= 6 && allLetters.Matches(optionalSegment))
     {
         lon += ((char)gridSquare.GetChar(4) - charA) * 5.0 / 60;