diff --git a/CMakeLists.txt b/CMakeLists.txt index a40ca3eee..19e72db17 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1222,7 +1222,8 @@ install (TARGETS udp_daemon message_aggregator BUNDLE DESTINATION ${WSJT_BIN_DESTINATION} COMPONENT runtime ) -install (TARGETS jt9 jt65code qra64code qra64sim jt9code jt4code wsprd +install (TARGETS jt9 jt65code qra64code qra64sim jt9code jt4code + msk144code wsprd RUNTIME DESTINATION ${WSJT_BIN_DESTINATION} COMPONENT runtime BUNDLE DESTINATION ${WSJT_BIN_DESTINATION} COMPONENT runtime ) diff --git a/doc/user_guide/en/install-mac.adoc b/doc/user_guide/en/install-mac.adoc index d2d5d6ca8..54a35d28c 100644 --- a/doc/user_guide/en/install-mac.adoc +++ b/doc/user_guide/en/install-mac.adoc @@ -1,7 +1,7 @@ // These instructions are up-to-date for WSJT-X v1.4 *OS X 10.7* and later: Download the file {osx} to your desktop, -double-click on it and consult its +ReadMe+ file for important +double-click on it and consult its `ReadMe` file for important installation notes. If you have already installed a previous version, you can retain it by diff --git a/doc/user_guide/en/logging.adoc b/doc/user_guide/en/logging.adoc index 699e50c5b..ae657d23a 100644 --- a/doc/user_guide/en/logging.adoc +++ b/doc/user_guide/en/logging.adoc @@ -1,5 +1,5 @@ A basic logging facility in _WSJT-X_ saves QSO information to files -named +wsjtx.log+ (in comma-separated text format) and +wsjtx_log.adi+ +named `wsjtx.log` (in comma-separated text format) and `wsjtx_log.adi` (in standard ADIF format). These files can be imported directly into other programs, for example spreadsheets and popular logging programs. As described in the <> and <> section of this Guide. -A typical execution of +jt65code+ is shown below. The program +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: @@ -73,9 +71,9 @@ symbol values, followed by the channel symbols: For an illustration of the power of the strong error-control coding in 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: +from FN42 to FN43 in the JT65 message: - C:\Users\joe\wsjt\wsjtx_install>jt65code "G0XYZ K1ABC FN43" + C:\WSJTX> jt65code "G0XYZ K1ABC FN43" Message Decoded Err? Type ---------------------------------------------------------------------- 1. G0XYZ K1ABC FN43 G0XYZ K1ABC FN43 1: Std Msg @@ -91,4 +89,58 @@ 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. +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 + + Message Decoded Err? Type + -------------------------------------------------------------------------- + 1. CQ WB9XYZ EN34 CQ WB9XYZ EN34 1: Std Msg + 2. CQ DX WB9XYZ EN34 CQ DX WB9XYZ EN34 1: Std Msg + 3. QRZ WB9XYZ EN34 QRZ WB9XYZ EN34 1: Std Msg + 4. KA1ABC WB9XYZ EN34 KA1ABC WB9XYZ EN34 1: Std Msg + 5. KA1ABC WB9XYZ RO KA1ABC WB9XYZ RO 1: Std Msg + 6. KA1ABC WB9XYZ -21 KA1ABC WB9XYZ -21 1: Std Msg + 7. KA1ABC WB9XYZ R-19 KA1ABC WB9XYZ R-19 1: Std Msg + 8. KA1ABC WB9XYZ RRR KA1ABC WB9XYZ RRR 1: Std Msg + 9. KA1ABC WB9XYZ 73 KA1ABC WB9XYZ 73 1: Std Msg + 10. KA1ABC WB9XYZ KA1ABC WB9XYZ 1: Std Msg + 11. CQ 000 WB9XYZ EN34 CQ 000 WB9XYZ EN34 1: Std Msg + 12. CQ 999 WB9XYZ EN34 CQ 999 WB9XYZ EN34 1: Std Msg + 13. CQ EU WB9XYZ EN34 CQ EU WB9XYZ EN34 1: Std Msg + 14. CQ WY WB9XYZ EN34 CQ WY WB9XYZ EN34 1: Std Msg + 15. ZL/KA1ABC WB9XYZ ZL/KA1ABC WB9XYZ 2: Type 1 pfx + 16. KA1ABC ZL/WB9XYZ KA1ABC ZL/WB9XYZ 2: Type 1 pfx + 17. KA1ABC/4 WB9XYZ KA1ABC/4 WB9XYZ 3: Type 1 sfx + 18. KA1ABC WB9XYZ/4 KA1ABC WB9XYZ/4 3: Type 1 sfx + 19. CQ ZL4/KA1ABC CQ ZL4/KA1ABC 4: Type 2 pfx + 20. DE ZL4/KA1ABC DE ZL4/KA1ABC 4: Type 2 pfx + 21. QRZ ZL4/KA1ABC QRZ ZL4/KA1ABC 4: Type 2 pfx + 22. CQ WB9XYZ/VE4 CQ WB9XYZ/VE4 5: Type 2 sfx + 23. HELLO WORLD HELLO WORLD 6: Free text + 24. ZL4/KA1ABC 73 ZL4/KA1ABC 73 6: Free text + 25. KA1ABC XL/WB9XYZ KA1ABC XL/WB9 * 6: Free text + 26. KA1ABC WB9XYZ/W4 KA1ABC WB9XYZ * 6: Free text + 27. 123456789ABCDEFGH 123456789ABCD * 6: Free text + 28. KA1ABC WB9XYZ EN34 OOO KA1ABC WB9XYZ EN34 OOO 1: Std Msg + 29. KA1ABC WB9XYZ OOO KA1ABC WB9XYZ OOO 1: Std Msg + 30. RO RO -1: Shorthand + 31. RRR RRR -1: Shorthand + 32. 73 73 -1: Shorthand + +MSK144 uses a binary channel code, so transmitted symbols have the value +0 or 1. Even numbered symbols (index starting at 0) are transmitted on +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" + + Message Decoded Err? Type + -------------------------------------------------------------------------- + 1. K1ABC W9XYZ EN37 K1ABC W9XYZ EN37 1: Std Msg + + Channel symbols (72 per line): + 110000100011001101010101001000111111001001001100110010011100001001000000 + 010110001011101111001010111011001100110101011000111101100010111100100011 diff --git a/doc/user_guide/en/wsjtx-main.adoc b/doc/user_guide/en/wsjtx-main.adoc index 3d497df2a..650810fdd 100644 --- a/doc/user_guide/en/wsjtx-main.adoc +++ b/doc/user_guide/en/wsjtx-main.adoc @@ -205,6 +205,9 @@ include::protocols.adoc[] == Astronomical Data include::astro_data.adoc[] +[[UTIL]] +== Utility Programs +include::utilities.adoc[] //// [[TXRX]] @@ -215,9 +218,6 @@ include::implementation.adoc[] == Troubleshooting To be added (?) ... -[[UTIL]] -== Utility Programs -include::utilities.adoc[] //// [[SUPPORT]] diff --git a/doc/user_guide/en/wspr.adoc b/doc/user_guide/en/wspr.adoc index 976c6c29e..00365e35b 100644 --- a/doc/user_guide/en/wspr.adoc +++ b/doc/user_guide/en/wspr.adoc @@ -63,13 +63,13 @@ tuner (ATU) to tune a multi-band antenna to the newly selected band. require other switching besides retuning your radio. To make this possible in an automated way, whenever _WSJT-X_ executes a successful band-change command to a CAT-controlled radio, it looks for a file -named +user_hardware.bat+, +user_hardware.cmd+, +user_hardware.exe+, -or +user_hardware+ in the working directory. If one of these is found, +named `user_hardware.bat`, `user_hardware.cmd`, `user_hardware.exe`, +or `user_hardware` in the working directory. If one of these is found, _WSJT-X_ tries to execute the command user_hardware nnn -- In the above command +nnn+ is the band-designation wavelength in +- In the above command `nnn` is the band-designation wavelength in meters. You must write your own program, script, or batch file to do the necessary switching at your station. diff --git a/lib/msk144code.f90 b/lib/msk144code.f90 index 6ccada7e0..576bc321a 100644 --- a/lib/msk144code.f90 +++ b/lib/msk144code.f90 @@ -48,7 +48,7 @@ program msk144code if(itype.eq.4) msgtype="Type 2 prefix" if(itype.eq.5) msgtype="Type 2 suffix" if(itype.eq.6) msgtype="Free text" - if(itype.eq.7) msgtype="Hashed callsigns" + if(itype.eq.7) msgtype="Hashed calls" bad=" " if(msgsent.ne.msg) bad="*" @@ -60,7 +60,7 @@ program msk144code n=144 if(msg(1:1).eq."<") n=40 write(*,1030) i4tone(1:n) -1030 format(/'Channel symbols:'/(72i1)) +1030 format(/'Channel symbols (72 per line):'/(72i1)) endif 999 end program msk144code