From 4d2e01bff322e27441e1673109f73a46c169be3f Mon Sep 17 00:00:00 2001 From: drowe67 Date: Wed, 12 Jul 2017 08:45:06 +0000 Subject: [PATCH] made sure UDP code disabled, trapped use of carrier attn feature outside of 700C, thanks Peter vk5apr git-svn-id: https://svn.code.sf.net/p/freetel/code@3298 01035d8c-6547-0410-b346-abe4f91aad63 --- freedv-dev/src/dlg_options.cpp | 10 ++++++++-- freedv-dev/src/fdmdv2_main.cpp | 3 +++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/freedv-dev/src/dlg_options.cpp b/freedv-dev/src/dlg_options.cpp index 499ca565..79b6c87f 100644 --- a/freedv-dev/src/dlg_options.cpp +++ b/freedv-dev/src/dlg_options.cpp @@ -566,13 +566,19 @@ void OptionsDlg::OnAttnCarrierEn(wxScrollEvent& event) { /* uncheck -> checked, attenuate selected carrier */ if (m_ckboxAttnCarrierEn->GetValue() && !wxGetApp().m_attn_carrier_en) { - freedv_set_carrier_ampl(g_pfreedv, wxGetApp().m_attn_carrier, 0.25); + if (freedv_get_mode(g_pfreedv) == FREEDV_MODE_700C) { + freedv_set_carrier_ampl(g_pfreedv, wxGetApp().m_attn_carrier, 0.25); + } else { + wxMessageBox("Carrier attenuation feature only works on 700C", wxT("Warning"), wxOK | wxICON_WARNING, this); + } } /* checked -> unchecked, reset selected carrier */ if (!m_ckboxAttnCarrierEn->GetValue() && wxGetApp().m_attn_carrier_en) { - freedv_set_carrier_ampl(g_pfreedv, wxGetApp().m_attn_carrier, 1.0); + if (freedv_get_mode(g_pfreedv) == FREEDV_MODE_700C) { + freedv_set_carrier_ampl(g_pfreedv, wxGetApp().m_attn_carrier, 1.0); + } } wxGetApp().m_attn_carrier_en = m_ckboxAttnCarrierEn->GetValue(); diff --git a/freedv-dev/src/fdmdv2_main.cpp b/freedv-dev/src/fdmdv2_main.cpp index 8e1ac046..506406c1 100644 --- a/freedv-dev/src/fdmdv2_main.cpp +++ b/freedv-dev/src/fdmdv2_main.cpp @@ -3864,6 +3864,8 @@ void MainFrame::CloseSerialPort(void) } +#ifdef __UDP_SUPPORT__ + //---------------------------------------------------------------- // PollUDP() - see if any commands on UDP port //---------------------------------------------------------------- @@ -3976,6 +3978,7 @@ void *UDPThread::Entry() { return NULL; } +#endif char my_get_next_tx_char(void *callback_state) { short ch = 0; -- 2.25.1