w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-22 20:28:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Reject message with ";" unless Hound mode selected or CRC10 matches DX Call.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8455 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2018-02-05 15:16:29 +00:00
parent 3c384f7cbb
commit 9a4ddf269e
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mainwindow.cpp
View File

@ -2802,9 +2802,13 @@ void MainWindow::readFromStdout() //readFromStdout
while(proc_jt9.canReadLine()) { while(proc_jt9.canReadLine()) {
QByteArray t=proc_jt9.readLine(); QByteArray t=proc_jt9.readLine();
if(m_mode=="FT8" and !m_config.bHound() and t.contains(";")) { if(m_mode=="FT8" and !m_config.bHound() and t.contains(";")) {
if(t.contains("<...>")) continue;
if(!m_bWarnedHound) {
QString errorMsg; QString errorMsg;
MessageBox::critical_message (this, MessageBox::critical_message (this,
tr("Should you be in \"FT8 DXpedition Hound\" mode?"), errorMsg); tr("Should you be in \"FT8 DXpedition Hound\" mode?"), errorMsg);
m_bWarnedHound=true;
}
} }
// qint64 ms=QDateTime::currentMSecsSinceEpoch() - m_msec0; // qint64 ms=QDateTime::currentMSecsSinceEpoch() - m_msec0;
bool bAvgMsg=false; bool bAvgMsg=false;
@ -3557,7 +3561,7 @@ void MainWindow::guiUpdate()
} else { } else {
m_bVHFwarned=false; m_bVHFwarned=false;
} }
if(m_config.bHound()) m_bWarnedHound=false;
if(m_auto and m_mode=="Echo" and m_bEchoTxOK) { if(m_auto and m_mode=="Echo" and m_bEchoTxOK) {
progressBar.setMaximum(6); progressBar.setMaximum(6);
progressBar.setValue(int(m_s6)); progressBar.setValue(int(m_s6));
@ -4978,13 +4982,13 @@ void MainWindow::on_actionFT8_triggered()
ui->txb6->setEnabled(false); ui->txb6->setEnabled(false);
} }
if((m_config.bFox() or m_config.bHound()) and !m_config.split_mode() and !m_bWarnSplit) { if((m_config.bFox() or m_config.bHound()) and !m_config.split_mode() and !m_bWarnedSplit) {
QString errorMsg; QString errorMsg;
MessageBox::critical_message (this, MessageBox::critical_message (this,
"Operation in FT8 DXpedition mode requires using *Split*\n" "Operation in FT8 DXpedition mode requires using *Split*\n"
"rig control with either *Rig* or *Fake It* on the \n" "rig control with either *Rig* or *Fake It* on the \n"
"*Settings | Radio* tab.", errorMsg); "*Settings | Radio* tab.", errorMsg);
m_bWarnSplit=true; m_bWarnedSplit=true;
} }
statusChanged(); statusChanged();
} }

3
mainwindow.h
View File

@ -482,7 +482,8 @@ private:
bool m_bCallingCQ; bool m_bCallingCQ;
bool m_bAutoReply; bool m_bAutoReply;
bool m_bCheckedContest; bool m_bCheckedContest;
bool m_bWarnSplit=false; bool m_bWarnedSplit=false;
bool m_bWarnedHound=false;
enum enum
{ {