git-svn-id: https://svn.code.sf.net/p/freetel/code@1070 01035d8c-6547-0410-b346-abe4f...

diff --git a/fdmdv2/build/fdmdv2.mk b/fdmdv2/build/fdmdv2.mk
index d977bee32ce652591c8072899691ab0b91971d98..05ae05746f1d7061dbf83bd1e99213b742f09cd3 100644 (file)
--- a/fdmdv2/build/fdmdv2.mk
+++ b/fdmdv2/build/fdmdv2.mk
@@ -13,7 +13,7 @@ CurrentFileName        :=
 CurrentFilePath        :=\r
 CurrentFileFullPath    :=\r
 User                   :=wittend\r
-Date                   :=11/24/2012\r
+Date                   :=11/25/2012\r
 CodeLitePath           :="D:\bin\CodeLite"\r
 LinkerName             :=g++\r
 SharedObjectLinkerName :=g++ -shared -fPIC\r
@@ -52,8 +52,8 @@ LibPath                := $(LibraryPathSwitch). $(LibraryPathSwitch)d:/Projects/
 AR       := ar rcus\r
 CXX      := g++\r
 CC       := gcc\r
-CXXFLAGS :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"1048\"  $(Preprocessors)\r
-CFLAGS   :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"1048\"  $(Preprocessors)\r
+CXXFLAGS :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"1066\"  $(Preprocessors)\r
+CFLAGS   :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"1066\"  $(Preprocessors)\r
 \r
 \r
 ##\r
@@ -65,7 +65,7 @@ PATH:=$(WXWIN)\lib\gcc_dll;$(PATH)
 WXCFG:=gcc_dll\mswu\r
 UNIT_TEST_PP_SRC_DIR:=D:\bin\UnitTest++-1.3\r
 Objects=$(IntermediateDirectory)/src_dlg_comports$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_main$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot$(ObjectSuffix) $(IntermediateDirectory)/src_topFrame$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot_scatter$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot_spectrum$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_pa_wrapper$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot_scalar$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_hdw_ports$(ObjectSuffix) $(IntermediateDirectory)/src_fdmdv2_plot_waterfall_linux$(ObjectSuffix) \\r
-       $(IntermediateDirectory)/src_dlg_audiooptions$(ObjectSuffix) \r
+       $(IntermediateDirectory)/src_dlg_audiooptions$(ObjectSuffix) $(IntermediateDirectory)/src_dlg_filter$(ObjectSuffix) \r
 \r
 ##\r
 ## Main Build Targets \r
@@ -176,6 +176,14 @@ $(IntermediateDirectory)/src_dlg_audiooptions$(DependSuffix): ../src/dlg_audioop
 $(IntermediateDirectory)/src_dlg_audiooptions$(PreprocessSuffix): ../src/dlg_audiooptions.cpp\r
        @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_dlg_audiooptions$(PreprocessSuffix) "D:/Projects/Radio/fdmdv2/src/dlg_audiooptions.cpp"\r
 \r
+$(IntermediateDirectory)/src_dlg_filter$(ObjectSuffix): ../src/dlg_filter.cpp $(IntermediateDirectory)/src_dlg_filter$(DependSuffix)\r
+       $(CXX) $(IncludePCH) $(SourceSwitch) "D:/Projects/Radio/fdmdv2/src/dlg_filter.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_dlg_filter$(ObjectSuffix) $(IncludePath)\r
+$(IntermediateDirectory)/src_dlg_filter$(DependSuffix): ../src/dlg_filter.cpp\r
+       @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/src_dlg_filter$(ObjectSuffix) -MF$(IntermediateDirectory)/src_dlg_filter$(DependSuffix) -MM "D:/Projects/Radio/fdmdv2/src/dlg_filter.cpp"\r
+\r
+$(IntermediateDirectory)/src_dlg_filter$(PreprocessSuffix): ../src/dlg_filter.cpp\r
+       @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_dlg_filter$(PreprocessSuffix) "D:/Projects/Radio/fdmdv2/src/dlg_filter.cpp"\r
+\r
 \r
 -include $(IntermediateDirectory)/*$(DependSuffix)\r
 ##\r
@@ -215,6 +223,9 @@ clean:
        $(RM) $(IntermediateDirectory)/src_dlg_audiooptions$(ObjectSuffix)\r
        $(RM) $(IntermediateDirectory)/src_dlg_audiooptions$(DependSuffix)\r
        $(RM) $(IntermediateDirectory)/src_dlg_audiooptions$(PreprocessSuffix)\r
+       $(RM) $(IntermediateDirectory)/src_dlg_filter$(ObjectSuffix)\r
+       $(RM) $(IntermediateDirectory)/src_dlg_filter$(DependSuffix)\r
+       $(RM) $(IntermediateDirectory)/src_dlg_filter$(PreprocessSuffix)\r
        $(RM) $(OutputFile)\r
        $(RM) $(OutputFile).exe\r
        $(RM) "D:\Projects\Radio\fdmdv2\build\.build-debug\fdmdv2"\r

diff --git a/fdmdv2/build/fdmdv2.project b/fdmdv2/build/fdmdv2.project
index b3b121b42523849cdb3e4662f6858cdf45038373..5c5379e073f98e6c8605ce6eb4653556371006e9 100644 (file)
--- a/fdmdv2/build/fdmdv2.project
+++ b/fdmdv2/build/fdmdv2.project
@@ -19,6 +19,7 @@
     <File Name="../src/fdmdv2_hdw_ports.cpp"/>
     <File Name="../src/fdmdv2_plot_waterfall_linux.cpp"/>
     <File Name="../src/dlg_audiooptions.cpp"/>
+    <File Name="../src/dlg_filter.cpp"/>
   </VirtualDirectory>
   <VirtualDirectory Name="include">
     <File Name="../src/dlg_comports.h"/>
@@ -42,6 +43,7 @@
     <File Name="../../../Audio/libsndfile/include/sndfile.h"/>
     <File Name="../src/fdmdv2_plot_waterfall_linux.h"/>
     <File Name="../src/dlg_audiooptions.h"/>
+    <File Name="../src/dlg_filter.h"/>
   </VirtualDirectory>
   <VirtualDirectory Name="resources">
     <File Name="../src/FDMDV2.fbp"/>

diff --git a/fdmdv2/build/fdmdv2.txt b/fdmdv2/build/fdmdv2.txt
index f9ea5e7f17c066919d6c5e3d61390a6f8c0d4ef1..68313f1d0b7dd2fcbe7cbf7e10ac08da80597bb7 100644 (file)
--- a/fdmdv2/build/fdmdv2.txt
+++ b/fdmdv2/build/fdmdv2.txt
@@ -1 +1 @@
-./Debug/src_dlg_comports.o ./Debug/src_fdmdv2_main.o ./Debug/src_fdmdv2_plot.o ./Debug/src_topFrame.o ./Debug/src_fdmdv2_plot_scatter.o ./Debug/src_fdmdv2_plot_spectrum.o ./Debug/src_fdmdv2_pa_wrapper.o ./Debug/src_fdmdv2_plot_scalar.o ./Debug/src_fdmdv2_hdw_ports.o ./Debug/src_fdmdv2_plot_waterfall_linux.o  ./Debug/src_dlg_audiooptions.o  \r
+./Debug/src_dlg_comports.o ./Debug/src_fdmdv2_main.o ./Debug/src_fdmdv2_plot.o ./Debug/src_topFrame.o ./Debug/src_fdmdv2_plot_scatter.o ./Debug/src_fdmdv2_plot_spectrum.o ./Debug/src_fdmdv2_pa_wrapper.o ./Debug/src_fdmdv2_plot_scalar.o ./Debug/src_fdmdv2_hdw_ports.o ./Debug/src_fdmdv2_plot_waterfall_linux.o  ./Debug/src_dlg_audiooptions.o ./Debug/src_dlg_filter.o  \r

diff --git a/fdmdv2/src/dlg_comports.cpp b/fdmdv2/src/dlg_comports.cpp
index 420db3b75e973f869df1da9d0814238a58f84504..51f40fa3d8327dda6c4606c81c228bca65a67135 100644 (file)
--- a/fdmdv2/src/dlg_comports.cpp
+++ b/fdmdv2/src/dlg_comports.cpp
@@ -41,7 +41,7 @@ ComPortsDlg::ComPortsDlg(wxWindow* parent, wxWindowID id, const wxString& title,
     bSizer30 = new wxBoxSizer(wxVERTICAL);
 
     wxGridSizer* gSizer3;
-    gSizer3 = new wxGridSizer(6, 2, 0, 0);
+    gSizer3 = new wxGridSizer(8, 2, 0, 0);
 
     m_staticText8 = new wxStaticText(this, wxID_ANY, _("Available Ports:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT);
     m_staticText8->Wrap(-1);
@@ -49,6 +49,7 @@ ComPortsDlg::ComPortsDlg(wxWindow* parent, wxWindowID id, const wxString& title,
 
     m_listCtrlPorts = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize);
     gSizer3->Add(m_listCtrlPorts, 2, wxALL|wxEXPAND, 2);
+
 /*
     m_staticText9 = new wxStaticText(this, wxID_ANY, _("Use Port:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT);
     m_staticText9->Wrap(-1);
@@ -88,6 +89,23 @@ ComPortsDlg::ComPortsDlg(wxWindow* parent, wxWindowID id, const wxString& title,
 
     bSizer30->Add(gSizer3, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5);
 
+//    wxStaticBoxSizer* polaritySizer;
+//    polaritySizer = new wxStaticBoxSizer(new wxStaticBox(this, wxID_ANY, _("")), wxHORIZONTAL);
+//    gSizer3->Add(polaritySizer, 0, wxALIGN_CENTER|wxALL, 1);
+
+    m_rbUseRTS = new wxRadioButton( this, wxID_ANY, wxT("Use RTS"), wxDefaultPosition, wxDefaultSize, 0 );
+    gSizer3->Add(m_rbUseRTS, 0, wxALIGN_CENTER|wxALL, 1);
+
+    m_ckRTSPos = new wxCheckBox( this, wxID_ANY, wxT("RTS = +V"), wxDefaultPosition, wxDefaultSize, 0 );
+    gSizer3->Add(m_ckRTSPos, 0, wxALIGN_CENTER|wxALL, 1);
+
+    m_rbUseDTR = new wxRadioButton( this, wxID_ANY, wxT("Use DTR"), wxDefaultPosition, wxDefaultSize, 0 );
+    gSizer3->Add(m_rbUseDTR, 0, wxALIGN_CENTER|wxALL, 1);
+
+    m_ckDTRPos = new wxCheckBox( this, wxID_ANY, wxT("DTR = +V"), wxDefaultPosition, wxDefaultSize, 0 );
+    gSizer3->Add(m_ckDTRPos, 0, wxALIGN_CENTER|wxALL, 1);
+
+
     m_sdbSizer5 = new wxStdDialogButtonSizer();
     m_sdbSizer5OK = new wxButton(this, wxID_OK);
     m_sdbSizer5->AddButton(m_sdbSizer5OK);
@@ -112,6 +130,13 @@ ComPortsDlg::ComPortsDlg(wxWindow* parent, wxWindowID id, const wxString& title,
     m_sdbSizer5OK->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(ComPortsDlg::OnOK), NULL, this);
     m_listCtrlPorts->Connect(wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler(ComPortsDlg::OnPortItemSelected), NULL, this);
     m_listCtrlBaudrates->Connect(wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler(ComPortsDlg::OnBaudrateItemSelected), NULL, this);
+/*
+    void    OnApply(wxCommandEvent& event);
+    void    OnRTSClick(wxCommandEvent& event);
+    void    OnRTSPosClick(wxCommandEvent& event);
+    void    OnDTRClick(wxCommandEvent& event);
+    void    OnDTRPosClick(wxCommandEvent& event);
+*/
 }
 
 //-------------------------------------------------------------------------
@@ -211,6 +236,11 @@ void ComPortsDlg::ExchangeData(int inout)
         m_textRigCtrlDatabits->SetValue(wxGetApp().m_strRigCtrlDatabits);
         m_textRigCtrlStopbits->SetValue(wxGetApp().m_strRigCtrlStopbits);
         m_textRigCtrlParity->SetValue(wxGetApp().m_strRigCtrlParity);
+
+        m_rbUseRTS->SetValue(wxGetApp().m_boolUseRTS);
+        m_ckRTSPos->SetValue(wxGetApp().m_boolRTSPos);
+        m_rbUseDTR->SetValue(wxGetApp().m_boolUseDTR);
+        m_ckDTRPos->SetValue(wxGetApp().m_boolDTRPos);
     }
     if(inout == EXCHANGE_DATA_OUT)
     {
@@ -221,6 +251,11 @@ void ComPortsDlg::ExchangeData(int inout)
         wxGetApp().m_strRigCtrlStopbits         = m_textRigCtrlStopbits->GetValue();
         wxGetApp().m_strRigCtrlParity           = m_textRigCtrlParity->GetValue();
 
+        wxGetApp().m_boolUseRTS                  = m_rbUseRTS->GetValue();
+        wxGetApp().m_boolRTSPos                  = m_ckRTSPos->GetValue();
+        wxGetApp().m_boolUseDTR                  = m_rbUseDTR->GetValue();
+        wxGetApp().m_boolDTRPos                  = m_ckDTRPos->GetValue();
+
         pConfig->Write(wxT("/Rig/Port"),        wxGetApp().m_strRigCtrlPort);
         pConfig->Write(wxT("/Rig/Baud"),        wxGetApp().m_strRigCtrlBaud);
         pConfig->Write(wxT("/Rig/DataBits"),    wxGetApp().m_strRigCtrlDatabits);
@@ -228,11 +263,22 @@ void ComPortsDlg::ExchangeData(int inout)
         pConfig->Write(wxT("/Rig/Parity"),      wxGetApp().m_strRigCtrlParity);
         //m_textRigCtrlFlowControl
 
+        pConfig->Write(wxT("/Rig/UseRTS"),      wxGetApp().m_boolUseRTS);
+        pConfig->Write(wxT("/Rig/RTSPolarity"), wxGetApp().m_boolRTSPos);
+        pConfig->Write(wxT("/Rig/UseDTR"),      wxGetApp().m_boolUseDTR);
+        pConfig->Write(wxT("/Rig/DTRPolarity"), wxGetApp().m_boolDTRPos);
+
         pConfig->Flush();
     }
     delete wxConfigBase::Set((wxConfigBase *) NULL);
 }
-
+/*
+    void    OnApply(wxCommandEvent& event);
+    void    OnRTSClick(wxCommandEvent& event);
+    void    OnRTSPosClick(wxCommandEvent& event);
+    void    OnDTRClick(wxCommandEvent& event);
+    void    OnDTRPosClick(wxCommandEvent& event);
+*/
 //-------------------------------------------------------------------------
 // OnPortItemSelected()
 //-------------------------------------------------------------------------

diff --git a/fdmdv2/src/dlg_comports.h b/fdmdv2/src/dlg_comports.h
index fb11a80f5e7e2359ea65d402debc1cad70b80546..fb7571d1700905c0587ea6ecc83ac09e9c0b87fd 100644 (file)
--- a/fdmdv2/src/dlg_comports.h
+++ b/fdmdv2/src/dlg_comports.h
@@ -50,6 +50,10 @@ class ComPortsDlg : public wxDialog
         void    OnClose(wxCloseEvent& event);
         void    OnInitDialog(wxInitDialogEvent& event);
         void    OnApply(wxCommandEvent& event);
+        void    OnRTSClick(wxCommandEvent& event);
+        void    OnRTSPosClick(wxCommandEvent& event);
+        void    OnDTRClick(wxCommandEvent& event);
+        void    OnDTRPosClick(wxCommandEvent& event);
 
         wxListBox*  m_listCtrlPorts;
         wxTextCtrl* m_textRigCtrlPort;
@@ -57,9 +61,14 @@ class ComPortsDlg : public wxDialog
         wxTextCtrl* m_textRigCtrlDatabits;
         wxTextCtrl* m_textRigCtrlStopbits;
         wxTextCtrl* m_textRigCtrlParity;
-        wxButton* m_sdbSizer5OK;
-        wxButton* m_sdbSizer5Apply;
-        wxButton* m_sdbSizer5Cancel;
+        wxButton*   m_sdbSizer5OK;
+        wxButton*   m_sdbSizer5Apply;
+        wxButton*   m_sdbSizer5Cancel;
+        
+        wxRadioButton *m_rbUseRTS;
+        wxCheckBox    *m_ckRTSPos;
+        wxRadioButton *m_rbUseDTR;
+        wxCheckBox    *m_ckDTRPos;
 };
 
 #endif // __COMPORTS_DIALOG__

diff --git a/fdmdv2/src/fdmdv2_main.cpp b/fdmdv2/src/fdmdv2_main.cpp
index 74dd90e4fa99a5978dc9a0b52179b1dbaeae88a4..88d877d2a62fbfebe849d2fb1a8c51b390e17673 100644 (file)
--- a/fdmdv2/src/fdmdv2_main.cpp
+++ b/fdmdv2/src/fdmdv2_main.cpp
@@ -402,41 +402,45 @@ MainFrame::~MainFrame()
         GetClientSize(&w, &h);
         GetPosition(&x, &y);
         wxLogDebug("x = %d y = %d w = %d h = %d\n", x,y,w,h);
-        pConfig->Write(wxT("/MainFrame/top"),           (long) x);
-        pConfig->Write(wxT("/MainFrame/left"),          (long) y);
-        pConfig->Write(wxT("/MainFrame/width"),         (long) w);
-        pConfig->Write(wxT("/MainFrame/height"),        (long) h);
-        pConfig->Write(wxT("/MainFrame/show_wf"),       wxGetApp().m_show_wf);
-        pConfig->Write(wxT("/MainFrame/show_spect"),    wxGetApp().m_show_spect);
-        pConfig->Write(wxT("/MainFrame/show_scatter"),  wxGetApp().m_show_scatter);
-        pConfig->Write(wxT("/MainFrame/show_timing"),   wxGetApp().m_show_timing);
-        pConfig->Write(wxT("/MainFrame/show_freq"),     wxGetApp().m_show_freq);
-        pConfig->Write(wxT("/MainFrame/show_speech_in"),wxGetApp().m_show_speech_in);
-        pConfig->Write(wxT("/MainFrame/show_speech_out"),wxGetApp().m_show_speech_out);
-        pConfig->Write(wxT("/MainFrame/show_demod_in"),wxGetApp().m_show_demod_in);
-
-        pConfig->Write(wxT("/Audio/SquelchActive"),     g_SquelchActive);
-        pConfig->Write(wxT("/Audio/SquelchLevel"),     (int)(g_SquelchLevel*2.0));
-
-        pConfig->Write(wxT("/Audio/framesPerBuffer"),        wxGetApp().m_framesPerBuffer);
-
-        pConfig->Write(wxT("/Audio/soundCard1InDeviceNum"),       g_soundCard1InDeviceNum);
-        pConfig->Write(wxT("/Audio/soundCard1OutDeviceNum"),      g_soundCard1OutDeviceNum);
-        pConfig->Write(wxT("/Audio/soundCard1SampleRate"),        g_soundCard1SampleRate );
-
-        pConfig->Write(wxT("/Audio/soundCard2InDeviceNum"),       g_soundCard2InDeviceNum);
-        pConfig->Write(wxT("/Audio/soundCard2OutDeviceNum"),      g_soundCard2OutDeviceNum);
-        pConfig->Write(wxT("/Audio/soundCard2SampleRate"),        g_soundCard2SampleRate );
-
-        pConfig->Write(wxT("/Rig/Port"),                wxGetApp().m_strRigCtrlPort);
-        pConfig->Write(wxT("/Rig/Baud"),                wxGetApp().m_strRigCtrlBaud);
-        pConfig->Write(wxT("/Rig/DataBits"),            wxGetApp().m_strRigCtrlDatabits);
-        pConfig->Write(wxT("/Rig/StopBits"),            wxGetApp().m_strRigCtrlStopbits);
-        pConfig->Write(wxT("/Rig/Parity"),              wxGetApp().m_strRigCtrlParity);
-
-        pConfig->Write(wxT("/File/playFileToMicInPath"), wxGetApp().m_playFileToMicInPath);
-        pConfig->Write(wxT("/File/recFileFromRadioPath"), wxGetApp().m_recFileFromRadioPath);
-        pConfig->Write(wxT("/File/recFileFromRadioSecs"), wxGetApp().m_recFileFromRadioSecs);
+        pConfig->Write(wxT("/MainFrame/top"),               (long) x);
+        pConfig->Write(wxT("/MainFrame/left"),              (long) y);
+        pConfig->Write(wxT("/MainFrame/width"),             (long) w);
+        pConfig->Write(wxT("/MainFrame/height"),            (long) h);
+        pConfig->Write(wxT("/MainFrame/show_wf"),           wxGetApp().m_show_wf);
+        pConfig->Write(wxT("/MainFrame/show_spect"),        wxGetApp().m_show_spect);
+        pConfig->Write(wxT("/MainFrame/show_scatter"),      wxGetApp().m_show_scatter);
+        pConfig->Write(wxT("/MainFrame/show_timing"),       wxGetApp().m_show_timing);
+        pConfig->Write(wxT("/MainFrame/show_freq"),         wxGetApp().m_show_freq);
+        pConfig->Write(wxT("/MainFrame/show_speech_in"),    wxGetApp().m_show_speech_in);
+        pConfig->Write(wxT("/MainFrame/show_speech_out"),   wxGetApp().m_show_speech_out);
+        pConfig->Write(wxT("/MainFrame/show_demod_in"),     wxGetApp().m_show_demod_in);
+
+        pConfig->Write(wxT("/Audio/SquelchActive"),         g_SquelchActive);
+        pConfig->Write(wxT("/Audio/SquelchLevel"),          (int)(g_SquelchLevel*2.0));
+
+        pConfig->Write(wxT("/Audio/framesPerBuffer"),       wxGetApp().m_framesPerBuffer);
+
+        pConfig->Write(wxT("/Audio/soundCard1InDeviceNum"),   g_soundCard1InDeviceNum);
+        pConfig->Write(wxT("/Audio/soundCard1OutDeviceNum"),  g_soundCard1OutDeviceNum);
+        pConfig->Write(wxT("/Audio/soundCard1SampleRate"),    g_soundCard1SampleRate );
+
+        pConfig->Write(wxT("/Audio/soundCard2InDeviceNum"),   g_soundCard2InDeviceNum);
+        pConfig->Write(wxT("/Audio/soundCard2OutDeviceNum"),  g_soundCard2OutDeviceNum);
+        pConfig->Write(wxT("/Audio/soundCard2SampleRate"),    g_soundCard2SampleRate );
+
+        pConfig->Write(wxT("/Rig/Port"),                    wxGetApp().m_strRigCtrlPort);
+        pConfig->Write(wxT("/Rig/Baud"),                    wxGetApp().m_strRigCtrlBaud);
+        pConfig->Write(wxT("/Rig/DataBits"),                wxGetApp().m_strRigCtrlDatabits);
+        pConfig->Write(wxT("/Rig/StopBits"),                wxGetApp().m_strRigCtrlStopbits);
+        pConfig->Write(wxT("/Rig/Parity"),                  wxGetApp().m_strRigCtrlParity);
+        pConfig->Write(wxT("/Rig/UseRTS"),                  wxGetApp().m_boolUseRTS);
+        pConfig->Write(wxT("/Rig/RTSPolarity"),             wxGetApp().m_boolRTSPos);
+        pConfig->Write(wxT("/Rig/UseDTR"),                  wxGetApp().m_boolUseDTR);
+        pConfig->Write(wxT("/Rig/DTRPolarity"),             wxGetApp().m_boolDTRPos);
+
+        pConfig->Write(wxT("/File/playFileToMicInPath"),    wxGetApp().m_playFileToMicInPath);
+        pConfig->Write(wxT("/File/recFileFromRadioPath"),   wxGetApp().m_recFileFromRadioPath);
+        pConfig->Write(wxT("/File/recFileFromRadioSecs"),   wxGetApp().m_recFileFromRadioSecs);
 
         pConfig->Write(wxT("/Audio/snrSlow"), wxGetApp().m_snrSlow);
     }
@@ -450,8 +454,9 @@ MainFrame::~MainFrame()
     m_btnTogTX->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(MainFrame::OnTogBtnTXClickUI), NULL, this);
 
     if (m_RxRunning)
+    {
         stopRxStream();
-
+    }
     if (g_sfPlayFile != NULL)
     {
         sf_close(g_sfPlayFile);

diff --git a/fdmdv2/src/fdmdv2_main.h b/fdmdv2/src/fdmdv2_main.h
index c9070d0882ef6e3a6989b84550e67698a023bf24..d43f1094bf63aecfa482b67ce7274a73ecfc7187 100644 (file)
--- a/fdmdv2/src/fdmdv2_main.h
+++ b/fdmdv2/src/fdmdv2_main.h
@@ -123,6 +123,10 @@ class MainApp : public wxApp
         wxString            m_strRigCtrlDatabits;
         wxString            m_strRigCtrlStopbits;
         wxString            m_strRigCtrlParity;
+        bool                m_boolUseRTS;
+        bool                m_boolRTSPos;
+        bool                m_boolUseDTR;
+        bool                m_boolDTRPos;
 
         wxString            m_playFileToMicInPath;
         wxString            m_recFileFromRadioPath;

diff --git a/fdmdv2/tests/pa_enum/pa_enum.mk b/fdmdv2/tests/pa_enum/pa_enum.mk
index aa2a1137b4d2b4152c7bb4e123648ea59aba0356..6f61a181383be1a240c09142bdaaf67f0e582e02 100644 (file)
--- a/fdmdv2/tests/pa_enum/pa_enum.mk
+++ b/fdmdv2/tests/pa_enum/pa_enum.mk
@@ -13,7 +13,7 @@ CurrentFileName        :=
 CurrentFilePath        :=\r
 CurrentFileFullPath    :=\r
 User                   :=wittend\r
-Date                   :=11/24/2012\r
+Date                   :=11/25/2012\r
 CodeLitePath           :="D:\bin\CodeLite"\r
 LinkerName             :=g++\r
 SharedObjectLinkerName :=g++ -shared -fPIC\r
@@ -52,8 +52,8 @@ LibPath                := $(LibraryPathSwitch). $(LibraryPathSwitch)/bin/MinGW-4
 AR       := ar rcus\r
 CXX      := g++\r
 CC       := gcc\r
-CXXFLAGS :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"1048\"  $(Preprocessors)\r
-CFLAGS   :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"1048\"  $(Preprocessors)\r
+CXXFLAGS :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"1066\"  $(Preprocessors)\r
+CFLAGS   :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"1066\"  $(Preprocessors)\r
 \r
 \r
 ##\r