From 938eea97126e985927bc15091d3ad148ed593578 Mon Sep 17 00:00:00 2001
From: Achilleas Anastasopoulos
Date: Sun, 12 Jun 2011 17:07:02 -0400
Subject: updated Makefile.am and block_tree.xml to reflect changes in grc file
for gr-trellis
---
grc/blocks/Makefile.am | 7 --
grc/blocks/block_tree.xml | 7 --
grc/blocks/trellis_encoder_xx.xml | 74 -----------------
grc/blocks/trellis_metrics_x.xml | 85 --------------------
grc/blocks/trellis_permutation.xml | 74 -----------------
grc/blocks/trellis_siso_combined_f.xml | 112 --------------------------
grc/blocks/trellis_siso_f.xml | 85 --------------------
grc/blocks/trellis_viterbi_combined_xx.xml | 123 -----------------------------
grc/blocks/trellis_viterbi_x.xml | 66 ----------------
9 files changed, 633 deletions(-)
delete mode 100644 grc/blocks/trellis_encoder_xx.xml
delete mode 100644 grc/blocks/trellis_metrics_x.xml
delete mode 100644 grc/blocks/trellis_permutation.xml
delete mode 100644 grc/blocks/trellis_siso_combined_f.xml
delete mode 100644 grc/blocks/trellis_siso_f.xml
delete mode 100644 grc/blocks/trellis_viterbi_combined_xx.xml
delete mode 100644 grc/blocks/trellis_viterbi_x.xml
(limited to 'grc')
diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am
index 14ffe8358..d7ca216f0 100644
--- a/grc/blocks/Makefile.am
+++ b/grc/blocks/Makefile.am
@@ -205,13 +205,6 @@ dist_ourdata_DATA = \
parameter.xml \
random_source_x.xml \
root_raised_cosine_filter.xml \
- trellis_encoder_xx.xml \
- trellis_metrics_x.xml \
- trellis_permutation.xml \
- trellis_siso_combined_f.xml \
- trellis_siso_f.xml \
- trellis_viterbi_combined_xx.xml \
- trellis_viterbi_x.xml \
variable.xml \
variable_config.xml \
variable_function_probe.xml \
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index 0b641d79c..9948b74fd 100644
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -235,13 +235,6 @@
Error Correction
Trellis
- trellis_encoder_xx
- trellis_metrics_x
- trellis_permutation
- trellis_siso_combined_f
- trellis_siso_f
- trellis_viterbi_combined_xx
- trellis_viterbi_x
gr_encode_ccsds_27_bb
diff --git a/grc/blocks/trellis_encoder_xx.xml b/grc/blocks/trellis_encoder_xx.xml
deleted file mode 100644
index 74a8cc346..000000000
--- a/grc/blocks/trellis_encoder_xx.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
- Trellis Encoder
- trellis_encoder_xx
- from gnuradio import trellis
- trellis.encoder_$(type)(trellis.fsm($fsm_args), $init_state)
-
- Type
- type
- enum
-
-
-
-
-
-
-
-
- FSM Args
- fsm_args
- raw
-
-
- Initial State
- init_state
- int
-
-
- in
- $type.input
-
-
- out
- $type.output
-
-
-The fsm arguments are passed directly to the trellis.fsm() constructor.
-
-
diff --git a/grc/blocks/trellis_metrics_x.xml b/grc/blocks/trellis_metrics_x.xml
deleted file mode 100644
index 2016a34c2..000000000
--- a/grc/blocks/trellis_metrics_x.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-
- Trellis Metrics
- trellis_metrics_x
- from gnuradio import trellis
- trellis.metrics_$(type)($card, $dim, $table, $metric_type)
- set_TABLE($table)
-
- Type
- type
- enum
-
-
-
-
-
-
- Output Cardinality
- card
- int
-
-
- Dimensionality
- dim
- int
-
-
- Constellation
- table
- $type.table
-
-
- Metric Type
- metric_type
- enum
-
-
-
-
-
- in
- $type.io
-
-
- out
- float
-
-
-Generate metrics required for Viterbi or SISO algorithms.
-
-
diff --git a/grc/blocks/trellis_permutation.xml b/grc/blocks/trellis_permutation.xml
deleted file mode 100644
index 7721cc71d..000000000
--- a/grc/blocks/trellis_permutation.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
- Trellis Permutation
- trellis_permutation
- from gnuradio import trellis
- trellis.permutation($block_size, $table, $syms_per_block, $type.size*$vlen)
-
- Type
- type
- enum
-
-
-
-
-
-
-
- Block Size
- block_size
- int
-
-
- Table
- table
- int_vector
-
-
- Symbols per Block
- syms_per_block
- int
-
-
- Vec Length
- vlen
- 1
- int
-
- $vlen > 0
-
- in
- $type
- $vlen
-
-
- out
- $type
- $vlen
-
-
diff --git a/grc/blocks/trellis_siso_combined_f.xml b/grc/blocks/trellis_siso_combined_f.xml
deleted file mode 100644
index 98874d7f4..000000000
--- a/grc/blocks/trellis_siso_combined_f.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-
-
-
- Trellis SISO Combo
- trellis_siso_combined_f
- from gnuradio import trellis
- trellis.siso_combined_f(trellis.fsm($fsm_args), $block_size, $init_state, $final_state, $a_post_in, $a_post_out, $siso_type, $dim, $table, $metric_type)
-
- FSM Args
- fsm_args
- raw
-
-
- Block Size
- block_size
- int
-
-
- Initial State
- init_state
- -1
- int
-
-
- Final State
- final_state
- -1
- int
-
-
- A-posteriori In
- a_post_in
- enum
-
-
-
-
- A-posteriori Out
- a_post_out
- enum
-
-
-
-
- SISO Type
- siso_type
- enum
-
-
-
-
- Dimensionality
- dim
- int
-
-
- Constellation
- table
- real_vector
-
-
- Metric Type
- metric_type
- enum
-
-
-
-
-
- in
- float
-
-
- out
- float
-
-
-BCJR Algorithm combined with metric calculation. \
-The fsm arguments are passed directly to the trellis.fsm() constructor.
-
-
diff --git a/grc/blocks/trellis_siso_f.xml b/grc/blocks/trellis_siso_f.xml
deleted file mode 100644
index 2b9cfe5f7..000000000
--- a/grc/blocks/trellis_siso_f.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-
- Trellis SISO
- trellis_siso_f
- from gnuradio import trellis
- trellis.siso_f(trellis.fsm($fsm_args), $block_size, $init_state, $final_state, $a_post_in, $a_post_out, $siso_type)
-
- FSM Args
- fsm_args
- raw
-
-
- Block Size
- block_size
- int
-
-
- Initial State
- init_state
- -1
- int
-
-
- Final State
- final_state
- -1
- int
-
-
- A-posteriori In
- a_post_in
- enum
-
-
-
-
- A-posteriori Out
- a_post_out
- enum
-
-
-
-
- SISO Type
- siso_type
- enum
-
-
-
-
- in
- float
-
-
- out
- float
-
-
-BCJR Algorithm. \
-The fsm arguments are passed directly to the trellis.fsm() constructor.
-
-
diff --git a/grc/blocks/trellis_viterbi_combined_xx.xml b/grc/blocks/trellis_viterbi_combined_xx.xml
deleted file mode 100644
index 33dcaaf73..000000000
--- a/grc/blocks/trellis_viterbi_combined_xx.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-
-
-
- Trellis Viterbi Combo
- trellis_viterbi_combined_xx
- from gnuradio import trellis
- trellis.viterbi_combined_$(type)$(out_type)(trellis.fsm($fsm_args), $block_size, $init_state, $final_state, $dim, $table, $metric_type)
- set_TABLE($table)
-
- Input Type
- type
- enum
-
-
-
-
-
-
- Output Type
- out_type
- enum
-
-
-
-
-
- FSM Args
- fsm_args
- raw
-
-
- Block Size
- block_size
- int
-
-
- Initial State
- init_state
- -1
- int
-
-
- Final State
- final_state
- -1
- int
-
-
- Dimensionality
- dim
- int
-
-
- Constellation
- table
- $type.table
-
-
- Metric Type
- metric_type
- enum
-
-
-
-
-
- in
- $type.io
-
-
- out
- $out_type.io
-
-
-Viterbi Decoder combined with metric calculation. \
-The fsm arguments are passed directly to the trellis.fsm() constructor.
-
-
diff --git a/grc/blocks/trellis_viterbi_x.xml b/grc/blocks/trellis_viterbi_x.xml
deleted file mode 100644
index 84b39677c..000000000
--- a/grc/blocks/trellis_viterbi_x.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
- Trellis Viterbi
- trellis_viterbi_x
- from gnuradio import trellis
- trellis.viterbi_$(type)(trellis.fsm($fsm_args), $block_size, $init_state, $final_state)
-
- Type
- type
- enum
-
-
-
-
-
- FSM Args
- fsm_args
- raw
-
-
- Block Size
- block_size
- int
-
-
- Initial State
- init_state
- -1
- int
-
-
- Final State
- final_state
- -1
- int
-
-
- in
- float
-
-
- out
- $type.io
-
-
-Viterbi Decoder. \
-The fsm arguments are passed directly to the trellis.fsm() constructor.
-
-
--
cgit