Merge branch 'v2.0-dev' into merge-2.0-with-master

pull/896/head
Mooneer Salem 2025-05-28 07:52:31 -07:00
commit d51ae29cef
5 changed files with 6 additions and 14 deletions

View File

@ -1250,6 +1250,8 @@ current mode. (PR #809)</li>
<li>Hamlib: support CAT PTT via the Data port instead of Mic (needed for
some older radios). (PR #875)</li>
<li>macOS: Show /dev/tty.* devices in CAT/PTT options. (PR #883)</li>
<li>Remove pre-PTT interrogation of frequency/mode to improve TX/RX
switching time. (PR #898)</li>
</ul></li>
<li>Build system:
<ul>

View File

@ -925,6 +925,7 @@ low as -2dB in a bandwidth of 1500 Hz. More information about Radio Autoencoder
* Shorten PulseAudio/pipewire app name. (PR #843)
* Hamlib: support CAT PTT via the Data port instead of Mic (needed for some older radios). (PR #875)
* macOS: Show /dev/tty.* devices in CAT/PTT options. (PR #883)
* Remove pre-PTT interrogation of frequency/mode to improve TX/RX switching time. (PR #898)
3. Build system:
* Allow overriding the version tag when building. (PR #727)
* Update wxWidgets to 3.2.8. (PR #861)

Binary file not shown.

View File

@ -1141,14 +1141,10 @@ void FreeDVReporterDialog::setBandFilter(FilterFrequency freq)
void FreeDVReporterDialog::FreeDVReporterDataModel::setBandFilter(FilterFrequency freq)
{
if (filteredFrequency_ != wxGetApp().appConfiguration.reportingConfiguration.reportingFrequency ||
currentBandFilter_ != freq)
{
filteredFrequency_ = wxGetApp().appConfiguration.reportingConfiguration.reportingFrequency;
currentBandFilter_ = freq;
filteredFrequency_ = wxGetApp().appConfiguration.reportingConfiguration.reportingFrequency;
currentBandFilter_ = freq;
refreshAllRows();
}
refreshAllRows();
}
wxString FreeDVReporterDialog::FreeDVReporterDataModel::makeValidTime_(std::string timeStr, wxDateTime& timeObj)

View File

@ -1003,13 +1003,6 @@ void MainFrame::togglePTT(void) {
m_togBtnOnOff->Enable(false);
}
if (wxGetApp().appConfiguration.rigControlConfiguration.hamlibUseForPTT) {
if (wxGetApp().rigFrequencyController != nullptr && wxGetApp().rigFrequencyController->isConnected()) {
// Update mode display on the bottom of the main UI.
wxGetApp().rigFrequencyController->requestCurrentFrequencyMode();
}
}
auto newTx = m_btnTogPTT->GetValue();
if (wxGetApp().rigPttController != nullptr && wxGetApp().rigPttController->isConnected())
{