Merge branch 'master' into next

3 files changed, 81 insertions, 0 deletions

diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am
index 14ffe8358..763faf584 100644
--- a/grc/blocks/Makefile.am
+++ b/grc/blocks/Makefile.am
@@ -90,6 +90,7 @@ dist_ourdata_DATA = \
 	gr_correlate_access_code_bb.xml \
 	gr_costas_loop_cc.xml \
 	gr_cpfsk_bc.xml \
+	gr_ctcss_squelch_ff.xml \
 	gr_dc_blocker.xml \
 	gr_decode_ccsds_27_fb.xml \
 	gr_deinterleave.xml \
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index 0b641d79c..e9382d158 100644
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -152,6 +152,7 @@
 		<block>gr_simple_squelch_cc</block>
 		<block>blks2_standard_squelch</block>
 		<block>gr_pwr_squelch_xx</block>
+		<block>gr_ctcss_squelch_ff</block>
 		<block>gr_threshold_ff</block>
 	</cat>
 	<cat>
diff --git a/grc/blocks/gr_ctcss_squelch_ff.xml b/grc/blocks/gr_ctcss_squelch_ff.xml
new file mode 100644
index 000000000..2911cfb87
--- /dev/null
+++ b/grc/blocks/gr_ctcss_squelch_ff.xml
@@ -0,0 +1,79 @@
+<!--
+#
+# Copyright 2011 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+-->
+
+<?xml version="1.0"?>
+<!--
+###################################################
+##CTCSS Squelch
+###################################################
+ -->
+<block>
+	<name>CTCSS Squelch</name>
+	<key>gr_ctcss_squelch_ff</key>
+	<import>from gnuradio import gr</import>
+	<make>gr.ctcss_squelch_ff($rate, $freq, $level, $len, $ramp, $gate)</make>
+	<callback>set_level($level)</callback>
+	<param>
+		<name>Sampling Rate (Hz)</name>
+		<key>rate</key>
+		<value>samp_rate</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Tone Frequency</name>
+		<key>freq</key>
+		<value>100.0</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Level</name>
+		<key>level</key>
+		<value>0.01</value>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Length</name>
+		<key>len</key>
+		<value>0</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Ramp</name>
+		<key>ramp</key>
+		<value>0</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Gate</name>
+		<key>gate</key>
+		<value>False</value>
+		<type>bool</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>float</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>float</type>
+	</source>
+</block>