w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-11-03 13:30:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

More corrections for compount FoxCall.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8366 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-12-22 18:30:35 +00:00
parent 69cb0333ab
commit ccca0ad9eb
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mainwindow.cpp
View File

@ -7439,6 +7439,10 @@ void MainWindow::foxTxSequencer()
hc1=m_foxQSOqueue.dequeue(); //Recover hound callsign from QSO queue hc1=m_foxQSOqueue.dequeue(); //Recover hound callsign from QSO queue
m_foxQSOqueue.enqueue(hc1); //Put him back in, at the end m_foxQSOqueue.enqueue(hc1); //Put him back in, at the end
fm = hc1 + " " + m_baseCall + " " + m_foxQSO[hc1].sent; //Tx msg fm = hc1 + " " + m_baseCall + " " + m_foxQSO[hc1].sent; //Tx msg
if(now-m_fullFoxCallTime > 300) {
fm = hc1 + " " + m_config.my_callsign(); //Tx msg
m_fullFoxCallTime=now;
}
islot++; islot++;
//Generate tx waveform //Generate tx waveform
foxGenWaveform(islot-1,fm); foxGenWaveform(islot-1,fm);
@ -7455,7 +7459,11 @@ void MainWindow::foxTxSequencer()
m_foxQSO[hc1].sent=rpt; //Report to send him m_foxQSO[hc1].sent=rpt; //Report to send him
m_foxQSO[hc1].t0=now; //QSO start time m_foxQSO[hc1].t0=now; //QSO start time
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
if(now-m_fullFoxCallTime > 300) {
fm = hc1 + " " + m_config.my_callsign(); //Tx msg
m_fullFoxCallTime=now;
}
islot++; islot++;
//Generate tx waveform //Generate tx waveform
foxGenWaveform(islot-1,fm); foxGenWaveform(islot-1,fm);
@ -7465,7 +7473,10 @@ void MainWindow::foxTxSequencer()
if(islot==0) { if(islot==0) {
//No tx message generated yet, so we'll call CQ //No tx message generated yet, so we'll call CQ
fm=ui->comboBoxCQ->currentText() + " " + m_config.my_callsign(); fm=ui->comboBoxCQ->currentText() + " " + m_config.my_callsign();
if(!fm.contains("/")) fm += " " + m_config.my_grid().mid(0,4); if(!fm.contains("/")) {
fm += " " + m_config.my_grid().mid(0,4);
m_fullFoxCallTime=now;
}
islot++; islot++;
foxGenWaveform(islot-1,fm); foxGenWaveform(islot-1,fm);
} }

2
mainwindow.h
View File

@ -367,6 +367,8 @@ private:
qint64 m_secBandChanged; qint64 m_secBandChanged;
qint64 m_freqMoon; qint64 m_freqMoon;
qint64 m_msec0; qint64 m_msec0;
qint64 m_fullFoxCallTime;
Frequency m_freqNominal; Frequency m_freqNominal;
Frequency m_freqTxNominal; Frequency m_freqTxNominal;
Astro::Correction m_astroCorrection; Astro::Correction m_astroCorrection;