Merge branch 'ms-disable-qsy-same-freq' into ms-rel-v1812

drowe67 · Jul 3, 2023 · 9565b91 · 9565b91
2 parents 5b9967d + ea3516a
commit 9565b91
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git 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, #456, #458)
+ * Add the ability to request that another FreeDV Reporter user QSY. (PR #434, #453, #456, #458, #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)

diff --git 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;
  }
  }