From c5930a0aa36e23f6cae35cf5298e415e28ee7c56 Mon Sep 17 00:00:00 2001 From: Jordan Sherer Date: Tue, 11 Dec 2018 22:14:26 -0500 Subject: [PATCH] Fixed rebase issues --- mainwindow.cpp | 8 -------- varicode.cpp | 2 -- 2 files changed, 10 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index bafdbeb..4ba4136 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1578,12 +1578,6 @@ void MainWindow::initializeDummyData(){ displayTextForFreq("HELLO BRAVE NEW WORLD \u2301 ", 42, DriftingDateTime::currentDateTimeUtc().addSecs(-300), false, true, true); displayActivity(true); - - ui->heartbeatButton->click(); - QTimer::singleShot(10000, this, [this](){ - m_idleMinutes = 61; - scheduleHeartbeat(true); - }); } void MainWindow::initialize_fonts () @@ -2383,7 +2377,6 @@ void MainWindow::on_menuControl_aboutToShow(){ ui->actionEnable_Spotting->setChecked(ui->spotButton->isChecked()); ui->actionEnable_Active->setChecked(ui->activeButton->isChecked()); ui->actionEnable_Auto_Reply->setChecked(ui->autoReplyButton->isChecked()); - ui->actionEnable_Heartbeat->setChecked(ui->heartbeatButton->isChecked()); ui->actionEnable_Selcall->setChecked(ui->selcalButton->isChecked()); QMenu * heartbeatMenu = new QMenu(this->menuBar()); @@ -5592,7 +5585,6 @@ void MainWindow::enqueueMessage(int priority, QString message, int freq, Callbac void MainWindow::enqueueHeartbeat(QString message){ m_txHeartbeatQueue.enqueue(message); - scheduleHeartbeat(true); } void MainWindow::resetMessage(){ diff --git a/varicode.cpp b/varicode.cpp index 60cb9e3..55771e1 100644 --- a/varicode.cpp +++ b/varicode.cpp @@ -1183,8 +1183,6 @@ QString Varicode::packHeartbeatMessage(QString const &text, const QString &calls cqNumber = cqs.key(type, 0); } - quint8 cqNumber = cqs.key(type, 0); - frame = packCompoundFrame(callsign, Varicode::FrameHeartbeat, packed_extra, cqNumber); if(frame.isEmpty()){ if(n) *n = 0;