[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 Jan 2016 22:24:45 +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 5632236167e81694947d992918a8035fa1bc2972
Merge: 4cf64f6 161147d
Author: Johnathan Corgan <address@hidden>
Date: Wed Jan 27 14:15:53 2016 -0800
Merge branch 'master' into next
gnuradio-runtime/include/gnuradio/sptr_magic.h | 1 +
gnuradio-runtime/lib/hier_block2.cc | 2 +
gnuradio-runtime/lib/sptr_magic.cc | 35 +-
gr-dtv/examples/CMakeLists.txt | 2 +
gr-dtv/examples/README.catv | 31 +
gr-dtv/examples/catv_tx_64qam.grc | 2079 ++++++++++++++++++++
gr-dtv/grc/CMakeLists.txt | 7 +-
gr-dtv/grc/dtv_block_tree.xml | 10 +-
gr-dtv/grc/dtv_catv_frame_sync_enc_bb.xml | 26 +
gr-dtv/grc/dtv_catv_randomizer_bb.xml | 20 +
gr-dtv/grc/dtv_catv_reed_solomon_enc_bb.xml | 20 +
gr-dtv/grc/dtv_catv_transport_framing_enc_bb.xml | 20 +
gr-dtv/grc/dtv_catv_trellis_enc_bb.xml | 20 +
gr-dtv/grc/dtv_dvbs2_modulator_bc.xml | 5 +
gr-dtv/include/gnuradio/dtv/CMakeLists.txt | 7 +-
...bs2_modulator_bc.h => catv_frame_sync_enc_bb.h} | 28 +-
.../{dvbs2_modulator_bc.h => catv_randomizer_bb.h} | 29 +-
...2_modulator_bc.h => catv_reed_solomon_enc_bb.h} | 27 +-
...ulator_bc.h => catv_transport_framing_enc_bb.h} | 29 +-
...{dvbs2_modulator_bc.h => catv_trellis_enc_bb.h} | 27 +-
gr-dtv/include/gnuradio/dtv/dvbs2_modulator_bc.h | 3 +-
gr-dtv/lib/CMakeLists.txt | 7 +-
gr-dtv/lib/catv/catv_frame_sync_enc_bb_impl.cc | 96 +
gr-dtv/lib/catv/catv_frame_sync_enc_bb_impl.h | 50 +
gr-dtv/lib/catv/catv_randomizer_bb_impl.cc | 104 +
gr-dtv/lib/catv/catv_randomizer_bb_impl.h | 49 +
gr-dtv/lib/catv/catv_reed_solomon_enc_bb_impl.cc | 153 ++
gr-dtv/lib/catv/catv_reed_solomon_enc_bb_impl.h | 56 +
.../lib/catv/catv_transport_framing_enc_bb_impl.cc | 131 ++
.../lib/catv/catv_transport_framing_enc_bb_impl.h | 84 +
gr-dtv/lib/catv/catv_trellis_enc_bb_impl.cc | 193 ++
gr-dtv/lib/catv/catv_trellis_enc_bb_impl.h | 60 +
gr-dtv/lib/dvbs2/dvbs2_modulator_bc_impl.cc | 70 +-
gr-dtv/swig/dtv_swig.i | 17 +-
gr-uhd/apps/uhd_app.py | 7 +-
35 files changed, 3414 insertions(+), 91 deletions(-)