diff --git a/Configuration.cpp b/Configuration.cpp index 95499f7..e484772 100644 --- a/Configuration.cpp +++ b/Configuration.cpp @@ -196,11 +196,11 @@ namespace int const combo_box_item_disabled (0); // QRegExp message_alphabet {"[- A-Za-z0-9+./?]*"}; - QRegExp message_alphabet {"[- @A-Za-z0-9+./?#<>]*"}; + QRegExp message_alphabet {"[^\\x00-\\x1F]*"}; // Magic numbers for file validation constexpr quint32 qrg_magic {0xadbccbdb}; - constexpr quint32 qrg_version {100}; // M.mm + constexpr quint32 qrg_version {101}; // M.mm } diff --git a/mainwindow.cpp b/mainwindow.cpp index cb1a749..6da5dc7 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -163,7 +163,7 @@ QVector g_ColorTbl; namespace { Radio::Frequency constexpr default_frequency {14074000}; - QRegExp message_alphabet {"[- A-Za-z0-9+./?:!]*"}; // base alphabet supported by FT8 + QRegExp message_alphabet {"[^\\x00-\\x1F]*"}; // base alphabet supported by FT8CALL // grid exact match excluding RR73 QRegularExpression grid_regexp {"\\A(?![Rr]{2}73)[A-Ra-r]{2}[0-9]{2}([A-Xa-x]{2}){0,1}\\z"};