From 606a716a0467bbdc93f92ba4344f270c495f3940 Mon Sep 17 00:00:00 2001 From: Mooneer Salem Date: Mon, 3 Jul 2023 00:02:32 -0700 Subject: [PATCH 1/2] Disable QSY button if the user is already on our frequency. --- src/freedv_reporter.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/freedv_reporter.cpp b/src/freedv_reporter.cpp index f2ba34ac1..9935fe10f 100644 --- a/src/freedv_reporter.cpp +++ b/src/freedv_reporter.cpp @@ -188,9 +188,15 @@ void FreeDVReporterDialog::refreshQSYButtonState() { auto selectedCallsign = m_listSpots->GetItemText(selectedIndex); - if (selectedCallsign != wxGetApp().m_reportingCallsign && wxGetApp().m_reportingFrequency > 0) + if (selectedCallsign != wxGetApp().m_reportingCallsign && + wxGetApp().m_reportingFrequency > 0) { - enabled = true; + wxString theirFreqString = m_listSpots->GetItemText(selectedIndex, 3); + wxRegEx mhzRegex(" MHz$"); + mhzRegex.Replace(&theirFreqString, ""); + + uint64_t theirFreq = wxAtof(theirFreqString) * 1000 * 1000; + enabled = theirFreq != wxGetApp().m_reportingFrequency; } } From ea3516a94cb50750857466b9cf81f75f71939919 Mon Sep 17 00:00:00 2001 From: Mooneer Salem Date: Mon, 3 Jul 2023 00:03:52 -0700 Subject: [PATCH 2/2] Add PR #359 to changelog. --- USER_MANUAL.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/USER_MANUAL.md b/USER_MANUAL.md index 2b1dfa731..0fcb8f157 100644 --- a/USER_MANUAL.md +++ b/USER_MANUAL.md @@ -875,7 +875,7 @@ LDPC | Low Density Parity Check Codes - a family of powerful FEC codes * Disable PTT and Voice Keyer buttons if only RX devices are configured. (PR #449) * Fix Linux display bugs when switching between dark and light mode. (PR #454) 2. Enhancements: - * Add the ability to request that another FreeDV Reporter user QSY. (PR #434, #453) + * Add the ability to request that another FreeDV Reporter user QSY. (PR #434, #453, #459) * Display 'Digital' on button when Analog mode is active. (PR #447) * Set minimum size for Mode box to 250px. (PR #446) * Notify FreeDV Reporter if only capable of RX. (PR #449)