grc: moved GRC blocks that were put into gr-digital into gr-digital/grc and refactored for new API.

4 files changed, 150 insertions, 1 deletions

diff --git a/gr-digital/grc/Makefile.am b/gr-digital/grc/Makefile.am
index d271ca06a..963939f12 100644
--- a/gr-digital/grc/Makefile.am
+++ b/gr-digital/grc/Makefile.am
@@ -34,4 +34,6 @@ dist_grcblocks_DATA = \
 	digital_psk_mod.xml			\
 	digital_psk_demod.xml			\
 	digital_qam_mod.xml			\
-	digital_qam_demod.xml
+	digital_qam_demod.xml			\
+	digital_fll_band_edge_cc.xml		\
+	digital_mpsk_receiver_cc.xml
diff --git a/gr-digital/grc/digital_block_tree.xml b/gr-digital/grc/digital_block_tree.xml
index 1be4110e1..3432d876c 100644
--- a/gr-digital/grc/digital_block_tree.xml
+++ b/gr-digital/grc/digital_block_tree.xml
@@ -34,6 +34,8 @@
 		<block>digital_cma_equalizer_cc</block>
 		<block>digital_lms_dd_equalizer_cc</block>
 		<block>digital_kurtotic_equalizer_cc</block>
+		<block>digital_fll_band_edge_cc</block>
+		<block>digital_mpsk_receiver_cc</block>
 	</cat>
 	<cat>
 		<name>Digital Modulators</name>
diff --git a/gr-digital/grc/digital_fll_band_edge_cc.xml b/gr-digital/grc/digital_fll_band_edge_cc.xml
new file mode 100644
index 000000000..1c5a34e54
--- /dev/null
+++ b/gr-digital/grc/digital_fll_band_edge_cc.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## FLL using Band-Edge Filters
+###################################################
+ -->
+<block>
+	<name>FLL Band-Edge</name>
+	<key>gr_fll_band_edge_cc</key>
+	<import>from gnuradio import gr</import>
+	<make>gr.fll_band_edge_cc($samps_per_sym, $rolloff, $filter_size, $w)</make>
+	<callback>set_loop_bandwidth($w)</callback>
+	<param>
+		<name>Type</name>
+		<key>type</key>
+		<type>enum</type>
+		<option>
+			<name>Complex->Complex</name>
+			<key>cc</key>
+			<opt>input:complex</opt>
+			<opt>output:complex</opt>
+		</option>
+	</param>
+
+	<param>
+		<name>Samples Per Symbol</name>
+		<key>samps_per_sym</key>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Filter Rolloff Factor</name>
+		<key>rolloff</key>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Prototype Filter Size</name>
+		<key>filter_size</key>
+		<type>int</type>
+	</param>
+
+	<param>
+		<name>Loop Bandwidth</name>
+		<key>w</key>
+		<type>real</type>
+	</param>
+
+	<sink>
+		<name>in</name>
+		<type>$type.input</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>$type.output</type>
+	</source>
+	<source>
+		<name>freq</name>
+		<type>float</type>
+		<optional>1</optional>
+	</source>
+	<source>
+		<name>phase</name>
+		<type>float</type>
+		<optional>1</optional>
+	</source>
+	<source>
+		<name>error</name>
+		<type>float</type>
+		<optional>1</optional>
+	</source>
+</block>
diff --git a/gr-digital/grc/digital_mpsk_receiver_cc.xml b/gr-digital/grc/digital_mpsk_receiver_cc.xml
new file mode 100644
index 000000000..948f18b6e
--- /dev/null
+++ b/gr-digital/grc/digital_mpsk_receiver_cc.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##MPSK Receiver
+###################################################
+ -->
+<block>
+	<name>MPSK Receiver</name>
+	<key>gr_mpsk_receiver_cc</key>
+	<import>from gnuradio import gr</import>
+	<make>gr.mpsk_receiver_cc($M, $theta, $w, $fmin, $fmax, $mu, $gain_mu, $omega, $gain_omega, $omega_relative_limit)</make>
+	<callback>set_loop_bandwidth($w)</callback>
+	<callback>set_mu($mu)</callback>
+	<callback>set_gain_mu($gain_mu)</callback>
+	<callback>set_omega($omega)</callback>
+	<callback>set_gain_omega($gain_omega)</callback>
+	<param>
+		<name>M</name>
+		<key>M</key>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Theta</name>
+		<key>theta</key>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Loop Bandwidth</name>
+		<key>w</key>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Min Freq</name>
+		<key>fmin</key>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Max Freq</name>
+		<key>fmax</key>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Mu</name>
+		<key>mu</key>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Gain Mu</name>
+		<key>gain_mu</key>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Omega</name>
+		<key>omega</key>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Gain Omega</name>
+		<key>gain_omega</key>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Omega Relative Limit</name>
+		<key>omega_relative_limit</key>
+		<type>real</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>complex</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>complex</type>
+	</source>
+</block>