digital: fixed GRC blocks for blocks moved to gr-digital.

8 files changed, 161 insertions, 13 deletions

diff --git a/gr-digital/grc/Makefile.am b/gr-digital/grc/Makefile.am
index 963939f12..e4426e721 100644
--- a/gr-digital/grc/Makefile.am
+++ b/gr-digital/grc/Makefile.am
@@ -25,15 +25,19 @@ grcblocksdir = $(grc_blocksdir)
 
 dist_grcblocks_DATA = \
 	digital_block_tree.xml			\
+	digital_binary_slicer_fb.xml		\
+	digital_clock_recovery_mm_xx.xml	\
+	digital_constellation_decoder_cb.xml	\
+	digital_correlate_access_code_bb.xml	\
 	digital_costas_loop_cc.xml		\
 	digital_cma_equalizer_cc.xml		\
-	digital_lms_dd_equalizer_cc.xml		\
+	digital_fll_band_edge_cc.xml		\
 	digital_kurtotic_equalizer_cc.xml	\
+	digital_lms_dd_equalizer_cc.xml		\
+	digital_mpsk_receiver_cc.xml		\
 	digital_dxpsk_mod.xml			\
 	digital_dxpsk_demod.xml			\
 	digital_psk_mod.xml			\
 	digital_psk_demod.xml			\
 	digital_qam_mod.xml			\
-	digital_qam_demod.xml			\
-	digital_fll_band_edge_cc.xml		\
-	digital_mpsk_receiver_cc.xml
+	digital_qam_demod.xml
diff --git a/gr-digital/grc/digital_binary_slicer_fb.xml b/gr-digital/grc/digital_binary_slicer_fb.xml
new file mode 100644
index 000000000..3187d13f9
--- /dev/null
+++ b/gr-digital/grc/digital_binary_slicer_fb.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Binary Slicer
+###################################################
+ -->
+<block>
+	<name>Binary Slicer</name>
+	<key>digital_binary_slicer_fb</key>
+	<import>from gnuradio import digital</import>
+	<make>digital.binary_slicer_fb()</make>
+	<sink>
+		<name>in</name>
+		<type>float</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>byte</type>
+	</source>
+</block>
diff --git a/gr-digital/grc/digital_block_tree.xml b/gr-digital/grc/digital_block_tree.xml
index 3432d876c..088fe1c10 100644
--- a/gr-digital/grc/digital_block_tree.xml
+++ b/gr-digital/grc/digital_block_tree.xml
@@ -30,11 +30,15 @@
 	<name></name> <!-- Blank for Root Name -->
 	<cat>
 		<name>Digital</name>
-		<block>digital_costas_loop_cc</block>
+		<block>digital_binary_slicer_fb</block>
+		<block>digital_clock_recovery_mm_xx</block>
 		<block>digital_cma_equalizer_cc</block>
-		<block>digital_lms_dd_equalizer_cc</block>
-		<block>digital_kurtotic_equalizer_cc</block>
+		<block>digital_constellation_decoder_cb</block>
+		<block>digital_correlate_access_code_bb</block>
+		<block>digital_costas_loop_cc</block>
 		<block>digital_fll_band_edge_cc</block>
+		<block>digital_kurtotic_equalizer_cc</block>
+		<block>digital_lms_dd_equalizer_cc</block>
 		<block>digital_mpsk_receiver_cc</block>
 	</cat>
 	<cat>
diff --git a/gr-digital/grc/digital_clock_recovery_mm_xx.xml b/gr-digital/grc/digital_clock_recovery_mm_xx.xml
new file mode 100644
index 000000000..d9c5ea4ff
--- /dev/null
+++ b/gr-digital/grc/digital_clock_recovery_mm_xx.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Clock Recovery MM
+###################################################
+ -->
+<block>
+	<name>Clock Recovery MM</name>
+	<key>digital_clock_recovery_mm_xx</key>
+	<import>from gnuradio import digital</import>
+	<make>digital.clock_recovery_mm_$(type.fcn)($omega, $gain_omega, $mu, $gain_mu, $omega_relative_limit)</make>
+	<callback>set_omega($omega)</callback>
+	<callback>set_gain_omega($gain_omega)</callback>
+	<callback>set_mu($mu)</callback>
+	<callback>set_gain_mu($gain_mu)</callback>
+	<param>
+		<name>Type</name>
+		<key>type</key>
+		<type>enum</type>
+		<option>
+			<name>Complex</name>
+			<key>complex</key>
+			<opt>fcn:cc</opt>
+		</option>
+		<option>
+			<name>Float</name>
+			<key>float</key>
+			<opt>fcn:ff</opt>
+		</option>
+	</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>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 Relative Limit</name>
+		<key>omega_relative_limit</key>
+		<type>real</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>$type</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>$type</type>
+	</source>
+</block>
diff --git a/gr-digital/grc/digital_constellation_decoder_cb.xml b/gr-digital/grc/digital_constellation_decoder_cb.xml
new file mode 100644
index 000000000..c7353e288
--- /dev/null
+++ b/gr-digital/grc/digital_constellation_decoder_cb.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Constellation Decoder
+###################################################
+ -->
+<block>
+	<name>Constellation Decoder</name>
+	<key>digital_constellation_decoder_cb</key>
+	<import>from gnuradio import digital</import>
+	<make>digital.constellation_decoder_cb($constellation)</make>
+	<param>
+		<name>Constellation Object</name>
+		<key>constellation</key>
+		<type>raw</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>complex</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>byte</type>
+	</source>
+</block>
diff --git a/gr-digital/grc/digital_correlate_access_code_bb.xml b/gr-digital/grc/digital_correlate_access_code_bb.xml
new file mode 100644
index 000000000..3941834c4
--- /dev/null
+++ b/gr-digital/grc/digital_correlate_access_code_bb.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Correlate Access Code
+###################################################
+ -->
+<block>
+	<name>Correlate Access Code</name>
+	<key>digital_correlate_access_code_bb</key>
+	<import>from gnuradio import digital</import>
+	<make>digital.correlate_access_code_bb($access_code, $threshold)</make>
+	<param>
+		<name>Access Code</name>
+		<key>access_code</key>
+		<value>101010</value>
+		<type>string</type>
+	</param>
+	<param>
+		<name>Threshold</name>
+		<key>threshold</key>
+		<type>int</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>byte</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>byte</type>
+	</source>
+</block>
diff --git a/gr-digital/grc/digital_fll_band_edge_cc.xml b/gr-digital/grc/digital_fll_band_edge_cc.xml
index 1c5a34e54..e4da773db 100644
--- a/gr-digital/grc/digital_fll_band_edge_cc.xml
+++ b/gr-digital/grc/digital_fll_band_edge_cc.xml
@@ -6,9 +6,9 @@
  -->
 <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>
+	<key>digital_fll_band_edge_cc</key>
+	<import>from gnuradio import digital</import>
+	<make>digital.fll_band_edge_cc($samps_per_sym, $rolloff, $filter_size, $w)</make>
 	<callback>set_loop_bandwidth($w)</callback>
 	<param>
 		<name>Type</name>
diff --git a/gr-digital/grc/digital_mpsk_receiver_cc.xml b/gr-digital/grc/digital_mpsk_receiver_cc.xml
index 948f18b6e..ab7e5c209 100644
--- a/gr-digital/grc/digital_mpsk_receiver_cc.xml
+++ b/gr-digital/grc/digital_mpsk_receiver_cc.xml
@@ -6,9 +6,9 @@
  -->
 <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>
+	<key>digital_mpsk_receiver_cc</key>
+	<import>from gnuradio import digital</import>
+	<make>digital.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>