w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-25 21:58:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add a checkbox to enable more frequent programmed CQs by Fox.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8659 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2018-05-14 18:45:23 +00:00
parent c1ca43da3e
commit 12c68a969a
3 changed files with 49 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mainwindow.cpp
View File

@ -7616,13 +7616,14 @@ void MainWindow::foxTxSequencer()
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?
if(m_tFoxTxSinceCQ >= m_foxCQtime) { if(m_tFoxTxSinceCQ >= m_foxCQtime and ui->cbMoreCQs->isChecked()) {
fm=ui->comboBoxCQ->currentText() + " " + m_config.my_callsign(); fm=ui->comboBoxCQ->currentText() + " " + m_config.my_callsign();
if(!fm.contains("/")) { if(!fm.contains("/")) {
//If Fox is not a compound callsign, add grid to the CQ message. //If Fox is not a compound callsign, add grid to the CQ message.
fm += " " + m_config.my_grid().mid(0,4); fm += " " + m_config.my_grid().mid(0,4);
m_fullFoxCallTime=now; m_fullFoxCallTime=now;
} }
m_tFoxTx0=m_tFoxTx; //Remember when we sent a CQ
islot++; islot++;
foxGenWaveform(islot-1,fm); foxGenWaveform(islot-1,fm);
goto Transmit; goto Transmit;
@ -7744,11 +7745,12 @@ list2Done:
if(islot < m_Nslots) { if(islot < m_Nslots) {
//At least one slot is still open //At least one slot is still open
if(m_tFoxTx%4==0 or islot==0) { if(islot==0 or ((m_tFoxTx-m_tFoxTx0>=4) and ui->cbMoreCQs->isChecked())) {
//Every 4th Tx sequence, we'll put a CQ message in an otherwise empty slot //Roughly every 4th Tx sequence, put a CQ message in an otherwise empty slot
fm=ui->comboBoxCQ->currentText() + " " + m_config.my_callsign(); fm=ui->comboBoxCQ->currentText() + " " + m_config.my_callsign();
if(!fm.contains("/")) { if(!fm.contains("/")) {
fm += " " + m_config.my_grid().mid(0,4); fm += " " + m_config.my_grid().mid(0,4);
m_tFoxTx0=m_tFoxTx; //Remember when we send a CQ
m_fullFoxCallTime=now; m_fullFoxCallTime=now;
} }
islot++; islot++;

1
mainwindow.h
View File

@ -433,6 +433,7 @@ private:
qint32 m_tAutoOn; qint32 m_tAutoOn;
// qint32 m_maxQSOs; // qint32 m_maxQSOs;
qint32 m_tFoxTx=0; qint32 m_tFoxTx=0;
qint32 m_tFoxTx0=0;
qint32 m_maxStrikes=3; //Max # of repeats: 3 strikes and you're out 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_maxFoxWait=3; //Max wait time for expected Hound replies
qint32 m_foxCQtime=10; //CQs at least every 5 minutes qint32 m_foxCQtime=10; //CQs at least every 5 minutes

79
mainwindow.ui
View File

@ -1577,41 +1577,6 @@ list. The list can be maintained in Settings (F2).</string>
<layout class="QGridLayout" name="gridLayout_11"> <layout class="QGridLayout" name="gridLayout_11">
<item row="0" column="1" rowspan="2"> <item row="0" column="1" rowspan="2">
<layout class="QGridLayout" name="gridLayout_10"> <layout class="QGridLayout" name="gridLayout_10">
<item row="1" column="0">
<widget class="QSpinBox" name="sbNlist">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="prefix">
<string>N List </string>
</property>
<property name="minimum">
<number>5</number>
</property>
<property name="maximum">
<number>100</number>
</property>
<property name="value">
<number>12</number>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QPushButton" name="pbFoxReset">
<property name="text">
<string>Reset</string>
</property>
</widget>
</item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QSpinBox" name="sbMax_dB"> <widget class="QSpinBox" name="sbMax_dB">
<property name="sizePolicy"> <property name="sizePolicy">
@ -1734,6 +1699,41 @@ list. The list can be maintained in Settings (F2).</string>
</item> </item>
</widget> </widget>
</item> </item>
<item row="6" column="0">
<widget class="QPushButton" name="pbFoxReset">
<property name="text">
<string>Reset</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QSpinBox" name="sbNlist">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="prefix">
<string>N List </string>
</property>
<property name="minimum">
<number>5</number>
</property>
<property name="maximum">
<number>100</number>
</property>
<property name="value">
<number>12</number>
</property>
</widget>
</item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QSpinBox" name="sbNslots"> <widget class="QSpinBox" name="sbNslots">
<property name="sizePolicy"> <property name="sizePolicy">
@ -1815,7 +1815,7 @@ list. The list can be maintained in Settings (F2).</string>
</item> </item>
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item row="7" column="0">
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@ -1828,6 +1828,13 @@ list. The list can be maintained in Settings (F2).</string>
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="5" column="0">
<widget class="QCheckBox" name="cbMoreCQs">
<property name="text">
<string>More CQs</string>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item row="0" column="0"> <item row="0" column="0">