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

Fixed #1: automatic repeat of CQ was not transmitting when setting was not checked

Browse Source
This commit is contained in:
Jordan Sherer 2018-12-01 16:59:17 -05:00
parent 4af1a14961
commit 5163a4a630
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mainwindow.cpp
View File

@ -5931,7 +5931,7 @@ void MainWindow::checkRepeat(){
if(ui->cqMacroButton->isChecked() && m_cqInterval > 0 && m_nextCQ.isValid()){ if(ui->cqMacroButton->isChecked() && m_cqInterval > 0 && m_nextCQ.isValid()){
if(DriftingDateTime::currentDateTimeUtc().secsTo(m_nextCQ) <= 0){ if(DriftingDateTime::currentDateTimeUtc().secsTo(m_nextCQ) <= 0){
sendCQ(); sendCQ(true);
} }
} }
} }
@ -6620,7 +6620,7 @@ void MainWindow::buildCQMenu(QMenu *menu){
menu->addSeparator(); menu->addSeparator();
auto now = menu->addAction("Send CQ Message Now"); auto now = menu->addAction("Send CQ Message Now");
connect(now, &QAction::triggered, this, &MainWindow::sendCQ); connect(now, &QAction::triggered, this, [this](){ sendCQ(true); });
} }
void MainWindow::buildRepeatMenu(QMenu *menu, QPushButton * button, int * interval){ void MainWindow::buildRepeatMenu(QMenu *menu, QPushButton * button, int * interval){
@ -6693,7 +6693,7 @@ void MainWindow::on_hbMacroButton_toggled(bool checked){
void MainWindow::on_hbMacroButton_clicked(){ void MainWindow::on_hbMacroButton_clicked(){
} }
void MainWindow::sendCQ(){ void MainWindow::sendCQ(bool repeat){
auto message = m_config.cq_message(); auto message = m_config.cq_message();
if(message.isEmpty()){ if(message.isEmpty()){
QString mygrid = m_config.my_grid().left(4); QString mygrid = m_config.my_grid().left(4);
@ -6704,7 +6704,7 @@ void MainWindow::sendCQ(){
addMessageText(replaceMacros(message, buildMacroValues(), true)); addMessageText(replaceMacros(message, buildMacroValues(), true));
if(m_config.transmit_directed()) toggleTx(true); if(repeat || m_config.transmit_directed()) toggleTx(true);
} }
void MainWindow::on_cqMacroButton_toggled(bool checked){ void MainWindow::on_cqMacroButton_toggled(bool checked){

2
mainwindow.h
View File

@ -280,7 +280,7 @@ private slots:
void sendHeartbeat(); void sendHeartbeat();
void on_hbMacroButton_toggled(bool checked); void on_hbMacroButton_toggled(bool checked);
void on_hbMacroButton_clicked(); void on_hbMacroButton_clicked();
void sendCQ(); void sendCQ(bool repeat=false);
void on_cqMacroButton_toggled(bool checked); void on_cqMacroButton_toggled(bool checked);
void on_cqMacroButton_clicked(); void on_cqMacroButton_clicked();
void on_replyMacroButton_clicked(); void on_replyMacroButton_clicked();