diff --git a/mainwindow.cpp b/mainwindow.cpp
index 704a6943a..1a5ba0eea 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -934,6 +934,7 @@ void MainWindow::writeSettings()
m_settings->setValue("LockTxFreq",m_lockTxFreq);
m_settings->setValue("PctTx",m_pctx);
m_settings->setValue("dBm",m_dBm);
+ m_settings->setValue ("WSPRPreferType1", ui->WSPR_prefer_type_1_check_box->isChecked ());
m_settings->setValue("UploadSpots",m_uploadSpots);
m_settings->setValue ("BandHopping", ui->band_hopping_group_box->isChecked ());
m_settings->setValue("TRindex",m_TRindex);
@@ -992,6 +993,7 @@ void MainWindow::readSettings()
m_inGain=m_settings->value("InGain",0).toInt();
m_pctx=m_settings->value("PctTx",20).toInt();
m_dBm=m_settings->value("dBm",37).toInt();
+ ui->WSPR_prefer_type_1_check_box->setChecked (m_settings->value ("WSPRPreferType1", true).toBool ());
m_uploadSpots=m_settings->value("UploadSpots",false).toBool();
if(!m_uploadSpots) ui->cbUploadWSPR_Spots->setStyleSheet("QCheckBox{background-color: yellow}");
ui->band_hopping_group_box->setChecked (m_settings->value ("BandHopping", false).toBool());
@@ -2698,7 +2700,9 @@ void MainWindow::guiUpdate()
sdBm.sprintf(" %d",m_dBm);
m_tx=1-m_tx;
int i2=m_config.my_callsign().indexOf("/");
- if(i2>0 || 6 == m_config.my_grid ().size ()) {
+ if(i2>0
+ || (6 == m_config.my_grid ().size ()
+ && !ui->WSPR_prefer_type_1_check_box->isChecked ())) {
if(i2<0) { // "Type 2" WSPR message
msg1=m_config.my_callsign() + " " + m_config.my_grid().mid(0,4) + sdBm;
} else {
diff --git a/mainwindow.ui b/mainwindow.ui
index 24818cca9..63e74f87c 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -1620,19 +1620,6 @@ list. The list can be maintained in Settings (F2).
0
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
@@ -1650,43 +1637,9 @@ list. The list can be maintained in Settings (F2).
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
- Band Hopping
-
-
- true
-
-
-
-
-
-
- Choose bands and times of day for band-hopping.
-
-
- Schedule ...
-
-
-
-
-
-
- -
-
+
+
-
+
Qt::Horizontal
@@ -1698,45 +1651,141 @@ list. The list can be maintained in Settings (F2).
- -
-
-
- Upload decoded messages to WSPRnet.org.
-
-
- Upload spots
-
-
-
- -
-
-
- Qt::AlignCenter
-
-
- Hz
-
-
- Tx
-
-
- 1400
-
-
- 1600
-
-
- 1500
-
-
-
-
-
-
- Transmit during the next 2-minute sequence.
+
+
+ Qt::Horizontal
-
- QPushButton:checked {
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
-
+
+
-
+
+
+ Qt::AlignCenter
+
+
+ Hz
+
+
+ Tx
+
+
+ 1400
+
+
+ 1600
+
+
+ 1500
+
+
+
+ -
+
+
+ Percentage of 2-minute sequences devoted to transmitting.
+
+
+ Qt::AlignCenter
+
+
+ %
+
+
+ Tx Pct
+
+
+ 100
+
+
+
+ -
+
+
+ Band Hopping
+
+
+ true
+
+
+
-
+
+
+ Choose bands and times of day for band-hopping.
+
+
+ Schedule ...
+
+
+
+
+
+
+
+
+ -
+
+
-
+
+
-
+
+
-
+
+
+ Upload decoded messages to WSPRnet.org.
+
+
+ Upload spots
+
+
+
+
+
+ -
+
+
+ <html><head/><body><p>6 digit locators cause 2 different mesages to be sent, the second contains the full locator but only a hashed callsign, other stations must have decoded the first once before they can decode your call in the second. Check this option to only send 4 digit locators if it will avoid the two message protocol.</p></body></html>
+
+
+ Prefer type 1 messages
+
+
+ true
+
+
+
+ -
+
+
-
+
+
+ Transmit during the next 2-minute sequence.
+
+
+ QPushButton:checked {
background-color: red;
border-style: outset;
border-width: 1px;
@@ -1745,77 +1794,121 @@ list. The list can be maintained in Settings (F2).
min-width: 5em;
padding: 3px;
}
-
-
- Tx Next
-
-
- true
-
-
+
+
+ Tx Next
+
+
+ true
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
-
+
+
+ Set Tx power in dBm (dB above 1 mW) as part of your WSPR message.
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+
+
+
+
+
- -
-
-
- Set Tx power in dBm (dB above 1 mW) as part of your WSPR message.
-
-
-
- -
-
+
-
+
- Qt::Horizontal
+ Qt::Vertical
- 40
- 20
+ 20
+ 40
- -
-
-
- Percentage of 2-minute sequences devoted to transmitting.
-
-
- Qt::AlignCenter
-
-
- %
-
-
- Tx Pct
-
-
- 100
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
+ -
+
+
+
+ 0
+ 0
+
+
+
+ QFrame::Panel
+
+
+ QFrame::Sunken
+
+
+
+ -
+
+
+ Digital gain for audio input
+
+
+ -50
+
+
+ 50
+
+
+ 20
+
+
+ QSlider::TicksBelow
+
+
+ 10
+
+
+
-
@@ -2015,32 +2108,6 @@ list. The list can be maintained in Settings (F2).
- -
-
-
- Callsign of station to be worked
-
-
-
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
- Locator of station to be worked
-
-
-
-
-
- Qt::AlignCenter
-
-
-
-
@@ -2063,6 +2130,19 @@ list. The list can be maintained in Settings (F2).
+ -
+
+
+ Callsign of station to be worked
+
+
+
+
+
+ Qt::AlignCenter
+
+
+
-
@@ -2079,6 +2159,19 @@ list. The list can be maintained in Settings (F2).
+ -
+
+
+ Locator of station to be worked
+
+
+
+
+
+ Qt::AlignCenter
+
+
+
-
@@ -2102,44 +2195,6 @@ list. The list can be maintained in Settings (F2).
- -
-
-
- Digital gain for audio input
-
-
- -50
-
-
- 50
-
-
- 20
-
-
- QSlider::TicksBelow
-
-
- 10
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- QFrame::Panel
-
-
- QFrame::Sunken
-
-
-
-
@@ -2168,45 +2223,6 @@ list. The list can be maintained in Settings (F2).
- -
-
-
-
- 0
- 0
-
-
-
- QLabel {
- font-family: MS Shell Dlg 2;
- font-size: 16pt;
- background-color : black;
- color : yellow;
-}
-
-
- QFrame::StyledPanel
-
-
- QFrame::Sunken
-
-
- 2
-
-
- 0
-
-
- <html><head/><body><p align="center"> 2015 Jun 17 </p><p align="center"> 01:23:45 </p></body></html>
-
-
- Qt::AlignCenter
-
-
- 5
-
-
-
-
@@ -2253,6 +2269,45 @@ QPushButton[state="ok"] {
+ -
+
+
+
+ 0
+ 0
+
+
+
+ QLabel {
+ font-family: MS Shell Dlg 2;
+ font-size: 16pt;
+ background-color : black;
+ color : yellow;
+}
+
+
+ QFrame::StyledPanel
+
+
+ QFrame::Sunken
+
+
+ 2
+
+
+ 0
+
+
+ <html><head/><body><p align="center"> 2015 Jun 17 </p><p align="center"> 01:23:45 </p></body></html>
+
+
+ Qt::AlignCenter
+
+
+ 5
+
+
+
-