diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 788b3efb4..84a47599f 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -6,99 +6,102 @@ set (common_SRCS set (UG_SRCS user_guide/acknowledgements.adoc - user_guide/install-from-source.adoc - user_guide/rig-config-drake.adoc - user_guide/settings-radio.adoc user_guide/compiling.adoc - user_guide/install-linux.adoc - user_guide/rig-config-elecraft.adoc - user_guide/settings-reporting.adoc user_guide/config-details.adoc - user_guide/install-mac.adoc - user_guide/rig-config-flexrad.adoc - user_guide/settings-txmacros.adoc user_guide/controls-functions-center.adoc - user_guide/install-windows.adoc - user_guide/rig-config-icom.adoc - user_guide/system-requirements.adoc user_guide/controls-functions-left.adoc - user_guide/introduction.adoc - user_guide/rig-config-kenwood.adoc - user_guide/transceiver-setup.adoc user_guide/controls-functions-main-window.adoc - user_guide/jt65-jt9-differences.adoc - user_guide/rig-config-main.adoc - user_guide/tutorial-example1.adoc user_guide/controls-functions-menus.adoc - user_guide/jt65-protocol.adoc - user_guide/rig-config-softrock.adoc - user_guide/tutorial-example2.adoc - user_guide/tutorial-vhf.adoc user_guide/controls-functions-messages.adoc - user_guide/jt9-protocol.adoc - user_guide/rig-config-template.adoc - user_guide/tutorial-main-window.adoc user_guide/controls-functions-status-bar.adoc - user_guide/make-qso.adoc - user_guide/rig-config-tentec.adoc - user_guide/tutorial-wide-graph-settings.adoc user_guide/controls-functions-wide-graph.adoc - user_guide/platform-dependencies.adoc - user_guide/rig-config-yaesu.adoc - user_guide/tx-rx.adoc user_guide/coop-prgrms.adoc - user_guide/rig-config-adat.adoc - user_guide/settings-audio.adoc - user_guide/utilities.adoc - user_guide/faq.adoc - user_guide/rig-config-alinco.adoc - user_guide/settings-frequencies.adoc - user_guide/wsjtx-main.adoc - user_guide/font-sizes.adoc - user_guide/rig-config-aor.adoc - user_guide/settings-general.adoc user_guide/cooperating-programs.adoc + user_guide/faq.adoc + user_guide/font-sizes.adoc + user_guide/install-from-source.adoc + user_guide/install-linux.adoc + user_guide/install-mac.adoc + user_guide/install-windows.adoc + user_guide/introduction.adoc + user_guide/jt65-jt9-differences.adoc + user_guide/jt65-protocol.adoc + user_guide/jt9-protocol.adoc user_guide/logging.adoc + user_guide/make-qso.adoc + user_guide/new_features.adoc + user_guide/platform-dependencies.adoc + user_guide/rig-config-adat.adoc + user_guide/rig-config-alinco.adoc + user_guide/rig-config-aor.adoc + user_guide/rig-config-drake.adoc + user_guide/rig-config-elecraft.adoc + user_guide/rig-config-flexrad.adoc + user_guide/rig-config-icom.adoc + user_guide/rig-config-kenwood.adoc + user_guide/rig-config-main.adoc + user_guide/rig-config-softrock.adoc + user_guide/rig-config-template.adoc + user_guide/rig-config-tentec.adoc + user_guide/rig-config-yaesu.adoc + user_guide/settings-audio.adoc user_guide/settings-colors.adoc + user_guide/settings-frequencies.adoc + user_guide/settings-general.adoc + user_guide/settings-radio.adoc + user_guide/settings-reporting.adoc + user_guide/settings-txmacros.adoc user_guide/support.adoc + user_guide/system-requirements.adoc + user_guide/transceiver-setup.adoc + user_guide/tutorial-example1.adoc + user_guide/tutorial-example2.adoc + user_guide/tutorial-main-window.adoc + user_guide/tutorial-wide-graph-settings.adoc + user_guide/tx-rx.adoc + user_guide/utilities.adoc + user_guide/vhf-and-up.adoc + user_guide/wsjtx-main.adoc + user_guide/wspr.adoc ) set (UG_IMGS user_guide/images/130610_2343-wav-80.png - user_guide/images/freemsg.png - user_guide/images/misc-main-ui.png - user_guide/images/colors.png - user_guide/images/status-bar-a.png - user_guide/images/MacAppMenu.png - user_guide/images/help-menu.png - user_guide/images/mode-menu.png - user_guide/images/r4148-txmac-ui.png - user_guide/images/traditional-msg-box.png - user_guide/images/RadioTab.png - user_guide/images/keyboard-shortcuts.png - user_guide/images/new-msg-box.png - user_guide/images/save-menu.png - user_guide/images/tx-macros.png user_guide/images/band-settings.png - user_guide/images/log-qso.png - user_guide/images/r3666-config-screen-80.png - user_guide/images/settings-audio.png - user_guide/images/view-menu.png + user_guide/images/colors.png user_guide/images/decode-menu.png - user_guide/images/main-ui-1.5.png - user_guide/images/r3666-main-ui-80.png - user_guide/images/settings-general.png - user_guide/images/wide-graph-controls.png user_guide/images/decodes.png - user_guide/images/main-ui-controls.png - user_guide/images/reporting.png - user_guide/images/setup-menu.png user_guide/images/file-menu.png - user_guide/images/misc-controls-center.png - user_guide/images/settings-frequencies.png - user_guide/images/special-mouse-commands.png - user_guide/images/psk-reporter.png + user_guide/images/freemsg.png + user_guide/images/help-menu.png user_guide/images/jtalert.png + user_guide/images/keyboard-shortcuts.png + user_guide/images/log-qso.png + user_guide/images/MacAppMenu.png + user_guide/images/main-ui-1.5.png + user_guide/images/main-ui-controls.png + user_guide/images/misc-controls-center.png + user_guide/images/misc-main-ui.png + user_guide/images/mode-menu.png + user_guide/images/new-msg-box.png + user_guide/images/psk-reporter.png + user_guide/images/r3666-config-screen-80.png + user_guide/images/r3666-main-ui-80.png + user_guide/images/r4148-txmac-ui.png + user_guide/images/RadioTab.png + user_guide/images/reporting.png + user_guide/images/save-menu.png + user_guide/images/settings-audio.png + user_guide/images/settings-frequencies.png + user_guide/images/settings-general.png + user_guide/images/setup-menu.png + user_guide/images/special-mouse-commands.png + user_guide/images/status-bar-a.png + user_guide/images/traditional-msg-box.png + user_guide/images/tx-macros.png + user_guide/images/view-menu.png + user_guide/images/wide-graph-controls.png + ) find_package (PythonInterp 2.4 REQUIRED) diff --git a/doc/user_guide/images/WSPR.png b/doc/user_guide/images/WSPR.png new file mode 100644 index 000000000..9154aba87 Binary files /dev/null and b/doc/user_guide/images/WSPR.png differ diff --git a/doc/user_guide/images/band_hopping.png b/doc/user_guide/images/band_hopping.png new file mode 100644 index 000000000..06ad88e1f Binary files /dev/null and b/doc/user_guide/images/band_hopping.png differ diff --git a/doc/user_guide/images/reporting.png b/doc/user_guide/images/reporting.png index ba4b9b884..b62acfaf4 100644 Binary files a/doc/user_guide/images/reporting.png and b/doc/user_guide/images/reporting.png differ diff --git a/doc/user_guide/new_features.adoc b/doc/user_guide/new_features.adoc new file mode 100644 index 000000000..8f90c6c82 --- /dev/null +++ b/doc/user_guide/new_features.adoc @@ -0,0 +1,17 @@ +For quick reference, here's a short list of features and capabilities +added to _WSJT-X_ since Version 1.5.0: + +- *WSPR* mode, including automatic coordinated band-hopping and an +improved sensitivity two-pass decoder. + +- EME-inspired features including *JT4* (submodes *A-G*), *Echo* mode, +and *automatic Doppler tracking*. Note that submodes *JT65B* and +*JT65C* are also present in Version 1.6, but the high-sensitivity +decoder required for EME is not yet included. + +- Tools for accurate *frequency calibration* of your radio, so you can +be automatically ``on frequency'' to within about 1 Hz. + +- Mode-specific working frequencies accessible from the drop-down +band selector. + diff --git a/doc/user_guide/settings-audio.adoc b/doc/user_guide/settings-audio.adoc index a9ce3fd52..1a23592ce 100644 --- a/doc/user_guide/settings-audio.adoc +++ b/doc/user_guide/settings-audio.adoc @@ -15,6 +15,10 @@ to prevent transmitting them over the air. +.wav+ files. A default directory for these files is provided; you can select another location if desired. -- _JT9W Settings_: JT9W is an experimental mode designed for EME on -the microwave bands, and is not enabled in current release versions. +- _AzEl Directory_: A file named +azel.dat+ will appear in the +specified directory. The file contains information usable by another +program for automatic tracking of the Sun or Moon, as well as +predicted Doppler shift for the specified EME path. The file is +updated once per second. + diff --git a/doc/user_guide/tutorial-wspr.adoc b/doc/user_guide/tutorial-wspr.adoc deleted file mode 100644 index 51938e2be..000000000 --- a/doc/user_guide/tutorial-wspr.adoc +++ /dev/null @@ -1,19 +0,0 @@ -.Main Window - -- Select *WSPR-2* from the *Mode* menu and. The main window will -reconfigure itself by removing some controls not used in WSPR mode. -You may wish to use the mouse change the width and height of the -window accordingly. - -- Select *Tab 3* (below the *Decode* button). - -.Wide Graph Settings -- *Bins/Pixel* = 2 -- *Start* = 1000 Hz -- *N Avg* = 10 -- *Flatten* = checked -- Select *Cumulative* for data display. - -- Use the mouse to adjust the width of the *Wide Graph* so its upper -frequency limit is about 2000 Hz. - diff --git a/doc/user_guide/tutorial-vhf.adoc b/doc/user_guide/vhf-and-up.adoc similarity index 100% rename from doc/user_guide/tutorial-vhf.adoc rename to doc/user_guide/vhf-and-up.adoc diff --git a/doc/user_guide/wsjtx-main.adoc b/doc/user_guide/wsjtx-main.adoc index 524e4f2f0..2bd6758e9 100644 --- a/doc/user_guide/wsjtx-main.adoc +++ b/doc/user_guide/wsjtx-main.adoc @@ -26,6 +26,10 @@ include::../common/links.adoc[] == Introduction include::introduction.adoc[] +[[NEW_FEATURES]] +== New in Version 1.6 +include::new_features.adoc[] + [[SYSREQ]] == System Requirements include::system-requirements.adoc[] @@ -98,10 +102,11 @@ include::transceiver-setup.adoc[] [[TUTORIAL]] == Basic Operating Tutorial -Sections <> through <> are keyed to the -needs of basic operation for two-way QSOs on the HF bands. Section -<> deals with WSPR mode, and section <> has -additional details of special relevance to VHF-and-up operation. +Sections <> through <> cover basic +operation for making two-way QSOs with modes JT9 and JT65 on the HF +bands. Section <> covers WSPR mode. If you are a new user +of _WSJT-X_ we suggest that you go through the full tutorial. It should +taks no more than 20 minutes. [[TUT_MAIN]] === Main Window Settings @@ -112,20 +117,21 @@ include::tutorial-main-window.adoc[] include::tutorial-wide-graph-settings.adoc[] [[TUT_EX1]] -=== JT9 Mode +=== JT9 include::tutorial-example1.adoc[] [[TUT_EX2]] -=== JT9+JT65 Mode +=== JT9+JT65 include::tutorial-example2.adoc[] -[[TUT_WSPR]] -=== WSPR Mode -include::tutorial-wspr.adoc[] +[[WSPR]] +== WSPR Mode +include::wspr.adoc[] -[[TUT_VHF]] -=== VHF and Up -include::tutorial-vhf.adoc[] + +[[VHF_AND_UP]] +== VHF Features +include::vhf-and-up.adoc[] [[MAKE_QSOS]] == Making QSOs diff --git a/doc/user_guide/wspr.adoc b/doc/user_guide/wspr.adoc new file mode 100644 index 000000000..48202bb27 --- /dev/null +++ b/doc/user_guide/wspr.adoc @@ -0,0 +1,24 @@ +- Select *WSPR-2* from the *Mode* menu. The main window will simplify +itself by removing controls not used in WSPR mode. + +- Use the mouse to set the width and height of the main window as +desired. + +- Select an active WSPR frequency (for example, 10.1387 MHz). + +- Configure the Wide Graph as suggested in the following screen shot. + +- Click *Monitor* to start a WSPR receiving period. + +- If you will be transmitting as well as receiving, select a suitable +value for *Tx Pct* (percentage of 2-minute sequences devoted to +transmitting) and activate the *Enable Tx* button. + +- Select your Tx power (in dBm) from the drop-down list. + +image::images/WSPR.png[align="center",alt="WSPR mode"] + +- To enable automatic band-hopping, check the indicated box and click +*Schedule* to select the bands you will use at each time of day. + +image::images/band_hopping.png[align="center",alt="Band Hopping"] diff --git a/mainwindow.ui b/mainwindow.ui index 363b5e9c4..49c92750a 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -501,7 +501,7 @@ - Set Tx Enable OFF + Stop transmitting immediately &Halt Tx @@ -573,7 +573,7 @@ QLabel[oob="true"] { - 0 + 1 @@ -1671,6 +1671,9 @@ list. The list can be maintained in Settings (F2). + + Choose bands and times of day for band-hopping. + Schedule ... @@ -1681,6 +1684,9 @@ list. The list can be maintained in Settings (F2). + + Percentage of 2-minute sequences devoted to transmitting. + Qt::AlignCenter @@ -1697,6 +1703,9 @@ list. The list can be maintained in Settings (F2). + + Upload decoded messages to WPRnet.org. + Upload spots @@ -1726,6 +1735,9 @@ list. The list can be maintained in Settings (F2). + + Transmit during the next 2-minute sequence. + QPushButton:checked { background-color: red; @@ -1746,7 +1758,11 @@ list. The list can be maintained in Settings (F2). - + + + Set Tx power in dBm (dB above 1 mW) as part of your WSPR message. + +