From 635fc597b3bf88f115be27e5ad30c4f3382e8e95 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 9 Dec 2016 19:26:45 +0000 Subject: [PATCH] Minor changes and additions to User Guide and utility programs. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7374 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- doc/user_guide/en/utilities.adoc | 41 ++++++++++++++++++++++++++------ lib/msk144code.f90 | 2 +- lib/qra64code.f90 | 6 ++--- 3 files changed, 38 insertions(+), 11 deletions(-) diff --git a/doc/user_guide/en/utilities.adoc b/doc/user_guide/en/utilities.adoc index c076e26df..deb27c43f 100644 --- a/doc/user_guide/en/utilities.adoc +++ b/doc/user_guide/en/utilities.adoc @@ -17,7 +17,7 @@ symbols in a transmitted message is 206. To run `jt4code`, enter the program name followed by a JT4 message enclosed in quotes. In Windows the command and program output might look like this: - C:\WSJTX> jt4code "G0XYZ K1ABC FN42" + C:\WSJTX\bin> jt4code "G0XYZ K1ABC FN42" Message Decoded Err? Type ------------------------------------------------------------------- 1. G0XYZ K1ABC FN42 G0XYZ K1ABC FN42 1: Std Msg @@ -36,7 +36,7 @@ sync tone. The total number of symbols in a transmitted message is 85. Enter the program name followed by a JT9 message enclosed in quotes: - C:\WSJTX> jt9code "G0XYZ K1ABC FN42" + C:\WSJTX\bin> jt9code "G0XYZ K1ABC FN42" Message Decoded Err? Type ------------------------------------------------------------------- 1. G0XYZ K1ABC FN42 G0XYZ K1ABC FN42 1: Std Msg @@ -56,7 +56,7 @@ A typical execution of `jt65code` is shown below. The program displays the packed message of 72 bits, shown here as 12 six-bit symbol values, followed by the channel symbols: - C:\WSJTX> jt65code "G0XYZ K1ABC FN42" + C:\WSJTX\bin> jt65code "G0XYZ K1ABC FN42" Message Decoded Err? Type ---------------------------------------------------------------------- 1. G0XYZ K1ABC FN42 G0XYZ K1ABC FN42 1: Std Msg @@ -73,7 +73,7 @@ JT9 and JT65, try looking at the channel symbols after changing a single character in the message. For example, change the grid locator from FN42 to FN43 in the JT65 message: - C:\WSJTX> jt65code "G0XYZ K1ABC FN43" + C:\WSJTX\bin> jt65code "G0XYZ K1ABC FN43" Message Decoded Err? Type ---------------------------------------------------------------------- 1. G0XYZ K1ABC FN43 G0XYZ K1ABC FN43 1: Std Msg @@ -89,11 +89,30 @@ You will discover that every possible JT65 message differs from every other possible JT65 message in at least 52 of the 63 information-carrying channel symbols. +Here's an example using the QRA64 mode: + + C:\WSJTX\bin qra64code "KA1ABC WB9XYZ EN37" + Message Decoded Err? Type + -------------------------------------------------------------------------- + 1 KA1ABC WB9XYZ EN37 KA1ABC WB9XYZ EN37 1: Std Msg + + Packed message, 6-bit symbols 34 16 49 32 51 26 31 40 41 22 0 41 + + Information-carrying channel symbols + 34 16 49 32 51 26 31 40 41 22 0 41 16 46 14 24 58 45 22 45 38 54 7 23 2 49 32 50 20 33 + 55 51 7 31 31 46 41 25 55 14 62 33 29 24 2 49 4 38 15 21 1 41 56 56 16 44 17 30 46 36 + 23 23 41 + + Channel symbols including sync + 20 50 60 0 40 10 30 34 16 49 32 51 26 31 40 41 22 0 41 16 46 14 24 58 45 22 45 38 54 7 + 23 2 49 32 50 20 33 55 51 20 50 60 0 40 10 30 7 31 31 46 41 25 55 14 62 33 29 24 2 49 + 4 38 15 21 1 41 56 56 16 44 17 30 46 36 23 23 41 20 50 60 0 40 10 30 + Execution of any of these utility programs with "-t" as the only command-line argument produces examples of all supported message types. For example, using `jt65code -t`: - C:\WSJTX> jt65code -t + C:\WSJTX\bin> jt65code -t Message Decoded Err? Type -------------------------------------------------------------------------- @@ -135,12 +154,20 @@ MSK144 uses a binary channel code, so transmitted symbols have the value the I (in-phase) channel, odd numbered symbols on the Q (quadrature) channel. A typical execution of `msk144code` is shown below. - C:\WSJTX> msk144code "K1ABC W9XYZ EN37" + C:\WSJTX\bin> msk144code "K1ABC W9XYZ EN37" Message Decoded Err? Type -------------------------------------------------------------------------- 1. K1ABC W9XYZ EN37 K1ABC W9XYZ EN37 1: Std Msg - Channel symbols (72 per line): + Channel symbols 110000100011001101010101001000111111001001001100110010011100001001000000 010110001011101111001010111011001100110101011000111101100010111100100011 + + C:\WSJTX\bin> msk144code " R-03" + Message Decoded Err? Type + -------------------------------------------------------------------------- + 1. R-03 R-03 7: Hashed calls + + Channel symbols + 1000011100001000111011111010011011111010 diff --git a/lib/msk144code.f90 b/lib/msk144code.f90 index 576bc321a..a58c768bd 100644 --- a/lib/msk144code.f90 +++ b/lib/msk144code.f90 @@ -60,7 +60,7 @@ program msk144code n=144 if(msg(1:1).eq."<") n=40 write(*,1030) i4tone(1:n) -1030 format(/'Channel symbols (72 per line):'/(72i1)) +1030 format(/'Channel symbols'/(72i1)) endif 999 end program msk144code diff --git a/lib/qra64code.f90 b/lib/qra64code.f90 index 369ce4d5e..629282240 100644 --- a/lib/qra64code.f90 +++ b/lib/qra64code.f90 @@ -54,13 +54,13 @@ program QRA64code if(nmsg.eq.1) then write(*,1030) dgen -1030 format(/'Packed message, 6-bit symbols: ',12i3) !Display packed symbols +1030 format(/'Packed message, 6-bit symbols ',12i3) !Display packed symbols write(*,1040) sent -1040 format(/'Information-carrying channel symbols:'/(i5,29i3)) +1040 format(/'Information-carrying channel symbols'/(i5,29i3)) write(*,1050) 10*icos7,sent(1:32),10*icos7,sent(33:63),10*icos7 -1050 format(/'Channel symbols including sync:'/(i5,29i3)) +1050 format(/'Channel symbols including sync'/(i5,29i3)) endif 999 end program QRA64code