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

Fixed compound calls / beacon / cq differentiation

Browse Source
This commit is contained in:
Jordan Sherer 2018-10-09 20:09:53 -04:00
parent d20fe46447
commit f0e30dc7b0
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
mainwindow.cpp
View File

@ -3676,7 +3676,6 @@ void MainWindow::readFromStdout() //readFromStdout
m_messageBuffer[d.freq].msgs.append(d); m_messageBuffer[d.freq].msgs.append(d);
} }
m_rxActivityQueue.append(d); m_rxActivityQueue.append(d);
m_bandActivity[offset].append(d); m_bandActivity[offset].append(d);
while(m_bandActivity[offset].count() > 10){ while(m_bandActivity[offset].count() > 10){
@ -3701,19 +3700,20 @@ void MainWindow::readFromStdout() //readFromStdout
cd.bits = decodedtext.bits(); cd.bits = decodedtext.bits();
// Only respond to BEACONS...remember that CQ messages are "Alt" beacons // Only respond to BEACONS...remember that CQ messages are "Alt" beacons
if(decodedtext.isBeacon() && !decodedtext.isAlt()){ if(decodedtext.isBeacon()){
if(!decodedtext.isAlt()){
// convert BEACON to a directed command and process... // convert BEACON to a directed command and process...
CommandDetail d = {}; CommandDetail d = {};
d.from = cd.call; d.from = cd.call;
d.to = "ALLCALL"; d.to = "ALLCALL";
d.cmd = " BEACON"; d.cmd = " BEACON";
d.snr = cd.snr; d.snr = cd.snr;
d.bits = cd.bits; d.bits = cd.bits;
d.grid = cd.grid; d.grid = cd.grid;
d.freq = cd.freq; d.freq = cd.freq;
d.utcTimestamp = cd.utcTimestamp; d.utcTimestamp = cd.utcTimestamp;
m_rxCommandQueue.append(d); m_rxCommandQueue.append(d);
}
} else { } else {
qDebug() << "buffering compound call" << cd.freq << cd.call << cd.bits; qDebug() << "buffering compound call" << cd.freq << cd.call << cd.bits;
@ -3787,7 +3787,7 @@ void MainWindow::readFromStdout() //readFromStdout
#endif #endif
// Parse CQs // Parse CQs
#if 1 #if 0
bool shouldParseCQs = true; bool shouldParseCQs = true;
if(shouldParseCQs && decodedtext.isStandardMessage()){ if(shouldParseCQs && decodedtext.isStandardMessage()){
QString theircall; QString theircall;
@ -8214,6 +8214,11 @@ void MainWindow::processRxActivity() {
} }
#endif #endif
// TODO: incremental printing of directed messages
// Display if:
// 1) this is a directed message header "to" us and should be buffered...
// 2) or, this is a buffered message frame for a buffer with us as the recipient.
if(!shouldDisplay){ if(!shouldDisplay){
continue; continue;
} }