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

Hide heartbeat and acks if we have HB turned off

Browse Source
This commit is contained in:
Jordan Sherer 2018-11-27 23:21:16 -05:00
parent 8004c51ed2
commit 9244ac08c6
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mainwindow.cpp
View File

@ -9094,9 +9094,9 @@ void MainWindow::processCommandActivity() {
writeDirectedCommandToFile(d); writeDirectedCommandToFile(d);
} }
// if this is an allcall, check to make sure we haven't replied to their allcall recently (in the past ping interval) // if this is an allcall, check to make sure we haven't replied to their allcall recently (in the past five minutes)
// that way we never get spammed by allcalls at a higher frequency than what we would normally ping // that way we never get spammed by allcalls at too high of a frequency
if (isAllCall && m_txAllcallCommandCache.contains(d.from) && m_txAllcallCommandCache[d.from]->secsTo(now) / 60 < m_config.heartbeat()) { if (isAllCall && m_txAllcallCommandCache.contains(d.from) && m_txAllcallCommandCache[d.from]->secsTo(now) / 60 < 5) {
continue; continue;
} }
@ -9580,9 +9580,7 @@ void MainWindow::displayBandActivity() {
selectedOffset = selectedItems.first()->text().toInt(); selectedOffset = selectedItems.first()->text().toInt();
} }
#if 0 bool hbEnabled = ui->hbMacroButton->isChecked();
bool pingEnabled = m_config.heartbeat() > 0;
#endif
ui->tableWidgetRXAll->setUpdatesEnabled(false); ui->tableWidgetRXAll->setUpdatesEnabled(false);
{ {
@ -9674,12 +9672,12 @@ void MainWindow::displayBandActivity() {
if (!isOffsetSelected && activityAging && item.utcTimestamp.secsTo(now) / 60 >= activityAging) { if (!isOffsetSelected && activityAging && item.utcTimestamp.secsTo(now) / 60 >= activityAging) {
continue; continue;
} }
#if 0
if (!pingEnabled && (item.text.contains(": HEARTBEAT") || item.text.contains("HEARTBEAT ACK"))){ if (!hbEnabled && (item.text.contains(": HB") || item.text.contains(" ACK "))){
// hide pings if we're not pinging. // hide heartbeats and acks if we are not currently heartbeating
continue; continue;
} }
#endif
if (item.text.isEmpty()) { if (item.text.isEmpty()) {
continue; continue;
} }