diff options
Diffstat (limited to 'gr-trellis/grc')
| -rw-r--r-- | gr-trellis/grc/trellis_encoder_xx.xml | 2 | ||||
| -rw-r--r-- | gr-trellis/grc/trellis_metrics_x.xml | 3 | ||||
| -rw-r--r-- | gr-trellis/grc/trellis_pccc_decoder_combined_xx.xml | 2 | ||||
| -rw-r--r-- | gr-trellis/grc/trellis_permutation.xml | 4 | ||||
| -rw-r--r-- | gr-trellis/grc/trellis_sccc_decoder_combined_xx.xml | 2 | ||||
| -rw-r--r-- | gr-trellis/grc/trellis_siso_combined_f.xml | 16 | ||||
| -rw-r--r-- | gr-trellis/grc/trellis_siso_f.xml | 13 | ||||
| -rw-r--r-- | gr-trellis/grc/trellis_viterbi_combined_xx.xml | 8 | ||||
| -rw-r--r-- | gr-trellis/grc/trellis_viterbi_x.xml | 4 |
9 files changed, 49 insertions, 5 deletions
diff --git a/gr-trellis/grc/trellis_encoder_xx.xml b/gr-trellis/grc/trellis_encoder_xx.xml index d877d53c5..c4259ffb9 100644 --- a/gr-trellis/grc/trellis_encoder_xx.xml +++ b/gr-trellis/grc/trellis_encoder_xx.xml @@ -11,6 +11,8 @@ <category>Trellis Coding</category> <import>from gnuradio import trellis</import> <make>trellis.encoder_$(type)(trellis.fsm($fsm_args), $init_state)</make> + <callback>set_FSM(trellis.fsm($fsm_args))</callback> + <callback>set_ST($init_state)</callback> <param> <name>Type</name> <key>type</key> diff --git a/gr-trellis/grc/trellis_metrics_x.xml b/gr-trellis/grc/trellis_metrics_x.xml index f551bc152..8bb978f27 100644 --- a/gr-trellis/grc/trellis_metrics_x.xml +++ b/gr-trellis/grc/trellis_metrics_x.xml @@ -12,6 +12,9 @@ <category>Trellis Coding</category> <import>from gnuradio import trellis, digital</import> <make>trellis.metrics_$(type)($card, $dim, $table, $metric_type)</make> + <callback>set_O($card)</callback> + <callback>set_D($dim)</callback> + <callback>set_TYPE($metric_type)</callback> <callback>set_TABLE($table)</callback> <param> <name>Type</name> diff --git a/gr-trellis/grc/trellis_pccc_decoder_combined_xx.xml b/gr-trellis/grc/trellis_pccc_decoder_combined_xx.xml index 9bb4b034a..ff727fbf8 100644 --- a/gr-trellis/grc/trellis_pccc_decoder_combined_xx.xml +++ b/gr-trellis/grc/trellis_pccc_decoder_combined_xx.xml @@ -21,7 +21,7 @@ $dim, $table, $metric_type, $scaling) </make> - <callback>set_TABLE($table)</callback> + <callback>set_scaling($scaling)</callback> <param> <name>Input Type</name> <key>type</key> diff --git a/gr-trellis/grc/trellis_permutation.xml b/gr-trellis/grc/trellis_permutation.xml index bf6fc3ff1..0f118e889 100644 --- a/gr-trellis/grc/trellis_permutation.xml +++ b/gr-trellis/grc/trellis_permutation.xml @@ -12,6 +12,10 @@ <category>Trellis Coding</category> <import>from gnuradio import trellis</import> <make>trellis.permutation($interleaver_size, $table, $syms_per_block, $type.size*$vlen)</make> + <callback>set_K($interleaver_size)</callback> + <callback>set_TABLE($table)</callback> + <callback>set_SYMS_PER_BLOCK($syms_per_block)</callback> + <param> <name>Type</name> <key>type</key> diff --git a/gr-trellis/grc/trellis_sccc_decoder_combined_xx.xml b/gr-trellis/grc/trellis_sccc_decoder_combined_xx.xml index bacc16cf5..4947376d9 100644 --- a/gr-trellis/grc/trellis_sccc_decoder_combined_xx.xml +++ b/gr-trellis/grc/trellis_sccc_decoder_combined_xx.xml @@ -21,7 +21,7 @@ $dim, $table, $metric_type, $scaling) </make> - <callback>set_TABLE($table)</callback> + <callback>set_scaling($scaling)</callback> <param> <name>Input Type</name> <key>type</key> diff --git a/gr-trellis/grc/trellis_siso_combined_f.xml b/gr-trellis/grc/trellis_siso_combined_f.xml index 95eceeea3..542bba6d8 100644 --- a/gr-trellis/grc/trellis_siso_combined_f.xml +++ b/gr-trellis/grc/trellis_siso_combined_f.xml @@ -12,6 +12,16 @@ <category>Trellis Coding</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> + <callback>set_FSM(trellis.fsm($fsm_args))</callback> + <callback>set_K($block_size)</callback> + <callback>set_S0($init_state)</callback> + <callback>set_SK($final_state)</callback> + <callback>set_POSTI($a_post_in)</callback> + <callback>set_POSTO($a_post_out)</callback> + <callback>set_SISO_TYPE($siso_type)</callback> + <callback>set_D($dim)</callback> + <callback>set_TABLE($table)</callback> + <callback>set_TYPE($metric_type)</callback> <param> <name>FSM Args</name> <key>fsm_args</key> @@ -101,7 +111,11 @@ </option> </param> <sink> - <name>in</name> + <name>in_i</name> + <type>float</type> + </sink> + <sink> + <name>in_o</name> <type>float</type> </sink> <source> diff --git a/gr-trellis/grc/trellis_siso_f.xml b/gr-trellis/grc/trellis_siso_f.xml index 67eeb2718..30849d272 100644 --- a/gr-trellis/grc/trellis_siso_f.xml +++ b/gr-trellis/grc/trellis_siso_f.xml @@ -12,6 +12,13 @@ <category>Trellis Coding</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> + <callback>set_FSM(trellis.fsm($fsm_args))</callback> + <callback>set_K($block_size)</callback> + <callback>set_S0($init_state)</callback> + <callback>set_SK($final_state)</callback> + <callback>set_POSTI($a_post_in)</callback> + <callback>set_POSTO($a_post_out)</callback> + <callback>set_SISO_TYPE($siso_type)</callback> <param> <name>FSM Args</name> <key>fsm_args</key> @@ -75,7 +82,11 @@ </param> <check>(isinstance(eval(""" $fsm_args """[1:-1], locals(),globals()), str) and open($fsm_args).close()) or True</check> <sink> - <name>in</name> + <name>priori</name> + <type>float</type> + </sink> + <sink> + <name>prioro</name> <type>float</type> </sink> <source> diff --git a/gr-trellis/grc/trellis_viterbi_combined_xx.xml b/gr-trellis/grc/trellis_viterbi_combined_xx.xml index 81b49860a..9c755dc52 100644 --- a/gr-trellis/grc/trellis_viterbi_combined_xx.xml +++ b/gr-trellis/grc/trellis_viterbi_combined_xx.xml @@ -12,7 +12,13 @@ <category>Trellis Coding</category> <import>from gnuradio import trellis, digital</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> + <callback>set_FSM(trellis.fsm($fsm_args))</callback> + <callback>set_K($block_size)</callback> + <callback>set_S0($init_state)</callback> + <callback>set_SK($final_state)</callback> + <callback>set_D($dim)</callback> + <callback>set_TABLE($table)</callback> + <callback>set_TYPE($metric_type)</callback> <param> <name>Input Type</name> <key>type</key> diff --git a/gr-trellis/grc/trellis_viterbi_x.xml b/gr-trellis/grc/trellis_viterbi_x.xml index 734bb5386..9083061e6 100644 --- a/gr-trellis/grc/trellis_viterbi_x.xml +++ b/gr-trellis/grc/trellis_viterbi_x.xml @@ -12,6 +12,10 @@ <category>Trellis Coding</category> <import>from gnuradio import trellis</import> <make>trellis.viterbi_$(type)(trellis.fsm($fsm_args), $block_size, $init_state, $final_state)</make> + <callback>set_FSM(trellis.fsm($fsm_args))</callback> + <callback>set_K($block_size)</callback> + <callback>set_S0($init_state)</callback> + <callback>set_SK($final_state)</callback> <param> <name>Type</name> <key>type</key> |