Merge branch 'hotfix-2.0.0-rc6' of bitbucket.org:k1jt/wsjtx into hotfix-2.0.0-rc6

This commit is contained in:
Steve Franke 2018-12-05 10:19:26 -06:00
commit fb39de196e
7 changed files with 21 additions and 17 deletions

View File

@ -67,7 +67,7 @@ d). Edit lines as needed. Keeping them in alphabetic order help see dupes.
:fmt_group: https://groups.yahoo.com/neo/groups/FMT-nuts/info[FMT Group] :fmt_group: https://groups.yahoo.com/neo/groups/FMT-nuts/info[FMT Group]
:fmt_k5cm: http://www.k5cm.com/[FMT Event Info] :fmt_k5cm: http://www.k5cm.com/[FMT Event Info]
:fmt_wspr: http://www.physics.princeton.edu/pulsar/K1JT/FMT_User.pdf[Accurate Frequency Measurements with your WSPR Setup] :fmt_wspr: http://www.physics.princeton.edu/pulsar/K1JT/FMT_User.pdf[Accurate Frequency Measurements with your WSPR Setup]
:ft8_tips: http://www.physics.princeton.edu/pulsar/K1JT/FT8_Operating_Tips.pdf[here] :ft8_tips: http://www.g4ifb.com/FT8_Hinson_tips_for_HF_DXers.pdf[FT8 Operating Guide]
:ft8_DXped: http://physics.princeton.edu/pulsar/k1jt/FT8_DXpedition_Mode.pdf[FT8 DXpedition Mode] :ft8_DXped: http://physics.princeton.edu/pulsar/k1jt/FT8_DXpedition_Mode.pdf[FT8 DXpedition Mode]
:gnu_gpl: http://www.gnu.org/licenses/gpl-3.0.txt[GNU General Public License] :gnu_gpl: http://www.gnu.org/licenses/gpl-3.0.txt[GNU General Public License]
:homepage: http://physics.princeton.edu/pulsar/K1JT/[WSJT Home Page] :homepage: http://physics.princeton.edu/pulsar/K1JT/[WSJT Home Page]

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 30 KiB

View File

@ -1,7 +1,10 @@
image::colors.png[align="center",alt="Colors Screen"] image::colors.png[align="center",alt="Colors Screen"]
_WSJT-X_ uses colors to highlight decoded messages containing _WSJT-X_ uses colors to highlight decoded CQ messages of particular
information of particular interest. Check the box to select any interest. Check the box *Show DXCC, grid, and worked-before status*
that interest you. Drag any line up or down to raise or lower on the *Settings | General* tab, and any boxes of interest to you on
its logical priority. Right-click any line to select a new the *Colors* tab. You can drag any line up or down to raise or lower
foreground or background color. its logical priority. Right-click any line to set a new foreground or
background color. Foreground and background colors are applied
separately, and careful choices of foreground, background, and
priority can provide two indications of worked-before status.

View File

@ -4,9 +4,9 @@
image::settings-frequencies.png[align="center",alt="Frequency Screen"] image::settings-frequencies.png[align="center",alt="Frequency Screen"]
_Working Frequencies_: By default the *Working Frequencies* table _Working Frequencies_: By default the *Working Frequencies* table
contains a list of frequencies conventionally used for modes JT4, JT9, contains a list of frequencies conventionally used for modes FT8, JT4,
JT65, MSK144, WSPR, and Echo. Conventions may change with time or JT9, JT65, MSK144, WSPR, and Echo. Conventions may change with time
by user preference; you can modify the frequency table as desired. or by user preference; you can modify the frequency table as desired.
- To change an existing entry, double-click to edit it, type a desired - To change an existing entry, double-click to edit it, type a desired
frequency in MHz or select from the drop down list of options, then frequency in MHz or select from the drop down list of options, then

View File

@ -46,13 +46,14 @@ when double-clicking.
NOTE: To avoid QRM from competing callers, it is frequently desirable NOTE: To avoid QRM from competing callers, it is frequently desirable
to answer a CQ on a different frequency from that of the CQing to answer a CQ on a different frequency from that of the CQing
station. The same is true when you tail-end another QSO. Choose a Tx station. The same is true when you tail-end another QSO. Choose a Tx
frequency that appears to be not in use. frequency that appears to be not in use. You might want to check the
box *Hold Tx Freq*.
NOTE: Keyboard shortcuts *Shift+F11* and *Shift+F12* provide an easy NOTE: Keyboard shortcuts *Shift+F11* and *Shift+F12* provide an easy
way to move your Tx frequency down or up in 60 Hz steps. way to move your Tx frequency down or up in 60 Hz steps.
NOTE: Further helpful tips on FT8 operating procedures are available NOTE: An online {ft8_tips} by ZL2IFB offers many helpful tips on
{ft8_tips}. Thanks to ZL2IFB! operating procedures.
.FT8 DXpedition Mode: .FT8 DXpedition Mode:

View File

@ -1,5 +1,5 @@
// This is a comment line, anything with // is ignored at process time. // This is a comment line, anything with // is ignored at process time.
= _WSJT-X_ User Guide = _WSJT-X 2.0_ User Guide
Joseph H Taylor, Jr, K1JT Joseph H Taylor, Jr, K1JT
:revnumber: {VERSION} :revnumber: {VERSION}
// For web-pages, adding :badges: is ok, but is a security issue for // For web-pages, adding :badges: is ok, but is a security issue for

View File

@ -1,16 +1,16 @@
subroutine fmtmsg(msg,iz) subroutine fmtmsg(msg,iz)
character*22 msg character*(*) msg
! Convert all letters to upper case ! Convert all letters to upper case
iz=22 iz=len(msg)
do i=1,22 do i=1,iz
if(msg(i:i).ge.'a' .and. msg(i:i).le.'z') & if(msg(i:i).ge.'a' .and. msg(i:i).le.'z') &
msg(i:i)= char(ichar(msg(i:i))+ichar('A')-ichar('a')) msg(i:i)= char(ichar(msg(i:i))+ichar('A')-ichar('a'))
if(msg(i:i).ne.' ') iz=i if(msg(i:i).ne.' ') iz=i
enddo enddo
do iter=1,5 !Collapse multiple blanks into one do iter=1,37 !Collapse multiple blanks into one
ib2=index(msg(1:iz),' ') ib2=index(msg(1:iz),' ')
if(ib2.lt.1) go to 100 if(ib2.lt.1) go to 100
msg=msg(1:ib2)//msg(ib2+2:) msg=msg(1:ib2)//msg(ib2+2:)