From a8a9f157e738461dec3a969992b6ec7bcc0b01f0 Mon Sep 17 00:00:00 2001
From: Achilleas Anastasopoulos
Date: Sun, 12 Jun 2011 17:05:46 -0400
Subject: Moved grc files from grc/block to gr-trellis/grc

---
 gr-trellis/grc/trellis_viterbi_x.xml | 69 ++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 gr-trellis/grc/trellis_viterbi_x.xml

(limited to 'gr-trellis/grc/trellis_viterbi_x.xml')

diff --git a/gr-trellis/grc/trellis_viterbi_x.xml b/gr-trellis/grc/trellis_viterbi_x.xml
new file mode 100644
index 000000000..5896209f1
--- /dev/null
+++ b/gr-trellis/grc/trellis_viterbi_x.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Trellis Viterbi
+###################################################
+ -->
+
+<category>Trellis</category>
+
+<block>
+	<name>Trellis Viterbi</name>
+	<key>trellis_viterbi_x</key>
+	<import>from gnuradio import trellis</import>
+	<make>trellis.viterbi_$(type)(trellis.fsm($fsm_args), $block_size, $init_state, $final_state)</make>
+	<param>
+		<name>Type</name>
+		<key>type</key>
+		<type>enum</type>
+		<option>
+			<name>Int</name>
+			<key>i</key>
+			<opt>io:int</opt>
+		</option>
+		<option>
+			<name>Short</name>
+			<key>s</key>
+			<opt>io:short</opt>
+		</option>
+		<option>
+			<name>Byte</name>
+			<key>b</key>
+			<opt>io:byte</opt>
+		</option>
+	</param>
+	<param>
+		<name>FSM Args</name>
+		<key>fsm_args</key>
+		<type>raw</type>
+	</param>
+	<param>
+		<name>Block Size</name>
+		<key>block_size</key>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Initial State</name>
+		<key>init_state</key>
+		<value>-1</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Final State</name>
+		<key>final_state</key>
+		<value>-1</value>
+		<type>int</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>float</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>$type.io</type>
+	</source>
+	<doc>
+Viterbi Decoder. \
+The fsm arguments are passed directly to the trellis.fsm() constructor.
+	</doc>
+</block>
-- 
cgit 


From d9955bc0ba633ebd4bb2964b656f47cd05ccd05f Mon Sep 17 00:00:00 2001
From: Achilleas Anastasopoulos
Date: Mon, 13 Jun 2011 18:38:03 -0400
Subject: added grc directory in gr-trellis

---
 gr-trellis/grc/trellis_viterbi_x.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-trellis/grc/trellis_viterbi_x.xml')

diff --git a/gr-trellis/grc/trellis_viterbi_x.xml b/gr-trellis/grc/trellis_viterbi_x.xml
index 5896209f1..3f85d95cb 100644
--- a/gr-trellis/grc/trellis_viterbi_x.xml
+++ b/gr-trellis/grc/trellis_viterbi_x.xml
@@ -5,11 +5,11 @@
 ###################################################
  -->
 
-<category>Trellis</category>
 
 <block>
 	<name>Trellis Viterbi</name>
 	<key>trellis_viterbi_x</key>
+	<category>Error Correction/Trellis</category>
 	<import>from gnuradio import trellis</import>
 	<make>trellis.viterbi_$(type)(trellis.fsm($fsm_args), $block_size, $init_state, $final_state)</make>
 	<param>
-- 
cgit 


From 8f6be2790220af5b4628de7daee3be4b494e3b3e Mon Sep 17 00:00:00 2001
From: Achilleas Anastasopoulos
Date: Wed, 31 Aug 2011 19:35:58 -0400
Subject: Added SCCC encoder/decoder grc blocksi and examples. Also moved all
 grc blocks related to trellis inside the gr-trellis/grc directory

---
 gr-trellis/grc/trellis_viterbi_x.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-trellis/grc/trellis_viterbi_x.xml')

diff --git a/gr-trellis/grc/trellis_viterbi_x.xml b/gr-trellis/grc/trellis_viterbi_x.xml
index 3f85d95cb..a0c69c36a 100644
--- a/gr-trellis/grc/trellis_viterbi_x.xml
+++ b/gr-trellis/grc/trellis_viterbi_x.xml
@@ -7,7 +7,7 @@
 
 
 <block>
-	<name>Trellis Viterbi</name>
+	<name>Viterbi</name>
 	<key>trellis_viterbi_x</key>
 	<category>Error Correction/Trellis</category>
 	<import>from gnuradio import trellis</import>
-- 
cgit 


From 02a32461e2f625f02ecbbe41354d59bf8dd5452b Mon Sep 17 00:00:00 2001
From: Achilleas Anastasopoulos
Date: Thu, 1 Sep 2011 17:33:53 -0400
Subject: Minor fixes in turbo GRC blocks

---
 gr-trellis/grc/trellis_viterbi_x.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-trellis/grc/trellis_viterbi_x.xml')

diff --git a/gr-trellis/grc/trellis_viterbi_x.xml b/gr-trellis/grc/trellis_viterbi_x.xml
index a0c69c36a..d97e6707a 100644
--- a/gr-trellis/grc/trellis_viterbi_x.xml
+++ b/gr-trellis/grc/trellis_viterbi_x.xml
@@ -45,7 +45,7 @@
 	<param>
 		<name>Initial State</name>
 		<key>init_state</key>
-		<value>-1</value>
+		<value>0</value>
 		<type>int</type>
 	</param>
 	<param>
-- 
cgit