diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e7c6893c..b2bb79b3c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,7 +45,7 @@ if (POLICY CMP0075) endif () project (wsjtx - VERSION 2.6.0.0 + VERSION 2.6.1.0 LANGUAGES C CXX Fortran ) set (PROJECT_DESCRIPTION "WSJT-X: Digital Modes for Weak Signal Communications in Amateur Radio") @@ -71,7 +71,7 @@ message (STATUS "******************************************************") include (set_build_type) # RC 0 or omitted is a development build, GA is a General Availability release build -set_build_type (RC 6) +set_build_type (RC 1) set (wsjtx_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${BUILD_TYPE_REVISION}") # @@ -80,7 +80,7 @@ set (wsjtx_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_ set (PROJECT_BUNDLE_NAME "WSJT-X") set (PROJECT_VENDOR "Joe Taylor, K1JT") set (PROJECT_CONTACT "Joe Taylor ") -set (PROJECT_COPYRIGHT "Copyright (C) 2001-2022 by Joe Taylor, K1JT") +set (PROJECT_COPYRIGHT "Copyright (C) 2001-2023 by Joe Taylor, K1JT") set (PROJECT_HOMEPAGE https://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html) set (PROJECT_MANUAL wsjtx-main) set (PROJECT_MANUAL_DIRECTORY_URL https://www.physics.princeton.edu/pulsar/K1JT/wsjtx-doc/) diff --git a/Configuration.cpp b/Configuration.cpp index cc977fd7c..c8652a599 100644 --- a/Configuration.cpp +++ b/Configuration.cpp @@ -228,6 +228,22 @@ namespace |DC # District of Columbia |DX # anyone else |SCC # Slovenia Contest Club contest + |DR|FR|GD|GR|OV|ZH|ZL # Dutch provinces (also FL,NH,UT,NB,LB) + |X01|X02|X03|X04|X05|X06|X07 # 99 neutral exchanges + |X08|X09|X10|X11|X12|X13|X14 + |X15|X16|X17|X18|X19|X20|X21 + |X22|X23|X24|X25|X26|X27|X28 + |X29|X30|X31|X32|X33|X34|X35 + |X36|X37|X38|X39|X40|X41|X42 + |X43|X44|X45|X46|X47|X48|X49 + |X50|X51|X52|X53|X54|X55|X56 + |X57|X58|X59|X60|X61|X62|X63 + |X64|X65|X66|X67|X68|X69|X70 + |X71|X72|X73|X74|X75|X76|X77 + |X78|X79|X80|X81|X82|X83|X84 + |X85|X86|X87|X88|X89|X90|X91 + |X92|X93|X94|X95|X96|X97|X98 + |X99 ) )", QRegularExpression::CaseInsensitiveOption | QRegularExpression::ExtendedPatternSyntaxOption}; @@ -241,15 +257,15 @@ namespace [A-F]\ * # class and optional space ( AB|AK|AL|AR|AZ|BC|CO|CT|DE|EB # ARRL/RAC section - |EMA|ENY|EPA|EWA|GA|GTA|IA|ID - |IL|IN|KS|KY|LA|LAX|MAR|MB|MDC - |ME|MI|MN|MO|MS|MT|NC|ND|NE|NFL - |NH|NL|NLI|NM|NNJ|NNY|NT|NTX|NV - |OH|OK|ONE|ONN|ONS|OR|ORG|PAC|PE - |PR|QC|RI|SB|SC|SCV|SD|SDG|SF - |SFL|SJV|SK|SNJ|STX|SV|TN|UT|VA - |VI|VT|WCF|WI|WMA|WNY|WPA|WTX - |WV|WWA|WY + |EMA|ENY|EPA|EWA|GA|GH|IA|ID + |IL|IN|KS|KY|LA|LAX|MB|MDC|ME + |MI|MN|MO|MS|MT|NB|NC|ND|NE|NFL + |NH|NL|NLI|NM|NNJ|NNY|NS|NTX|NV + |OH|OK|ONE|ONN|ONS|OR|ORG|PAC + |PE|PR|QC|RI|SB|SC|SCV|SD|SDG + |SF|SFL|SJV|SK|SNJ|STX|SV|TER + |TN|UT|VA|VI|VT|WCF|WI|WMA|WNY + |WPA|WTX|WV|WWA|WY |DX # anyone else ) )", QRegularExpression::CaseInsensitiveOption | QRegularExpression::ExtendedPatternSyntaxOption}; @@ -565,6 +581,7 @@ private: Q_SLOT void on_cbAutoLog_clicked(bool); Q_SLOT void on_Field_Day_Exchange_textEdited (QString const&); Q_SLOT void on_RTTY_Exchange_textEdited (QString const&); + Q_SLOT void on_Contest_Name_textEdited (QString const&); // typenames used as arguments must match registered type names :( Q_SIGNAL void start_transceiver (unsigned seqeunce_number) const; @@ -660,6 +677,7 @@ private: QString my_grid_; QString FD_exchange_; QString RTTY_exchange_; + QString Contest_Name_; qint32 id_interval_; qint32 ntrials_; @@ -693,6 +711,7 @@ private: bool decode_at_52s_; bool single_decode_; bool twoPass_; + bool Individual_Contest_Name_; bool bSpecialOp_; int SelectedActivity_; bool x2ToneSpacing_; @@ -800,6 +819,7 @@ bool Configuration::enable_VHF_features () const {return m_->enable_VHF_features bool Configuration::decode_at_52s () const {return m_->decode_at_52s_;} bool Configuration::single_decode () const {return m_->single_decode_;} bool Configuration::twoPass() const {return m_->twoPass_;} +bool Configuration::Individual_Contest_Name() const {return m_->Individual_Contest_Name_;} bool Configuration::x2ToneSpacing() const {return m_->x2ToneSpacing_;} bool Configuration::x4ToneSpacing() const {return m_->x4ToneSpacing_;} bool Configuration::split_mode () const {return m_->split_mode ();} @@ -960,6 +980,11 @@ QString Configuration::RTTY_Exchange() const return m_->RTTY_exchange_; } +QString Configuration::Contest_Name() const +{ + return m_->Contest_Name_; +} + auto Configuration::special_op_id () const -> SpecialOperatingActivity { return m_->bSpecialOp_ ? static_cast (m_->SelectedActivity_) : SpecialOperatingActivity::NONE; @@ -1403,6 +1428,7 @@ void Configuration::impl::initialize_models () ui_->decode_at_52s_check_box->setChecked(decode_at_52s_); ui_->single_decode_check_box->setChecked(single_decode_); ui_->cbTwoPass->setChecked(twoPass_); + ui_->cbContestName->setChecked(Individual_Contest_Name_); ui_->gbSpecialOpActivity->setChecked(bSpecialOp_); ui_->special_op_activity_button_group->button (SelectedActivity_)->setChecked (true); ui_->cbx2ToneSpacing->setChecked(x2ToneSpacing_); @@ -1513,6 +1539,7 @@ void Configuration::impl::read_settings () my_grid_ = settings_->value ("MyGrid", QString {}).toString (); FD_exchange_ = settings_->value ("Field_Day_Exchange",QString {}).toString (); RTTY_exchange_ = settings_->value ("RTTY_Exchange",QString {}).toString (); + Contest_Name_ = settings_->value ("Contest_Name",QString {}).toString (); ui_->Field_Day_Exchange->setText(FD_exchange_); ui_->RTTY_Exchange->setText(RTTY_exchange_); if (next_font_.fromString (settings_->value ("Font", QGuiApplication::font ().toString ()).toString ()) @@ -1610,6 +1637,10 @@ void Configuration::impl::read_settings () frequencies_.reset_to_defaults(); } } + else + { + frequencies_.reset_to_defaults(); + } } stations_.station_list (settings_->value ("stations").value ()); @@ -1662,6 +1693,7 @@ void Configuration::impl::read_settings () decode_at_52s_ = settings_->value("Decode52",false).toBool (); single_decode_ = settings_->value("SingleDecode",false).toBool (); twoPass_ = settings_->value("TwoPass",true).toBool (); + Individual_Contest_Name_ = settings_->value("Individual_Contest_Name",true).toBool (); bSpecialOp_ = settings_->value("SpecialOpActivity",false).toBool (); SelectedActivity_ = settings_->value("SelectedActivity",1).toInt (); x2ToneSpacing_ = settings_->value("x2ToneSpacing",false).toBool (); @@ -1722,6 +1754,7 @@ void Configuration::impl::write_settings () settings_->setValue ("MyGrid", my_grid_); settings_->setValue ("Field_Day_Exchange", FD_exchange_); settings_->setValue ("RTTY_Exchange", RTTY_exchange_); + settings_->setValue ("Contest_Name", Contest_Name_); settings_->setValue ("Font", font_.toString ()); settings_->setValue ("DecodedTextFont", decoded_text_font_.toString ()); settings_->setValue ("IDint", id_interval_); @@ -1796,6 +1829,7 @@ void Configuration::impl::write_settings () settings_->setValue ("Decode52", decode_at_52s_); settings_->setValue ("SingleDecode", single_decode_); settings_->setValue ("TwoPass", twoPass_); + settings_->setValue ("Individual_Contest_Name", Individual_Contest_Name_); settings_->setValue ("SelectedActivity", SelectedActivity_); settings_->setValue ("SpecialOpActivity", bSpecialOp_); settings_->setValue ("x2ToneSpacing", x2ToneSpacing_); @@ -2186,6 +2220,7 @@ void Configuration::impl::accept () my_grid_ = ui_->grid_line_edit->text (); FD_exchange_= ui_->Field_Day_Exchange->text ().toUpper (); RTTY_exchange_= ui_->RTTY_Exchange->text ().toUpper (); + Contest_Name_= ui_->Contest_Name->text ().toUpper (); spot_to_psk_reporter_ = ui_->psk_reporter_check_box->isChecked (); psk_reporter_tcpip_ = ui_->psk_reporter_tcpip_check_box->isChecked (); id_interval_ = ui_->CW_id_interval_spin_box->value (); @@ -2223,6 +2258,7 @@ void Configuration::impl::accept () decode_at_52s_ = ui_->decode_at_52s_check_box->isChecked (); single_decode_ = ui_->single_decode_check_box->isChecked (); twoPass_ = ui_->cbTwoPass->isChecked (); + Individual_Contest_Name_ = ui_->cbContestName->isChecked (); bSpecialOp_ = ui_->gbSpecialOpActivity->isChecked (); SelectedActivity_ = ui_->special_op_activity_button_group->checkedId(); x2ToneSpacing_ = ui_->cbx2ToneSpacing->isChecked (); @@ -2308,6 +2344,8 @@ void Configuration::impl::accept () use_dynamic_grid_ = ui_->use_dynamic_grid->isChecked(); highlight_DXcall_ = ui_->cbHighlightDXcall->isChecked(); highlight_DXgrid_ = ui_->cbHighlightDXgrid->isChecked(); + Individual_Contest_Name_ = ui_->cbContestName->isChecked(); + write_settings (); // make visible to all } @@ -2892,6 +2930,11 @@ void Configuration::impl::on_RTTY_Exchange_textEdited (QString const& exchange) ui_->RTTY_Exchange->setText (exchange.toUpper ()); } +void Configuration::impl::on_Contest_Name_textEdited (QString const& exchange) +{ + ui_->Contest_Name->setText (exchange.toUpper ()); +} + bool Configuration::impl::have_rig () { if (!open_rig ()) diff --git a/Configuration.hpp b/Configuration.hpp index 85b887ae7..dbf6b9124 100644 --- a/Configuration.hpp +++ b/Configuration.hpp @@ -100,6 +100,7 @@ public: QString my_grid () const; QString Field_Day_Exchange() const; QString RTTY_Exchange() const; + QString Contest_Name() const; void setEU_VHF_Contest(); QFont text_font () const; QFont decoded_text_font () const; @@ -187,7 +188,8 @@ public: void setSpecial_None(); bool highlight_DXcall () const; bool highlight_DXgrid () const; - + bool Individual_Contest_Name() const; + // 0 1 2 3 4 5 6 7 8 enum class SpecialOperatingActivity {NONE, NA_VHF, EU_VHF, FIELD_DAY, RTTY, WW_DIGI, FOX, HOUND, ARRL_DIGI}; SpecialOperatingActivity special_op_id () const; diff --git a/Configuration.ui b/Configuration.ui index f86214cca..1f91e09cd 100644 --- a/Configuration.ui +++ b/Configuration.ui @@ -1312,6 +1312,9 @@ radio interface behave as expected. + + <html><head/><body><p>Use only VFO A for split operation (the program temporarily changes the QRG of your rig during transmission).</p></body></html> + Fake It @@ -1322,6 +1325,9 @@ radio interface behave as expected. + + <html><head/><body><p>Use VFO A+B for split operation (works with many rigs, but requires the use of both VFOs).</p></body></html> + Rig @@ -1332,6 +1338,9 @@ radio interface behave as expected. + + <html><head/><body><p>Don't use split (not recommended).</p></body></html> + None @@ -2504,289 +2513,6 @@ Right click for insert and delete options. Advanced - - - - Special operating activity - - - true - - - false - - - - - - <html><head/><body><p>FT8 DXpedition mode: Fox (DXpedition) operator.</p></body></html> - - - Fox - - - Fox - - - false - - - special_op_activity_button_group - - - - - - - - 0 - 0 - - - - <html><head/><body><p>European VHF+ contests requiring a signal report, serial number, and 6-character locator.</p></body></html> - - - EU VHF Contest - - - EU VHF Contest - - - special_op_activity_button_group - - - - - - - - 0 - 0 - - - - <html><head/><body><p>North American VHF/UHF/Microwave contests and others in which a 4-character grid locator is the required exchange.</p></body></html> - - - NA VHF Contest - - - NA VHF - - - special_op_activity_button_group - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - <html><head/><body><p>FT8 DXpedition mode: Hound operator calling the DX.</p></body></html> - - - Hound - - - Hound - - - true - - - special_op_activity_button_group - - - - - - - - - <html><head/><body><p>ARRL Field Day exchange: number of transmitters, Class, and ARRL/RAC section or &quot;DX&quot;.</p></body></html> - - - A R R L Field Day - - - ARRL Field Day - - - special_op_activity_button_group - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Field Day exchange - - - FD Exch: - - - Field_Day_Exchange - - - - - - - - 70 - 0 - - - - <html><head/><body><p>ARRL Field Day exchange: number of transmitters, Class, and ARRL/RAC section or &quot;DX&quot;.</p></body></html> - - - 6A SNJ - - - Qt::AlignCenter - - - - - - - - - - - - 0 - 18 - - - - <html><head/><body><p>World-Wide Digi-mode contest</p><p><br/></p></body></html> - - - WW Digital Contest - - - WW Digi Contest - - - special_op_activity_button_group - - - - - - - - - <html><head/><body><p>FT Roundup and similar contests. Exchange is US state, Canadian province, or &quot;DX&quot;.</p></body></html> - - - R T T Y Roundup - - - FT Roundup - - - special_op_activity_button_group - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - RTTY Roundup exchange - - - FT RU Exch: - - - RTTY_Exchange - - - - - - - - 70 - 0 - - - - <html><head/><body><p>FT Roundup and similar contests. Exchange is US state, Canadian province, or &quot;DX&quot;.</p></body></html> - - - NJ - - - Qt::AlignCenter - - - - - - - - - - - <html><head/><body><p>ARRL International Digital Contest</p></body></html> - - - ARRL Digi Contest - - - special_op_activity_button_group - - - - - - @@ -3027,6 +2753,349 @@ Right click for insert and delete options. + + + + Special operating activity + + + true + + + false + + + + + + <html><head/><body><p>FT8 DXpedition mode: Hound operator calling the DX.</p></body></html> + + + Hound + + + Hound + + + true + + + special_op_activity_button_group + + + + + + + + 0 + 0 + + + + <html><head/><body><p>North American VHF/UHF/Microwave contests and others in which a 4-character grid locator is the required exchange.</p></body></html> + + + NA VHF Contest + + + NA VHF + + + special_op_activity_button_group + + + + + + + + + <html><head/><body><p>ARRL Field Day exchange: number of transmitters, Class, and ARRL/RAC section or &quot;DX&quot;.</p></body></html> + + + A R R L Field Day + + + ARRL Field Day + + + special_op_activity_button_group + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Field Day exchange + + + FD Exch: + + + Field_Day_Exchange + + + + + + + + 70 + 0 + + + + <html><head/><body><p>ARRL Field Day exchange: number of transmitters, Class, and ARRL/RAC section or &quot;DX&quot;.</p></body></html> + + + 6A SNJ + + + Qt::AlignCenter + + + + + + + + + + + <html><head/><body><p>ARRL International Digital Contest</p></body></html> + + + ARRL Digi Contest + + + special_op_activity_button_group + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 18 + + + + <html><head/><body><p>World-Wide Digi-mode contest</p><p><br/></p></body></html> + + + WW Digital Contest + + + WW Digi Contest + + + special_op_activity_button_group + + + + + + + + + <html><head/><body><p>FT Roundup and similar contests. Exchange is US state, Canadian province, or &quot;DX&quot;.</p></body></html> + + + R T T Y Roundup + + + FT Roundup + + + special_op_activity_button_group + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + RTTY Roundup exchange + + + FT RU Exch: + + + RTTY_Exchange + + + + + + + + 70 + 0 + + + + <html><head/><body><p>FT Roundup and similar contests. Exchange is US state, Canadian province, or &quot;DX&quot;.</p></body></html> + + + NJ + + + Qt::AlignCenter + + + + + + + + + + + <html><head/><body><p>FT8 DXpedition mode: Fox (DXpedition) operator.</p></body></html> + + + Fox + + + Fox + + + false + + + special_op_activity_button_group + + + + + + + + 0 + 0 + + + + <html><head/><body><p>European VHF+ contests requiring a signal report, serial number, and 6-character locator.</p></body></html> + + + EU VHF Contest + + + EU VHF Contest + + + special_op_activity_button_group + + + + + + + + + <html><head/><body><p>Call CQ with an individual contest name instead of TEST, RU, or WW. </p></body></html> + + + CQ with individual contest name + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Contest name: + + + + + + + + 70 + 16777215 + + + + PACC + + + 4 + + + 2 + + + Qt::AlignCenter + + + + + + + + + + @@ -3267,13 +3336,13 @@ Right click for insert and delete options. - - - - - + + + + + diff --git a/NEWS b/NEWS index 638641189..d4f755648 100644 --- a/NEWS +++ b/NEWS @@ -9,7 +9,56 @@ \$$ \$$ \$$$$$$ \$$$$$$ \$$ \$$ \$$ -Copyright 2001 - 2022 by Joe Taylor, K1JT, and the WSJT Development Team +Copyright 2001 - 2023 by Joe Taylor, K1JT, and the WSJT Development Team + + Release: WSJT-X 2.6.0 + January 2, 2023 + ------------------------- + +WSJT-X 2.6.0 is a General Availability (GA) release, the first since +version 2.5.4. Its major enhancements include the following: + + - Support for the ARRL International DX Contest + - Performance enhancements for the FT8 and Q65 modes + - New features for EME Echo mode, including calibrated SNR reports + - Several new convenience features for Fox operators + - Save/Restore capability, "Preferred" status, and effective date + ranges for mode-dependent tables of default frequencies + - Improved display features for contest log + - Improved calibration of SNR estimates for modes FST4 and FST4W + +Other enhancements and bug fixes since 2.6.0-rc5 include the following: + + - PSK Reporter spotting is now also possible for frequencies > 4 GHz. + This is required for QO-100, for example. + + - The minimum width of the main window has been further reduced, and + such small sizes are now remembered and properly restored. + + - Some further improvements for Fox operators. + + - Fix the long-standing flaw that "Start new period decodes at top" + didn't work anymore after several hours. + + - Fix a flaw that could cause crashes by double-clicking messages + with <...> in certain QSO situations. + + - Fix a flaw that prevented the rig from initializing correctly after + switching between configurations when connected via HRD. + + - Add tooltips to better explain the split operation options. + + - Add some additional FT roundup exchanges which can be used for + local contests or QSO parties. + + - Add an option to call CQ with an individual contest name. + + - Update of some ARRL section abbreviations. + +For full details on changes since WSJT-X version 2.5.4, be sure to +read the Release Notes sections for 2.6.0-rc1 through rc5, immediately +following. + Release: WSJT-X 2.6.0-rc5 November 29, 2022 diff --git a/Network/PSKReporter.cpp b/Network/PSKReporter.cpp index 5543c222b..1161a583c 100644 --- a/Network/PSKReporter.cpp +++ b/Network/PSKReporter.cpp @@ -299,7 +299,7 @@ void PSKReporter::impl::build_preamble (QDataStream& message) << quint16 (0xffff) // Option 1 Field Length (variable) << quint32 (30351u) // Option 1 Enterprise Number << quint16 (0x8000 + 5u) // Option 2 Information Element ID (frequency) - << quint16 (4u) // Option 2 Field Length + << quint16 (5u) // Option 2 Field Length << quint32 (30351u) // Option 2 Enterprise Number << quint16 (0x8000 + 6u) // Option 3 Information Element ID (sNR) << quint16 (1u) // Option 3 Field Length @@ -423,8 +423,19 @@ void PSKReporter::impl::send_report (bool send_residue) // Sender information writeUtfString (tx_out, spot.call_); - tx_out - << static_cast (spot.freq_) + uint8_t data[5]; + long long int i64 = spot.freq_; + data[0] = ( i64 & 0xff); + data[1] = ((i64 >> 8) & 0xff); + data[2] = ((i64 >> 16) & 0xff); + data[3] = ((i64 >> 24) & 0xff); + data[4] = ((i64 >> 32) & 0xff); + tx_out // BigEndian + << static_cast (data[4]) + << static_cast (data[3]) + << static_cast (data[2]) + << static_cast (data[1]) + << static_cast (data[0]) << static_cast (spot.snr_); writeUtfString (tx_out, spot.mode_); writeUtfString (tx_out, spot.grid_); diff --git a/Release_Notes.txt b/Release_Notes.txt index f25ba4e56..f748bfd5e 100644 --- a/Release_Notes.txt +++ b/Release_Notes.txt @@ -9,7 +9,56 @@ \$$ \$$ \$$$$$$ \$$$$$$ \$$ \$$ \$$ -Copyright 2001 - 2022 by Joe Taylor, K1JT, and the WSJT Development Team +Copyright 2001 - 2023 by Joe Taylor, K1JT, and the WSJT Development Team + + Release: WSJT-X 2.6.0 + January 2, 2023 + ------------------------- + +WSJT-X 2.6.0 is a General Availability (GA) release, the first since +version 2.5.4. Its major enhancements include the following: + + - Support for the ARRL International DX Contest + - Performance enhancements for the FT8 and Q65 modes + - New features for EME Echo mode, including calibrated SNR reports + - Several new convenience features for Fox operators + - Save/Restore capability, "Preferred" status, and effective date + ranges for mode-dependent tables of default frequencies + - Improved display features for contest log + - Improved calibration of SNR estimates for modes FST4 and FST4W + +Other enhancements and bug fixes since 2.6.0-rc5 include the following: + + - PSK Reporter spotting is now also possible for frequencies > 4 GHz. + This is required for QO-100, for example. + + - The minimum width of the main window has been further reduced, and + such small sizes are now remembered and properly restored. + + - Some further improvements for Fox operators. + + - Fix the long-standing flaw that "Start new period decodes at top" + didn't work anymore after several hours. + + - Fix a flaw that could cause crashes by double-clicking messages + with <...> in certain QSO situations. + + - Fix a flaw that prevented the rig from initializing correctly after + switching between configurations when connected via HRD. + + - Add tooltips to better explain the split operation options. + + - Add some additional FT roundup exchanges which can be used for + local contests or QSO parties. + + - Add an option to call CQ with an individual contest name. + + - Update of some ARRL section abbreviations. + +For full details on changes since WSJT-X version 2.5.4, be sure to +read the Release Notes sections for 2.6.0-rc1 through rc5, immediately +following. + Release: WSJT-X 2.6.0-rc5 November 29, 2022 diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index eb058291b..5aacc8fc8 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -63,6 +63,8 @@ set (UG_SRCS set (UG_IMGS images/active_stations.png + images/Add_Frequency.png + images/Add_station_info.png images/AstroData_2.png images/Astronomical_data.png images/auto-seq.png diff --git a/doc/common/links.adoc b/doc/common/links.adoc index a9d45db2a..17ae26203 100644 --- a/doc/common/links.adoc +++ b/doc/common/links.adoc @@ -49,21 +49,21 @@ d). Edit lines as needed. Keeping them in alphabetic order help see dupes. :asciidoctor_style: https://asciidoctor.org/docs/asciidoc-writers-guide/#delimited-blocks[AsciiDoctor Styles Guide] :asciidoctor_syntax: https://asciidoctor.org/docs/asciidoc-writers-guide/#delimited-blocks[AsciiDoctor Syntax Guide] :cc_by_sa: https://creativecommons.org/licenses/by-sa/3.0/[Commons Attribution-ShareAlike 3.0 Unported License] -:debian32: https://physics.princeton.edu/pulsar/K1JT/wsjtx_{VERSION}_i386.deb[wsjtx_{VERSION}_i386.deb] -:debian64: https://physics.princeton.edu/pulsar/K1JT/wsjtx_{VERSION}_amd64.deb[wsjtx_{VERSION}_amd64.deb] -:raspbian: https://physics.princeton.edu/pulsar/K1JT/wsjtx_{VERSION}_armhf.deb[wsjtx_{VERSION}_armhf.deb] -:raspbian64: https://physics.princeton.edu/pulsar/K1JT/wsjtx_{VERSION}_arm64.deb[wsjtx_{VERSION}_arm64.deb] +:debian32: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/wsjtx_{VERSION}_i386.deb[wsjtx_{VERSION}_i386.deb] +:debian64: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/wsjtx_{VERSION}_amd64.deb[wsjtx_{VERSION}_amd64.deb] +:raspbian: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/wsjtx_{VERSION}_armhf.deb[wsjtx_{VERSION}_armhf.deb] +:raspbian64: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/wsjtx_{VERSION}_arm64.deb[wsjtx_{VERSION}_arm64.deb] :debian: https://www.debian.org/[Debian] :dev_guide: https://www.physics.princeton.edu/pulsar/K1JT/wsjtx-doc/wsjt-dev-guide.html[Dev-Guide] :devsvn: https://sourceforge.net/p/wsjt/wsjt/HEAD/tree/[Devel-SVN] :devrepo: https://sourceforge.net/p/wsjt/wsjtx/ci/master/tree/[SourceForge] :dimension4: http://www.thinkman.com/dimension4/[Thinking Man Software] -:download: https://physics.princeton.edu/pulsar/K1JT/wsjtx.html[Download Page] +:download: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/wsjtx.html[Download Page] :dxatlas: http://www.dxatlas.com/[Afreet Software, Inc.] :dxlcommander: https://www.dxlabsuite.com/commander/[Commander] :dxlsuite: https://www.dxlabsuite.com/[DX Lab Suite] -:fedora32: https://physics.princeton.edu/pulsar/K1JT/wsjtx-{VERSION}-i686.rpm[wsjtx-{VERSION}-i686.rpm] -:fedora64: https://physics.princeton.edu/pulsar/K1JT/wsjtx-{VERSION}-x86_64.rpm[wsjtx-{VERSION}-x86_64.rpm] +:fedora32: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/wsjtx-{VERSION}-i686.rpm[wsjtx-{VERSION}-i686.rpm] +:fedora64: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/wsjtx-{VERSION}-x86_64.rpm[wsjtx-{VERSION}-x86_64.rpm] :fmt_arrl: https://www.arrl.org/frequency-measuring-test[ARRL FMT Info] :fmt_group: https://groups.yahoo.com/neo/groups/FMT-nuts/info[FMT Group] :fmt_k5cm: http://www.k5cm.com/[FMT Event Info] @@ -73,20 +73,20 @@ d). Edit lines as needed. Keeping them in alphabetic order help see dupes. :ft8_tips: https://www.g4ifb.com/FT8_Hinson_tips_for_HF_DXers.pdf[FT8 Operating Guide] :ft8_DXped: https://physics.princeton.edu/pulsar/k1jt/FT8_DXpedition_Mode.pdf[FT8 DXpedition Mode] :gnu_gpl: https://www.gnu.org/licenses/gpl-3.0.txt[GNU General Public License] -:homepage: https://physics.princeton.edu/pulsar/K1JT/[WSJT Home Page] +:homepage: https://wsjt.sourceforge.io/index.html[WSJT Home Page] :hrd: http://www.hrdsoftwarellc.com/[Ham Radio Deluxe] -:jt4eme: https://physics.princeton.edu/pulsar/K1JT/WSJT-X_1.6.0_for_JT4_v7.pdf[Using WSJT-X for JT4 EME Operation] -:jt65protocol: https://physics.princeton.edu/pulsar/K1JT/JT65.pdf[QEX] +:jt4eme: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/WSJT-X_1.6.0_for_JT4_v7.pdf[Using WSJT-X for JT4 EME Operation] +:jt65protocol: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/JT65.pdf[QEX] :jtalert: https://hamapps.com/[JTAlert] :launchpadki7mt: https://launchpad.net/~ki7mt[KI7MT PPA's] :log4om: https://www.log4om.com[Log4OM] -:lunarEchoes: https://physics.princeton.edu/pulsar/K1JT/LunarEchoes_QEX.pdf[QEX] +:lunarEchoes: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/LunarEchoes_QEX.pdf[QEX] :msk144: https://physics.princeton.edu/pulsar/k1jt/MSK144_Protocol_QEX.pdf[QEX] :msvcpp_redist: https://www.microsoft.com/en-ph/download/details.aspx?id=40784[Microsoft VC++ 2013 Redistributable] :msys_url: https://sourceforge.net/projects/mingwbuilds/files/external-binary-packages/[MSYS Download] :n1mm_logger: https://n1mm.hamdocs.com/tiki-index.php[N1MM Logger+] :ntpsetup: https://www.satsignal.eu/ntp/setup.html[Network Time Protocol Setup] -:osx_instructions: https://physics.princeton.edu/pulsar/K1JT/OSX_Readme[Mac OS X Install Instructions] +:osx_instructions: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/OSX_Readme[Mac OS X Install Instructions] :ppa: https://en.wikipedia.org/wiki/Personal_Package_Archive[PPA] :projsummary: https://sourceforge.net/projects/wsjt/[Project Summary] :pskreporter: https://pskreporter.info/pskmap.html[PSK Reporter] @@ -99,32 +99,32 @@ d). Edit lines as needed. Keeping them in alphabetic order help see dupes. :writelog: https://writelog.com/[Writelog] :wsjtx_group: https://groups.io/g/WSJTX[WSJTX Group] :wsjtx_group2: https://groups.io/g/WSJTX[join the group] -:wsjtx: https://physics.princeton.edu/pulsar/K1JT/wsjtx.html[WSJT-X] +:wsjtx: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/wsjtx.html[WSJT-X] :wspr0_guide: https://www.physics.princeton.edu/pulsar/K1JT/WSPR0_Instructions.TXT[WSPR0 Guide] -:wspr: https://physics.princeton.edu/pulsar/K1JT/wspr.html[WSPR Home Page] +:wspr: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/wspr.html[WSPR Home Page] :wsprnet: https://wsprnet.org/drupal/[WSPRnet] :wsprnet_activity: https://wsprnet.org/drupal/wsprnet/activity[WSPRnet Activity page] // Download Links :cty_dat: https://www.country-files.com/cty/[Amateur Radio Country Files] :jtbridge: https://jt-bridge.eller.nu/[JT-Bridge] -:jtsdk_doc: https://physics.princeton.edu/pulsar/K1JT/JTSDK-DOC.exe[Download] +:jtsdk_doc: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/JTSDK-DOC.exe[Download] :jtsdk_installer: https://sourceforge.net/projects/jtsdk/files/win32/2.0.0/JTSDK-2.0.0-B2-Win32.exe/download[Download] :jtsdk_omnirig: https://sourceforge.net/projects/jtsdk/files/win32/2.0.0/base/contrib/OmniRig.zip/download[Download] -:jtsdk_py: https://physics.princeton.edu/pulsar/K1JT/JTSDK-PY.exe[Download] -:jtsdk_qt: https://physics.princeton.edu/pulsar/K1JT/JTSDK-QT.exe[Download] +:jtsdk_py: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/JTSDK-PY.exe[Download] +:jtsdk_qt: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/JTSDK-QT.exe[Download] :jtsdk_vcredist: https://sourceforge.net/projects/jtsdk/files/win32/2.0.0/base/contrib/vcredist_x86.exe/download[Download] :nh6z: http://www.nh6z.net/Amatuer_Radio_Station_NH6Z/Other_Peoples_Software.html[here] :omnirig: http://www.dxatlas.com/OmniRig/Files/OmniRig.zip[Omni-Rig] -:osx: https://physics.princeton.edu/pulsar/K1JT/wsjtx-{VERSION}-Darwin.dmg[wsjtx-{VERSION}-Darwin.dmg] -:QRA64_EME: https://physics.princeton.edu/pulsar/K1JT/QRA64_EME.pdf[QRA64 for microwave EME] +:osx: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/wsjtx-{VERSION}-Darwin.dmg[wsjtx-{VERSION}-Darwin.dmg] +:QRA64_EME: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/QRA64_EME.pdf[QRA64 for microwave EME] :svn: https://subversion.apache.org/packages.html#windows[Subversion] -:win32: https://physics.princeton.edu/pulsar/K1JT/wsjtx-{VERSION}-win32.exe[wsjtx-{VERSION}-win32.exe] -:win64: https://physics.princeton.edu/pulsar/K1JT/wsjtx-{VERSION}-win64.exe[wsjtx-{VERSION}-win64.exe] +:win32: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/wsjtx-{VERSION}-win32.exe[wsjtx-{VERSION}-win32.exe] +:win64: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/wsjtx-{VERSION}-win64.exe[wsjtx-{VERSION}-win64.exe] :wsjt-devel: https://sourceforge.net/p/wsjt/mailman/wsjt-devel/[join the group] :wsjt-devel2: https://sourceforge.net/p/wsjt/mailman/wsjt-devel/[subscribe to the list] :wsjt_repo: https://sourceforge.net/p/wsjt/wsjt_orig/ci/master/tree/[WSJT Source Repository] -:wspr_code: https://physics.princeton.edu/pulsar/K1JT/WSPRcode.exe[WSPRcode.exe] +:wspr_code: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/WSPRcode.exe[WSPRcode.exe] :wspr_svn: https://sourceforge.net/p/wsjt/wspr/ci/master/tree/[WSPR Source Repository] // MAIL-TO links diff --git a/doc/user_guide/en/images/Add_Frequency.png b/doc/user_guide/en/images/Add_Frequency.png new file mode 100644 index 000000000..7f4341f10 Binary files /dev/null and b/doc/user_guide/en/images/Add_Frequency.png differ diff --git a/doc/user_guide/en/images/Windows_Dark.png b/doc/user_guide/en/images/Windows_Dark.png index 6e877f4e1..4a864b19d 100644 Binary files a/doc/user_guide/en/images/Windows_Dark.png and b/doc/user_guide/en/images/Windows_Dark.png differ diff --git a/doc/user_guide/en/images/settings-advanced.png b/doc/user_guide/en/images/settings-advanced.png index b1ed3cc8e..3c708f37e 100644 Binary files a/doc/user_guide/en/images/settings-advanced.png and b/doc/user_guide/en/images/settings-advanced.png differ diff --git a/doc/user_guide/en/images/settings-frequencies.png b/doc/user_guide/en/images/settings-frequencies.png index 7106e606c..395bf848d 100644 Binary files a/doc/user_guide/en/images/settings-frequencies.png and b/doc/user_guide/en/images/settings-frequencies.png differ diff --git a/doc/user_guide/en/new_features.adoc b/doc/user_guide/en/new_features.adoc index 5bc46628e..234d636f0 100644 --- a/doc/user_guide/en/new_features.adoc +++ b/doc/user_guide/en/new_features.adoc @@ -4,26 +4,43 @@ - _WSJT-X 2.6_ implements new features supporting the ARRL International Digital Contest and its distance based scoring. The *Call 1st* checkbox has been replaced by a drop-down control offering -*CQ Max Dist* as an alternative. With this option selected, the -program will select the reply to your CQ that yields the most contest -points. In addition, a new window labeled *Active Stations* displays -a list of received but unworked callsigns, sorted in decreasing order -of potential contest points. Click on a line in this window to call -that station. +*CQ Max Dist* as an alternative. A new window labeled *Active +Stations* displays a list of received but unworked callsigns, sorted +in decreasing order of potential contest points. With option *CQ Max +Dist* selected, the program will select the reply to your CQ that +yields the most contest points. You can click on a line in the Active +Stations window to call that station. - Decoding performance for FT8 and Q65 has been improved in a variety of situations with available _a priori_ (AP) information. - *Echo* mode now offers a *Clear Avg* button and produces reliable measurements of SNR even when Doppler spread is large. Its *Monitor* -function can be used to measure SNR for a received unmodulated -carrier such as a key-down test signal emitted by another station and -reflected from the Moon, and to measure Sun, Moon, and ground noise as -aids for optimizing an EME station's performance. +function can be used to measure SNR for a received unmodulated carrier +such as a key-down test signal emitted by another station and +reflected from the Moon, and also to measure Sun, Moon, and ground +noise as aids for optimizing an EME station's performance. - New buttons on the main window allow quick changes between modes -FT4, FT8, MSK144, Q65, and JT65. Another new button allows toggling -FT8 Hound mode ON or OFF. +FT4, FT8, MSK144, Q65, and JT65, and toggling FT8 Hound mode ON/OFF. + +- New convenience features allow Fox operators to react more quickly +to particular QSO situations. A two-column table in Tab 2 provides an +overview of the queue and of callsigns with QSOs in progress. Fox +operator can change the ordering of callsigns in the queue, allowing +reaction to changes in propagation. Fox now responds automatically +for another two cycles to stations whose report has not been received, +increasing the success rate for difficult QSOs. + +- The Working frequency table now offers save/restore capability and +better handling of more than one frequency per mode-band +combination. You can set preferred frequencies, and WSJT-X will select +these when you change band or mode. You can label a tabled frequency +with a description, for example a DXpedition callsign, and set Start +and End date and time so the frequencies automatically appear and +disappear from the displayed options. You can load a publicly +available frequency table from a file, to easily make such DXpedition +data available to the program. - Optional color highlighting is provided for specified DX Call and DX Grid, and for messages containing RR73 or 73. @@ -33,17 +50,19 @@ request automatic starting of a new file every month or every year, and you can disable writing altogether. - Settings for T/R period and Submode are remembered by mode when you -switch directly between (for example) MSK144-15, Q65-60A, JT65-C, or +switch directly between modes: for example, MSK144-15, Q65-60A, or FST4-120. - Tx and Rx audio frequencies are remembered and restored when you return from a mode that sets a default frequency 1500 Hz (MSK144, FST4W, Echo, WSPR, FreqCal), then switching back to FT4, FT8, Q65, -JT65, or FST4. +FST4, or JT65. -- Other changes include bug fixes and rig control for some new radios. - -- _MAP65 3.0_ (available for Windows only) now sends additional -information to file azel.dat and offers digital scaling of input I/Q -data. +- Rig control is provided for some new radios, and bug fixes for +controlling others. +- New features in _MAP65_ (available for Windows only) include an aid +for measuring antenna pointing errors and an ability to read the file +wsjtx.log (kept by _WSJT-X_) to recognize EME contest dupes. In +addition, _MAP65_ now sends additional information to file azel.dat +and offers optional digital scaling of input I/Q data. diff --git a/doc/user_guide/en/settings-frequencies.adoc b/doc/user_guide/en/settings-frequencies.adoc index 414fc5395..f0e1752f7 100644 --- a/doc/user_guide/en/settings-frequencies.adoc +++ b/doc/user_guide/en/settings-frequencies.adoc @@ -10,15 +10,17 @@ preference; you can modify the frequency table as desired. image::settings-frequencies.png[align="center",alt="Frequency Screen"] - To change an existing entry, double-click to edit it, type a desired -frequency in MHz or select from the drop down list of options, then -hit *Enter* on the keyboard. The program will format your changed -entry appropriately. +frequency in MHz or select from the drop-down list of options, then +hit *Enter* on the keyboard. You can mark an entry as Preferred, +provide a descriptive label, and indicate starting and ending dates +and times for it to be displayed on the band-select control. The +program will format your changed entries appropriately. - To add a new entry, right-click anywhere on the frequency table and -select *Insert*. Enter a frequency in MHz in the pop-up box and -select the desired mode (or leave the Mode selection as *All*). Then -click *OK*. The table may include more than one frequency for a given -band. +select *Insert*. Enter your desired information and click *OK*. The +table may include more than one frequency for a given mode and band. + +image::Add_Frequency.png[align="center",alt="Add Frequency window"] - To delete an entry, right-click it and select *Delete*, multiple entries can be deleted in a single operation by selecting them before diff --git a/lib/77bit/packjt77.f90 b/lib/77bit/packjt77.f90 index 8fc575f0c..ce6b4dfd3 100644 --- a/lib/77bit/packjt77.f90 +++ b/lib/77bit/packjt77.f90 @@ -204,8 +204,8 @@ subroutine unpack77(c77,nrx,msg,unpk77_success) ! the value of nrx is used to decide when mycall13 or dxcall13 should ! be used in place of a callsign from the hashtable ! - parameter (NSEC=85) !Number of ARRL Sections - parameter (NUSCAN=65) !Number of US states and Canadian provinces + parameter (NSEC=86) !Number of ARRL Sections + parameter (NUSCAN=171) !Number of States and Provinces parameter (MAXGRID4=32400) integer*8 n58 integer ntel(3) @@ -229,14 +229,14 @@ subroutine unpack77(c77,nrx,msg,unpk77_success) data c/' 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ/'/ data csec/ & "AB ","AK ","AL ","AR ","AZ ","BC ","CO ","CT ","DE ","EB ", & - "EMA","ENY","EPA","EWA","GA ","GTA","IA ","ID ","IL ","IN ", & - "KS ","KY ","LA ","LAX","MAR","MB ","MDC","ME ","MI ","MN ", & + "EMA","ENY","EPA","EWA","GA ","GH ","IA ","ID ","IL ","IN ", & + "KS ","KY ","LA ","LAX","NS ","MB ","MDC","ME ","MI ","MN ", & "MO ","MS ","MT ","NC ","ND ","NE ","NFL","NH ","NL ","NLI", & - "NM ","NNJ","NNY","NT ","NTX","NV ","OH ","OK ","ONE","ONN", & + "NM ","NNJ","NNY","TER","NTX","NV ","OH ","OK ","ONE","ONN", & "ONS","OR ","ORG","PAC","PR ","QC ","RI ","SB ","SC ","SCV", & "SD ","SDG","SF ","SFL","SJV","SK ","SNJ","STX","SV ","TN ", & "UT ","VA ","VI ","VT ","WCF","WI ","WMA","WNY","WPA","WTX", & - "WV ","WWA","WY ","DX ","PE "/ + "WV ","WWA","WY ","DX ","PE ","NB "/ data cmult/ & "AL ","AK ","AZ ","AR ","CA ","CO ","CT ","DE ","FL ","GA ", & "HI ","ID ","IL ","IN ","IA ","KS ","KY ","LA ","ME ","MD ", & @@ -244,7 +244,18 @@ subroutine unpack77(c77,nrx,msg,unpk77_success) "NM ","NY ","NC ","ND ","OH ","OK ","OR ","PA ","RI ","SC ", & "SD ","TN ","TX ","UT ","VT ","VA ","WA ","WV ","WI ","WY ", & "NB ","NS ","QC ","ON ","MB ","SK ","AB ","BC ","NWT","NF ", & - "LB ","NU ","YT ","PEI","DC "/ + "LB ","NU ","YT ","PEI","DC ","DR ","FR ","GD ","GR ","OV ", & + "ZH ","ZL ","X01","X02","X03","X04","X05","X06","X07","X08", & + "X09","X10","X11","X12","X13","X14","X15","X16","X17","X18", & + "X19","X20","X21","X22","X23","X24","X25","X26","X27","X28", & + "X29","X30","X31","X32","X33","X34","X35","X36","X37","X38", & + "X39","X40","X41","X42","X43","X44","X45","X46","X47","X48", & + "X49","X50","X51","X52","X53","X54","X55","X56","X57","X58", & + "X59","X60","X61","X62","X63","X64","X65","X66","X67","X68", & + "X69","X70","X71","X72","X73","X74","X75","X76","X77","X78", & + "X79","X80","X81","X82","X83","X84","X85","X86","X87","X88", & + "X89","X90","X91","X92","X93","X94","X95","X96","X97","X98", & + "X99"/ data dxcall13_set/.false./ data mycall13_set/.false./ data mycall13_0/''/ @@ -892,7 +903,7 @@ subroutine pack77_03(nwords,w,i3,n3,c77) ! Check 0.3 and 0.4 (ARRL Field Day exchange) ! Example message: WA9XYZ KA1ABC R 16A EMA 28 28 1 4 3 7 71 - parameter (NSEC=85) !Number of ARRL Sections + parameter (NSEC=86) !Number of ARRL Sections character*13 w(19) character*77 c77 character*6 bcall_1,bcall_2 @@ -900,14 +911,14 @@ subroutine pack77_03(nwords,w,i3,n3,c77) logical ok1,ok2 data csec/ & "AB ","AK ","AL ","AR ","AZ ","BC ","CO ","CT ","DE ","EB ", & - "EMA","ENY","EPA","EWA","GA ","GTA","IA ","ID ","IL ","IN ", & - "KS ","KY ","LA ","LAX","MAR","MB ","MDC","ME ","MI ","MN ", & + "EMA","ENY","EPA","EWA","GA ","GH ","IA ","ID ","IL ","IN ", & + "KS ","KY ","LA ","LAX","NS ","MB ","MDC","ME ","MI ","MN ", & "MO ","MS ","MT ","NC ","ND ","NE ","NFL","NH ","NL ","NLI", & - "NM ","NNJ","NNY","NT ","NTX","NV ","OH ","OK ","ONE","ONN", & + "NM ","NNJ","NNY","TER","NTX","NV ","OH ","OK ","ONE","ONN", & "ONS","OR ","ORG","PAC","PR ","QC ","RI ","SB ","SC ","SCV", & "SD ","SDG","SF ","SFL","SJV","SK ","SNJ","STX","SV ","TN ", & "UT ","VA ","VI ","VT ","WCF","WI ","WMA","WNY","WPA","WTX", & - "WV ","WWA","WY ","DX ","PE "/ + "WV ","WWA","WY ","DX ","PE ","NB "/ if(nwords.lt.4 .or. nwords.gt.5) return call chkcall(w(1),bcall_1,ok1) @@ -1194,7 +1205,7 @@ subroutine pack77_3(nwords,w,i3,n3,c77) ! - DX: rpt serial R 559 0013 ! Example message: TU; W9XYZ K1ABC R 579 MA 1 28 28 1 3 13 74 - parameter (NUSCAN=65) !Number of US states and Canadian provinces/territories + parameter (NUSCAN=171) !Number of US states and Canadian provinces/territories character*13 w(19) character*77 c77 character*6 bcall_1,bcall_2 @@ -1208,7 +1219,18 @@ subroutine pack77_3(nwords,w,i3,n3,c77) "NM ","NY ","NC ","ND ","OH ","OK ","OR ","PA ","RI ","SC ", & "SD ","TN ","TX ","UT ","VT ","VA ","WA ","WV ","WI ","WY ", & "NB ","NS ","QC ","ON ","MB ","SK ","AB ","BC ","NWT","NF ", & - "LB ","NU ","YT ","PEI","DC "/ + "LB ","NU ","YT ","PEI","DC ","DR ","FR ","GD ","GR ","OV ", & + "ZH ","ZL ","X01","X02","X03","X04","X05","X06","X07","X08", & + "X09","X10","X11","X12","X13","X14","X15","X16","X17","X18", & + "X19","X20","X21","X22","X23","X24","X25","X26","X27","X28", & + "X29","X30","X31","X32","X33","X34","X35","X36","X37","X38", & + "X39","X40","X41","X42","X43","X44","X45","X46","X47","X48", & + "X49","X50","X51","X52","X53","X54","X55","X56","X57","X58", & + "X59","X60","X61","X62","X63","X64","X65","X66","X67","X68", & + "X69","X70","X71","X72","X73","X74","X75","X76","X77","X78", & + "X79","X80","X81","X82","X83","X84","X85","X86","X87","X88", & + "X89","X90","X91","X92","X93","X94","X95","X96","X97","X98", & + "X99"/ if(w(1)(1:1).eq.'<' .and. w(2)(1:1).eq.'<') go to 900 if(nwords.eq.4 .or. nwords.eq.5 .or. nwords.eq.6) then diff --git a/map65/mainwindow.cpp b/map65/mainwindow.cpp index 98a34a164..1ff6fe1fe 100644 --- a/map65/mainwindow.cpp +++ b/map65/mainwindow.cpp @@ -1014,30 +1014,30 @@ void MainWindow::stub() //stub() void MainWindow::on_actionRelease_Notes_triggered() { QDesktopServices::openUrl(QUrl( - "https://www.physics.princeton.edu/pulsar/K1JT/Release_Notes.txt", + "https://wsjt.sourceforge.io/Release_Notes.txt", QUrl::TolerantMode)); } void MainWindow::on_actionOnline_Users_Guide_triggered() //Display manual { QDesktopServices::openUrl(QUrl( - "https://www.physics.princeton.edu/pulsar/K1JT/MAP65_Users_Guide.pdf", + "https://wsjt.sourceforge.io/MAP65_Users_Guide.pdf", QUrl::TolerantMode)); } void MainWindow::on_actionQSG_Q65_triggered() { - QDesktopServices::openUrl (QUrl {"https://physics.princeton.edu/pulsar/k1jt/Q65_Quick_Start.pdf"}); + QDesktopServices::openUrl (QUrl {"https://wsjt.sourceforge.io/Q65_Quick_Start.pdf"}); } void MainWindow::on_actionQSG_MAP65_v3_triggered() { - QDesktopServices::openUrl (QUrl {"https://physics.princeton.edu/pulsar/k1jt/WSJTX_2.5.0_MAP65_3.0_Quick_Start.pdf"}); + QDesktopServices::openUrl (QUrl {"https://wsjt.sourceforge.io/WSJTX_2.5.0_MAP65_3.0_Quick_Start.pdf"}); } void MainWindow::on_actionQ65_Sensitivity_in_MAP65_3_0_triggered() { - QDesktopServices::openUrl (QUrl {"https://physics.princeton.edu/pulsar/k1jt/Q65_Sensitivity_in_MAP65.pdf"}); + QDesktopServices::openUrl (QUrl {"https://wsjt.sourceforge.io/Q65_Sensitivity_in_MAP65.pdf"}); } void MainWindow::on_actionAstro_Data_triggered() //Display Astro diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 43d618bca..863c93ebb 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -224,7 +224,7 @@ int* ipc_q65w; namespace { - Radio::Frequency constexpr default_frequency {14076000}; + Radio::Frequency constexpr default_frequency {14074000}; QRegExp message_alphabet {"[- @A-Za-z0-9+./?#<>;$]*"}; // grid exact match excluding RR73 QRegularExpression grid_regexp {"\\A(?![Rr]{2}73)[A-Ra-r]{2}[0-9]{2}([A-Xa-x]{2}){0,1}\\z"}; @@ -366,7 +366,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple, m_appDir {QApplication::applicationDirPath ()}, m_cqStr {""}, m_palette {"Linrad"}, - m_mode {"JT9"}, + m_mode {"FT8"}, m_rpt {"-15"}, m_pfx { "1A", "1S", @@ -827,6 +827,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple, config_label.hide (); } statusUpdate (); + QTimer::singleShot (250, [=] {setRig (m_lastMonitoredFrequency);}); // This is needed for Hamradio Deluxe }); m_multi_settings->create_menu_actions (this, ui->menuConfig); m_configurations_button = m_rigErrorMessageBox.addButton (tr ("Configurations...") @@ -1298,7 +1299,7 @@ void MainWindow::readSettings() ui->actionSplit_ALL_TXT_yearly->setChecked(m_settings->value("splitAllTxtYearly", false).toBool()); ui->actionSplit_ALL_TXT_monthly->setChecked(m_settings->value("splitAllTxtMonthly", false).toBool()); ui->actionDisable_writing_of_ALL_TXT->setChecked(m_settings->value("disableWritingOfAllTxt", false).toBool()); - m_mode=m_settings->value("Mode","JT9").toString(); + m_mode=m_settings->value("Mode","FT8").toString(); ui->actionNone->setChecked(m_settings->value("SaveNone",true).toBool()); ui->actionSave_decoded->setChecked(m_settings->value("SaveDecoded",false).toBool()); ui->actionSave_all->setChecked(m_settings->value("SaveAll",false).toBool()); @@ -2654,27 +2655,27 @@ void MainWindow::on_stopButton_clicked() //stopButton void MainWindow::on_actionRelease_Notes_triggered () { - QDesktopServices::openUrl (QUrl {"http://physics.princeton.edu/pulsar/k1jt/Release_Notes.txt"}); + QDesktopServices::openUrl (QUrl {"https://wsjt.sourceforge.io/Release_Notes.txt"}); } void MainWindow::on_actionFT8_DXpedition_Mode_User_Guide_triggered() { - QDesktopServices::openUrl (QUrl {"http://physics.princeton.edu/pulsar/k1jt/FT8_DXpedition_Mode.pdf"}); + QDesktopServices::openUrl (QUrl {"https://wsjt.sourceforge.io/FT8_DXpedition_Mode.pdf"}); } void MainWindow::on_actionQSG_FST4_triggered() { - QDesktopServices::openUrl (QUrl {"https://physics.princeton.edu/pulsar/k1jt/FST4_Quick_Start.pdf"}); + QDesktopServices::openUrl (QUrl {"https://wsjt.sourceforge.io/FST4_Quick_Start.pdf"}); } void MainWindow::on_actionQSG_Q65_triggered() { - QDesktopServices::openUrl (QUrl {"https://physics.princeton.edu/pulsar/k1jt/Q65_Quick_Start.pdf"}); + QDesktopServices::openUrl (QUrl {"https://wsjt.sourceforge.io/Q65_Quick_Start.pdf"}); } void MainWindow::on_actionQSG_X250_M3_triggered() { - QDesktopServices::openUrl (QUrl {"https://physics.princeton.edu/pulsar/k1jt/WSJTX_2.5.0_MAP65_3.0_Quick_Start.pdf"}); + QDesktopServices::openUrl (QUrl {"https://wsjt.sourceforge.io/WSJTX_2.5.0_MAP65_3.0_Quick_Start.pdf"}); } void MainWindow::on_actionOnline_User_Guide_triggered() //Display manual @@ -4353,15 +4354,17 @@ void MainWindow::guiUpdate() if(m_mode=="FT8" and SpecOp::FOX==m_specOp) { // Don't allow Fox mode in any of the default FT8 sub-bands. - qint32 ft8Freq[]={1840,3573,7074,10136,14074,18100,21074,24915,28074,50313,70100}; + qint32 ft8Freq[]={1840000,3573000,7074000,10136000,14074000,18100000,21074000,24915000,28074000,50313000,70154000}; for(int i=0; i<11; i++) { - int kHzdiff=m_freqNominal/1000 - ft8Freq[i]; - if(qAbs(kHzdiff) < 4) { + int kHzdiff=m_freqNominal - ft8Freq[i]; + if(qAbs(kHzdiff) < 3000 ) { m_bTxTime=false; if (m_auto) auto_tx_mode (false); - auto const& message = tr ("Please choose another dial frequency." - " WSJT-X will not operate in Fox mode" - " in the standard FT8 sub-bands."); + if (m_tune) stop_tuning(); + auto const& message = tr ("Please choose another dial frequency.\n" + "Must be 3Khz away from %1.\n" + "WSJT-X will not operate in Fox mode\n" + "overlapping the standard FT8 sub-bands.").arg(ft8Freq[i]); QTimer::singleShot (0, [=] { // don't block guiUpdate MessageBox::warning_message (this, tr ("Fox Mode warning"), message); }); @@ -5813,12 +5816,16 @@ void MainWindow::genCQMsg () ( tlist.at(1)==my_callsign or tlist.at(2)==my_callsign ) and stdCall(my_callsign)) { + if(m_config.Individual_Contest_Name()) { + m_cqStr = m_config.Contest_Name(); + } else { if(SpecOp::NA_VHF == m_specOp) m_cqStr="TEST"; if(SpecOp::EU_VHF == m_specOp) m_cqStr="TEST"; if(SpecOp::FIELD_DAY == m_specOp) m_cqStr="FD"; if(SpecOp::RTTY == m_specOp) m_cqStr="RU"; if(SpecOp::WW_DIGI == m_specOp) m_cqStr="WW"; if(SpecOp::ARRL_DIGI == m_specOp) m_cqStr="TEST"; + } if( tlist.at(1)==my_callsign ) { t="CQ " + m_cqStr + " " + tlist.at(1) + " " + tlist.at(2); } else { diff --git a/widgets/mainwindow.ui b/widgets/mainwindow.ui index 07ea2fb0a..e5ed6cefe 100644 --- a/widgets/mainwindow.ui +++ b/widgets/mainwindow.ui @@ -6,10 +6,16 @@ 0 0 - 991 - 690 + 880 + 685 + + + 750 + 0 + + WSJT-X by K1JT @@ -2004,7 +2010,7 @@ Double-click to reset to the standard 73 message 2 - + 4 @@ -3144,7 +3150,7 @@ QPushButton[state="ok"] { 0 0 - 991 + 880 22