mirror of https://github.com/saitohirga/WSJT-X.git
Merged from trunk:
------------------------------------------------------------------------ r8208 | k1jt | 2017-11-02 14:18:24 +0000 (Thu, 02 Nov 2017) | 2 lines Make a special-case exception for nonstandard 3X/Guinea callsigns. ------------------------------------------------------------------------ r8213 | k1jt | 2017-11-03 15:18:08 +0000 (Fri, 03 Nov 2017) | 2 lines Slightly more restrictive conditions for allowing 3X? prefixes. ------------------------------------------------------------------------ r8221 | bsomervi | 2017-11-05 17:01:56 +0000 (Sun, 05 Nov 2017) | 1 line Fix User Guide Omni-Rig download link text and spell Omni-Rig like Alex does ------------------------------------------------------------------------ git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx-1.8@8222 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
a7aec4f27f
commit
ff60b340c4
|
@ -104,7 +104,7 @@ d). Edit lines as needed. Keeping them in alphabetic order help see dupes.
|
|||
:jtsdk_qt: http://physics.princeton.edu/pulsar/K1JT/JTSDK-QT.exe[Download]
|
||||
:jtsdk_vcredist: http://sourceforge.net/projects/jtsdk/files/win32/2.0.0/base/contrib/vcredist_x86.exe/download[Download]
|
||||
:nh6z: http://www.nh6z.net/Amatuer_Radio_Station_NH6Z/Other_Peoples_Software.html[here]
|
||||
:omnirig: http://www.dxatlas.com/OmniRig/Files/OmniRig.zip[Download]
|
||||
:omnirig: http://www.dxatlas.com/OmniRig/Files/OmniRig.zip[Omni-Rig]
|
||||
:osx: http://physics.princeton.edu/pulsar/K1JT/wsjtx-{VERSION}-Darwin.dmg[wsjtx-{VERSION}-Darwin.dmg]
|
||||
:QRA64_EME: http://physics.princeton.edu/pulsar/K1JT/QRA64_EME.pdf[QRA64 for microwave EME]
|
||||
:svn: http://subversion.apache.org/packages.html#windows[Subversion]
|
||||
|
|
|
@ -47,13 +47,16 @@ location for each instance of _WSJT-X_.
|
|||
wsjtx --rig-name=TS2000
|
||||
wsjtx --rig-name=FT847
|
||||
|
||||
When setting up rig control through _OmniRig_, something goes wrong when I click *Test CAT*. What can I do about it?::
|
||||
When setting up rig control through _Omni-Rig_, something goes wrong
|
||||
when I click *Test CAT*. What can I do about it?::
|
||||
|
||||
_OmniRig_ apparently has a bug that appears when you click *Test CAT*.
|
||||
Forget using *Test CAT* and just click *OK*. _OmniRig_ then behaves
|
||||
normally.
|
||||
_Omni-Rig_ apparently has a bug that appears when you click *Test
|
||||
CAT*. Forget using *Test CAT* and just click *OK*. _Omni-Rig_ then
|
||||
behaves normally.
|
||||
|
||||
I am using _WSJT-X_ with _Ham Radio Deluxe_. All seems well until I start HRD Logbook or DM780 running in parallel; then CAT control becomes unreliable.::
|
||||
I am using _WSJT-X_ with _Ham Radio Deluxe_. All seems well until I
|
||||
start HRD Logbook or DM780 running in parallel; then CAT control
|
||||
becomes unreliable.::
|
||||
|
||||
You may see delays up to 20 seconds or so in frequency changes or
|
||||
other radio commands, due to a bug in HRD. HRD folks are aware of the
|
||||
|
|
|
@ -23,7 +23,7 @@ regions
|
|||
frequencies
|
||||
|
||||
- Improved CAT control for many radios, including those controlled
|
||||
through Commander or OmniRig
|
||||
through Commander or Omni-Rig
|
||||
|
||||
- Bug fixes and minor tweaks to user interface
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@ your radio, select the *Radio* tab.
|
|||
|
||||
- Alternatively, if you have configured your station for control by
|
||||
*DX Lab Suite Commander*, *Ham Radio Deluxe*, *Hamlib NET rigctl*, or
|
||||
*OmniRig*, you may select one of those program names from the *Rig*
|
||||
*Omni-Rig*, you may select one of those program names from the *Rig*
|
||||
list. In these cases the entry field immediately under _CAT Control_
|
||||
will be relabeled as *Network Server*. Leave this field blank to
|
||||
access the default instance of your control program, running on the
|
||||
|
@ -19,9 +19,9 @@ same computer. If the control program runs on a different computer
|
|||
and/or port, specify it here. Hover the mouse pointer over the entry
|
||||
field to see the required formatting details.
|
||||
|
||||
- Select *OmniRig Rig 1* or *OmniRig Rig 2* to connect to an _OmniRig_
|
||||
server running on the same computer. Note that _OmniRig_ is available
|
||||
only under Windows.
|
||||
- Select *Omni-Rig Rig 1* or *Omni-Rig Rig 2* to connect to an
|
||||
_Omni-Rig_ server running on the same computer. Note that _Omni-Rig_
|
||||
is available only under Windows.
|
||||
|
||||
- Set *Poll Interval* to the desired interval for _WSJT-X_ to query
|
||||
your radio. For most radios a small number (say, 1 – 3 s) is
|
||||
|
|
|
@ -64,6 +64,10 @@ subroutine packbits(dbits,nsymd,m0,sym)
|
|||
! Work-around for Swaziland prefix:
|
||||
if(callsign(1:4).eq.'3DA0') callsign='3D0'//callsign(5:6)
|
||||
|
||||
! Work-around for Guinea prefixes:
|
||||
if(callsign(1:2).eq.'3X' .and. callsign(3:3).ge.'A' .and. &
|
||||
callsign(3:3).le.'Z') callsign='Q'//callsign(3:6)
|
||||
|
||||
if(callsign(1:3).eq.'CQ ') then
|
||||
ncall=NBASE + 1
|
||||
if(callsign(4:4).ge.'0' .and. callsign(4:4).le.'9' .and. &
|
||||
|
@ -265,7 +269,9 @@ subroutine packbits(dbits,nsymd,m0,sym)
|
|||
psfx = ' '
|
||||
endif
|
||||
|
||||
999 if(word(1:3).eq.'3D0') word='3DA0'//word(4:)
|
||||
999 if(word(1:3).eq.'3D0') word='3DA0'//word(4:)
|
||||
if(word(1:1).eq.'Q' .and. word(2:2).ge.'A' .and. &
|
||||
word(2:2).le.'Z') word='3X'//word(2:)
|
||||
|
||||
return
|
||||
end subroutine unpackcall
|
||||
|
|
Loading…
Reference in New Issue