diff options
| author | Josh Blum | 2011-09-28 22:16:41 -0700 |
|---|---|---|
| committer | Josh Blum | 2011-09-28 22:16:41 -0700 |
| commit | 3f7db0afa99caeecb18428d7514dadd380d88d56 (patch) | |
| tree | b513683057e96d03ff8138100d6059d80e7b3265 /grc/blocks/trellis_encoder_xx.xml | |
| parent | 60fd23a703bb16065717159bdd5ec9edf03d7302 (diff) | |
| parent | 9e73c4e8372bc581d686d5e82a808894d41523ec (diff) | |
| download | gnuradio-3f7db0afa99caeecb18428d7514dadd380d88d56.tar.gz gnuradio-3f7db0afa99caeecb18428d7514dadd380d88d56.tar.bz2 gnuradio-3f7db0afa99caeecb18428d7514dadd380d88d56.zip | |
Merge branch 'next' into digital
Conflicts:
gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h
gnuradio-core/src/lib/general/general.i
gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.cc
gnuradio-core/src/lib/general/gr_pll_freqdet_cf.cc
gnuradio-core/src/lib/general/gr_pll_refout_cc.cc
gnuradio-core/src/python/gnuradio/gr/qa_pll_carriertracking.py
gnuradio-core/src/python/gnuradio/gr/qa_pll_freqdet.py
gnuradio-core/src/python/gnuradio/gr/qa_pll_refout.py
Diffstat (limited to 'grc/blocks/trellis_encoder_xx.xml')
| -rw-r--r-- | grc/blocks/trellis_encoder_xx.xml | 74 |
1 files changed, 0 insertions, 74 deletions
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 @@ -<?xml version="1.0"?> -<!-- -################################################### -##Trellis Encoder -################################################### - --> -<block> - <name>Trellis Encoder</name> - <key>trellis_encoder_xx</key> - <import>from gnuradio import trellis</import> - <make>trellis.encoder_$(type)(trellis.fsm($fsm_args), $init_state)</make> - <param> - <name>Type</name> - <key>type</key> - <type>enum</type> - <option> - <name>Byte->Byte</name> - <key>bb</key> - <opt>input:byte</opt> - <opt>output:byte</opt> - </option> - <option> - <name>Byte->Short</name> - <key>bs</key> - <opt>input:byte</opt> - <opt>output:short</opt> - </option> - <option> - <name>Byte->Int</name> - <key>bi</key> - <opt>input:byte</opt> - <opt>output:int</opt> - </option> - <option> - <name>Short->Short</name> - <key>ss</key> - <opt>input:short</opt> - <opt>output:short</opt> - </option> - <option> - <name>Short->Int</name> - <key>si</key> - <opt>input:short</opt> - <opt>output:int</opt> - </option> - <option> - <name>Int->Int</name> - <key>ii</key> - <opt>input:int</opt> - <opt>output:int</opt> - </option> - </param> - <param> - <name>FSM Args</name> - <key>fsm_args</key> - <type>raw</type> - </param> - <param> - <name>Initial State</name> - <key>init_state</key> - <type>int</type> - </param> - <sink> - <name>in</name> - <type>$type.input</type> - </sink> - <source> - <name>out</name> - <type>$type.output</type> - </source> - <doc> -The fsm arguments are passed directly to the trellis.fsm() constructor. - </doc> -</block> |