more tweaks to squelch

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

diff --git a/fdmdv2-dev/README.txt b/fdmdv2-dev/README.txt
index 22f7675e60cfe0eb13de872af47f9cd804d8bf0e..88e29c805084e3ebddb5f671a6f6c340353f2a30 100644 (file)
--- a/fdmdv2-dev/README.txt
+++ b/fdmdv2-dev/README.txt
@@ -182,18 +182,19 @@ TODO
     [ ] plot error patterns for 700 and 1600
     [ ] plot error histograms for 700 and 1600
 
-[ ] Mel Bugs
+[X] Mel Bugs
     [X] resync issue
     [X] equalise power on 700 and 1600
     [X] research real and complex PAPR
     [X] waterfall and spectrum in analog mode
     [X] The waterfall in analog mode appears to quit working sometimes?
-    [X] Squelch control on 1600 mode will not open up squelch to 0 (appears to be around 2 dB)
-    [ ] On TX, intermittently PTT will cause signal to be heard in speakers.  Toggle PTT or 
+
+    [X] On TX, intermittently PTT will cause signal to be heard in speakers.  Toggle PTT or 
         Stop/Start toggle and then starts working.
-    [ ] There is a .dll missing otherwise FreeDV will not excite.  We tested it on xp, win7, 8, 8.1 and 10.   
-        Needs ilbusb0.dll  the 32bit one on all releases. 
-    [ ] I am not sure the "checksum" is still working when enabled (1600 mode)
+    [ ] short varicode
+        + cld be broken in freedv_api
+    [ ] Squelch control on 1600 mode will not open up squelch to 0 (appears to be around 2 dB)
+    [ ] space bar keys PTT when entering text info box
 
 [ ] FreeDV 700 improvements
     [ ] bpf filter after clipping to remove clicks
@@ -204,6 +205,8 @@ TODO
 [X] win32
     [X] X-compile works
     [X] basic installer
+    [ ] add ilbusb0.dll
+    [ ] add hamlib stuff
 
 [ ] Small fixes
     [X] Playfile bug
@@ -214,7 +217,7 @@ TODO
     [X] default squelch 2dB
     [ ] cmd line file decode
     [ ] Waterfall direction
-    [ ] documenttation or use, walk through,you tube, blog posts
+    [ ] documentation or use, walk through,you tube, blog posts
     [ ] scatter diagram agc with hysteresis
     [ ] scatter diagram useful on fading channels in real time (longer persistance?)
 

diff --git a/fdmdv2-dev/src/fdmdv2_main.cpp b/fdmdv2-dev/src/fdmdv2_main.cpp
index 011ca5247c2666965cb5fc5e438e318b425c0bec..64d8fdd7bb9e33d5b82a8ed357f710a2fd86bdc8 100644 (file)
--- a/fdmdv2-dev/src/fdmdv2_main.cpp
+++ b/fdmdv2-dev/src/fdmdv2_main.cpp
@@ -426,7 +426,7 @@ MainFrame::MainFrame(wxWindow *parent) : TopFrame(parent)
 
     // squelch settings
     char sqsnr[15];
-    m_sliderSQ->SetValue((int)(g_SquelchLevel*2.0));
+    m_sliderSQ->SetValue((int)((g_SquelchLevel+5.0)*2.0));
     sprintf(sqsnr, "%4.1f", g_SquelchLevel);
     wxString sqsnr_string(sqsnr);
     m_textSQ->SetLabel(sqsnr_string);
@@ -1203,7 +1203,7 @@ void MainFrame::OnPaint(wxPaintEvent& WXUNUSED(event))
 void MainFrame::OnCmdSliderScroll(wxScrollEvent& event)
 {
     char sqsnr[15];
-    g_SquelchLevel = (float)m_sliderSQ->GetValue()/2.0;   
+    g_SquelchLevel = (float)m_sliderSQ->GetValue()/2.0 - 5.0;   
     sprintf(sqsnr, "%4.1f", g_SquelchLevel); // 0.5 dB steps
     wxString sqsnr_string(sqsnr);
     m_textSQ->SetLabel(sqsnr_string);
@@ -2924,10 +2924,9 @@ void txRxProcessing()
 
         // send latest squelch level to FreeDV API, as it handles squelch internally
 
-        if (g_SquelchActive)
-            g_pfreedv->snr_squelch_thresh = g_SquelchLevel;
-        else
-            g_pfreedv->snr_squelch_thresh = -100.0;
+        g_pfreedv->squelch_en = g_SquelchActive;
+        g_pfreedv->snr_squelch_thresh = g_SquelchLevel;
+        //fprintf(g_logfile, "snr_squelch_thresh: %f\n",  g_pfreedv->snr_squelch_thresh);
 
         // Get some audio to send to headphones/speaker.  If in analog
         // mode we pass thru the "from radio" audio to the