disabled a few extraneous test modes for v0.96 release

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

diff --git a/fdmdv2/src/fdmdv2_main.cpp b/fdmdv2/src/fdmdv2_main.cpp
index 365c6e2292c3cbe4555d12b076fe2e3ae3ba98e9..97cec47fdd08a6f982bedfd960ed8f19d6396879 100644 (file)
--- a/fdmdv2/src/fdmdv2_main.cpp
+++ b/fdmdv2/src/fdmdv2_main.cpp
@@ -741,7 +741,7 @@ void MainFrame::OnTimer(wxTimerEvent &evt)
     }
     g_testFrames = m_ckboxTestFrame->GetValue();
 
-    if (g_State && g_testFrames) {
+    if (g_State) {
         char bits[80], errors[80], ber[80];
 
         // update stats on main page
@@ -1011,6 +1011,21 @@ void MainFrame::OnTogBtnAnalogClick (wxCommandEvent& event)
     event.Skip();
 }
 
+void MainFrame::OnCallSignReset(wxCommandEvent& event)
+{
+    m_pcallsign = m_callsign;
+    memset(m_callsign, 0, MAX_CALLSIGN);
+    wxString s;
+    s.Printf("%s", m_callsign);
+    m_txtCtrlCallSign->SetValue(s);
+}
+
+void MainFrame::OnBerReset(wxCommandEvent& event)
+{
+    g_total_bits = 0;
+    g_total_bit_errors = 0;
+}
+
 #ifdef ALC
 //-------------------------------------------------------------------------
 // OnTogBtnALCClick()
@@ -1568,10 +1583,11 @@ void MainFrame::OnTogBtnOnOff(wxCommandEvent& event)
         m_togBtnOnOff->SetLabel(wxT("Stop"));
 
         m_rb1400old->Disable();
-        m_rb1400->Disable();
         m_rb1600->Disable();
+#ifdef DISABLED_FEATURE
+        m_rb1400->Disable();
         m_rb2000->Disable();
-
+#endif
         // determine what mode we are using
 
         int codec2_mode;
@@ -1580,22 +1596,27 @@ void MainFrame::OnTogBtnOnOff(wxCommandEvent& event)
             g_Nc = 14;
             codec2_mode = CODEC2_MODE_1400;
         }
+       
+#ifdef DISABLED_FEATURE
         if (m_rb1400->GetValue()) {
             g_mode = MODE_1400;
             g_Nc = 14;
             codec2_mode = CODEC2_MODE_1400;
         }
+#endif
         if (m_rb1600->GetValue()) {
             g_mode = MODE_1600;
             g_Nc = 16;
             codec2_mode = CODEC2_MODE_1300;
         }
+#ifdef DISABLED_FEATURE
         if (m_rb2000->GetValue()) {
             g_mode = MODE_2000;
             g_Nc = 20;
             codec2_mode = CODEC2_MODE_1400;
         }
         printf("g_mode: %d  Nc: %d  codec2_mode: %d\n", g_mode, g_Nc, codec2_mode);
+#endif
 
         // init modem and codec states
 
@@ -1680,9 +1701,11 @@ void MainFrame::OnTogBtnOnOff(wxCommandEvent& event)
         //m_btnTogPTT->Disable();
         m_togBtnOnOff->SetLabel(wxT("Start"));
         m_rb1400old->Enable();
-        m_rb1400->Enable();
         m_rb1600->Enable();
+#ifdef DISABLED_FEATURE
+        m_rb1400->Enable();
         m_rb2000->Enable();
+#endif
     }
 }
 
@@ -2619,8 +2642,11 @@ void per_frame_rx_processing(
                             recd_codeword |= codec_bits[i];
                         }
                         codeword1 = golay23_decode(recd_codeword);
-                        if (codeword1 != recd_codeword)
-                            printf("codeword1: 0x%x  recd_codeword: 0x%x\n", codeword1,recd_codeword );
+                        g_total_bit_errors += golay23_count_errors(recd_codeword, codeword1);
+                        g_total_bits       += 23;
+
+                        //if (codeword1 != recd_codeword)
+                        //    printf("codeword1: 0x%x  recd_codeword: 0x%x\n", codeword1,recd_codeword );
                         //fprintf(stderr, "received codeword1: 0x%x  decoded codeword1: 0x%x\n", recd_codeword, codeword1);
 
                         for(i=0; i<12; i++) {
@@ -2639,8 +2665,11 @@ void per_frame_rx_processing(
                             recd_codeword |= codec_bits[i];
                         }
                         codeword2 = golay23_decode(recd_codeword);
-                        if (codeword2 != recd_codeword)
-                            printf("codeword2: 0x%x  recd_codeword: 0x%x\n", codeword2,recd_codeword );
+                        g_total_bit_errors += golay23_count_errors(recd_codeword, codeword2);
+                        g_total_bits       += 23;
+                        
+                        // if (codeword2 != recd_codeword)
+                        //    printf("codeword2: 0x%x  recd_codeword: 0x%x\n", codeword2,recd_codeword );
                         //fprintf(stderr, "received codeword2: 0x%x  decoded codeword2: 0x%x\n", recd_codeword, codeword2);
 
                         for(i=0; i<12; i++) {
@@ -2665,6 +2694,9 @@ void per_frame_rx_processing(
                             recd_codeword |= codec_bits[i];
                         }
                         codeword1 = golay23_decode(recd_codeword);
+                        g_total_bit_errors += golay23_count_errors(recd_codeword, codeword1);
+                        g_total_bits       += 23;
+
                         //if (codeword1 != recd_codeword)
                         //    printf("codeword1: 0x%x  recd_codeword: 0x%x\n", codeword1,recd_codeword );
                         //codeword1 = recd_codeword;

diff --git a/fdmdv2/src/fdmdv2_main.h b/fdmdv2/src/fdmdv2_main.h
index ea1bcc3c645a7dfcfe9e14548911f1dd2c054887..63393a30ea452814390102af4fca6d65179d4684 100644 (file)
--- a/fdmdv2/src/fdmdv2_main.h
+++ b/fdmdv2/src/fdmdv2_main.h
@@ -402,6 +402,9 @@ class MainFrame : public TopFrame
         void OnTogBtnPTT( wxCommandEvent& event );
         void OnTogBtnOnOff( wxCommandEvent& event );
 
+        void OnCallSignReset( wxCommandEvent& event );
+        void OnBerReset( wxCommandEvent& event );
+
         //System Events
         void OnPaint(wxPaintEvent& event);
         void OnSize( wxSizeEvent& event );

diff --git a/fdmdv2/src/topFrame.cpp b/fdmdv2/src/topFrame.cpp
index 36b03f761c11a872771eeb70ba6e92f3d9fd5394..0875cedc9aa601c55cb44e027b37156190955aa7 100644 (file)
--- a/fdmdv2/src/topFrame.cpp
+++ b/fdmdv2/src/topFrame.cpp
@@ -182,9 +182,13 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const
     wxBoxSizer* bSizer15;
     bSizer15 = new wxBoxSizer(wxVERTICAL);
 
+    m_BtnCallSignReset = new wxButton(this, wxID_ANY, _("Clear"), wxDefaultPosition, wxDefaultSize, 0);
+    lowerSizer->Add(m_BtnCallSignReset, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
     m_txtCtrlCallSign = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY);
     m_txtCtrlCallSign->SetToolTip(_("Call Sign of transmitting station will appear here"));
     bSizer15->Add(m_txtCtrlCallSign, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5);
+
     lowerSizer->Add(bSizer15, 1, wxEXPAND, 5);
 
     wxBoxSizer* bSizer141;
@@ -195,7 +199,7 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const
     //=====================================================
 
     // DR 4 Dec - taken off for screen for Beta release to avoid questions on their use until
-    // we implemen this feature
+    // we implement this feature
  #ifdef UNIMPLEMENTED
     // TxID
     //---------
@@ -271,14 +275,26 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const
     m_ckboxTestFrame = new wxCheckBox(this, wxID_ANY, _("Enable"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE);
     sbSizer_testFrames->Add(m_ckboxTestFrame, 0, wxALIGN_LEFT, 0);
 
+    rightSizer->Add(sbSizer_testFrames,0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 3);
+
+    //------------------------------
+    // BER Frames box
+    //------------------------------
+
+    wxStaticBoxSizer* sbSizer_ber;
+    sbSizer_ber = new wxStaticBoxSizer(new wxStaticBox(this, wxID_ANY, _("Bit Error Rate")), wxVERTICAL);
+
+    m_BtnBerReset = new wxButton(this, wxID_ANY, _("Reset"), wxDefaultPosition, wxDefaultSize, 0);
+    sbSizer_ber->Add(m_BtnBerReset, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 1);
+
     m_textBits = new wxStaticText(this, wxID_ANY, wxT("Bits...: 0"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
-    sbSizer_testFrames->Add(m_textBits, 0, wxALIGN_LEFT, 1);
+    sbSizer_ber->Add(m_textBits, 0, wxALIGN_LEFT, 1);
     m_textErrors = new wxStaticText(this, wxID_ANY, wxT("Errors: 0"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
-    sbSizer_testFrames->Add(m_textErrors, 0, wxALIGN_LEFT, 1);
+    sbSizer_ber->Add(m_textErrors, 0, wxALIGN_LEFT, 1);
     m_textBER = new wxStaticText(this, wxID_ANY, wxT("BER...: 0.0"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
-    sbSizer_testFrames->Add(m_textBER, 0, wxALIGN_LEFT, 1);
+    sbSizer_ber->Add(m_textBER, 0, wxALIGN_LEFT, 1);
 
-    rightSizer->Add(sbSizer_testFrames,0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 3);
+    rightSizer->Add(sbSizer_ber,0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 3);
 
     /* new --- */
 
@@ -290,12 +306,16 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const
 
     m_rb1400old = new wxRadioButton( this, wxID_ANY, wxT("1400 V0.91"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
     sbSizer_mode->Add(m_rb1400old, 0, wxALIGN_LEFT|wxALL, 1);
+#ifdef DISABLED_FEATURE
     m_rb1400 = new wxRadioButton( this, wxID_ANY, wxT("1400"), wxDefaultPosition, wxDefaultSize, 0);
     sbSizer_mode->Add(m_rb1400, 0, wxALIGN_LEFT|wxALL, 1);
+#endif
     m_rb1600 = new wxRadioButton( this, wxID_ANY, wxT("1600"), wxDefaultPosition, wxDefaultSize, 0);
     sbSizer_mode->Add(m_rb1600, 0, wxALIGN_LEFT|wxALL, 1);
+#ifdef DISABLED_FEATURE
     m_rb2000 = new wxRadioButton( this, wxID_ANY, wxT("2000"), wxDefaultPosition, wxDefaultSize, 0);
     sbSizer_mode->Add(m_rb2000, 0, wxALIGN_LEFT|wxALL, 1);
+#endif
 
     rightSizer->Add(sbSizer_mode,0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 3);
 
@@ -455,6 +475,9 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const
     m_togBtnALC->Connect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnALCClick), NULL, this);
 #endif
     m_btnTogPTT->Connect(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnTogBtnPTT), NULL, this);
+
+    m_BtnCallSignReset->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnCallSignReset), NULL, this);
+    m_BtnBerReset->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TopFrame::OnBerReset), NULL, this);
 }
 
 TopFrame::~TopFrame()

diff --git a/fdmdv2/src/topFrame.h b/fdmdv2/src/topFrame.h
index 70b04167badd3e127f72e18f7de0b0777927858c..e5979a13c67dbc6ad70e5b61d95685dc2e5af4a3 100644 (file)
--- a/fdmdv2/src/topFrame.h
+++ b/fdmdv2/src/topFrame.h
@@ -87,13 +87,16 @@ class TopFrame : public wxFrame
         wxCheckBox* m_ckboxSNR;
         wxGauge* m_gaugeLevel;
         wxStaticText* m_textLevel;
-        wxTextCtrl* m_txtCtrlCallSign;
+        wxTextCtrl*   m_txtCtrlCallSign;
+        wxButton*     m_BtnCallSignReset;
         wxSlider* m_sliderSQ;
         wxCheckBox* m_ckboxSQ;
         wxStaticText* m_textSQ;
         wxStatusBar* m_statusBar1;
 
         wxCheckBox    *m_ckboxTestFrame;
+
+        wxButton*     m_BtnBerReset;
         wxStaticText  *m_textBits;
         wxStaticText  *m_textErrors;
         wxStaticText  *m_textBER;
@@ -152,6 +155,9 @@ class TopFrame : public wxFrame
         virtual void OnTogBtnPTT_UI(wxUpdateUIEvent& event ) { event.Skip(); }
         virtual void OnTogBtnOnOffUI(wxUpdateUIEvent& event ) { event.Skip(); }
 
+        virtual void OnCallSignReset( wxCommandEvent& event ) { event.Skip(); }
+        virtual void OnBerReset( wxCommandEvent& event ) { event.Skip(); }
+
     public:
         wxToggleButton* m_togRxID;
         wxToggleButton* m_togTxID;

diff --git a/fdmdv2/src/version.h b/fdmdv2/src/version.h
index 5f783fb0a816011d93b025ae2c0b122cd274fb90..02acabbabdad0b865cba820a45b65650ad6f8c6c 100644 (file)
--- a/fdmdv2/src/version.h
+++ b/fdmdv2/src/version.h
@@ -1,6 +1,6 @@
 #ifndef FREEDV_VER_DOT_H
 #define FREEDV_VER_DOT_H 1
 
-#define FREEDV_VERSION "0.95 Beta"
+#define FREEDV_VERSION "0.96 Beta"
 
 #endif //FREEDV_VER_DOT_H