From 86c3f6aa901f8387f237df42a3216e2b999db183 Mon Sep 17 00:00:00 2001 From: Steven Franke Date: Tue, 22 Nov 2022 12:51:52 -0600 Subject: [PATCH 01/10] Upload FST4W-900 spots with tr=15 because WSPRnet does not recognize tr=16. --- Network/wsprnet.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Network/wsprnet.cpp b/Network/wsprnet.cpp index e01be1b5e..903c82368 100644 --- a/Network/wsprnet.cpp +++ b/Network/wsprnet.cpp @@ -278,9 +278,10 @@ QString WSPRNet::encode_mode () const if (m_mode == "FST4W") { auto tr = static_cast ((TR_period_ / 60.)+.5); - if (2 == tr || 15 == tr) +// if (2 == tr || 15 == tr) + if (2 == tr) { - tr += 1; // distinguish from WSPR-2 and WSPR-15 + tr += 1; // distinguish from WSPR-2 } return QString::number (tr); } From f77a249c3d14e33db4d9802bff9fd58cae3c8ae8 Mon Sep 17 00:00:00 2001 From: Steven Franke Date: Tue, 22 Nov 2022 14:09:10 -0600 Subject: [PATCH 02/10] Updates to NEWS and Release notes. --- NEWS | 2 ++ Release_Notes.txt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/NEWS b/NEWS index 9d428ff57..1da5fb15f 100644 --- a/NEWS +++ b/NEWS @@ -22,6 +22,8 @@ In program WSJT-X: - Better calibration for FST4/W SNR estimates. + - Upload FST4W-900 spots to wsprnet with TR code 15 instead of 16. + - Improved FT8 decoding on crowded bands. - The Working frequency table now offers the following options: diff --git a/Release_Notes.txt b/Release_Notes.txt index bfcbf0d76..3fe56cae9 100644 --- a/Release_Notes.txt +++ b/Release_Notes.txt @@ -22,6 +22,8 @@ In program WSJT-X: - Better calibration for FST4/W SNR estimates. + - Upload FST4W-900 spots to wsprnet with TR code 15 instead of 16. + - Improved FT8 decoding on crowded bands. - The Working frequency table now offers the following options: From 8436eac2e2772a6991b733b000149d244091362f Mon Sep 17 00:00:00 2001 From: Uwe Risse Date: Wed, 23 Nov 2022 13:16:08 +0100 Subject: [PATCH 03/10] Further updates to NEWS and Release notes. --- NEWS | 3 ++- Release_Notes.txt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 1da5fb15f..91550845c 100644 --- a/NEWS +++ b/NEWS @@ -90,7 +90,7 @@ In program WSJT-X: has turned out to be not reliable enough. - Correct a long-standing flaw which caused the "Transmit digital gain" - overlay toappear somewhere on the screen. + overlay to appear somewhere on the screen. - "Highlight DX Call" now also works when the other station is <...>. @@ -104,6 +104,7 @@ tentative new features: - an ability to read the file wsjtx.log (kept by WSJT-X) to recognize EME contest dupes. + Release: WSJT-X 2.6.0-rc4 September 8, 2022 ------------------------- diff --git a/Release_Notes.txt b/Release_Notes.txt index 3fe56cae9..3cd151a6b 100644 --- a/Release_Notes.txt +++ b/Release_Notes.txt @@ -90,7 +90,7 @@ In program WSJT-X: has turned out to be not reliable enough. - Correct a long-standing flaw which caused the "Transmit digital gain" - overlay toappear somewhere on the screen. + overlay to appear somewhere on the screen. - "Highlight DX Call" now also works when the other station is <...>. @@ -104,6 +104,7 @@ tentative new features: - an ability to read the file wsjtx.log (kept by WSJT-X) to recognize EME contest dupes. + Release: WSJT-X 2.6.0-rc4 September 8, 2022 ------------------------- From a36a99997b34ad7da196fd03e96d47ab45d1bb1e Mon Sep 17 00:00:00 2001 From: Uwe Risse Date: Thu, 24 Nov 2022 10:32:42 +0100 Subject: [PATCH 04/10] Fox mode: Display any reply from the Hound in the Rx Frequency window. --- widgets/mainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 6910cbea8..31a8a0b29 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -3957,7 +3957,7 @@ void MainWindow::readFromStdout() //readFromStdout } if(SpecOp::FOX==m_specOp and decodedtext.string().contains(" DE ")) for_us=true; //Hound with compound callsign - if(SpecOp::FOX==m_specOp and for_us and (audioFreq<1000)) bDisplayRight=true; + if(SpecOp::FOX==m_specOp and for_us) bDisplayRight=true; if(SpecOp::FOX!=m_specOp and (for_us or (abs(audioFreq - m_wideGraph->rxFreq()) <= 10))) bDisplayRight=true; } } else { From d3bcc2c6b46050a00a5225fb950f2acc365eca4f Mon Sep 17 00:00:00 2001 From: Uwe Risse Date: Thu, 24 Nov 2022 13:55:33 +0100 Subject: [PATCH 05/10] Remove a station from the In Progress window after the QSO has been logged. --- widgets/mainwindow.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 31a8a0b29..27c41f610 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -9593,6 +9593,7 @@ list2Done: on_logQSOButton_clicked (); m_foxRateQueue.enqueue (now); //Add present time in seconds //to Rate queue. + QTimer::singleShot (1000, [=] {m_foxQSOinProgress.removeOne(hc1);}); //Remove from In Progress window } m_loggedByFox[hc1] += (m_lastBand + " "); } From 104fcf2193766d700a040e7c293d8c308b1ae26a Mon Sep 17 00:00:00 2001 From: Uwe Risse Date: Thu, 24 Nov 2022 14:23:30 +0100 Subject: [PATCH 06/10] Fox mode: Display any reply from a Hound in the Rx Frequency window that is for us and contains a report. --- widgets/mainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 27c41f610..08f87af3a 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -3957,7 +3957,7 @@ void MainWindow::readFromStdout() //readFromStdout } if(SpecOp::FOX==m_specOp and decodedtext.string().contains(" DE ")) for_us=true; //Hound with compound callsign - if(SpecOp::FOX==m_specOp and for_us) bDisplayRight=true; + if(SpecOp::FOX==m_specOp and for_us and (audioFreq<1000 or decodedtext.string().contains(QRegularExpression{" R\\W\\d"}))) bDisplayRight=true; if(SpecOp::FOX!=m_specOp and (for_us or (abs(audioFreq - m_wideGraph->rxFreq()) <= 10))) bDisplayRight=true; } } else { From a8979b01d1efb0dcf1c2ac9e4b69a265d17ef292 Mon Sep 17 00:00:00 2001 From: Uwe Risse Date: Thu, 24 Nov 2022 16:33:07 +0100 Subject: [PATCH 07/10] Fox mode: Remove a station from the "In Progress" window when transmission of "RR73" is completed. --- widgets/mainwindow.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 08f87af3a..0f0802748 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -9593,7 +9593,10 @@ list2Done: on_logQSOButton_clicked (); m_foxRateQueue.enqueue (now); //Add present time in seconds //to Rate queue. - QTimer::singleShot (1000, [=] {m_foxQSOinProgress.removeOne(hc1);}); //Remove from In Progress window + QTimer::singleShot (13000, [=] { + m_foxQSOinProgress.removeOne(hc1); //Remove from In Progress window + updateFoxQSOsInProgressDisplay(); //Update InProgress display after Tx is complete + }); } m_loggedByFox[hc1] += (m_lastBand + " "); } From 89dd922cef4172c3d9272a6de519a83cba0392b7 Mon Sep 17 00:00:00 2001 From: Uwe Risse Date: Fri, 25 Nov 2022 09:15:23 +0100 Subject: [PATCH 08/10] Fox mode: Prevent callers below 1000 Hz from being displayed in the Rx frequency window. --- widgets/mainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 0f0802748..11d82d18a 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -3957,7 +3957,7 @@ void MainWindow::readFromStdout() //readFromStdout } if(SpecOp::FOX==m_specOp and decodedtext.string().contains(" DE ")) for_us=true; //Hound with compound callsign - if(SpecOp::FOX==m_specOp and for_us and (audioFreq<1000 or decodedtext.string().contains(QRegularExpression{" R\\W\\d"}))) bDisplayRight=true; + if(SpecOp::FOX==m_specOp and for_us and decodedtext.string().contains(QRegularExpression{" R\\W\\d"})) bDisplayRight=true; if(SpecOp::FOX!=m_specOp and (for_us or (abs(audioFreq - m_wideGraph->rxFreq()) <= 10))) bDisplayRight=true; } } else { From 4e071495a038e72017a5f2ce9805ca295ffa176a Mon Sep 17 00:00:00 2001 From: Brian Moran Date: Sat, 26 Nov 2022 08:44:26 -0800 Subject: [PATCH 09/10] correct spelling --- Release_Notes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Release_Notes.txt b/Release_Notes.txt index 3cd151a6b..f25ba4e56 100644 --- a/Release_Notes.txt +++ b/Release_Notes.txt @@ -30,7 +30,7 @@ In program WSJT-X: - Better handling of more than one frequency per band. - Set your preferred frequencies, WSJT-X always comes back to these QRGs when changing band or mode. - - You can label your frequencies with discriptions (e.g. DXp AB0YXZ). + - You can label your frequencies with descriptions (e.g. DXp AB0YXZ). - Option to set Start and End Date/Time, so that the frequencies automatically appear and disappear. Useful for contest or DXpedition QRGs. From 14b1a7151761fc3ba3a9e030ff0eeeb117a18142 Mon Sep 17 00:00:00 2001 From: Uwe Risse Date: Sun, 27 Nov 2022 13:55:23 +0100 Subject: [PATCH 10/10] Correct NEWS as well. --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 91550845c..638641189 100644 --- a/NEWS +++ b/NEWS @@ -30,7 +30,7 @@ In program WSJT-X: - Better handling of more than one frequency per band. - Set your preferred frequencies, WSJT-X always comes back to these QRGs when changing band or mode. - - You can label your frequencies with discriptions (e.g. DXp AB0YXZ). + - You can label your frequencies with descriptions (e.g. DXp AB0YXZ). - Option to set Start and End Date/Time, so that the frequencies automatically appear and disappear. Useful for contest or DXpedition QRGs.