[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5 |
Date: |
Tue, 29 Dec 2015 22:49:26 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next-qt5
in repository gnuradio.
commit a6d80b8ab4390963be23d117fa02afb59e5472cb
Merge: d0b9dcf d2c6938
Author: Johnathan Corgan <address@hidden>
Date: Tue Dec 29 14:18:53 2015 -0800
Merge branch 'next' into next-qt5
cmake/Packaging/Ubuntu-15.10.cmake | 13 ++
gr-dtv/CMakeLists.txt | 2 +
gr-dtv/examples/CMakeLists.txt | 25 +++-
gr-dtv/examples/atsc_ctrlport_monitor.py | 149 +++++++++++++++++++++
gr-dtv/include/gnuradio/dtv/atsc_equalizer.h | 3 +
gr-dtv/include/gnuradio/dtv/atsc_rs_decoder.h | 15 +++
gr-dtv/include/gnuradio/dtv/atsc_viterbi_decoder.h | 6 +
gr-dtv/lib/atsc/atsc_equalizer_impl.cc | 89 +++++++++---
gr-dtv/lib/atsc/atsc_equalizer_impl.h | 7 +-
gr-dtv/lib/atsc/atsc_rs_decoder_impl.cc | 89 +++++++++---
gr-dtv/lib/atsc/atsc_rs_decoder_impl.h | 13 +-
gr-dtv/lib/atsc/atsc_single_viterbi.cc | 65 +++++----
gr-dtv/lib/atsc/atsc_single_viterbi.h | 17 ++-
gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.cc | 25 ++++
gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.h | 4 +
gr-uhd/include/gnuradio/uhd/usrp_source.h | 5 +-
gr-uhd/lib/usrp_sink_impl.cc | 6 +-
gr-uhd/lib/usrp_source_impl.cc | 45 ++++---
gr-uhd/lib/usrp_source_impl.h | 4 +-
19 files changed, 482 insertions(+), 100 deletions(-)