From 0cf4884ffc1d16f6c94d2623c4cacbe4556c7de8 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 14 Oct 2016 12:51:51 +0000 Subject: [PATCH] Adjust the "FrequencyList" table to better reflect conventional usage. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7179 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- FrequencyList.cpp | 67 ++++++++++----------- doc/user_guide/en/settings-advanced.adoc | 6 +- doc/user_guide/en/settings-frequencies.adoc | 5 +- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/FrequencyList.cpp b/FrequencyList.cpp index 10ef51d7a..53add51f6 100644 --- a/FrequencyList.cpp +++ b/FrequencyList.cpp @@ -60,48 +60,47 @@ namespace {28124600, Modes::WSPR}, {50000000, Modes::Echo}, {50276000, Modes::JT65}, + {50280000, Modes::MSK144}, {50293000, Modes::WSPR}, {70091000, Modes::JT65}, {70091000, Modes::WSPR}, {144000000, Modes::Echo}, - {144100000, Modes::JT4}, - {144489000, Modes::JT65}, + {144120000, Modes::JT65}, + {144120000, Modes::Echo}, + {144140000, Modes::MSK144}, {144489000, Modes::WSPR}, - {222000000, Modes::JT4}, - {222000000, Modes::JT65}, - {432000000, Modes::Echo}, - {432000000, Modes::JT4}, - {432000000, Modes::JT65}, + {222065000, Modes::JT65}, + {222065000, Modes::Echo}, + {432065000, Modes::Echo}, + {432065000, Modes::JT65}, {432300000, Modes::WSPR}, - {902000000, Modes::JT4}, - {902000000, Modes::JT65}, - {1296000000, Modes::Echo}, - {1296000000, Modes::JT4}, - {1296000000, Modes::JT65}, + {902065000, Modes::JT65}, + {1296065000, Modes::Echo}, + {1296065000, Modes::JT65}, {1296500000, Modes::WSPR}, {2301000000, Modes::Echo}, - {2301000000, Modes::JT4}, - {2301000000, Modes::JT65}, - {2304000000, Modes::Echo}, - {2304000000, Modes::JT4}, - {2304000000, Modes::JT65}, - {2320000000, Modes::Echo}, - {2320000000, Modes::JT4}, - {2320000000, Modes::JT65}, - {3400000000, Modes::Echo}, - {3400000000, Modes::JT4}, - {3400000000, Modes::JT65}, - {3456000000, Modes::JT4}, - {3456000000, Modes::JT65}, - {5760000000, Modes::Echo}, - {5760000000, Modes::JT4}, - {5760000000, Modes::JT65}, - {10368000000, Modes::Echo}, - {10368000000, Modes::JT4}, - {10368000000, Modes::JT65}, - {24048000000, Modes::Echo}, - {24048000000, Modes::JT4}, - {24048000000, Modes::JT65}, + {2301065000, Modes::JT4}, + {2301065000, Modes::JT65}, + {2304065000, Modes::Echo}, + {2304065000, Modes::JT4}, + {2304065000, Modes::JT65}, + {2320065000, Modes::Echo}, + {2320065000, Modes::JT4}, + {2320065000, Modes::JT65}, + {3400065000, Modes::Echo}, + {3400065000, Modes::JT4}, + {3400065000, Modes::JT65}, + {3456065000, Modes::JT4}, + {3456065000, Modes::JT65}, + {5760065000, Modes::Echo}, + {5760065000, Modes::JT4}, + {5760065000, Modes::JT65}, + {10368100000, Modes::Echo}, + {10368100000, Modes::JT4}, + {10368100000, Modes::JT65}, + {24048100000, Modes::Echo}, + {24048100000, Modes::JT4}, + {24048100000, Modes::JT65}, }; } diff --git a/doc/user_guide/en/settings-advanced.adoc b/doc/user_guide/en/settings-advanced.adoc index 5338c9019..e7138bc2f 100644 --- a/doc/user_guide/en/settings-advanced.adoc +++ b/doc/user_guide/en/settings-advanced.adoc @@ -3,9 +3,9 @@ image::settings-advanced.png[align="center",alt="Settings Advanced"] _JT65 decoding parameters_ - *Random erasure patterns* sets the number of pseudo-random trials -used by the Franke-Taylor decoder, on a logarithmic scale. Larger -numbers give slightly better sensitivity but take longer. For most -purposes a good setting is 6 or 7. +used by the Franke-Taylor JT65 decoder, on a logarithmic scale. +Larger numbers give slightly better sensitivity but take longer. For +most purposes a good setting is 6 or 7. - *Aggressive decoding level* sets the threshold for acceptable decodes using Deep Search. Higher numbers will display results diff --git a/doc/user_guide/en/settings-frequencies.adoc b/doc/user_guide/en/settings-frequencies.adoc index 2ed8e5cea..0eb56d4ee 100644 --- a/doc/user_guide/en/settings-frequencies.adoc +++ b/doc/user_guide/en/settings-frequencies.adoc @@ -4,8 +4,9 @@ image::settings-frequencies.png[align="center",alt="Frequency Screen"] _Working Frequencies_: By default the *Working Frequencies* table -contains a list of currently recommended dial frequencies for each -mode. You can modify the frequency table as desired. +contains a list of frequencies conventionally used for modes JT4, JT9, +JT65, MSK144, WSPR, and Echo. Conventions may change with time or +by user preference; you can modify the frequency table as desired. - To change an existing entry, click to select it, type a desired frequency in MHz, and hit *Enter* on the keyboard. The program will