[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 02/03: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 02/03: Merge branch 'master' into next |
|
Date: |
Sun, 29 Mar 2015 02:27:30 +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 457c564ab13304af72effbc7a5b7297b27b88f97
Merge: 944a0a6 72c11a0
Author: Johnathan Corgan <address@hidden>
Date: Sat Mar 28 19:16:09 2015 -0700
Merge branch 'master' into next
gr-analog/grc/analog_ctcss_squelch_ff.xml | 1 +
.../include/gnuradio/analog/ctcss_squelch_ff.h | 2 +
gr-analog/lib/ctcss_squelch_ff_impl.cc | 70 +-
gr-analog/lib/ctcss_squelch_ff_impl.h | 10 +-
gr-analog/lib/pwr_squelch_cc_impl.cc | 14 +
gr-analog/lib/pwr_squelch_cc_impl.h | 4 +-
gr-analog/lib/squelch_base_cc_impl.cc | 4 +
gr-dtv/examples/README.dvbs2 | 4 +
gr-dtv/examples/dvbs2_tx.grc | 1914 ++++++++++++
gr-dtv/grc/CMakeLists.txt | 3 +
gr-dtv/grc/dtv_block_tree.xml | 6 +
gr-dtv/grc/dtv_dvbs2_interleaver_bb.xml | 220 ++
gr-dtv/grc/dtv_dvbs2_modulator_bc.xml | 265 ++
gr-dtv/grc/dtv_dvbs2_physical_cc.xml | 331 +++
gr-dtv/include/gnuradio/dtv/CMakeLists.txt | 3 +
gr-dtv/include/gnuradio/dtv/dvbs2_interleaver_bb.h | 57 +
gr-dtv/include/gnuradio/dtv/dvbs2_modulator_bc.h | 57 +
gr-dtv/include/gnuradio/dtv/dvbs2_physical_cc.h | 60 +
gr-dtv/lib/CMakeLists.txt | 3 +
gr-dtv/lib/atsc/atsc_interleaver_impl.cc | 1 +
gr-dtv/lib/dvbs2/dvbs2_interleaver_bb_impl.cc | 587 ++++
gr-dtv/lib/dvbs2/dvbs2_interleaver_bb_impl.h | 63 +
gr-dtv/lib/dvbs2/dvbs2_modulator_bc_impl.cc | 3040 ++++++++++++++++++++
gr-dtv/lib/dvbs2/dvbs2_modulator_bc_impl.h | 58 +
gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc | 800 ++++++
gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.h | 68 +
gr-dtv/swig/dtv_swig.i | 9 +
gr-filter/include/gnuradio/filter/iir_filter.h | 68 +-
gr-filter/lib/iir_filter.cc | 6 +-
gr-filter/lib/iir_filter_ccc_impl.cc | 2 +-
gr-filter/lib/iir_filter_ccc_impl.h | 2 +-
gr-filter/lib/iir_filter_ccd_impl.cc | 2 +-
gr-filter/lib/iir_filter_ccd_impl.h | 2 +-
gr-filter/lib/iir_filter_ccf_impl.cc | 2 +-
gr-filter/lib/iir_filter_ccf_impl.h | 2 +-
gr-filter/lib/iir_filter_ccz_impl.cc | 2 +-
gr-filter/lib/iir_filter_ccz_impl.h | 2 +-
gr-filter/lib/iir_filter_ffd_impl.cc | 2 +-
gr-filter/lib/iir_filter_ffd_impl.h | 2 +-
gr-uhd/include/gnuradio/uhd/usrp_source.h | 8 +
gr-uhd/lib/usrp_source_impl.cc | 12 +
gr-uhd/lib/usrp_source_impl.h | 1 +
42 files changed, 7721 insertions(+), 48 deletions(-)