[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/02: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/02: Merge branch 'master' into next |
|
Date: |
Fri, 28 Aug 2015 19:19:54 +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 1b9349297663e5af00df4a42f1a7b9389ac9b4ac
Merge: 183dc9e 5e64507
Author: Johnathan Corgan <address@hidden>
Date: Fri Aug 28 12:03:54 2015 -0700
Merge branch 'master' into next
Conflicts:
docs/sphinx/source/index.rst
cmake/Modules/GrSetupQt4.cmake | 8 +-
docs/sphinx/source/analog.rst | 21 +
docs/sphinx/source/analog/get_blocks.py | 106 --
docs/sphinx/source/analog/index.rst | 61 -
.../sphinx/source/analog/level_controllers_blk.rst | 13 -
.../sphinx/source/analog/measurement_tools_blk.rst | 6 -
docs/sphinx/source/analog/modulators_blk.rst | 8 -
docs/sphinx/source/analog/peak_detectors_blk.rst | 4 -
docs/sphinx/source/analog/synchronizers_blk.rst | 6 -
docs/sphinx/source/analog_blocks.rst | 40 +
.../source/{audio/index.rst => audio_blocks.rst} | 0
docs/sphinx/source/blocks/audio_blk.rst | 5 -
.../sphinx/source/blocks/boolean_operators_blk.rst | 18 -
docs/sphinx/source/blocks/byte_operators_blk.rst | 12 -
docs/sphinx/source/blocks/controlport_blk.rst | 5 -
docs/sphinx/source/blocks/debug_tools_blk.rst | 14 -
docs/sphinx/source/blocks/file_operators_blk.rst | 10 -
docs/sphinx/source/blocks/get_blocks.py | 106 --
docs/sphinx/source/blocks/index.rst | 337 -----
.../sphinx/source/blocks/level_controllers_blk.rst | 16 -
docs/sphinx/source/blocks/math_operators_blk.rst | 53 -
.../sphinx/source/blocks/measurement_tools_blk.rst | 18 -
docs/sphinx/source/blocks/message_tools_blk.rst | 11 -
docs/sphinx/source/blocks/misc_blk.rst | 19 -
docs/sphinx/source/blocks/modulators_blk.rst | 4 -
docs/sphinx/source/blocks/networking_tools_blk.rst | 7 -
docs/sphinx/source/blocks/peak_detectors_blk.rst | 9 -
docs/sphinx/source/blocks/stream_operators_blk.rst | 26 -
docs/sphinx/source/blocks/stream_tag_tools_blk.rst | 6 -
docs/sphinx/source/blocks/type_converters_blk.rst | 22 -
.../source/blocks/waveform_generators_blk.rst | 4 -
docs/sphinx/source/blocks_blocks.rst | 228 +++
docs/sphinx/source/channels.rst | 14 +-
docs/sphinx/source/channels_blocks.rst | 12 +
.../source/{comedi.rst => comedi_blocks.rst} | 3 +-
docs/sphinx/source/digital.rst | 116 ++
docs/sphinx/source/digital/blocks.rst | 69 -
docs/sphinx/source/digital/constellations.rst | 13 -
docs/sphinx/source/digital/index.rst | 151 --
docs/sphinx/source/digital/ofdm.rst | 14 -
docs/sphinx/source/digital/pkt_utils.rst | 18 -
docs/sphinx/source/digital/utilities.rst | 12 -
docs/sphinx/source/digital_blocks.rst | 75 +
docs/sphinx/source/dtv.rst | 4 +
docs/sphinx/source/dtv_blocks.rst | 44 +
docs/sphinx/source/eng_notation/index.rst | 8 -
docs/sphinx/source/eng_option/index.rst | 6 -
docs/sphinx/source/{fcd.rst => fcd_blocks.rst} | 3 +-
docs/sphinx/source/fec.rst | 31 +-
docs/sphinx/source/fec_blocks.rst | 20 +
docs/sphinx/source/fft.rst | 29 +-
docs/sphinx/source/fft_blocks.rst | 9 +
docs/sphinx/source/filter.rst | 29 +
docs/sphinx/source/filter/channelizers_blk.rst | 7 -
docs/sphinx/source/filter/filter_blk.rst | 16 -
docs/sphinx/source/filter/filter_design.rst | 4 -
docs/sphinx/source/filter/index.rst | 56 -
docs/sphinx/source/filter/resamplers_blk.rst | 9 -
docs/sphinx/source/filter_blocks.rst | 55 +
docs/sphinx/source/gr/contents.rst | 18 -
docs/sphinx/source/gr/index.rst | 23 -
docs/sphinx/source/gr_unittest/index.rst | 7 -
docs/sphinx/source/index.rst | 1561 ++++++++++++++++++--
docs/sphinx/source/{noaa.rst => noaa_blocks.rst} | 2 +-
docs/sphinx/source/pager/index.rst | 23 -
.../source/{pager/blks.rst => pager_blocks.rst} | 7 +-
docs/sphinx/source/plot_data.rst | 6 -
docs/sphinx/source/pmt.rst | 193 +++
docs/sphinx/source/pmt/any.rst | 7 -
docs/sphinx/source/pmt/boolean.rst | 8 -
docs/sphinx/source/pmt/dictionary.rst | 12 -
docs/sphinx/source/pmt/generalfunctions.rst | 31 -
docs/sphinx/source/pmt/index.rst | 347 -----
docs/sphinx/source/pmt/integer.rst | 13 -
docs/sphinx/source/pmt/list.rst | 22 -
docs/sphinx/source/pmt/message_accepter.rst | 7 -
docs/sphinx/source/pmt/misc.rst | 22 -
docs/sphinx/source/pmt/number.rst | 4 -
docs/sphinx/source/pmt/pair.rst | 15 -
docs/sphinx/source/pmt/readwrite.rst | 7 -
docs/sphinx/source/pmt/real.rst | 14 -
docs/sphinx/source/pmt/serialize.rst | 8 -
docs/sphinx/source/pmt/symbol.rst | 7 -
docs/sphinx/source/pmt/tuple.rst | 7 -
docs/sphinx/source/pmt/vector.rst | 92 --
docs/sphinx/source/pyqt_filter.rst | 6 -
docs/sphinx/source/pyqt_plot.rst | 6 -
docs/sphinx/source/qtgui/index.rst | 9 -
docs/sphinx/source/qtgui_blocks.rst | 20 +
docs/sphinx/source/runtime.rst | 65 +
.../source/{trellis/objs.rst => trellis.rst} | 4 +-
docs/sphinx/source/trellis/index.rst | 90 --
.../{trellis/blks.rst => trellis_blocks.rst} | 6 +-
docs/sphinx/source/uhd.rst | 16 +-
docs/sphinx/source/uhd_blocks.rst | 8 +
.../source/{video_sdl.rst => video_sdl_blocks.rst} | 0
docs/sphinx/source/vocoder.rst | 6 +
docs/sphinx/source/vocoder/index.rst | 26 -
.../{vocoder/blks.rst => vocoder_blocks.rst} | 2 +
.../source/{wavelet.rst => wavelet_blocks.rst} | 0
docs/sphinx/source/wxgui.rst | 5 +
docs/sphinx/source/wxgui/blks.rst | 16 -
docs/sphinx/source/wxgui/index.rst | 20 -
docs/sphinx/source/wxgui_blocks.rst | 7 +
docs/sphinx/source/zeromq_blocks.rst | 17 +
.../python/gnuradio/ctrlport/gr-perf-monitorx | 23 +-
.../include/gnuradio/digital/pfb_clock_sync_ccf.h | 2 +-
gr-digital/python/digital/ofdm_packet_utils.py | 529 ++++---
gr-digital/python/digital/ofdm_txrx.py | 39 +-
gr-digital/python/digital/psk_constellations.py | 96 +-
gr-digital/python/digital/qam_constellations.py | 256 ++--
gr-digital/python/digital/soft_dec_lut_gen.py | 109 +-
gr-fec/examples/tpc_ber_curve_gen.py | 457 ++++++
gr-filter/lib/pfb_arb_resampler_fff_impl.cc | 29 +-
gr-filter/python/filter/pfb.py | 16 +-
gr-qtgui/grc/qtgui_const_sink_x.xml | 1 +
gr-qtgui/grc/qtgui_freq_sink_x.xml | 1 +
gr-qtgui/grc/qtgui_time_sink_x.xml | 1 +
.../include/gnuradio/qtgui/TimeRasterDisplayPlot.h | 5 +
.../include/gnuradio/qtgui/WaterfallDisplayPlot.h | 4 +
gr-qtgui/lib/TimeRasterDisplayPlot.cc | 17 +-
gr-qtgui/lib/WaterfallDisplayPlot.cc | 16 +-
gr-zeromq/examples/python/client.py | 4 +-
gr-zeromq/examples/python/gui.py | 4 +-
gr-zeromq/examples/python/server.py | 4 +-
grc/base/FlowGraph.py | 57 +-
grc/blocks/options.xml | 6 +
grc/blocks/xmlrpc_server.xml | 4 +-
grc/gui/Messages.py | 5 +-
grc/python/Generator.py | 6 +-
130 files changed, 3598 insertions(+), 2915 deletions(-)