From 52177a05139877f90d32595780318a1361fda130 Mon Sep 17 00:00:00 2001
From: Jordan Sherer <jordan@widefido.com>
Date: Wed, 10 Oct 2018 10:10:30 -0400
Subject: [PATCH] Fixed parsing of commands to not split up command words

---
 varicode.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/varicode.cpp b/varicode.cpp
index f83031c..42a3c8a 100644
--- a/varicode.cpp
+++ b/varicode.cpp
@@ -96,7 +96,7 @@ QMap<int, int> checksum_cmds = {
 };
 
 QString callsign_pattern = QString("(?<callsign>[A-Z0-9/]+)");
-QString optional_cmd_pattern = QString("(?<cmd>\\s?(?:BEACON (ACK|REQ)|AGN[?]|ACK\\b|73\\b|YES\\b|NO\\b|SNR\\b|QSL[?]|QSL\\b|RR\\b|HEARING\\b|HW CPY[?]|FB\\b|QTH\\b|QTC\\b|GRID\\b|APRS[:]|QRZ[?]|[?@&$%#^> ]))?");
+QString optional_cmd_pattern = QString("(?<cmd>\\s?(?:BEACON (ACK|REQ)|AGN[?]|QSL[?]|HW CPY[?]|APRS[:]|QRZ[?]|(?:ACK|73|YES|NO|SNR|QSL|RR|HEARING|FB|QTH|QTC|GRID)(?= |$)|[?@&$%#^> ]))?");
 QString optional_grid_pattern = QString("(?<grid>\\s?[A-R]{2}[0-9]{2})?");
 QString optional_extended_grid_pattern = QString("^(?<grid>\\s?(?:[A-R]{2}[0-9]{2}(?:[A-X]{2}(?:[0-9]{2})?)*))?");
 QString optional_num_pattern = QString("(?<num>(?<=SNR|HEARING|BEACON ACK)\\s?[-+]?(?:3[01]|[0-2]?[0-9]))?");