change space bar capture logic to allow call signs strings with spaces, works on...

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

diff --git a/fdmdv2/src/fdmdv2_defines.h b/fdmdv2/src/fdmdv2_defines.h
index 93380e961942723a3ef02f6f30237cad01da35a7..3c2168e1debfedfdfadedd15595f489da09d01ea 100644 (file)
--- a/fdmdv2/src/fdmdv2_defines.h
+++ b/fdmdv2/src/fdmdv2_defines.h
@@ -67,7 +67,7 @@
 #define MAX_BITS_PER_FDMDV_FRAME 40                            // 2000 bit/s mode
 
 // Squelch
-#define SQ_DEFAULT_SNR      4.0
+#define SQ_DEFAULT_SNR      1.5
 
 // Level Gauge
 #define FROM_RADIO_MAX       0.8

diff --git a/fdmdv2/src/fdmdv2_main.cpp b/fdmdv2/src/fdmdv2_main.cpp
index 95aa0d57cd88589ff008d4b61133c352d4d85746..fbdc8ca225b0e63d8691a8992f9ff8b2bfbd2f39 100644 (file)
--- a/fdmdv2/src/fdmdv2_main.cpp
+++ b/fdmdv2/src/fdmdv2_main.cpp
@@ -899,14 +899,13 @@ void MainFrame::OnCheckSNRClick(wxCommandEvent& event)
     //printf("m_snrSlow: %d\n", (int)wxGetApp().m_snrSlow);
 }
 
-// check for space bar press
+// check for space bar press (only when running)
 
 int MainApp::FilterEvent(wxEvent& event)
 {
     if ((event.GetEventType() == wxEVT_KEY_DOWN) && 
         (((wxKeyEvent&)event).GetKeyCode() == WXK_SPACE))
         {
-            //printf("m_rxRunnng: %d\n", frame->m_RxRunning);
             if (frame->m_RxRunning) {
                 if (frame->m_btnTogPTT->GetValue())
                     frame->m_btnTogPTT->SetValue(false);
@@ -915,10 +914,8 @@ int MainApp::FilterEvent(wxEvent& event)
 
                 frame->togglePTT();
             }
-            return true;
-
         }
- 
+
     return -1;
 }
 
@@ -1414,6 +1411,14 @@ void MainFrame::OnToolsAudio(wxCommandEvent& event)
     delete dlg;
 }
 
+//-------------------------------------------------------------------------
+// OnToolsAudioUI()
+//-------------------------------------------------------------------------
+void MainFrame::OnToolsAudioUI(wxUpdateUIEvent& event)
+{
+    event.Enable(!m_RxRunning);
+}
+
 //-------------------------------------------------------------------------
 // OnToolsFilter()
 //-------------------------------------------------------------------------
@@ -1437,9 +1442,9 @@ void MainFrame::OnToolsOptions(wxCommandEvent& event)
 }
 
 //-------------------------------------------------------------------------
-// OnToolsAudioUI()
+// OnToolsOptionsUI()
 //-------------------------------------------------------------------------
-void MainFrame::OnToolsAudioUI(wxUpdateUIEvent& event)
+void MainFrame::OnToolsOptionsUI(wxUpdateUIEvent& event)
 {
     event.Enable(!m_RxRunning);
 }

diff --git a/fdmdv2/src/fdmdv2_main.h b/fdmdv2/src/fdmdv2_main.h
index 4b23653758d50ae1a08b8f07769b7e6de3a3c9bc..57f7db95d06340bc87c4bb5c0e0b10027e69888a 100644 (file)
--- a/fdmdv2/src/fdmdv2_main.h
+++ b/fdmdv2/src/fdmdv2_main.h
@@ -398,6 +398,7 @@ class MainFrame : public TopFrame
         void OnToolsComCfgUI( wxUpdateUIEvent& event );
         void OnToolsFilter( wxCommandEvent& event );
         void OnToolsOptions(wxCommandEvent& event);
+        void OnToolsOptionsUI(wxUpdateUIEvent& event);
 
         void OnPlayFileToMicIn( wxCommandEvent& event );
         void OnRecFileFromRadio( wxCommandEvent& event );