From 42101fa565593a58f6df451a6aecf6fee51f70e0 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Fri, 14 Sep 2018 20:18:36 +0100 Subject: [PATCH 1/2] Add a .gitattributes file and populate it with initial export-ignore attributes This change allows developers to easily create a sanitized source archive for example: git archive --format=tar --prefix=wsjtx-2.0.0/ wsjtx-2.0.0-rc1 | gzip >wsjtx-2.0.0-rc1.tgz Which creates a sources tarball called wsjtx-2.0.0-rc1.tgz from the wsjtx-2.0.0-rc1 tag (substitute HEAD or a branch name or even a commit SHA for other contents). --- .gitattributes | 3 +++ sources.exclude | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 .gitattributes delete mode 100644 sources.exclude diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..93434826f --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +.gitattributes export-ignore +/samples export-ignore +/lib/fsk4hf export-ignore diff --git a/sources.exclude b/sources.exclude deleted file mode 100644 index 80ac1fccd..000000000 --- a/sources.exclude +++ /dev/null @@ -1,4 +0,0 @@ -.git -sources.exclude -samples -lib/fsk4hf From 34f9355f0033245c0b96f11a7d53a2dbeb106744 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 17 Sep 2018 09:12:47 -0400 Subject: [PATCH 2/2] Fix a few flaws in descriptive documents. --- lib/77bit/77bit.txt | 11 +++++----- lib/77bit/New_Features_WSJT-X_2.0.txt | 30 ++++++++++++++++++--------- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/lib/77bit/77bit.txt b/lib/77bit/77bit.txt index 5334ee57c..0d6c4b733 100644 --- a/lib/77bit/77bit.txt +++ b/lib/77bit/77bit.txt @@ -64,9 +64,10 @@ i3.n3 0.5 Telemetry, 71 bits -1. Two standard callsigns, Roger, and grid or report. Each callsign - may have an appended "/R" to indicate Rover status for NA VHF - contests. +1. Two callsigns, Roger, and grid or report. Each callsign may have + an appended "/R" to indicate Rover status for NA VHF contests. + Either callsign may be nonstandard if enclosed in angle brackets, + for example . 2. Same as Type 1, but uses /P instead of /R. For European VHF contests. @@ -76,8 +77,8 @@ i3.n3 US state, Canadian province/territory, or DX serial number from 0001 to 7999. -4. One hashed call; one standard, compound, or nonstandard call with - up to 11 characters; and an optional RRR, RR73, or 73. +4. One hashed call or "CQ"; one compound or nonstandard call with up + to 11 characters; and (if not "CQ") an optional RRR, RR73, or 73. --------------------------------------------------------------------------- The following are tentative and not included in first release. diff --git a/lib/77bit/New_Features_WSJT-X_2.0.txt b/lib/77bit/New_Features_WSJT-X_2.0.txt index 26c293050..b97c45411 100644 --- a/lib/77bit/New_Features_WSJT-X_2.0.txt +++ b/lib/77bit/New_Features_WSJT-X_2.0.txt @@ -1,4 +1,5 @@ New Features in WSJT-X 2.0 + September 17, 2018 -------------------------- This document is an update to the white paper "Plans for WSJT-X @@ -94,6 +95,7 @@ i3.n3 Example Messages Comments 1. K1ABC W9XYZ RR73 1. K1ABC/R W9XYZ EN37 NA VHF Contest 1. K1ABC W9XYZ/R RR73 NA VHF Contest + 1. K1ABC/R W9XYZ/R RR73 NA VHF Contest 1. W9XYZ Compound call 1. W9XYZ 73 Compound call 1. W9XYZ -13 Nonstandard call @@ -109,18 +111,26 @@ i3.n3 Example Messages Comments 3. TU; KA0DEF K1ABC R 569 MA ARRL RTTY Roundup 3. TU; K1ABC G3AAA R 559 0194 ARRL RTTY Roundup 3. W9XYZ K1ABC R 589 MA ARRL RTTY Roundup - 4. CQ KH1/KH7Z Compound call + 4. CQ PJ4/K1ABC 4. CQ YW18FIFA Nonstandard call + 4. YW18FIFA RR73 Nonstandard call + 4. PJ4/K1ABC RRR Nonstandard call + 4. YW18FIFA Nonstandard call + 4. YW18FIFA 73 Nonstandard call + 4. PJ4/K1ABC Nonstandard call + 4. PJ4/K1ABC 73 Nonstandard call + 4. YW18FIFA RRR Nonstandard call ---------------------------------------------------------------------------------- In the above list, callsigns enclosed in angle brackets (e.g., , ) are transmitted as hash codes. They will be -displayed correctly by any receiving station that has copied the full -callsign (without brackets) in a previous transmissiion. Otherwise -the receiving software will display <...>. +displayed correctly by receiving stations that have copied the full +callsign without brackets in a previous transmissiion. Otherwise the +receiving software will display <...>. Hash collisions are possible +but should be rare, and extremely rare within a particular QSO. -Some minimal QSO sequences that take advantage of the new 77-bit -messages are illustrated below. Model QSOs 1 and 2 are the same as +Some minimal message sequences that take advantage of the new 77-bit +formats are illustrated below. Model QSOs 1 and 2 are the same as those used by the old FT8 and MSK144 protocols, and QSO number 3 is the same as the existing FT8 DXpedition Mode. Model QSOs 4 through 9 were not possible with the old protocols. @@ -166,8 +176,8 @@ W9XYZ K1ABC R 2B EMA ---------------------------------------------------------------------------------- 5. ARRL VHF Contests ---------------------------------------------------------------------------------- -CQ TEST K1ABC/R FN42 "/R" is optional - K1ABC/R W9XYZ EN37 +CQ TEST K1ABC/R FN42 "/R" is optional + K1ABC/R W9XYZ EN37 on either callsign W9XYZ K1ABC/R R FN42 K1ABC/R W9XYZ RR73 @@ -185,8 +195,8 @@ TU; G3AAA K1ABC R 559 MA ---------------------------------------------------------------------------------- 7. EU VHF Contest ---------------------------------------------------------------------------------- -CQ TEST G4ABC/P IO91 "/P" is optional - G4ABC/P PA9XYZ JO22 +CQ TEST G4ABC/P IO91 "/P" is optional + G4ABC/P PA9XYZ JO22 on either callsign PA9XYZ 590003 IO91NP G4ABC/P R 570007 JO22DB PA9XYZ G4ABC/P RR73