From f67ea3803dce3ef1f732b4aa4457d302edbcaa5a Mon Sep 17 00:00:00 2001 From: Jordan Sherer Date: Wed, 25 Jul 2018 20:24:22 -0400 Subject: [PATCH] Changed to a better callsign validator expression --- varicode.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/varicode.cpp b/varicode.cpp index d982a4b..c8f4a7a 100644 --- a/varicode.cpp +++ b/varicode.cpp @@ -30,7 +30,8 @@ const int nalphabet = 41; QString alphabet = {"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ+-./?"}; QString grid_pattern = {R"((?[A-R]{2}[0-9]{2})+)"}; -QString compound_callsign_pattern = {R"((?(\d|[A-Z])+\/?((\d|[A-Z]){2,})(\/(\d|[A-Z])+)?(\/(\d|[A-Z])+)?))"}; +QString orig_compound_callsign_pattern = {R"((?(\d|[A-Z])+\/?((\d|[A-Z]){2,})(\/(\d|[A-Z])+)?(\/(\d|[A-Z])+)?))"}; +QString compound_callsign_pattern = {R"((?([A-Z0-9]{1,4}\/)?([0-9A-Z])?([0-9A-Z])([0-9])([A-Z])?([A-Z])?([A-Z])?(\/[A-Z0-9]{1,4})?))"}; QString pack_callsign_pattern = {R"(([0-9A-Z ])([0-9A-Z])([0-9])([A-Z ])([A-Z ])([A-Z ]))"}; QString callsign_alphabet = {"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ "}; @@ -47,7 +48,8 @@ QMap directed_cmds = { {"|", 6 }, // relay message? {"!", 7 }, // alert message? - // {"/", 8 }, // unused? (can we even use stroke?) + // {"=", 8 }, // unused? (can we even use equals?) + // {"/", 9 }, // unused? (can we even use stroke?) // directed responses {" ACK", 23 }, // acknowledged