mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2025-05-29 21:02:26 -04:00
SF-type 0 msgs send only 4 call+rpt but up to 5 RR73
This commit is contained in:
parent
4916c77d10
commit
9c7316226a
@ -10410,7 +10410,7 @@ void MainWindow::foxTxSequencer()
|
|||||||
QString t,rpt;
|
QString t,rpt;
|
||||||
qint32 islot=0;
|
qint32 islot=0;
|
||||||
qint32 n1,n2,n3;
|
qint32 n1,n2,n3;
|
||||||
|
int nMaxRemainingSlots=0;
|
||||||
m_tFoxTx++; //Increment Fox Tx cycle counter
|
m_tFoxTx++; //Increment Fox Tx cycle counter
|
||||||
|
|
||||||
//Is it time for a stand-alone CQ?
|
//Is it time for a stand-alone CQ?
|
||||||
@ -10462,13 +10462,15 @@ void MainWindow::foxTxSequencer()
|
|||||||
|
|
||||||
list1Done:
|
list1Done:
|
||||||
//Compile list2: Up to Nslots Hound calls to be sent a report.
|
//Compile list2: Up to Nslots Hound calls to be sent a report.
|
||||||
|
// For Superfox, up to 5 RR73, but only 4 callsigns with reports. m_NSlots should be 5 for SF.
|
||||||
|
nMaxRemainingSlots = (m_config.superFox()) ? m_Nslots - 1 : m_Nslots;
|
||||||
for(int i=0; i<m_foxQSOinProgress.count(); i++) {
|
for(int i=0; i<m_foxQSOinProgress.count(); i++) {
|
||||||
//First do those for QSOs in progress
|
//First do those for QSOs in progress
|
||||||
hc=m_foxQSOinProgress.at(i);
|
hc=m_foxQSOinProgress.at(i);
|
||||||
if((m_foxQSO[hc].tFoxRrpt < 0) and (m_foxQSO[hc].ncall < m_maxStrikes)) {
|
if((m_foxQSO[hc].tFoxRrpt < 0) and (m_foxQSO[hc].ncall < m_maxStrikes)) {
|
||||||
//Sent him a report and have not received R+rpt: call him again
|
//Sent him a report and have not received R+rpt: call him again
|
||||||
list2 << hc; //Add to list2
|
list2 << hc; //Add to list2
|
||||||
if(list2.size()==m_Nslots) goto list2Done;
|
if(list2.size()==nMaxRemainingSlots) goto list2Done;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -10489,7 +10491,7 @@ list1Done:
|
|||||||
m_foxQSO[hc].tFoxTxRR73 = -1; //Have not sent RR73
|
m_foxQSO[hc].tFoxTxRR73 = -1; //Have not sent RR73
|
||||||
refreshHoundQueueDisplay();
|
refreshHoundQueueDisplay();
|
||||||
|
|
||||||
if(list2.size()==m_Nslots) {
|
if(list2.size()==nMaxRemainingSlots) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -10501,7 +10503,6 @@ list2Done:
|
|||||||
n2=list2.size();
|
n2=list2.size();
|
||||||
n3=qMax(n1,n2);
|
n3=qMax(n1,n2);
|
||||||
if(n3>m_Nslots) n3=m_Nslots;
|
if(n3>m_Nslots) n3=m_Nslots;
|
||||||
|
|
||||||
for(int i=0; i<n3; i++) {
|
for(int i=0; i<n3; i++) {
|
||||||
hc1="";
|
hc1="";
|
||||||
fm="";
|
fm="";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user