w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-02-03 09:44:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-2.2.0' of bitbucket.org:k1jt/wsjtx into release-2.2.0

Browse Source
This commit is contained in:
Bill Somerville 2020-05-26 19:57:43 +01:00
commit 2088ad8597
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/user_guide/en/settings-frequencies.adoc
View File

@ -2,7 +2,7 @@
[[FIG_BAND_SETTINGS]] [[FIG_BAND_SETTINGS]]
_By default, the *Working Frequencies* table contains a list of By default, the *Working Frequencies* table contains a list of
frequencies conventionally used for modes FT8, JT4, JT9, JT65, MSK144, frequencies conventionally used for modes FT8, JT4, JT9, JT65, MSK144,
WSPR, and Echo. Conventions may change with time or by user WSPR, and Echo. Conventions may change with time or by user
preference; you can modify the frequency table as desired. preference; you can modify the frequency table as desired.

2
doc/user_guide/en/settings-txmacros.adoc
View File

@ -3,7 +3,7 @@
[[FigTxMacros]] [[FigTxMacros]]
*Tx Macros* are an aid for sending brief, frequently used free-text *Tx Macros* are an aid for sending brief, frequently used free-text
messages such as the examples shown above. messages such as the examples shown below.
image::tx-macros.png[align="center",alt="Tx Macros Screen"] image::tx-macros.png[align="center",alt="Tx Macros Screen"]

1
lib/ft8_decode.f90
View File

@ -135,6 +135,7 @@ contains
do ipass=1,npass do ipass=1,npass
newdat=.true. newdat=.true.
syncmin=1.3 syncmin=1.3
if(ndepth.le.2) syncmin=1.6
if(ipass.eq.1) then if(ipass.eq.1) then
lsubtract=.true. lsubtract=.true.
ndeep=ndepth ndeep=ndepth

3
widgets/mainwindow.cpp
View File

@ -921,7 +921,8 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
set_mode (m_mode); set_mode (m_mode);
if(m_mode=="Echo") monitor(false); //Don't auto-start Monitor in Echo mode. if(m_mode=="Echo") monitor(false); //Don't auto-start Monitor in Echo mode.
ui->sbSubmode->setValue (vhf ? m_nSubMode : 0); ui->sbSubmode->setValue (vhf ? m_nSubMode : 0); //Submodes require VHF features
if(m_mode=="ISCAT" and !vhf) mode_label.setText("ISCAT A");
if(m_mode=="MSK144") { if(m_mode=="MSK144") {
Q_EMIT transmitFrequency (1000.0); Q_EMIT transmitFrequency (1000.0);
} else { } else {