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

Fixed bug in checksuming of buffered messages

Browse Source
This commit is contained in:
Jordan Sherer 2018-07-27 01:24:38 -04:00
parent bf11d66f60
commit 2158722ebc
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mainwindow.cpp
View File

@ -248,6 +248,16 @@ namespace
int roundDown = ( (int) (numToRound) / multiple) * multiple; int roundDown = ( (int) (numToRound) / multiple) * multiple;
return roundDown + multiple; return roundDown + multiple;
} }
QString rstrip(const QString& str) {
int n = str.size() - 1;
for (; n >= 0; --n) {
if (!str.at(n).isSpace()) {
return str.left(n + 1);
}
}
return "";
}
} }
//--------------------------------------------------- MainWindow constructor //--------------------------------------------------- MainWindow constructor
@ -3242,12 +3252,13 @@ void MainWindow::readFromStdout() //readFromStdout
d.isCompound = decodedtext.isCompoundMessage(); d.isCompound = decodedtext.isCompoundMessage();
d.bits = decodedtext.bits(); d.bits = decodedtext.bits();
d.freq = offset; d.freq = offset;
d.text = decodedtext.messageWords().isEmpty() ? "" : decodedtext.messageWords().first().trimmed(); d.text = decodedtext.message(); //decodedtext.messageWords().isEmpty() ? "" : decodedtext.messageWords().first().trimmed();
d.utcTimestamp = QDateTime::currentDateTimeUtc(); d.utcTimestamp = QDateTime::currentDateTimeUtc();
d.snr = decodedtext.snr(); d.snr = decodedtext.snr();
m_bandActivity[offset].append(d); m_bandActivity[offset].append(d);
if(m_messageBuffer.contains(d.freq/10*10)){ if(m_messageBuffer.contains(d.freq/10*10)){
qDebug() << "buffering" << (d.freq/10*10) << d.text;
m_messageBuffer[d.freq/10*10].msgs.append(d); m_messageBuffer[d.freq/10*10].msgs.append(d);
} }
@ -5701,7 +5712,9 @@ QPair<QStringList, QStringList> MainWindow::buildFT8MessageFrames(QString const&
if(Varicode::isCommandBuffered(dirCmd) && !line.isEmpty()){ if(Varicode::isCommandBuffered(dirCmd) && !line.isEmpty()){
// TODO: jsherer - this is how we can add 16-bit checksum to the message, just encode it in the data... // TODO: jsherer - this is how we can add 16-bit checksum to the message, just encode it in the data...
line = Varicode::checksum16(line) + " " + line; qDebug() << "generating checksum for line" << line;
line = line + " " + Varicode::checksum16(line);
qDebug() << line;
} }
} }
@ -8642,15 +8655,18 @@ void MainWindow::displayActivity(bool force){
foreach(auto part, buffer.msgs){ foreach(auto part, buffer.msgs){
message.append(part.text); message.append(part.text);
} }
message = rstrip(message);
QString checksum = message.left(3); QString checksum = message.right(3);
message = message.mid(4); message = message.left(message.length()-4);
if(Varicode::checksum16Valid(checksum, message)){ if(Varicode::checksum16Valid(checksum, message)){
buffer.cmd.text = message; buffer.cmd.text = message;
m_rxCommandQueue.append(buffer.cmd); m_rxCommandQueue.append(buffer.cmd);
} else { } else {
qDebug() << "Buffered message failed checksum...discarding"; qDebug() << "Buffered message failed checksum...discarding";
qDebug() << "Checksum:" << checksum;
qDebug() << "Message:" << message;
} }
// regardless of valid or not, remove the "complete" buffered message from the buffer cache // regardless of valid or not, remove the "complete" buffered message from the buffer cache

6
varicode.cpp
View File

@ -837,7 +837,7 @@ QString Varicode::packCompoundMessage(const QString &baseCallsign, const QString
QStringList Varicode::unpackCompoundMessage(const QString &text){ QStringList Varicode::unpackCompoundMessage(const QString &text){
QStringList unpacked; QStringList unpacked;
if(text.length() < 13){ if(text.length() < 13 || text.contains(" ")){
return unpacked; return unpacked;
} }
@ -955,7 +955,7 @@ QString Varicode::packDirectedMessage(const QString &text, const QString &baseCa
QStringList Varicode::unpackDirectedMessage(const QString &text){ QStringList Varicode::unpackDirectedMessage(const QString &text){
QStringList unpacked; QStringList unpacked;
if(text.length() < 13){ if(text.length() < 13 || text.contains(" ")){
return unpacked; return unpacked;
} }
@ -1034,7 +1034,7 @@ QString Varicode::packDataMessage(const QString &input, QString * out, int *n){
QString Varicode::unpackDataMessage(const QString &text){ QString Varicode::unpackDataMessage(const QString &text){
QString unpacked; QString unpacked;
if(text.length() < 13){ if(text.length() < 13 || text.contains(" ")){
return unpacked; return unpacked;
} }