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

Fix ALLCALL SNR query when ALLCALL or the station calling is selected

Browse Source
This commit is contained in:
Jordan Sherer 2018-09-15 08:22:24 -04:00
parent ecc537475a
commit dae1118bf3
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mainwindow.cpp
View File

@ -9456,12 +9456,8 @@ void MainWindow::processCommandActivity() {
// if this is an allcall, check to make sure we haven't replied to their allcall recently (in the past beacon interval) // if this is an allcall, check to make sure we haven't replied to their allcall recently (in the past beacon interval)
// that way we never get spammed by allcalls at a high frequency than what we would beacon // that way we never get spammed by allcalls at a high frequency than what we would beacon
if (isAllCall){ if (isAllCall && m_txAllcallCommandCache.contains(d.from) && m_txAllcallCommandCache[d.from]->secsTo(now) / 60 < m_config.beacon()) {
if(m_txAllcallCommandCache.contains(d.from) && m_txAllcallCommandCache[d.from]->secsTo(now) / 60 < m_config.beacon()) { continue;
continue;
}
m_txAllcallCommandCache.insert(d.from, new QDateTime(now), 25);
} }
// display the command activity // display the command activity
@ -9540,8 +9536,9 @@ void MainWindow::processCommandActivity() {
if (d.cmd == "?") { if (d.cmd == "?") {
// do not respond to allcall ? if: // do not respond to allcall ? if:
// 1. we recently responded to one // 1. we recently responded to one
// 2. or, we are in a directed qso...(i.e., we have a callsign selected) // 2. or, we are in a directed qso...(i.e., we have a callsign selected that isn't ALLCALL)
if(isAllCall && !callsignSelected().isEmpty()){ auto selectedCall = callsignSelected();
if(isAllCall && !selectedCall.isEmpty() && selectedCall != "ALLCALL" && selectedCall != d.from){
continue; continue;
} }
@ -9768,6 +9765,11 @@ void MainWindow::processCommandActivity() {
continue; continue;
} }
// add ALLCALLs to the ALLCALL cache
if(isAllCall){
m_txAllcallCommandCache.insert(d.from, new QDateTime(now), 25);
}
// queue the reply here to be sent when a free interval is available on the frequency that was sent // queue the reply here to be sent when a free interval is available on the frequency that was sent
// unless, this is an allcall, to which we should be responding on a clear frequency offset // unless, this is an allcall, to which we should be responding on a clear frequency offset
// we always want to make sure that the directed cache has been updated at this point so we have the // we always want to make sure that the directed cache has been updated at this point so we have the