w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-23 09:59:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor code cleanup for Fox mode.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8610 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2018-04-11 20:32:17 +00:00
parent 5307289ef8
commit 4d82d515ed
2 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mainwindow.cpp
View File

@ -7289,7 +7289,7 @@ void MainWindow::on_pbFoxReset_clicked()
{ {
ui->textBrowser4->setText(""); ui->textBrowser4->setText("");
m_houndQueue.clear(); m_houndQueue.clear();
m_foxQSOinProgress.clear(); //It this a bad idea ??? // m_foxQSOinProgress.clear(); //It this a bad idea ???
writeFoxQSO(" Reset"); writeFoxQSO(" Reset");
} }
@ -7512,8 +7512,10 @@ void MainWindow::foxRxSequencer(QString msg, QString houndCall, QString rptRcvd)
*/ */
if(m_foxQSO.contains(houndCall)) { if(m_foxQSO.contains(houndCall)) {
if(m_foxQSO[houndCall].ncall < qMax(4,m_Nslots+1)) { //### ??? ### if(m_foxQSO[houndCall].ncall < qMax(4,m_Nslots+1)) { //### ??? ###
m_foxQSO[houndCall].rcvd=rptRcvd.mid(1); //Save rptRcvd for the log m_foxQSO[houndCall].rcvd=rptRcvd.mid(1); //Save rptRcvd for the log
m_foxRR73Queue.enqueue(houndCall); //Request RR73 to be sent to Hound if(!m_foxRR73Queue.contains(houndCall)) { //Already in RR73Queue?
m_foxRR73Queue.enqueue(houndCall); //Request RR73 to be sent to Hound
}
writeFoxQSO(" Rx: " + msg.trimmed()); writeFoxQSO(" Rx: " + msg.trimmed());
} }
} }
@ -7533,6 +7535,8 @@ void MainWindow::foxTxSequencer()
QString hc1,hc2; //Hound calls QString hc1,hc2; //Hound calls
QString t,rpt; QString t,rpt;
QStringList sentTo; QStringList sentTo;
m_nFoxTx++;
m_maxQSOs=m_Nslots + m_foxRR73Queue.count(); m_maxQSOs=m_Nslots + m_foxRR73Queue.count();
int islot=0; int islot=0;
@ -7614,11 +7618,11 @@ void MainWindow::foxTxSequencer()
while (!m_houndQueue.isEmpty() and m_foxQSOinProgress.count() < m_Nslots) { while (!m_houndQueue.isEmpty() and m_foxQSOinProgress.count() < m_Nslots) {
t=m_houndQueue.dequeue(); //Fetch new hound from queue t=m_houndQueue.dequeue(); //Fetch new hound from queue
hc1=t.mid(0,6).trimmed(); //hound call hc1=t.mid(0,6).trimmed(); //hound call
m_foxQSOinProgress.enqueue(hc1); //Put him in the QSO queue m_foxQSOinProgress.enqueue(hc1); //Put him in the QSO queue
m_foxQSO[hc1].grid=t.mid(11,4); //hound grid m_foxQSO[hc1].grid=t.mid(11,4); //hound grid
rpt=t.mid(7,3); rpt=t.mid(7,3);
m_foxQSO[hc1].sent=rpt; //Report to send him m_foxQSO[hc1].sent=rpt; //Report to send him
m_foxQSO[hc1].ncall++; //Number of times called m_foxQSO[hc1].ncall=1; //Number of times called
rm_tb4(hc1); //Remove this hound from tb4 rm_tb4(hc1); //Remove this hound from tb4
fm = hc1 + " " + m_baseCall + " " + rpt; //Tx msg fm = hc1 + " " + m_baseCall + " " + rpt; //Tx msg
islot++; islot++;
@ -7649,6 +7653,7 @@ Transmit:
for(auto a: m_foxQSO.keys()) { //Weed out Hounds called too many times for(auto a: m_foxQSO.keys()) { //Weed out Hounds called too many times
int ncalls=m_foxQSO[a].ncall; int ncalls=m_foxQSO[a].ncall;
if(ncalls >= qMax(4,m_Nslots+1)) { //### Not sure about ">=" ### if(ncalls >= qMax(4,m_Nslots+1)) { //### Not sure about ">=" ###
qDebug() << "Removed" << a;
m_foxQSO.remove(a); m_foxQSO.remove(a);
m_foxQSOinProgress.removeOne(a); m_foxQSOinProgress.removeOne(a);
if(m_foxRR73Queue.contains(a)) m_foxRR73Queue.removeOne(a); if(m_foxRR73Queue.contains(a)) m_foxRR73Queue.removeOne(a);
@ -7796,11 +7801,11 @@ void MainWindow::foxTest()
} }
if(line.contains("Tx1:")) foxTxSequencer(); if(line.contains("Tx1:")) foxTxSequencer();
qDebug() << "aa" << m_maxQSOs << m_houndQueue.count() <<m_foxQSOinProgress.count() // qDebug() << "aa" << m_maxQSOs << m_houndQueue.count() <<m_foxQSOinProgress.count()
<< m_foxRR73Queue.count() << line.mid(37).trimmed(); // << m_foxRR73Queue.count() << line.mid(37).trimmed();
t.sprintf("%3d %3d %3d %3d %3d %3d ",m_maxQSOs,m_houndQueue.count(), t.sprintf("%3d %3d %3d %3d %3d %3d %5d ",m_maxQSOs,m_houndQueue.count(),
m_foxQSOinProgress.count(),m_foxRR73Queue.count(),m_foxQSO.count(), m_foxQSOinProgress.count(),m_foxRR73Queue.count(),m_foxQSO.count(),
m_loggedByFox.count()); m_loggedByFox.count(),m_nFoxTx);
sdiag << t << line.mid(37).trimmed() << "\n"; sdiag << t << line.mid(37).trimmed() << "\n";
} }
} }

23
mainwindow.h
View File

@ -433,6 +433,7 @@ private:
qint32 m_tAutoOn; qint32 m_tAutoOn;
qint32 m_nFoxTxSinceCQ=0; qint32 m_nFoxTxSinceCQ=0;
qint32 m_maxQSOs; qint32 m_maxQSOs;
qint32 m_nFoxTx=0;
bool m_btxok; //True if OK to transmit bool m_btxok; //True if OK to transmit
bool m_diskData; bool m_diskData;
@ -577,20 +578,22 @@ private:
QSet<QString> m_pfx; QSet<QString> m_pfx;
QSet<QString> m_sfx; QSet<QString> m_sfx;
struct FoxQSO struct FoxQSO //Everything we need to know about QSOs in progress (or recently logged).
{ {
QString grid; QString grid; //Hound's declared locator
QString sent; QString sent; //Report sent to Hound
QString rcvd; QString rcvd; //Report received from Hound
qint32 ncall; qint32 ncall; //Number of times a report was sent to Hound
qint32 nRR73; //Number of times
qint32 nT0; //m_nFoxTx (Fox Tx cycle counter) when R+rpt was received from Hound
}; };
QMap<QString,FoxQSO> m_foxQSO; QMap<QString,FoxQSO> m_foxQSO; //Key = HoundCall, value = parameters for QSO in progress
QMap<QString,QString> m_loggedByFox; QMap<QString,QString> m_loggedByFox; //Key = HoundCall, value = logged band
QQueue<QString> m_houndQueue; //Selected Hounds available for starting a QSO QQueue<QString> m_houndQueue; //Selected Hounds available for starting a QSO
QQueue<QString> m_foxQSOinProgress; //QSOs in progress: Fox has sent a report QQueue<QString> m_foxQSOinProgress; //QSOs in progress: Fox has sent a report
QQueue<QString> m_foxRR73Queue; //Hounds from whom Fox has received R+rpt QQueue<QString> m_foxRR73Queue; //Hounds from whom Fox has received R+rpt
QQueue<qint64> m_foxRateQueue; QQueue<qint64> m_foxRateQueue;
QDateTime m_dateTimeQSOOn; QDateTime m_dateTimeQSOOn;