chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added checksum generation and ACK

Browse Source
This commit is contained in:
Jordan Sherer 2018-07-23 08:51:29 -04:00
parent 20d931a9ca
commit c0833aa753
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
varicode.cpp
View File

@ -44,8 +44,10 @@ QMap<QString, int> directed_cmds = {
{"&", 2 }, // query station message {"&", 2 }, // query station message
{"$", 3 }, // query station(s) heard {"$", 3 }, // query station(s) heard
{"|", 4 }, // relay message {"|", 4 }, // relay message
{"!", 5 }, // alert message
// directed responses // directed responses
{" ACK", 23 }, // acknowledge
{" PWR", 24 }, // power level {" PWR", 24 }, // power level
{" SNR", 25 }, // seen a station at the provided snr {" SNR", 25 }, // seen a station at the provided snr
{" NO", 26 }, // negative confirm {" NO", 26 }, // negative confirm
@ -56,11 +58,11 @@ QMap<QString, int> directed_cmds = {
{" ", 31 }, // send freetext {" ", 31 }, // send freetext
}; };
QSet<int> allowed_cmds = {0, 1, 2, 24, 25, 26, 27, 28, 29, 30, 31}; QSet<int> allowed_cmds = {0, 1, 2, /*3,*/ 4, /*5,*/ 23, 24, 25, 26, 27, 28, 29, 30, 31};
QRegularExpression directed_re("^" QRegularExpression directed_re("^"
"(?<to>[A-Z0-9/]+)" "(?<to>[A-Z0-9/]+)"
"(?<cmd>\\s?(?:AGN[?]|RR|73|YES|NO|SNR|PWR|[?$@&| ]))" "(?<cmd>\\s?(?:AGN[?]|RR|73|YES|NO|SNR|PWR|ACK|[?$@&|! ]))"
"(?<pwr>\\s?\\d+\\s?[KM]?W)?" "(?<pwr>\\s?\\d+\\s?[KM]?W)?"
"(?<num>\\s?[-+]?(?:3[01]|[0-2]?[0-9]))?" "(?<num>\\s?[-+]?(?:3[01]|[0-2]?[0-9]))?"
); );
@ -191,6 +193,22 @@ QString Varicode::formatPWR(int dbm){
return QString("%1W").arg(mwatts/1000); return QString("%1W").arg(mwatts/1000);
} }
QString Varicode::checksum(QString const &input){
auto fromBytes = input.toLocal8Bit();
auto crc = CRC::Calculate(fromBytes.data(), fromBytes.length(), CRC::CRC_16_KERMIT());
auto checksum = Varicode::pack16bits(crc);
if(checksum.length() < 3){
checksum += QString(" ").repeated(3-checksum.length());
}
return checksum;
}
bool Varicode::checksumValid(QString const &checksum, QString const &input){
auto fromBytes = input.toLocal8Bit();
auto crc = CRC::Calculate(fromBytes.data(), fromBytes.length(), CRC::CRC_16_KERMIT());
return Varicode::pack16bits(crc) == checksum;
}
QStringList Varicode::parseCallsigns(QString const &input){ QStringList Varicode::parseCallsigns(QString const &input){
QStringList callsigns; QStringList callsigns;
QRegularExpression re(callsign_pattern2); QRegularExpression re(callsign_pattern2);

3
varicode.h
View File

@ -30,6 +30,9 @@ public:
static QString formatSNR(int snr); static QString formatSNR(int snr);
static QString formatPWR(int dbm); static QString formatPWR(int dbm);
static QString checksum(QString const &input);
static bool checksumValid(QString const &checksum, QString const &input);
static QStringList parseCallsigns(QString const &input); static QStringList parseCallsigns(QString const &input);
static QStringList parseGrids(QString const &input); static QStringList parseGrids(QString const &input);