[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: |
Sun, 6 Sep 2015 01:19:41 +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 24c336cd99d8012681d40ccb00b1966e3c28450f
Merge: 273e506 45c0fee
Author: Johnathan Corgan <address@hidden>
Date: Sat Sep 5 18:05:13 2015 -0700
Merge branch 'master' into next
Conflicts:
gr-atsc/lib/qa_atsci_fake_single_viterbi.cc
gr-atsc/lib/qa_atsci_fs_correlator.cc
gr-atsc/lib/qa_atsci_single_viterbi.cc
gnuradio-runtime/apps/evaluation_random_numbers.py | 139 +++++
gnuradio-runtime/include/gnuradio/random.h | 54 +-
gnuradio-runtime/lib/math/random.cc | 131 ++---
gnuradio-runtime/python/gnuradio/gr/qa_random.py | 64 +++
gnuradio-runtime/swig/runtime_swig.i | 2 +
gr-blocks/grc/blocks_tag_object.xml | 1 +
gr-dtv/grc/CMakeLists.txt | 8 +
gr-dtv/grc/dtv_block_tree.xml | 8 +
gr-dtv/grc/dtv_dvbt_bit_inner_deinterleaver.xml | 89 ++++
.../grc/dtv_dvbt_convolutional_deinterleaver.xml | 43 ++
gr-dtv/grc/dtv_dvbt_demap.xml | 90 ++++
...ls.xml => dtv_dvbt_demod_reference_signals.xml} | 14 +-
gr-dtv/grc/dtv_dvbt_energy_descramble.xml | 29 ++
gr-dtv/grc/dtv_dvbt_ofdm_sym_acquisition.xml | 76 +++
gr-dtv/grc/dtv_dvbt_reed_solomon_dec.xml | 70 +++
gr-dtv/grc/dtv_dvbt_reference_signals.xml | 2 +-
gr-dtv/grc/dtv_dvbt_viterbi_decoder.xml | 120 +++++
.../{dvbt_map.h => dvbt_bit_inner_deinterleaver.h} | 38 +-
...bt_map.h => dvbt_convolutional_deinterleaver.h} | 37 +-
.../gnuradio/dtv/{dvbt_map.h => dvbt_demap.h} | 24 +-
.../gnuradio/dtv/dvbt_demod_reference_signals.h | 73 +++
.../dtv/{dvbt_map.h => dvbt_energy_descramble.h} | 37 +-
gr-dtv/include/gnuradio/dtv/dvbt_map.h | 4 +-
.../{dvbt_map.h => dvbt_ofdm_sym_acquisition.h} | 33 +-
.../dtv/{dvbt_map.h => dvbt_reed_solomon_dec.h} | 40 +-
.../dtv/{dvbt_map.h => dvbt_viterbi_decoder.h} | 42 +-
gr-dtv/lib/CMakeLists.txt | 10 +
.../lib/dvbt/dvbt_bit_inner_deinterleaver_impl.cc | 191 +++++++
.../lib/dvbt/dvbt_bit_inner_deinterleaver_impl.h | 65 +++
.../dvbt/dvbt_convolutional_deinterleaver_impl.cc | 137 +++++
.../dvbt/dvbt_convolutional_deinterleaver_impl.h | 57 +++
gr-dtv/lib/dvbt/dvbt_demap_impl.cc | 185 +++++++
gr-dtv/lib/dvbt/dvbt_demap_impl.h | 71 +++
.../lib/dvbt/dvbt_demod_reference_signals_impl.cc | 152 ++++++
.../lib/dvbt/dvbt_demod_reference_signals_impl.h | 68 +++
gr-dtv/lib/dvbt/dvbt_energy_descramble_impl.cc | 156 ++++++
gr-dtv/lib/dvbt/dvbt_energy_descramble_impl.h | 65 +++
gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc | 417 +++++++++++++++
gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.h | 105 ++++
gr-dtv/lib/dvbt/dvbt_reed_solomon_dec_impl.cc | 106 ++++
gr-dtv/lib/dvbt/dvbt_reed_solomon_dec_impl.h | 62 +++
gr-dtv/lib/dvbt/dvbt_reference_signals_impl.cc | 19 +-
.../lib/dvbt/dvbt_symbol_inner_interleaver_impl.cc | 2 +-
gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.cc | 495 ++++++++++++++++++
gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.h | 125 +++++
gr-dtv/swig/dtv_swig.i | 24 +
gr-filter/lib/qa_fir_filter_with_buffer.cc | 4 +-
gr-qtgui/examples/CMakeLists.txt | 1 +
gr-qtgui/examples/qtgui_vector_sink_example.grc | 565 +++++++++++----------
49 files changed, 3823 insertions(+), 527 deletions(-)