Fixed display of beacons and beacon acks when not beaconining
This commit is contained in:
parent
ca79a450ca
commit
60b58fb50f
@ -7942,10 +7942,12 @@ void MainWindow::on_pbT2R_clicked()
|
|||||||
|
|
||||||
void MainWindow::on_beaconButton_clicked()
|
void MainWindow::on_beaconButton_clicked()
|
||||||
{
|
{
|
||||||
|
// clear the beacon queue when you toggle the button
|
||||||
|
m_txBeaconQueue.clear();
|
||||||
|
displayBandActivity();
|
||||||
|
|
||||||
|
// then process the action
|
||||||
if(ui->beaconButton->isChecked()){
|
if(ui->beaconButton->isChecked()){
|
||||||
// clear the beacon queue when you turn it on.
|
|
||||||
m_txBeaconQueue.clear();
|
|
||||||
// then schedule the next beacon
|
|
||||||
scheduleBeacon(true);
|
scheduleBeacon(true);
|
||||||
} else {
|
} else {
|
||||||
pauseBeacon();
|
pauseBeacon();
|
||||||
@ -9867,6 +9869,8 @@ void MainWindow::displayBandActivity() {
|
|||||||
selectedOffset = selectedItems.first()->text().toInt();
|
selectedOffset = selectedItems.first()->text().toInt();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool beaconEnabled = ui->beaconButton->isChecked();
|
||||||
|
|
||||||
ui->tableWidgetRXAll->setUpdatesEnabled(false);
|
ui->tableWidgetRXAll->setUpdatesEnabled(false);
|
||||||
{
|
{
|
||||||
// Scroll Position
|
// Scroll Position
|
||||||
@ -9953,6 +9957,10 @@ void MainWindow::displayBandActivity() {
|
|||||||
if (activityAging && item.utcTimestamp.secsTo(now) / 60 >= activityAging) {
|
if (activityAging && item.utcTimestamp.secsTo(now) / 60 >= activityAging) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
if (!beaconEnabled && (item.text.contains(": BEACON") || item.text.contains("BEACON ACK"))){
|
||||||
|
// hide beacons if we're not beaconing.
|
||||||
|
continue;
|
||||||
|
}
|
||||||
if (item.text.isEmpty()) {
|
if (item.text.isEmpty()) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user