[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
|
Date: |
Wed, 27 May 2015 17:25:39 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit ec714f97c495ac3cc4d7ae98a6e94c1878b5a71b
Merge: 7cbbe1d 71ab508
Author: Johnathan Corgan <address@hidden>
Date: Wed May 27 10:19:40 2015 -0700
Merge branch 'master' into next
gr-dtv/examples/README.dvbt | 4 +
gr-dtv/examples/dvbt_tx_2k.grc | 2076 ++++++++++++++++++++
gr-dtv/examples/dvbt_tx_8k.grc | 2076 ++++++++++++++++++++
gr-dtv/grc/CMakeLists.txt | 8 +
gr-dtv/grc/dtv_block_tree.xml | 11 +
gr-dtv/grc/dtv_dvbt_bit_inner_interleaver.xml | 89 +
gr-dtv/grc/dtv_dvbt_convolutional_interleaver.xml | 43 +
gr-dtv/grc/dtv_dvbt_energy_dispersal.xml | 29 +
gr-dtv/grc/dtv_dvbt_inner_coder.xml | 112 ++
gr-dtv/grc/dtv_dvbt_map.xml | 90 +
gr-dtv/grc/dtv_dvbt_reed_solomon_enc.xml | 70 +
gr-dtv/grc/dtv_dvbt_reference_signals.xml | 222 +++
gr-dtv/grc/dtv_dvbt_symbol_inner_interleaver.xml | 56 +
gr-dtv/include/gnuradio/dtv/CMakeLists.txt | 9 +
gr-dtv/include/gnuradio/dtv/dvb_config.h | 12 +
gr-dtv/include/gnuradio/dtv/dvbt2_config.h | 11 -
gr-dtv/include/gnuradio/dtv/dvbt2_framemapper_cc.h | 2 +-
.../gnuradio/dtv/dvbt2_freqinterleaver_cc.h | 3 +-
gr-dtv/include/gnuradio/dtv/dvbt2_miso_cc.h | 3 +-
gr-dtv/include/gnuradio/dtv/dvbt2_p1insertion_cc.h | 3 +-
gr-dtv/include/gnuradio/dtv/dvbt2_paprtr_cc.h | 3 +-
.../include/gnuradio/dtv/dvbt2_pilotgenerator_cc.h | 3 +-
.../gnuradio/dtv/dvbt_bit_inner_interleaver.h | 67 +
.../gnuradio/dtv/dvbt_config.h} | 38 +-
.../gnuradio/dtv/dvbt_convolutional_interleaver.h | 58 +
.../gnuradio/dtv/dvbt_energy_dispersal.h} | 45 +-
gr-dtv/include/gnuradio/dtv/dvbt_inner_coder.h | 69 +
gr-dtv/include/gnuradio/dtv/dvbt_map.h | 65 +
.../include/gnuradio/dtv/dvbt_reed_solomon_enc.h | 61 +
.../include/gnuradio/dtv/dvbt_reference_signals.h | 71 +
.../gnuradio/dtv/dvbt_symbol_inner_interleaver.h | 66 +
gr-dtv/lib/CMakeLists.txt | 10 +
gr-dtv/lib/dvbt/dvbt_bit_inner_interleaver_impl.cc | 191 ++
gr-dtv/lib/dvbt/dvbt_bit_inner_interleaver_impl.h | 65 +
gr-dtv/lib/dvbt/dvbt_configure.cc | 274 +++
gr-dtv/lib/dvbt/dvbt_configure.h | 103 +
.../dvbt/dvbt_convolutional_interleaver_impl.cc | 89 +
.../dvbt_convolutional_interleaver_impl.h} | 27 +-
gr-dtv/lib/dvbt/dvbt_energy_dispersal_impl.cc | 150 ++
gr-dtv/lib/dvbt/dvbt_energy_dispersal_impl.h | 65 +
gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc | 257 +++
gr-dtv/lib/dvbt/dvbt_inner_coder_impl.h | 78 +
gr-dtv/lib/dvbt/dvbt_map_impl.cc | 163 ++
gr-dtv/lib/dvbt/dvbt_map_impl.h | 72 +
gr-dtv/lib/dvbt/dvbt_reed_solomon.cc | 475 +++++
gr-dtv/lib/dvbt/dvbt_reed_solomon.h | 70 +
gr-dtv/lib/dvbt/dvbt_reed_solomon_enc_impl.cc | 103 +
gr-dtv/lib/dvbt/dvbt_reed_solomon_enc_impl.h | 62 +
gr-dtv/lib/dvbt/dvbt_reference_signals_impl.cc | 1280 ++++++++++++
gr-dtv/lib/dvbt/dvbt_reference_signals_impl.h | 258 +++
.../lib/dvbt/dvbt_symbol_inner_interleaver_impl.cc | 225 +++
.../lib/dvbt/dvbt_symbol_inner_interleaver_impl.h | 70 +
gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc | 4 +-
gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.h | 2 +-
gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.cc | 4 +-
gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.h | 2 +-
gr-dtv/lib/dvbt2/dvbt2_miso_cc_impl.cc | 4 +-
gr-dtv/lib/dvbt2/dvbt2_miso_cc_impl.h | 2 +-
gr-dtv/lib/dvbt2/dvbt2_p1insertion_cc_impl.cc | 4 +-
gr-dtv/lib/dvbt2/dvbt2_p1insertion_cc_impl.h | 2 +-
gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.cc | 4 +-
gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.h | 2 +-
gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc | 4 +-
gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.h | 2 +-
gr-dtv/swig/dtv_swig.i | 26 +
65 files changed, 9532 insertions(+), 92 deletions(-)