From ccca0ad9ebfdc962dac78c67a35263eaf4968818 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 22 Dec 2017 18:30:35 +0000 Subject: [PATCH] More corrections for compount FoxCall. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8366 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- mainwindow.cpp | 15 +++++++++++++-- mainwindow.h | 2 ++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index aa858f44e..1d22f4903 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -7439,6 +7439,10 @@ void MainWindow::foxTxSequencer() hc1=m_foxQSOqueue.dequeue(); //Recover hound callsign from QSO queue m_foxQSOqueue.enqueue(hc1); //Put him back in, at the end 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++; //Generate tx waveform foxGenWaveform(islot-1,fm); @@ -7455,7 +7459,11 @@ void MainWindow::foxTxSequencer() m_foxQSO[hc1].sent=rpt; //Report to send him m_foxQSO[hc1].t0=now; //QSO start time 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++; //Generate tx waveform foxGenWaveform(islot-1,fm); @@ -7465,7 +7473,10 @@ void MainWindow::foxTxSequencer() if(islot==0) { //No tx message generated yet, so we'll call CQ 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++; foxGenWaveform(islot-1,fm); } diff --git a/mainwindow.h b/mainwindow.h index 32f19e39a..486ef53d4 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -367,6 +367,8 @@ private: qint64 m_secBandChanged; qint64 m_freqMoon; qint64 m_msec0; + qint64 m_fullFoxCallTime; + Frequency m_freqNominal; Frequency m_freqTxNominal; Astro::Correction m_astroCorrection;