From: drowe67 Date: Tue, 20 Nov 2012 02:49:53 +0000 (+0000) Subject: removed tx & rx loopback, as they no longer necc X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=3edafcab396e28a397dd1a7359911a4de469c2cd;p=freetel-svn-tracking.git removed tx & rx loopback, as they no longer necc git-svn-id: https://svn.code.sf.net/p/freetel/code@1033 01035d8c-6547-0410-b346-abe4f91aad63 --- diff --git a/fdmdv2/src/fdmdv2_main.cpp b/fdmdv2/src/fdmdv2_main.cpp index 52bffe61..379331f2 100644 --- a/fdmdv2/src/fdmdv2_main.cpp +++ b/fdmdv2/src/fdmdv2_main.cpp @@ -311,8 +311,8 @@ MainFrame::MainFrame(wxWindow *parent) : TopFrame(parent) m_togBtnAnalog->Disable(); //m_togBtnALC->Disable(); m_btnTogTX->Disable(); - m_togBtnLoopRx->Disable(); - m_togBtnLoopTx->Disable(); + //m_togBtnLoopRx->Disable(); + //m_togBtnLoopTx->Disable(); // m_menuItemPlayAudioFile->Enable(false); @@ -914,8 +914,8 @@ void MainFrame::OnClose(wxCommandEvent& event) m_togBtnAnalog->Disable(); //m_togBtnALC->Disable(); m_btnTogTX->Disable(); - m_togBtnLoopRx->Disable(); - m_togBtnLoopTx->Disable(); + //m_togBtnLoopRx->Disable(); + //m_togBtnLoopTx->Disable(); } @@ -1161,8 +1161,8 @@ void MainFrame::OnTogBtnOnOff(wxCommandEvent& event) m_togTxID->Enable(); m_togBtnAnalog->Enable(); m_btnTogTX->Enable(); - m_togBtnLoopRx->Enable(); - m_togBtnLoopTx->Enable(); + //m_togBtnLoopRx->Enable(); + //m_togBtnLoopTx->Enable(); m_togBtnOnOff->SetLabel(wxT("Stop")); // init modem and codec states @@ -1210,8 +1210,8 @@ void MainFrame::OnTogBtnOnOff(wxCommandEvent& event) m_togTxID->Disable(); m_togBtnAnalog->Disable(); m_btnTogTX->Disable(); - m_togBtnLoopRx->Disable(); - m_togBtnLoopTx->Disable(); + //m_togBtnLoopRx->Disable(); + //m_togBtnLoopTx->Disable(); m_togBtnOnOff->SetLabel(wxT("Start")); } } diff --git a/fdmdv2/src/topFrame.cpp b/fdmdv2/src/topFrame.cpp index c007f4dc..7dcef905 100644 --- a/fdmdv2/src/topFrame.cpp +++ b/fdmdv2/src/topFrame.cpp @@ -307,6 +307,7 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const bSizer1511->Add(m_togBtnOnOff, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 1); sbSizer5->Add(bSizer1511, 0, wxEXPAND, 1); +#ifdef UNIMPLEMENTED //------------------------------ // Toggle Loopback button for RX //------------------------------ @@ -337,6 +338,7 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const bSizer15113->Add(bSizer15112, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 0); sbSizer5->Add(bSizer15113, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 1); +#endif //------------------------------ // Split Frequency Mode Toggle @@ -451,8 +453,10 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const m_ckboxSQ->Connect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(TopFrame::OnCheckSQClick), NULL, this); m_togBtnOnOff->Connect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnOnOff), NULL, this); +#ifdef UNIMPLEMENTED m_togBtnLoopRx->Connect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnLoopRx), NULL, this); m_togBtnLoopTx->Connect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnLoopTx), NULL, this); +#endif m_togBtnSplit->Connect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnSplitClick), NULL, this); m_togBtnAnalog->Connect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnAnalogClick), NULL, this); #ifdef ALC @@ -521,8 +525,10 @@ TopFrame::~TopFrame() m_ckboxSQ->Disconnect(wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(TopFrame::OnCheckSQClick), NULL, this); m_togBtnOnOff->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnOnOff), NULL, this); +#ifdef UNIMPLEMENTED m_togBtnLoopRx->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnLoopRx), NULL, this); m_togBtnLoopTx->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnLoopTx), NULL, this); +#endif m_togBtnSplit->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnSplitClick), NULL, this); m_togBtnAnalog->Disconnect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnAnalogClick), NULL, this); #ifdef ALC