mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-11-27 14:48:46 -05:00
Clean up the Tx Watchdog code.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4322 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
e39f6dfc15
commit
ba47458615
@ -308,7 +308,7 @@ MainWindow::MainWindow(bool multiple, QSettings * settings, QSharedMemory *shdme
|
|||||||
m_freeText=false;
|
m_freeText=false;
|
||||||
m_msErase=0;
|
m_msErase=0;
|
||||||
m_sent73=false;
|
m_sent73=false;
|
||||||
m_watchdogLimit=5;
|
m_watchdogLimit=7;
|
||||||
m_repeatMsg=0;
|
m_repeatMsg=0;
|
||||||
m_secBandChanged=0;
|
m_secBandChanged=0;
|
||||||
m_lockTxFreq=false;
|
m_lockTxFreq=false;
|
||||||
@ -1446,8 +1446,7 @@ void MainWindow::guiUpdate()
|
|||||||
QString t="Please choose another Tx frequency.\n";
|
QString t="Please choose another Tx frequency.\n";
|
||||||
t+="WSJT-X will not knowingly transmit\n";
|
t+="WSJT-X will not knowingly transmit\n";
|
||||||
t+="in the WSPR sub-band on 30 m.";
|
t+="in the WSPR sub-band on 30 m.";
|
||||||
msgBox0.setText(t);
|
msgBox(t);
|
||||||
msgBox0.show();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1678,7 +1677,6 @@ void MainWindow::stopTx()
|
|||||||
tx_status_label->setStyleSheet("");
|
tx_status_label->setStyleSheet("");
|
||||||
tx_status_label->setText("");
|
tx_status_label->setText("");
|
||||||
ptt0Timer->start(200); //Sequencer delay
|
ptt0Timer->start(200); //Sequencer delay
|
||||||
|
|
||||||
monitor (true);
|
monitor (true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1694,11 +1692,10 @@ void MainWindow::stopTx2()
|
|||||||
on_stopTxButton_clicked();
|
on_stopTxButton_clicked();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_config.watchdog () && m_repeatMsg>m_watchdogLimit)
|
if (m_config.watchdog () && m_repeatMsg>=m_watchdogLimit-1)
|
||||||
{
|
{
|
||||||
on_stopTxButton_clicked();
|
on_stopTxButton_clicked();
|
||||||
msgBox0.setText("Runaway Tx watchdog");
|
msgBox("Runaway Tx watchdog");
|
||||||
msgBox0.show();
|
|
||||||
m_repeatMsg=0;
|
m_repeatMsg=0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user