scrambler stuff

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9727 221aa14e-8319-0410-a670-987f0aec2ac5

4 files changed, 91 insertions, 8 deletions

diff --git a/grc/data/platforms/python/block_tree.xml b/grc/data/platforms/python/block_tree.xml
index 7ac9e5199..4cc98b4c5 100644
--- a/grc/data/platforms/python/block_tree.xml
+++ b/grc/data/platforms/python/block_tree.xml
@@ -214,6 +214,16 @@
 	</cat>
 	<cat>
 		<name>Error Correction</name>
+		<cat>
+			<name>Trellis</name>
+			<block>trellis_encoder_xx</block>
+			<block>trellis_metrics_x</block>
+			<block>trellis_permutation</block>
+			<block>trellis_siso_combined_f</block>
+			<block>trellis_siso_f</block>
+			<block>trellis_viterbi_combined_xx</block>
+			<block>trellis_viterbi_x</block>
+		</cat>
 
 		<block>blks2_packet_decoder</block>
 		<block>blks2_packet_encoder</block>
@@ -222,14 +232,9 @@
 		<block>gr_decode_ccsds_27_fb</block>
 	</cat>
 	<cat>
-		<name>Trellis</name>
-		<block>trellis_encoder_xx</block>
-		<block>trellis_metrics_x</block>
-		<block>trellis_permutation</block>
-		<block>trellis_siso_combined_f</block>
-		<block>trellis_siso_f</block>
-		<block>trellis_viterbi_combined_xx</block>
-		<block>trellis_viterbi_x</block>
+		<name>Line Coding</name>
+		<block>gr_scrambler_bb</block>
+		<block>gr_descrambler_bb</block>
 	</cat>
 	<cat>
 		<name>USRP</name>
diff --git a/grc/data/platforms/python/blocks/Makefile.am b/grc/data/platforms/python/blocks/Makefile.am
index 806c56bde..7bc678180 100644
--- a/grc/data/platforms/python/blocks/Makefile.am
+++ b/grc/data/platforms/python/blocks/Makefile.am
@@ -82,6 +82,7 @@ dist_ourdata_DATA = \
 	gr_decode_ccsds_27_fb.xml \
 	gr_deinterleave.xml \
 	gr_delay.xml \
+	gr_descrambler_bb.xml \
 	gr_diff_decoder_bb.xml \
 	gr_diff_encoder_bb.xml \
 	gr_diff_phasor_cc.xml \
@@ -143,6 +144,7 @@ dist_ourdata_DATA = \
 	gr_repeat.xml \
 	gr_rms_xx.xml \
 	gr_sample_and_hold_xx.xml \
+	gr_scrambler_bb.xml \
 	gr_short_to_float.xml \
 	gr_sig_source_x.xml \
 	gr_simple_correlator.xml \
diff --git a/grc/data/platforms/python/blocks/gr_descrambler_bb.xml b/grc/data/platforms/python/blocks/gr_descrambler_bb.xml
new file mode 100644
index 000000000..5cfbcc203
--- /dev/null
+++ b/grc/data/platforms/python/blocks/gr_descrambler_bb.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Descrambler
+###################################################
+ -->
+<block>
+	<name>Descrambler</name>
+	<key>gr_descrambler_bb</key>
+	<import>from gnuradio import gr</import>
+	<make>gr.descrambler_bb($mask, $seed, $len)</make>
+	<param>
+		<name>Mask</name>
+		<key>mask</key>
+		<value>0x8A</value>
+		<type>hex</type>
+	</param>
+	<param>
+		<name>Seed</name>
+		<key>seed</key>
+		<value>0x7F</value>
+		<type>hex</type>
+	</param>
+	<param>
+		<name>Length</name>
+		<key>len</key>
+		<value>7</value>
+		<type>int</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>byte</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>byte</type>
+	</source>
+</block>
diff --git a/grc/data/platforms/python/blocks/gr_scrambler_bb.xml b/grc/data/platforms/python/blocks/gr_scrambler_bb.xml
new file mode 100644
index 000000000..d079c4015
--- /dev/null
+++ b/grc/data/platforms/python/blocks/gr_scrambler_bb.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Descrambler
+###################################################
+ -->
+<block>
+	<name>Scrambler</name>
+	<key>gr_scrambler_bb</key>
+	<import>from gnuradio import gr</import>
+	<make>gr.scrambler_bb($mask, $seed, $len)</make>
+	<param>
+		<name>Mask</name>
+		<key>mask</key>
+		<value>0x8A</value>
+		<type>hex</type>
+	</param>
+	<param>
+		<name>Seed</name>
+		<key>seed</key>
+		<value>0x7F</value>
+		<type>hex</type>
+	</param>
+	<param>
+		<name>Length</name>
+		<key>len</key>
+		<value>7</value>
+		<type>int</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>byte</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>byte</type>
+	</source>
+</block>