diff --git a/doc/user_guide/en/images/130610_2343-wav-80.png b/doc/user_guide/en/images/130610_2343-wav-80.png index 3360529e9..6c2cefa9e 100644 Binary files a/doc/user_guide/en/images/130610_2343-wav-80.png and b/doc/user_guide/en/images/130610_2343-wav-80.png differ diff --git a/doc/user_guide/en/images/Astronomical_data.png b/doc/user_guide/en/images/Astronomical_data.png index 6fa61857f..cccceb02d 100644 Binary files a/doc/user_guide/en/images/Astronomical_data.png and b/doc/user_guide/en/images/Astronomical_data.png differ diff --git a/doc/user_guide/en/images/VHF_controls.png b/doc/user_guide/en/images/VHF_controls.png index 1efd3dd07..27452c36b 100644 Binary files a/doc/user_guide/en/images/VHF_controls.png and b/doc/user_guide/en/images/VHF_controls.png differ diff --git a/doc/user_guide/en/images/WSPR.png b/doc/user_guide/en/images/WSPR.png index 9154aba87..4e7678828 100644 Binary files a/doc/user_guide/en/images/WSPR.png and b/doc/user_guide/en/images/WSPR.png differ diff --git a/doc/user_guide/en/images/decodes.png b/doc/user_guide/en/images/decodes.png index af9c73252..920f84b43 100644 Binary files a/doc/user_guide/en/images/decodes.png and b/doc/user_guide/en/images/decodes.png differ diff --git a/doc/user_guide/en/images/main-ui.png b/doc/user_guide/en/images/main-ui.png new file mode 100644 index 000000000..26ca1cf35 Binary files /dev/null and b/doc/user_guide/en/images/main-ui.png differ diff --git a/doc/user_guide/en/settings-audio.adoc b/doc/user_guide/en/settings-audio.adoc index a8f62f43b..8917b3498 100644 --- a/doc/user_guide/en/settings-audio.adoc +++ b/doc/user_guide/en/settings-audio.adoc @@ -15,6 +15,13 @@ to prevent transmitting them over the air. IMPORTANT: Be sure that your audio device is configured to sample at 48000 Hz, 16 bits. +IMPORTANT: Windows Vista and later may configure audio devices using +the Texas Instruments PCM2900 series CODEC for microphone input rather +line input. (This chip is used in many radios with built-in USB +CODECs, as well as various other audio interfaces.) If you are using +such a device, be sure to set the mic level in the Recording Device +Properties to 0 dB. + - _Save Directory_: _WSJT-X_ can save its received audio sequences as +.wav+ files. A default directory for these files is provided; you can select another location if desired. diff --git a/doc/user_guide/en/transceiver-setup.adoc b/doc/user_guide/en/transceiver-setup.adoc index f1c06df6b..1ef769833 100644 --- a/doc/user_guide/en/transceiver-setup.adoc +++ b/doc/user_guide/en/transceiver-setup.adoc @@ -11,8 +11,9 @@ controls to set the background noise level (scale at lower left of main window) to around 30 dB when no signals are present. It is usually best to turn AGC off or reduce the RF gain control to minimize AGC action. If necessary you can also adjust the slider next to the -dB scale, but note that the overall dynamic range will be best with -this slider not too far from its mid-point. +dB scale, but note that the overall dynamic range will be best when +the displayed level is near 30 dB with the slider close to its +mid-point. .Bandwidth and Frequency Setting @@ -22,8 +23,9 @@ mode, you should normally choose the widest one possible, up to about Graph* (waterfall and 2D spectrum) to display the conventional JT65 and JT9 sub-bands simultaneously on most HF bands. Further details are provided in the <>. A wider -displayed bandwidth may also be helpful at VHF and above, where JT4 -and JT65 signals are found over much wider ranges of frequencies. +displayed bandwidth may also be helpful at VHF and above, where JT4, +JT65, and QRA64 signals may be found over much wider ranges of +frequencies. - If you have only a standard SSB filter you won’t be able to display more than about 2.7 kHz bandwidth. Depending on the exact dial @@ -43,21 +45,16 @@ radio into transmit mode and generate a steady audio tone. * Listen to the generated audio tone using your radio’s *Monitor* facility. The transmitted tone should be perfectly smooth, with no -clicks or glitches. +clicks or glitches. Make sure that this is true even when you +simultaneously use the computer to do other tasks such as email, web +browsing, etc. * Open the computer's audio mixer controls for output ("`Playback`") devices and adjust the volume slider downward from its maximum until -the RF output from your transmitter falls by around ten percent. This -will be a good level for audio drive. +the RF output from your transmitter falls slightly. This is generally +a good level for audio drive. * Alternatively, you can make the Tx audio level adjustment using the digital slider labeled *Pwr* at the right edge of the main window. * Toggle the *Tune* button once more to stop your test transmission. - -IMPORTANT: Windows Vista and later incorrectly configure audio devices -using the Texas Instruments PCM2900 series CODEC for microphone input -rather line input. (This chip is used in many radios with built-in -USB CODECs, as well as various other audio interfaces.) If you are -using such a device, be sure to set the mic level in the Recording -Device Properties to 0 dB. diff --git a/doc/user_guide/en/tutorial-example1.adoc b/doc/user_guide/en/tutorial-example1.adoc index 280b69462..6e1e826d3 100644 --- a/doc/user_guide/en/tutorial-example1.adoc +++ b/doc/user_guide/en/tutorial-example1.adoc @@ -12,7 +12,7 @@ those shown in the screen shot below. something similar to the to the following screen shot: [[X12]] -image::main-ui-1.6.png[align="center",alt="Main UI and Wide Graph"] +image::main-ui.png[align="center",alt="Main UI and Wide Graph"] .Decoding Overview diff --git a/doc/user_guide/en/tutorial-example2.adoc b/doc/user_guide/en/tutorial-example2.adoc index f65988c4f..3c66af7da 100644 --- a/doc/user_guide/en/tutorial-example2.adoc +++ b/doc/user_guide/en/tutorial-example2.adoc @@ -7,23 +7,25 @@ frequencies to 1718 Hz. .Wide Graph Settings: -- Set *Bins/Pixel* = 7 +- *Bins/Pixel* = 7 +- *JT65 .... JT9* = 2500 - Adjust the width of the Wide Graph window so that the upper frequency limit is approximately 4000 Hz. .Open a Wave File: - Select *File | Open* and navigate to +...\save\samples\130610_2343.wav+. -The waterfall should look like this: +The waterfall should look something like this: //.130610_2343.wav Decode [[X14]] image::130610_2343-wav-80.png[align="left",alt="Wide Graph Decode 130610_2343"] -IMPORTANT: Notice the [blue]*BLUE* marker on the waterfall scale, here -set at 2500 Hz. Its position is set by the spinner control *JT65 nnnn -JT9*, where nnnn is a frequency in Hz. In *JT9+JT65* mode the program -will automatically decode JT9 signals only above this frequency. +IMPORTANT: The position pf the blue marker on the waterfall scale is +set by the spinner control *JT65 nnnn JT9*, where nnnn is an audio +frequency in Hz. In *JT9+JT65* mode the program will automatically +decode JT9 signals only above this frequency. JT65 signals will be +decoded over the full displayed frequency range. JT9 signals appear in the *Cumulative* spectrum as nearly rectangular shapes about 16 Hz wide. They have no clearly visible sync tone like diff --git a/doc/user_guide/en/tutorial-main-window.adoc b/doc/user_guide/en/tutorial-main-window.adoc index cb46299e2..df39633e3 100644 --- a/doc/user_guide/en/tutorial-main-window.adoc +++ b/doc/user_guide/en/tutorial-main-window.adoc @@ -9,7 +9,7 @@ IMPORTANT: Sliders and spinner controls respond to *Arrow* key presses and *Page Up/Down* key presses, with the *Page* keys moving the controls in larger steps. You can also type numbers directly into -the spinner controls. +the spinner controls or use the mouse wheel. - Select *Tab 2* (below the *Decode* button) to choose the alternative set of controls for generating and selecting Tx messages. diff --git a/doc/user_guide/en/tutorial-wide-graph-settings.adoc b/doc/user_guide/en/tutorial-wide-graph-settings.adoc index c6ac093dc..164fa013f 100644 --- a/doc/user_guide/en/tutorial-wide-graph-settings.adoc +++ b/doc/user_guide/en/tutorial-wide-graph-settings.adoc @@ -1,13 +1,13 @@ // Status=review - *Bins/Pixel* = 4 -- *JT65 .... JT9* = 2500 - *Start* = 200 Hz - *N Avg* = 5 - *Palette* = Digipan - *Flatten* = checked - Select *Cumulative* for data display -- *Gain* and *Zero* sliders set near midscale +- *Gain* and *Zero* sliders for waterfall and spectrum set near midscale +- *Spec* = 25% - Use the mouse to adjust the width of the *Wide Graph* so that its upper frequency limit is about 2400 Hz. diff --git a/doc/user_guide/en/vhf-features.adoc b/doc/user_guide/en/vhf-features.adoc index 4b3199fd3..58051af03 100644 --- a/doc/user_guide/en/vhf-features.adoc +++ b/doc/user_guide/en/vhf-features.adoc @@ -1,57 +1,69 @@ === VHF Setup -_WSJT-X_ v1.7.0 builds on the features designed for use on VHF and -higher bands first introduced in v1.6. These features now include -*JT4*, a mode particularly useful for EME on the microwave bands; -*QRA64*, a mode for EME using a "`Q-ary Repeat Accumulate`" code, a +_WSJT-X_ v1.7 builds on for VHF and +higher bands first introduced in v1.6. These features now include: + +- *JT4*, a mode particularly useful for EME on the microwave bands + +- *QRA64*, a mode for EME using a "`Q-ary Repeat Accumulate`" code, a low-density partity-check (LDPC) code using a 64-character symbol -alphabet; *MSK144*, a mode for meteor scatter using a binary LDPC code -and offset quadrature phase-shift keying (OQPSK), a waveform also -known as Minimum Shift Keying (MSK); and *ISCAT*, intended for other -types of scatter propagation. Additional VHF-and-up features include -*Echo* mode, for detecting and measuring your own lunar echoes, and -automatic high-accuracy *Doppler tracking* for the EME path. +alphabet -- To activate the VHF-and-up features check the box labeled _Enable -VHF/UHF/Microwave features_ on the *Settings | General* tab. In most -cases you will also want to check _Single decode_. +- *MSK144*, a mode for meteor scatter using a binary LDPC code +and Offset Quadrature Phase-Shift Keying (OQPSK), a waveform also +known as Minimum Shift Keying (MSK) -- If you will be doing EME, check the box _Decode at t = 52 s_ -to allow for the EME path delay on received signals. +- *ISCAT*, intended for other types of scatter propagation. -- If you will use automatic Doppler tracking, check the box _Allow Tx -frequency changes while transmitting_. On the *Radio* tab select -_Split Operation_ (use either _Rig_ or _Fake It_: you might need to -experiment with both). +- *Echo* mode, for detecting and measuring your own lunar echoes + +- Automatic *Doppler tracking* for the EME path + +To activate the VHF-and-up features: + +- Check the box labeled *Enable VHF/UHF/Microwave features* on the +*Settings | General* tab. + +- In most cases you will also want to check *Single decode*. + +- If you will be doing EME, check the box *Decode at t = 52 s* +to allow for the EME path delay on received signals + +- If you will use automatic Doppler tracking, check the box *Allow Tx +frequency changes while transmitting*. IMPORTANT: Not all transceivers permit computer adjustments of Tx frequency while transmitting. Among those that do are the IC-735, IC-756 Pro II, IC-910-H, FT-847, TS-2000 (with Rev 9 firmware -upgrade), Flex 1500 and 5000, HPSDR, Anan-10, Anan-100, and KX3. +upgrade), TS-590S, TS-590SG, Flex 1500 and 5000, HPSDR, Anan-10, +Anan-100, and KX3. + +- On the *Radio* tab select *Split Operation* (use either *Rig* or +*Fake It*; you may need to experiment with both options to find one +that works best with your radio). - The main window reconfigures itself as necessary to include controls supporting features of each mode. For example, in JT4 mode the -central part of the main window will look like this: +central part of the main window might look something like this: image::VHF_controls.png[align="center",alt="VHF Controls"] - On the *View* menu, select *Astronomical data* to display a window with important information for tracking the Moon and performing -automatic Doppler control. Check the box labeled _Doppler tracking_ +automatic Doppler control. Check the box labeled *Doppler tracking* to ensure that the right-hand portion of the window is visible. image::Astronomical_data.png[align="center",alt="Astronomical data"] -IMPORTANT: Note that three different types of Doppler tracking are -provided. +Three different types of Doppler tracking are provided: -- Select _Full Doppler to DX Grid_ if you know your QSO partner's locator +- Select *Full Doppler to DX Grid* if you know your QSO partner's locator and he/she will not be using any Doppler control. -- Select _Receive only_ to enable EME Doppler tracking of your receive +- Select *Receive only* to enable EME Doppler tracking of your receive frequency to a specific locator; your Tx frequency will remain fixed. -- Select _Constant frequency on Moon_ to correct for your own (one-way) +- Select *Constant frequency on Moon* to correct for your own (one-way) Doppler shift to or from the Moon. If your QSO partner does the same thing, both stations will have the required Doppler compensation. Moreover, anyone else using this option will hear both of you @@ -77,10 +89,10 @@ the 10 GHz band. - If using a transverter, set the appropriate offset on the *Settings | Frequencies* tab. Offset is defined as (desired transceiver dial reading) minus (desired on-the-air frequency). For example, when -using a 144 MHz radio at 10368 MHz, _Offset (MHz)_ = (144 - 10368) = +using a 144 MHz radio at 10368 MHz, *Offset (MHz)* = (144 - 10368) = -10224.000. If the band is already in the table, you can edit the offset by double clicking on the offset field itself. Otherwise a new -band can be added by right clicking in the table and selecting _Insert_. +band can be added by right clicking in the table and selecting *Insert*. image::Add_station_info.png[align="center",alt="Station information"] @@ -92,7 +104,7 @@ image::decoding_depth.png[align="center",alt="Decoding Depth"] - By convention, EME with JT4 can use "`short form`" messages. To activate automatic generation of these messages, check the box labeled -_Sh_ on the main window. +*Sh* on the main window. IMPORTANT: Thanks to G3WDG, many additional hints for using JT4 and Echo mode on the EME path are available in {jt4eme}. @@ -131,14 +143,14 @@ To make a sequence of echo tests: - Select *Echo* from the *Mode* menu. -- On the Astronomical Data window check _Doppler tracking_ and -_Constant frequency on the Moon_ +- On the Astronomical Data window check *Doppler tracking* and +*Constant frequency on the Moon* -- Choose your desired test frequency using the _Frequency above nominal -band edge_ controls. +- Choose your desired test frequency using the *Frequency above nominal +band edge* controls. - Be sure that your rig control has been set up for _Split Operation_ -(either _Rig_ of _Fake It_) on the *Settings | Radio* tab. +(either *Rig* or *Fake It*) on the *Settings | Radio* tab. - Click *Enable Tx* on the main window to start a sequence of 6-second cycles. diff --git a/doc/user_guide/en/wsjtx-main.adoc b/doc/user_guide/en/wsjtx-main.adoc index 0c251719c..2f1125055 100644 --- a/doc/user_guide/en/wsjtx-main.adoc +++ b/doc/user_guide/en/wsjtx-main.adoc @@ -115,7 +115,7 @@ bands. <> covers WSPR mode, and <> covers VHF+ features. If you are a new user of _WSJT-X_ we suggest that you go through the full HF-oriented tutorial while at your radio. It should take no more than 20 minutes. -If your main interests are WSPR of VHF+, you may then proceed to +If your main interests are WSPR or VHF+, you may then proceed to Sections 7 and 8. [[TUT_MAIN]] diff --git a/doc/user_guide/en/wspr.adoc b/doc/user_guide/en/wspr.adoc index f426fdc93..e295406e1 100644 --- a/doc/user_guide/en/wspr.adoc +++ b/doc/user_guide/en/wspr.adoc @@ -1,4 +1,4 @@ -- Select *WSPR-2* from the *Mode* menu. The main window will +- Select *WSPR* from the *Mode* menu. The main window will reconfigure itself to the WSPR interface, removing some controls not used in WSPR mode. diff --git a/mainwindow.cpp b/mainwindow.cpp index 4c3e347f3..3dc78e2fe 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1179,11 +1179,9 @@ void MainWindow::dataSink(qint64 frames) t2.sprintf(" -f %.6f ",f0m1500); if(m_diskData) { -// cmnd='"' + m_appDir + '"' + "/wsprd " + m_path; cmnd='"' + m_appDir + '"' + "/wsprd -a \"" + QDir::toNativeSeparators(m_dataDir.absolutePath()) + "\" \"" + m_path + "\""; -// if(m_TRseconds==900) cmnd='"' + m_appDir + '"' + "/wsprd -m 15" + t2 + -// m_path + '"'; +// QDir::toNativeSeparators(m_dataDir.absolutePath()) + "\" " + t2 + " " + m_path + "\""; } else { cmnd='"' + m_appDir + '"' + "/wsprd -a \"" + QDir::toNativeSeparators(m_dataDir.absolutePath()) + "\" " +