diff options
| author | Achilleas Anastasopoulos <anastas@umich.edu> | 2011-06-13 18:38:03 -0400 |
|---|---|---|
| committer | Achilleas Anastasopoulos <anastas@umich.edu> | 2011-06-13 18:38:03 -0400 |
| commit | d9955bc0ba633ebd4bb2964b656f47cd05ccd05f (patch) | |
| tree | d7142da7070fc7274968afc52f288f3b9c79d390 /gr-trellis | |
| parent | 938eea97126e985927bc15091d3ad148ed593578 (diff) | |
added grc directory in gr-trellis
Diffstat (limited to 'gr-trellis')
| -rw-r--r-- | gr-trellis/Makefile.am | 2 | ||||
| -rw-r--r-- | gr-trellis/grc/.gitignore | 23 | ||||
| -rw-r--r-- | gr-trellis/grc/Makefile.am | 33 | ||||
| -rw-r--r-- | gr-trellis/grc/trellis_encoder_xx.xml | 3 | ||||
| -rw-r--r-- | gr-trellis/grc/trellis_metrics_x.xml | 2 | ||||
| -rw-r--r-- | gr-trellis/grc/trellis_permutation.xml | 2 | ||||
| -rw-r--r-- | gr-trellis/grc/trellis_siso_combined_f.xml | 2 | ||||
| -rw-r--r-- | gr-trellis/grc/trellis_siso_f.xml | 2 | ||||
| -rw-r--r-- | gr-trellis/grc/trellis_viterbi_combined_xx.xml | 2 | ||||
| -rw-r--r-- | gr-trellis/grc/trellis_viterbi_x.xml | 2 |
10 files changed, 64 insertions, 9 deletions
diff --git a/gr-trellis/Makefile.am b/gr-trellis/Makefile.am index d68fb59c9d..89d190ecfc 100644 --- a/gr-trellis/Makefile.am +++ b/gr-trellis/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -SUBDIRS = src doc +SUBDIRS = src grc doc pkgconfigdir = $(libdir)/pkgconfig dist_pkgconfig_DATA = gnuradio-trellis.pc diff --git a/gr-trellis/grc/.gitignore b/gr-trellis/grc/.gitignore new file mode 100644 index 0000000000..f3462d009e --- /dev/null +++ b/gr-trellis/grc/.gitignore @@ -0,0 +1,23 @@ +/Makefile +/Makefile.in +/aclocal.m4 +/configure +/config.h.in +/stamp-h.in +/libtool +/config.log +/config.h +/config.cache +/config.status +/missing +/stamp-h +/stamp-h1 +/.deps +/.libs +/*.la +/*.lo +/autom4te.cache +/*.cache +/missing +/make.log +/*.pc diff --git a/gr-trellis/grc/Makefile.am b/gr-trellis/grc/Makefile.am new file mode 100644 index 0000000000..377f5e8460 --- /dev/null +++ b/gr-trellis/grc/Makefile.am @@ -0,0 +1,33 @@ +# +# Copyright 2009 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# + +include $(top_srcdir)/Makefile.common + +grcblocksdir = $(grc_blocksdir) + +dist_grcblocks_DATA = \ + trellis_encoder_xx.xml \ + trellis_siso_combined_f.xml \ + trellis_viterbi_x.xml \ + trellis_metrics_x.xml \ + trellis_siso_f.xml \ + trellis_permutation.xml \ + trellis_viterbi_combined_xx.xml diff --git a/gr-trellis/grc/trellis_encoder_xx.xml b/gr-trellis/grc/trellis_encoder_xx.xml index 6d7ef122ec..717e04cee5 100644 --- a/gr-trellis/grc/trellis_encoder_xx.xml +++ b/gr-trellis/grc/trellis_encoder_xx.xml @@ -5,11 +5,10 @@ ################################################### --> -<category>Trellis</category> - <block> <name>Trellis Encoder</name> <key>trellis_encoder_xx</key> + <category>Error Correction/Trellis</category> <import>from gnuradio import trellis</import> <make>trellis.encoder_$(type)(trellis.fsm($fsm_args), $init_state)</make> <param> diff --git a/gr-trellis/grc/trellis_metrics_x.xml b/gr-trellis/grc/trellis_metrics_x.xml index d00f2350c7..ccb59a36e2 100644 --- a/gr-trellis/grc/trellis_metrics_x.xml +++ b/gr-trellis/grc/trellis_metrics_x.xml @@ -5,11 +5,11 @@ ################################################### --> -<category>Trellis</category> <block> <name>Trellis Metrics</name> <key>trellis_metrics_x</key> + <category>Error Correction/Trellis</category> <import>from gnuradio import trellis</import> <make>trellis.metrics_$(type)($card, $dim, $table, $metric_type)</make> <callback>set_TABLE($table)</callback> diff --git a/gr-trellis/grc/trellis_permutation.xml b/gr-trellis/grc/trellis_permutation.xml index 8804177e9d..6bd14e6b79 100644 --- a/gr-trellis/grc/trellis_permutation.xml +++ b/gr-trellis/grc/trellis_permutation.xml @@ -5,11 +5,11 @@ ################################################### --> -<category>Trellis</category> <block> <name>Trellis Permutation</name> <key>trellis_permutation</key> + <category>Error Correction/Trellis</category> <import>from gnuradio import trellis</import> <make>trellis.permutation($block_size, $table, $syms_per_block, $type.size*$vlen)</make> <param> diff --git a/gr-trellis/grc/trellis_siso_combined_f.xml b/gr-trellis/grc/trellis_siso_combined_f.xml index 0f96a322c9..48ed8dd760 100644 --- a/gr-trellis/grc/trellis_siso_combined_f.xml +++ b/gr-trellis/grc/trellis_siso_combined_f.xml @@ -5,11 +5,11 @@ ################################################### --> -<category>Trellis</category> <block> <name>Trellis SISO Combo</name> <key>trellis_siso_combined_f</key> + <category>Error Correction/Trellis</category> <import>from gnuradio import trellis</import> <make>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)</make> <param> diff --git a/gr-trellis/grc/trellis_siso_f.xml b/gr-trellis/grc/trellis_siso_f.xml index 897cc07030..21af005fa2 100644 --- a/gr-trellis/grc/trellis_siso_f.xml +++ b/gr-trellis/grc/trellis_siso_f.xml @@ -5,11 +5,11 @@ ################################################### --> -<category>Trellis</category> <block> <name>Trellis SISO</name> <key>trellis_siso_f</key> + <category>Error Correction/Trellis</category> <import>from gnuradio import trellis</import> <make>trellis.siso_f(trellis.fsm($fsm_args), $block_size, $init_state, $final_state, $a_post_in, $a_post_out, $siso_type)</make> <param> diff --git a/gr-trellis/grc/trellis_viterbi_combined_xx.xml b/gr-trellis/grc/trellis_viterbi_combined_xx.xml index bb7396ab8c..874c64a587 100644 --- a/gr-trellis/grc/trellis_viterbi_combined_xx.xml +++ b/gr-trellis/grc/trellis_viterbi_combined_xx.xml @@ -5,11 +5,11 @@ ################################################### --> -<category>Trellis</category> <block> <name>Trellis Viterbi Combo</name> <key>trellis_viterbi_combined_xx</key> + <category>Error Correction/Trellis</category> <import>from gnuradio import trellis</import> <make>trellis.viterbi_combined_$(type)$(out_type)(trellis.fsm($fsm_args), $block_size, $init_state, $final_state, $dim, $table, $metric_type)</make> <callback>set_TABLE($table)</callback> diff --git a/gr-trellis/grc/trellis_viterbi_x.xml b/gr-trellis/grc/trellis_viterbi_x.xml index 5896209f1e..3f85d95cbf 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> |