diff --git a/mainwindow.cpp b/mainwindow.cpp
index e1854700f..9f355df93 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -7616,13 +7616,14 @@ void MainWindow::foxTxSequencer()
m_tFoxTx++; //Increment Fox Tx cycle counter
//Is it time for a stand-alone CQ?
- if(m_tFoxTxSinceCQ >= m_foxCQtime) {
+ if(m_tFoxTxSinceCQ >= m_foxCQtime and ui->cbMoreCQs->isChecked()) {
fm=ui->comboBoxCQ->currentText() + " " + m_config.my_callsign();
if(!fm.contains("/")) {
//If Fox is not a compound callsign, add grid to the CQ message.
fm += " " + m_config.my_grid().mid(0,4);
m_fullFoxCallTime=now;
}
+ m_tFoxTx0=m_tFoxTx; //Remember when we sent a CQ
islot++;
foxGenWaveform(islot-1,fm);
goto Transmit;
@@ -7744,11 +7745,12 @@ list2Done:
if(islot < m_Nslots) {
//At least one slot is still open
- if(m_tFoxTx%4==0 or islot==0) {
- //Every 4th Tx sequence, we'll put a CQ message in an otherwise empty slot
+ if(islot==0 or ((m_tFoxTx-m_tFoxTx0>=4) and ui->cbMoreCQs->isChecked())) {
+ //Roughly every 4th Tx sequence, put a CQ message in an otherwise empty slot
fm=ui->comboBoxCQ->currentText() + " " + m_config.my_callsign();
if(!fm.contains("/")) {
fm += " " + m_config.my_grid().mid(0,4);
+ m_tFoxTx0=m_tFoxTx; //Remember when we send a CQ
m_fullFoxCallTime=now;
}
islot++;
diff --git a/mainwindow.h b/mainwindow.h
index f8ed44ce0..c9d3dcef7 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -433,6 +433,7 @@ private:
qint32 m_tAutoOn;
// qint32 m_maxQSOs;
qint32 m_tFoxTx=0;
+ qint32 m_tFoxTx0=0;
qint32 m_maxStrikes=3; //Max # of repeats: 3 strikes and you're out
qint32 m_maxFoxWait=3; //Max wait time for expected Hound replies
qint32 m_foxCQtime=10; //CQs at least every 5 minutes
diff --git a/mainwindow.ui b/mainwindow.ui
index f49560904..140ec87d8 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -1577,41 +1577,6 @@ list. The list can be maintained in Settings (F2).
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 16777215
- 16777215
-
-
-
- N List
-
-
- 5
-
-
- 100
-
-
- 12
-
-
-
- -
-
-
- Reset
-
-
-
-
@@ -1734,6 +1699,41 @@ list. The list can be maintained in Settings (F2).
+ -
+
+
+ Reset
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 16777215
+ 16777215
+
+
+
+ N List
+
+
+ 5
+
+
+ 100
+
+
+ 12
+
+
+
-
@@ -1815,7 +1815,7 @@ list. The list can be maintained in Settings (F2).
- -
+
-
Qt::Vertical
@@ -1828,6 +1828,13 @@ list. The list can be maintained in Settings (F2).
+ -
+
+
+ More CQs
+
+
+
-