[Commit-gnuradio] gnuradio-core/src/lib/general gr_ctcss_squelch_...

[Johnathan Corgan]

CVSROOT:        /sources/gnuradio
Module name:    gnuradio-core
Changes by:     Johnathan Corgan <jcorgan>      06/07/02 00:43:43

Modified files:
        src/lib/general: gr_ctcss_squelch_ff.cc gr_ctcss_squelch_ff.h 
                         gr_ctcss_squelch_ff.i 

Log message:
        Adjusted default level and detection length after on-the-air testing.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/src/lib/general/gr_ctcss_squelch_ff.cc?cvsroot=gnuradio&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/src/lib/general/gr_ctcss_squelch_ff.h?cvsroot=gnuradio&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/src/lib/general/gr_ctcss_squelch_ff.i?cvsroot=gnuradio&r1=1.1&r2=1.2

Patches:
Index: gr_ctcss_squelch_ff.cc
===================================================================
RCS file: 
/sources/gnuradio/gnuradio-core/src/lib/general/gr_ctcss_squelch_ff.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gr_ctcss_squelch_ff.cc      1 Jul 2006 10:33:54 -0000       1.1
+++ gr_ctcss_squelch_ff.cc      2 Jul 2006 00:43:42 -0000       1.2
@@ -56,9 +56,9 @@
   d_freq = freq;
   d_level = level;
 
-  // Default is 125 ms detection time
+  // Default is 100 ms detection time
   if (len == 0)
-    d_len = (int)(rate/8);
+    d_len = (int)(rate/10.0);
   else
     d_len = len;
 
@@ -106,6 +106,7 @@
       d_out_c = abs(d_goertzel_c.output());
       d_out_r = abs(d_goertzel_r.output());
   
+      //printf("d_out_l=%f d_out_c=%f d_out_r=%f\n", d_out_l, d_out_c, 
d_out_r);
       d_mute = (d_out_c < d_level || d_out_c < d_out_l || d_out_c < d_out_r);
   }
 }

Index: gr_ctcss_squelch_ff.h
===================================================================
RCS file: 
/sources/gnuradio/gnuradio-core/src/lib/general/gr_ctcss_squelch_ff.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gr_ctcss_squelch_ff.h       1 Jul 2006 10:33:54 -0000       1.1
+++ gr_ctcss_squelch_ff.h       2 Jul 2006 00:43:42 -0000       1.2
@@ -30,7 +30,7 @@
 typedef boost::shared_ptr<gr_ctcss_squelch_ff> gr_ctcss_squelch_ff_sptr;
 
 gr_ctcss_squelch_ff_sptr 
-gr_make_ctcss_squelch_ff(int rate, float freq, float level=0.04, int len=0, 
int ramp=0, bool gate=false);
+gr_make_ctcss_squelch_ff(int rate, float freq, float level=0.01, int len=0, 
int ramp=0, bool gate=false);
 
 /*!
  * \brief gate or zero output if ctcss tone not present

Index: gr_ctcss_squelch_ff.i
===================================================================
RCS file: 
/sources/gnuradio/gnuradio-core/src/lib/general/gr_ctcss_squelch_ff.i,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gr_ctcss_squelch_ff.i       1 Jul 2006 10:33:54 -0000       1.1
+++ gr_ctcss_squelch_ff.i       2 Jul 2006 00:43:42 -0000       1.2
@@ -25,7 +25,7 @@
 %include gr_squelch_base_ff.i
 
 gr_ctcss_squelch_ff_sptr 
-gr_make_ctcss_squelch_ff(int rate, float freq, float level=0.04, int len=0, 
int ramp=0, bool gate=false);
+gr_make_ctcss_squelch_ff(int rate, float freq, float level=0.01, int len=0, 
int ramp=0, bool gate=false);
 
 class gr_ctcss_squelch_ff : public gr_squelch_base_ff
 {