From 2d4083e2cfbb071d852043e84d4e200f795fb8ec Mon Sep 17 00:00:00 2001 From: Uwe Risse Date: Thu, 15 Dec 2022 13:21:44 +0100 Subject: [PATCH 1/6] Some details changed to the Fox mode frequency warning. --- widgets/mainwindow.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index e0117aefb..831e662d1 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -4313,15 +4313,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); }); From 930e1e5a9c6f58946f910b934452036761f9eebe Mon Sep 17 00:00:00 2001 From: Uwe Risse Date: Sat, 17 Dec 2022 18:54:49 +0100 Subject: [PATCH 2/6] PSK Reporter spotting is now also possible for frequencies > 4 GHz. This is required for QO-100, for example. --- Network/PSKReporter.cpp | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) 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_); From d0cf7ea49777319d9227a46d459eedfcdf59fd81 Mon Sep 17 00:00:00 2001 From: Uwe Risse Date: Mon, 19 Dec 2022 12:49:25 +0100 Subject: [PATCH 3/6] Further reduce the minimum width of the main window and ensure that such small sizes are remembered. --- widgets/mainwindow.ui | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) 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 From 706351400f51e80f888c60eec1f202e2f72d4b2e Mon Sep 17 00:00:00 2001 From: Uwe Risse Date: Wed, 21 Dec 2022 17:57:59 +0100 Subject: [PATCH 4/6] Add tooltips to explain the split operation options. --- Configuration.ui | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/Configuration.ui b/Configuration.ui index f86214cca..9274244a8 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 @@ -3267,13 +3276,13 @@ Right click for insert and delete options. - - - - - - + + + + + + From 7c12c66f16d7bca543f3d9c46857a3c08c810dd2 Mon Sep 17 00:00:00 2001 From: Uwe Risse Date: Sun, 25 Dec 2022 10:58:30 +0100 Subject: [PATCH 5/6] Ensure that after switching between configurations, the rig is initialized correctly when connected via HRD. --- widgets/mainwindow.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 831e662d1..7b033a3ed 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -804,6 +804,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...") From 0bf83a818871caf0bc8e2ff00b20fd151eea25c1 Mon Sep 17 00:00:00 2001 From: Uwe Risse Date: Wed, 28 Dec 2022 12:50:33 +0100 Subject: [PATCH 6/6] Preparations for the next release. --- CMakeLists.txt | 4 ++-- NEWS | 29 ++++++++++++++++++++++++++++- Release_Notes.txt | 29 ++++++++++++++++++++++++++++- 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c47d51eca..ef5d688a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 5) +set_build_type (GA) 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/NEWS b/NEWS index 638641189..84cd43501 100644 --- a/NEWS +++ b/NEWS @@ -9,7 +9,34 @@ \$$ \$$ \$$$$$$ \$$$$$$ \$$ \$$ \$$ -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 + Januar 2, 2023 + ------------------------- + +WSJT-X 2.6.0 is very similar to rc5, but contains some bug fixes. It has +the following changes since Release Candidate 5: + + - 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. + + - 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. + Release: WSJT-X 2.6.0-rc5 November 29, 2022 diff --git a/Release_Notes.txt b/Release_Notes.txt index f25ba4e56..9bcc25cf5 100644 --- a/Release_Notes.txt +++ b/Release_Notes.txt @@ -9,7 +9,34 @@ \$$ \$$ \$$$$$$ \$$$$$$ \$$ \$$ \$$ -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 + Januar 2, 2023 + ------------------------- + +WSJT-X 2.6.0 is very similar to rc5, but contains some bug fixes. It has +the following changes since Release Candidate 5: + + - 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. + + - 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. + Release: WSJT-X 2.6.0-rc5 November 29, 2022