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

Fixed rebase issues

Browse Source
This commit is contained in:
Jordan Sherer 2018-12-11 22:14:26 -05:00
parent 9079d45587
commit c5930a0aa3
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mainwindow.cpp
View File

@ -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(){

2
varicode.cpp
View File

@ -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;