w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-02-03 09:44:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

More consistent Tx Next button behaviour

Browse Source
This commit is contained in:
Bill Somerville 2020-08-15 15:57:29 +01:00
parent 45f28aff45
commit ec623deb9f
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
widgets/mainwindow.cpp
View File

@ -3742,19 +3742,20 @@ void MainWindow::guiUpdate()
m_tuneup=false; //This is not an ATU tuneup m_tuneup=false; //This is not an ATU tuneup
bool btx = m_auto && m_WSPR_tx_next; // To Tx, we need m_auto and bool btx = m_auto && m_WSPR_tx_next; // To Tx, we need m_auto and
// scheduled transmit // scheduled transmit
m_WSPR_tx_next = false;
if(btx) { if(btx) {
m_ntr=-1; //This says we will have transmitted m_ntr=-1; //This says we will have transmitted
ui->pbTxNext->setChecked (false); ui->pbTxNext->setChecked (false);
m_bTxTime=true; //Start a WSPR or FST4W Tx sequence m_bTxTime=true; //Start a WSPR or FST4W Tx sequence
} else { } else {
// This will be a WSPR or FST4W Rx sequence. // This will be a WSPR or FST4W Rx sequence.
m_ntr=1; //This says we will have received m_ntr=1; //This says we will have received
m_bTxTime=false; //Start a WSPR or FST4W Rx sequence m_bTxTime=false; //Start a WSPR or FST4W Rx sequence
} }
} }
} else { } else {
// For all modes other than WSPR and Fst4W // For all modes other than WSPR and Fst4W
m_bTxTime = (t2p >= tx1) and (t2p < tx2); m_bTxTime = (t2p >= tx1) and (t2p < tx2);
if(m_mode=="Echo") m_bTxTime = m_bTxTime and m_bEchoTxOK; if(m_mode=="Echo") m_bTxTime = m_bTxTime and m_bEchoTxOK;
if(m_mode=="FT8" and ui->tx5->currentText().contains("/B ")) { if(m_mode=="FT8" and ui->tx5->currentText().contains("/B ")) {
@ -5756,8 +5757,6 @@ void MainWindow::on_tx6_editingFinished() //tx6 edited
void MainWindow::on_RoundRobin_currentTextChanged(QString text) void MainWindow::on_RoundRobin_currentTextChanged(QString text)
{ {
ui->sbTxPercent->setEnabled (text == tr ("Random")); ui->sbTxPercent->setEnabled (text == tr ("Random"));
m_WSPR_tx_next = false; // cancel any pending Tx to avoid
// undesirable consecutive Tx periods
} }
@ -8138,7 +8137,6 @@ void MainWindow::on_pbTxNext_clicked(bool b)
{ {
if (b && !ui->autoButton->isChecked ()) if (b && !ui->autoButton->isChecked ())
{ {
m_WSPR_tx_next = false; // cancel any pending start from schedule
ui->autoButton->click (); // make sure Tx is possible ui->autoButton->click (); // make sure Tx is possible
} }
} }