diff --git a/doc/user_guide/en/compiling.adoc b/doc/user_guide/en/compiling.adoc deleted file mode 100644 index 13a8550ec..000000000 --- a/doc/user_guide/en/compiling.adoc +++ /dev/null @@ -1,20 +0,0 @@ -// Status=review -// Note to developers. The URL http://developer.berlios.de/projects/wsjt/. is -// to a very old src version of WSJT 5.7 or so. WSJTX is not listed at all. -// Also, all the Qt4 stuff is now obsolete, and needs to be updated. - -// Web Links -// Source File is: dev-guide/source/wsjtx-dev/wsjtx-dev.adoc -// At some point, compiling_wsjtx_linux.html needs a name change to: wsjtx-dev.html -// These files can only be built on Linux, due to source-highlight being removed -// From the windows build batch file. -:dev-guide: http://www.physics.princeton.edu/pulsar/K1JT/wsjtx-doc/wsjt-dev-guide.html[WSJT Developers Guide] - -// mail-to links - -A Developer's Guide for WSJT and its sister programs is itself under -development. The present draft contains full instructions for -compiling _WSJT-X_ in Linux, and an outline of steps required in -Windows. - -{dev-guide} diff --git a/doc/user_guide/en/controls-functions-status-bar.adoc b/doc/user_guide/en/controls-functions-status-bar.adoc index 2c2fff485..2709c9c60 100644 --- a/doc/user_guide/en/controls-functions-status-bar.adoc +++ b/doc/user_guide/en/controls-functions-status-bar.adoc @@ -18,5 +18,5 @@ displayed exactly as it will be decoded by receiving stations. A progress bar shows the elapsed fraction of a Tx or Rx sequence. Finally, if the Watchdog timer was enabled on the *settings | General* tab, a label in the lower right-hand corner displays the number of -minutes remaining before timout. +minutes remaining before timeout. diff --git a/doc/user_guide/en/docinfo.html b/doc/user_guide/en/docinfo.html index f74a1119d..8a05192b7 100644 --- a/doc/user_guide/en/docinfo.html +++ b/doc/user_guide/en/docinfo.html @@ -4,7 +4,7 @@ } body { - font-family: Arial, Hevetica, sans-serif; + font-family: Arial, Helvetica, sans-serif; } h1, h2, h3, h4, h5, h6 { diff --git a/doc/user_guide/en/implementation.adoc b/doc/user_guide/en/implementation.adoc deleted file mode 100644 index fbfd20c97..000000000 --- a/doc/user_guide/en/implementation.adoc +++ /dev/null @@ -1,87 +0,0 @@ -// Status=review -.Transmitting - -Immediately before the start of a transmission _WSJT-X_ encodes a -user's message and computes the sequence of tones to be sent. The -audio waveform is computed on-the-fly, with 16-bit integer samples -sent to the audio output device at a 48000 Hz rate. Generated signals -have continuous phase and constant amplitude, and there are no key -clicks. The transmitter's power amplifier need not be highly linear. - -.Receiving - -_WSJT-X_ acquires 16-bit integer samples from the audio input device -at a 48000 Hz rate and immediately downsamples the stream to 12000 Hz. -Spectra from overlapping segments are computed for the waterfall -display and saved for the decoder at intervals of 3456/12000 = 0.288 -s, half the JT9 symbol length. - -.Decoding - -At the end of a reception sequence, about 50 seconds into the UTC -minute, received data samples are forwarded to the decoder. In JT9 -and JT65 modes the decoder goes through its full procedure twice: -first at the selected Rx frequency, and then over the full displayed -frequency range. Each decoding pass can be described as a sequence of -discrete blocks. Details of the functional blocks are different for -each mode. In dual-mode JT9+JT65 operation on computers with more -than one CPU, decoding computations for the two modes are done in -parallel. - -The basic decoding algorithm for JT65 mode is described in the 2005 -{jt65protocol} paper. The following list summarizes the corresponding -algorithm for JT9 mode. Blocks are labeled here with the names of -functional procedures in the code. - -[horizontal] -+sync9+:: Use sync symbols to find candidate JT9 signals - in the specified frequency range - -Then, at the frequency of each plausible candidate: - -[horizontal] -+downsam9+:: Mix, filter and downsample to 16 complex - samples/symbol - -+peakdt9+:: Using sync symbols, time-align to start of JT9 symbol - sequence - -+afc9+:: Measure frequency offset and possible drift - -+twkfreq+:: Remove frequency offset and drift - -+symspec2+:: Compute 8-bin spectra for 69 information-carrying - symbols, using the time- and frequency-aligned data; - transform to yield 206 single-bit soft symbols - -+interleave9+:: Remove single-bit interleaving imposed at the - transmitter - -+decode9+:: Retrieve a 72-bit user message using the sequential - Fano algorithm - - -+unpackmsg+:: Unpack a human-readable message from the 72-bit - compressed format - -Decoding of clean JT9 signals in a white-noise background starts to -fail below signal-to-noise ratio -25 dB and reaches 50% copy at -26 -dB. - -With marginal or unrecognizable signals the sequential Fano algorithm -can take exponentially long times. If the +sync9+ step in the above -sequence finds many seemingly worthy candidate signals and many of -them turn out to be undecodable, the decoding loop can take an -inconveniently long time. For this reason the step labeled +decode9+ -is programmed to "`time out`" and report failure for a given signal if -it takes too long. The choices *Fast | Normal | Deepest* on the -*Decode* menu provide the user with a three-step adjustment of the -timeout limit. - -Decoding in JT4 and WSPR modes is basically similar to that for JT9. -The same K=32, r=1/2 sequential Fano algorithm is used for all three -modes. Other details such as tone numbers, symbol lengths, -synchronizing scheme, and subroutine names are distinct for each mode. -The WSPR decoder now uses a two-pass algorithm. Decoded signals are -reconstructed and subtracted from the received waveform, after which a -second decoding pass takes place. diff --git a/doc/user_guide/en/protocols.adoc b/doc/user_guide/en/protocols.adoc index 03f49906d..6a00cda95 100644 --- a/doc/user_guide/en/protocols.adoc +++ b/doc/user_guide/en/protocols.adoc @@ -46,7 +46,7 @@ following sequence (60 bits per line): [[JT9PRO]] ==== JT9 -FEC in JT9 uses the same strong convolutional code aa JT4: constraint +FEC in JT9 uses the same strong convolutional code as JT4: constraint length K=32, rate r=1/2, and a zero tail, leading to an encoded message length of (72+31) × 2 = 206 information-carrying bits. Modulation is nine-tone frequency-shift keying, 9-FSK at @@ -249,7 +249,8 @@ and your QSO partner ± 200 Hz. .Parameters of Fast Modes [width="90%",cols="3h,^3,^2,^1,^2,^2,^2,^2,^2",frame="topbot",options="header"] |===================================================================== -|Mode |FEC Type |(k,n) | Q| Mod | Baud |BW (Hz)|fSync|TxT (s) +|Mode |FEC Type |(n,k) | Q|Modulation Type|Keying rate (Baud) +|Bandwidth (Hz)|Sync Energy|Tx Duration (s) |ISCAT-A | - | - |42|42-FSK| 21.5 | 905 | 0.17| 1.176 |ISCAT-B | - | - |42|42-FSK| 43.1 | 1809 | 0.17| 0.588 |JT9E |K=32, r=1/2|(206,72)| 8| 9-FSK| 25.0 | 225 | 0.19| 3.400