w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-07-20 10:35:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Better arrangement of qDebug()'s for testing Fox sequencing.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8613 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2018-04-13 20:22:29 +00:00
parent 57cf6b3f15
commit c35be9bc38
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mainwindow.cpp
View File

@ -7508,6 +7508,7 @@ void MainWindow::foxRxSequencer(QString msg, QString houndCall, QString rptRcvd)
* If houndCall matches a callsign in one of our active QSO slots, we * If houndCall matches a callsign in one of our active QSO slots, we
* prepare to send "houndCall RR73" to that caller. * prepare to send "houndCall RR73" to that caller.
*/ */
qDebug() << m_tFoxTx << "Rx: " << msg.mid(24).trimmed();
if(m_foxQSO.contains(houndCall)) { if(m_foxQSO.contains(houndCall)) {
m_foxQSO[houndCall].rcvd=rptRcvd.mid(1); //Save report Rcvd, for the log m_foxQSO[houndCall].rcvd=rptRcvd.mid(1); //Save report Rcvd, for the log
m_foxQSO[houndCall].tFoxRrpt=m_tFoxTx; //Save time R+rpt was received m_foxQSO[houndCall].tFoxRrpt=m_tFoxTx; //Save time R+rpt was received
@ -7625,7 +7626,6 @@ list2Done:
n1=list1.size(); n1=list1.size();
n2=list2.size(); n2=list2.size();
n3=qMax(n1,n2); n3=qMax(n1,n2);
// qDebug() << "dd" << n1 << n2 << n3;
for(int i=0; i<n3; i++) { for(int i=0; i<n3; i++) {
hc1=""; hc1="";
fm=""; fm="";
@ -7693,7 +7693,7 @@ Transmit:
bool b3=(m_foxQSO[hc].ncall > m_maxStrikes); bool b3=(m_foxQSO[hc].ncall > m_maxStrikes);
bool b4=(m_foxQSO[hc].nRR73 > m_maxStrikes); bool b4=(m_foxQSO[hc].nRR73 > m_maxStrikes);
if(b1 or b2 or b3 or b4) { if(b1 or b2 or b3 or b4) {
qDebug() << "Removed" << hc << m_tFoxTx << m_foxQSO[hc].tFoxRrpt qDebug() << m_tFoxTx << "Rem:" << hc << m_foxQSO[hc].tFoxRrpt
<< m_foxQSO[hc].tFoxTxRR73 << m_foxQSO[hc].ncall << m_foxQSO[hc].nRR73 << m_foxQSO[hc].tFoxTxRR73 << m_foxQSO[hc].ncall << m_foxQSO[hc].nRR73
<< m_maxFoxWait; << m_maxFoxWait;
m_foxQSO.remove(hc); m_foxQSO.remove(hc);
@ -7751,7 +7751,7 @@ void MainWindow::doubleClickOnFoxQueue(Qt::KeyboardModifiers modifiers)
void MainWindow::foxGenWaveform(int i,QString fm) void MainWindow::foxGenWaveform(int i,QString fm)
{ {
if(i==0) qDebug() << ""; if(i==0) qDebug() << "";
qDebug() << "Tx" << i << fm; qDebug() << m_tFoxTx << "Tx" << i << fm;
//Generate and accumulate the Tx waveform //Generate and accumulate the Tx waveform
fm += " "; fm += " ";
fm=fm.mid(0,40); fm=fm.mid(0,40);
@ -7846,12 +7846,14 @@ void MainWindow::foxTest()
foxRxSequencer(msg,hc1,rptRcvd); foxRxSequencer(msg,hc1,rptRcvd);
} }
} }
if(line.contains("Tx1:")) foxTxSequencer(); if(line.contains("Tx1:")) {
foxTxSequencer();
t.sprintf("%3d %3d %3d %3d %5d ",m_houndQueue.count(), } else {
m_foxQSOinProgress.count(),m_foxQSO.count(), t.sprintf("%3d %3d %3d %3d %5d ",m_houndQueue.count(),
m_loggedByFox.count(),m_tFoxTx); m_foxQSOinProgress.count(),m_foxQSO.count(),
sdiag << t << line.mid(37).trimmed() << "\n"; m_loggedByFox.count(),m_tFoxTx);
// qDebug() << "aa " << t << line.mid(37).trimmed(); sdiag << t << line.mid(37).trimmed() << "\n";
// qDebug() << "aa " << t << line.mid(37).trimmed();
}
} }
} }