[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: |
Sat, 6 Aug 2016 22:28:37 +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 d6b4e78b722a81de8def0730d44b1d0a94d846c7
Merge: e09246a fc1a6a8
Author: Johnathan Corgan <address@hidden>
Date: Sat Aug 6 15:24:01 2016 -0700
Merge branch 'next' into next-qt5
gnuradio-runtime/include/gnuradio/attributes.h | 8 +-
gnuradio-runtime/include/gnuradio/basic_block.h | 6 ++
gnuradio-runtime/include/gnuradio/block.h | 24 ++++++
gnuradio-runtime/include/gnuradio/hier_block2.h | 25 ++++++
gnuradio-runtime/lib/block.cc | 14 ++++
gnuradio-runtime/lib/hier_block2.cc | 12 +++
gnuradio-runtime/lib/hier_block2_detail.cc | 18 ++++
gnuradio-runtime/lib/hier_block2_detail.h | 3 +
gnuradio-runtime/swig/block.i | 3 +
gnuradio-runtime/swig/hier_block2.i | 3 +
gr-blocks/python/blocks/qa_logger.py | 96 ++++++++++++++++++++++
.../lib/dvbt/dvbt_bit_inner_deinterleaver_impl.cc | 10 ++-
gr-dtv/lib/dvbt/dvbt_bit_inner_interleaver_impl.cc | 8 +-
gr-filter/examples/benchmark_filters.py | 32 +++-----
gr-filter/grc/filter_fractional_resampler_xx.xml | 7 +-
.../gnuradio/filter/fractional_resampler_cc.h | 5 ++
.../gnuradio/filter/fractional_resampler_ff.h | 6 ++
gr-filter/lib/fractional_resampler_cc_impl.cc | 26 ++++++
gr-filter/lib/fractional_resampler_cc_impl.h | 2 +
gr-filter/lib/fractional_resampler_ff_impl.cc | 27 ++++++
gr-filter/lib/fractional_resampler_ff_impl.h | 2 +
gr-qtgui/apps/gr_constellation_plot | 31 +++----
gr-qtgui/apps/gr_psd_plot_b | 15 ++--
gr-qtgui/apps/gr_psd_plot_c | 15 ++--
gr-qtgui/apps/gr_psd_plot_f | 15 ++--
gr-qtgui/apps/gr_psd_plot_i | 15 ++--
gr-qtgui/apps/gr_psd_plot_s | 15 ++--
gr-qtgui/apps/gr_spectrogram_plot | 57 +++++++------
gr-qtgui/apps/gr_spectrogram_plot_b | 15 ++--
gr-qtgui/apps/gr_spectrogram_plot_c | 15 ++--
gr-qtgui/apps/gr_spectrogram_plot_f | 15 ++--
gr-qtgui/apps/gr_spectrogram_plot_i | 15 ++--
gr-qtgui/apps/gr_spectrogram_plot_s | 15 ++--
gr-qtgui/apps/gr_time_plot_b | 11 ++-
gr-qtgui/apps/gr_time_plot_c | 11 ++-
gr-qtgui/apps/gr_time_plot_f | 11 ++-
gr-qtgui/apps/gr_time_plot_i | 11 ++-
gr-qtgui/apps/gr_time_plot_s | 11 ++-
gr-qtgui/apps/gr_time_raster_b | 13 ++-
gr-qtgui/apps/gr_time_raster_f | 13 ++-
gr-qtgui/apps/plot_psd_base.py | 40 +++++----
gr-qtgui/apps/plot_spectrogram_base.py | 43 +++++-----
gr-qtgui/apps/plot_time_base.py | 33 ++++----
gr-qtgui/apps/plot_time_raster_base.py | 41 +++++----
gr-utils/python/utils/gr_plot_fft | 8 +-
gr-utils/python/utils/gr_plot_fft_c | 11 +--
gr-utils/python/utils/gr_plot_fft_f | 12 +--
gr-utils/python/utils/gr_plot_float | 27 +++---
gr-utils/python/utils/gr_plot_int | 27 +++---
gr-utils/python/utils/gr_plot_iq | 31 ++++---
gr-utils/python/utils/gr_plot_psd | 8 +-
gr-utils/python/utils/gr_plot_psd_c | 13 ++-
gr-utils/python/utils/gr_plot_psd_f | 13 ++-
gr-utils/python/utils/gr_plot_short | 27 +++---
gr-utils/python/utils/plot_fft_base.py | 33 ++++----
gr-utils/python/utils/plot_psd_base.py | 48 ++++++-----
56 files changed, 638 insertions(+), 433 deletions(-)