diff options
| author | Josh Blum <josh@joshknows.com> | 2011-09-28 22:16:41 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-09-28 22:16:41 -0700 |
| commit | 3f7db0afa99caeecb18428d7514dadd380d88d56 (patch) | |
| tree | b513683057e96d03ff8138100d6059d80e7b3265 /gr-trellis/src/lib/generate_trellis.py | |
| parent | 60fd23a703bb16065717159bdd5ec9edf03d7302 (diff) | |
| parent | 9e73c4e8372bc581d686d5e82a808894d41523ec (diff) | |
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 'gr-trellis/src/lib/generate_trellis.py')
| -rw-r--r-- | gr-trellis/src/lib/generate_trellis.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gr-trellis/src/lib/generate_trellis.py b/gr-trellis/src/lib/generate_trellis.py index 9f845f74a4..31bc44aac0 100644 --- a/gr-trellis/src/lib/generate_trellis.py +++ b/gr-trellis/src/lib/generate_trellis.py @@ -33,9 +33,10 @@ other_roots = [ 'trellis_metrics_X', 'trellis_viterbi_X', 'trellis_viterbi_combined_XX', - 'trellis_sccc_decoder_combined_XX', 'trellis_sccc_decoder_X', + 'trellis_sccc_decoder_combined_XX', 'trellis_pccc_decoder_X', + 'trellis_pccc_decoder_combined_XX', ] other_signatures = ( @@ -45,9 +46,10 @@ other_signatures = ( ['s','i','f','c'], ['b','s','i'], ['sb','ss','si','ib','is','ii','fb','fs','fi','cb','cs','ci'], - ['fb','fs','fi','cb','cs','ci'], ['b','s','i'], + ['fb','fs','fi','cb','cs','ci'], ['b','s','i'], + ['fb','fs','fi','cb','cs','ci'], ) |