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

Fix errors in Fox message logic; default No Dupes.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8337 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-12-16 20:56:42 +00:00
parent bceb795d04
commit 44377f3031
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/decoder.f90
View File

@ -79,8 +79,10 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
logical(params%lft8apon),logical(params%lapcqonly),params%napwid, & logical(params%lft8apon),logical(params%lapcqonly),params%napwid, &
params%mycall,params%mygrid,params%hiscall,params%hisgrid) params%mycall,params%mygrid,params%hiscall,params%hisgrid)
call timer('decft8 ',1) call timer('decft8 ',1)
if(nfox.gt.0) then
n15min=minval(n15fox(1:nfox)) n15min=minval(n15fox(1:nfox))
n15max=maxval(n15fox(1:nfox)) n15max=maxval(n15fox(1:nfox))
endif
j=0 j=0
rewind 19 rewind 19
if(nfox.eq.0) then if(nfox.eq.0) then
@ -230,6 +232,7 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
1010 format('<DecodeFinished>',2i4) 1010 format('<DecodeFinished>',2i4)
call flush(6) call flush(6)
close(13) close(13)
close(19)
if(params%nmode.eq.4 .or. params%nmode.eq.65) close(14) if(params%nmode.eq.4 .or. params%nmode.eq.65) close(14)
return return

11
mainwindow.cpp
View File

@ -899,6 +899,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
splashTimer.setSingleShot (true); splashTimer.setSingleShot (true);
splashTimer.start (20 * 1000); splashTimer.start (20 * 1000);
/*
if(m_config.my_callsign()=="K1JT" or m_config.my_callsign()=="K9AN" or if(m_config.my_callsign()=="K1JT" or m_config.my_callsign()=="K9AN" or
m_config.my_callsign()=="G4WJS" || m_config.my_callsign () == "W9XYZ") { m_config.my_callsign()=="G4WJS" || m_config.my_callsign () == "W9XYZ") {
ui->actionWSPR_LF->setEnabled(true); ui->actionWSPR_LF->setEnabled(true);
@ -910,6 +911,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
"Please use WSJT-X v1.8.0\n", errorMsg); "Please use WSJT-X v1.8.0\n", errorMsg);
Q_EMIT finished (); Q_EMIT finished ();
} }
*/
if(!ui->cbMenus->isChecked()) { if(!ui->cbMenus->isChecked()) {
ui->cbMenus->setChecked(true); ui->cbMenus->setChecked(true);
@ -3715,7 +3717,7 @@ void MainWindow::stopTx2()
m_ntr=0; m_ntr=0;
} }
last_tx_label.setText("Last Tx: " + m_currentMessage.trimmed()); last_tx_label.setText("Last Tx: " + m_currentMessage.trimmed());
if(m_mode=="FT8" and m_config.bHound()) auto_tx_mode(false); //### if(m_mode=="FT8" and m_config.bHound()) auto_tx_mode(false); ###
} }
void MainWindow::ba2msg(QByteArray ba, char message[]) //ba2msg() void MainWindow::ba2msg(QByteArray ba, char message[]) //ba2msg()
@ -7371,7 +7373,7 @@ void MainWindow::foxRxSequencer(DecodedText decodedtext, QString houndCall, QStr
if(m_foxMsgSent[i].contains(houndCall + " ")) { if(m_foxMsgSent[i].contains(houndCall + " ")) {
m_houndRptRcvd[i]=houndGrid.mid(1); m_houndRptRcvd[i]=houndGrid.mid(1);
int i1=qMax(m_foxMsgSent[i].indexOf("+"), m_foxMsgSent[i].indexOf("-")); int i1=qMax(m_foxMsgSent[i].indexOf("+"), m_foxMsgSent[i].indexOf("-"));
m_foxMsgToBeSent[i]=m_foxMsgSent[i].mid(0,i1-1) + " RR73"; if(i1>7) m_foxMsgToBeSent[i]=m_foxMsgSent[i].mid(0,i1-1) + " RR73";
} else { } else {
m_foxMsgToBeSent[i]=m_foxMsgSent[i]; m_foxMsgToBeSent[i]=m_foxMsgSent[i];
} }
@ -7413,6 +7415,7 @@ TxTimeout:
} }
} }
if(fm.contains(" RR73")) { if(fm.contains(" RR73")) {
// Log this QSO! // Log this QSO!
@ -7422,8 +7425,6 @@ TxTimeout:
m_rptRcvd=m_houndRptRcvd[i]; m_rptRcvd=m_houndRptRcvd[i];
qDebug() << "Logged by Fox:" << i << m_hisCall << m_hisGrid << m_rptSent << m_rptRcvd << m_lastBand; qDebug() << "Logged by Fox:" << i << m_hisCall << m_hisGrid << m_rptSent << m_rptRcvd << m_lastBand;
on_logQSOButton_clicked(); on_logQSOButton_clicked();
m_houndCall[i]="";
m_houndGrid[i]="";
m_loggedByFox[m_hisCall] += (m_lastBand + " "); m_loggedByFox[m_hisCall] += (m_lastBand + " ");
//Find someone to call next //Find someone to call next
@ -7438,6 +7439,8 @@ TxTimeout:
} else { } else {
//Default to a standard (i3bit=0) message if queue is empty //Default to a standard (i3bit=0) message if queue is empty
fm=m_houndCall[i] + " " + m_config.my_callsign() + " RR73"; fm=m_houndCall[i] + " " + m_config.my_callsign() + " RR73";
m_houndCall[i]="";
m_houndGrid[i]="";
} }
} }
if(!fm.contains(";")) { if(!fm.contains(";")) {

3
mainwindow.ui
View File

@ -1920,6 +1920,9 @@ list. The list can be maintained in Settings (F2).</string>
<property name="text"> <property name="text">
<string>No Dupes</string> <string>No Dupes</string>
</property> </property>
<property name="checked">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>