w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2026-07-25 11:34:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Now 6 digit locators are possible again add option to prefer type 1 WSPR messages

Browse Source 
This  option, on  by  default, maintains  backwards compatibility  for
non-compound  callsign  holders.   If   switched  off  and  they  have
specified a 6 digit  grid then it will be sent in  the type 2 protocol
using two messages and a hashed callsign.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7053 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville
2016-09-03 23:33:13 +00:00
parent ecd48e425c
commit bdc8dd881c
2 changed files with 302 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mainwindow.cpp
+5 -1
View File
@@ -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 {