Merge branch 'hotfix-2.0.1-rc1' of bitbucket.org:k1jt/wsjtx into hotfix-2.0.1-rc1

This commit is contained in:
Bill Somerville 2018-12-16 01:28:21 +00:00
commit a901ad52f3
2 changed files with 10 additions and 5 deletions

View File

@ -126,12 +126,12 @@ Either callsign (or both) may have /P appended.
K1ABC W9XYZ RR73 K1ABC W9XYZ RR73
[[COMP-CALL]] [[COMP-CALL]]
=== Compound Callsigns === Nonstandard Callsigns
*FT8 and MSK144* *FT8 and MSK144*
Compound callsigns like xx/K1ABC or K1ABC/x and nonstandard callsigns Compound callsigns like xx/K1ABC or K1ABC/x and special event
like YW18FIFA are supported for normal QSOs but not for the special callsigns like YW18FIFA are supported for normal QSOs but not for
contest-style messages. Model QSOs look something like this: contest-style messages. Model QSOs look something like this:
CQ PJ4/K1ABC CQ PJ4/K1ABC
@ -159,6 +159,11 @@ Except for the special cases involving /P or /R used in VHF
contesting, _WSJT-X {VERSION_MAJOR}.{VERSION_MINOR}_ offers no support contesting, _WSJT-X {VERSION_MAJOR}.{VERSION_MINOR}_ offers no support
for two nonstandard callsigns to work each other. for two nonstandard callsigns to work each other.
TIP: Using a nonstandard callsign has definite costs. It restricts
the types of information that can be included in a message. It
prevents including your locator in standard messages, which
necessarily impairs the usefulness of tools like PSK Reporter.
*JT4, JT9, JT65, and QRA64* *JT4, JT9, JT65, and QRA64*
In the 72-bit modes, compound callsigns are handled in one of two In the 72-bit modes, compound callsigns are handled in one of two

View File

@ -106,8 +106,8 @@ namespace
{50276000, Modes::JT65, IARURegions::R2}, {50276000, Modes::JT65, IARURegions::R2},
{50276000, Modes::JT65, IARURegions::R3}, {50276000, Modes::JT65, IARURegions::R3},
{50380000, Modes::MSK144, IARURegions::R1}, {50380000, Modes::MSK144, IARURegions::R1},
{50280000, Modes::MSK144, IARURegions::R2}, {50260000, Modes::MSK144, IARURegions::R2},
{50280000, Modes::MSK144, IARURegions::R3}, {50260000, Modes::MSK144, IARURegions::R3},
{50293000, Modes::WSPR, IARURegions::R2}, {50293000, Modes::WSPR, IARURegions::R2},
{50293000, Modes::WSPR, IARURegions::R3}, {50293000, Modes::WSPR, IARURegions::R3},
{50310000, Modes::JT65, IARURegions::ALL}, {50310000, Modes::JT65, IARURegions::ALL},