[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 16/17: Merge remote-tracking branch 'mmuell
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 16/17: Merge remote-tracking branch 'mmueller/fix_networkx_version_checking' into maint |
|
Date: |
Thu, 14 Apr 2016 20:43:05 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch maint
in repository gnuradio.
commit 03c35e660fca1b4c55c48da8f7e88be32733c01b
Merge: e6be6cb 70c947d
Author: Johnathan Corgan <address@hidden>
Date: Thu Apr 14 11:33:54 2016 -0700
Merge remote-tracking branch 'mmueller/fix_networkx_version_checking' into
maint
CMakeLists.txt | 4 +-
cmake/Modules/GrVersion.cmake | 8 +-
docs/exploring-gnuradio/fm_tx.grc | 4 +
gnuradio-runtime/include/gnuradio/block.h | 4 +-
gnuradio-runtime/include/gnuradio/block_detail.h | 7 +
gnuradio-runtime/include/gnuradio/buffer.h | 4 +
gnuradio-runtime/lib/block_detail.cc | 20 +
gnuradio-runtime/lib/flat_flowgraph.cc | 13 +-
.../python/gnuradio/ctrlport/gr-perf-monitorx | 13 +-
gr-analog/examples/fmtest.py | 3 +-
gr-analog/grc/analog_fm_preemph.xml | 8 +-
gr-analog/grc/analog_nbfm_tx.xml | 8 +
gr-analog/grc/analog_wfm_tx.xml | 7 +
gr-analog/lib/CMakeLists.txt | 11 -
gr-analog/lib/frequency_modulator_fc_impl.cc | 22 +
gr-analog/lib/frequency_modulator_fc_impl.h | 2 +
gr-analog/lib/sig_source_X_impl.cc.t | 32 +-
gr-analog/lib/sig_source_X_impl.h.t | 2 +-
gr-analog/python/analog/fm_emph.py | 254 +-
gr-analog/python/analog/nbfm_tx.py | 5 +-
gr-analog/python/analog/wfm_tx.py | 5 +-
gr-blocks/grc/blocks_repeat.xml | 1 +
gr-blocks/include/gnuradio/blocks/repeat.h | 18 +
.../include/gnuradio/blocks/vector_sink_X.h.t | 1 +
.../include/gnuradio/blocks/vector_source_X.h.t | 1 +
gr-blocks/lib/repeat_impl.cc | 20 +
gr-blocks/lib/repeat_impl.h | 6 +
gr-blocks/lib/tuntap_pdu_impl.cc | 33 +
gr-blocks/lib/tuntap_pdu_impl.h | 1 +
gr-blocks/lib/vector_sink_X_impl.h.t | 2 +-
gr-blocks/lib/vector_source_X_impl.h.t | 1 +
gr-blocks/python/blocks/qa_block_behavior.py | 79 +
gr-blocks/python/blocks/qa_vector_sink_source.py | 36 +
gr-digital/grc/digital_constellation.xml | 51 +-
gr-dtv/CMakeLists.txt | 2 +
gr-dtv/examples/CMakeLists.txt | 27 +-
gr-dtv/examples/README.catv | 31 +
gr-dtv/examples/README.dvbs | 26 +
gr-dtv/examples/atsc_ctrlport_monitor.py | 149 ++
.../examples/{dvbs2_tx.grc => catv_tx_64qam.grc} | 1625 +++++++------
gr-dtv/examples/dvbs2_tx.grc | 2516 +++++++++++++-------
gr-dtv/examples/{dvbs2_tx.grc => dvbs_tx.grc} | 2449 +++++++++++++------
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 | 22 +-
gr-dtv/include/gnuradio/dtv/CMakeLists.txt | 7 +-
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 +
...bs2_modulator_bc.h => catv_frame_sync_enc_bb.h} | 27 +-
.../{dvbs2_modulator_bc.h => catv_randomizer_bb.h} | 28 +-
...2_modulator_bc.h => catv_reed_solomon_enc_bb.h} | 26 +-
...ulator_bc.h => catv_transport_framing_enc_bb.h} | 28 +-
...{dvbs2_modulator_bc.h => catv_trellis_enc_bb.h} | 26 +-
gr-dtv/include/gnuradio/dtv/dvbs2_config.h | 6 +
gr-dtv/include/gnuradio/dtv/dvbs2_modulator_bc.h | 6 +-
gr-dtv/lib/CMakeLists.txt | 7 +-
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-dtv/lib/catv/catv_frame_sync_enc_bb_impl.cc | 96 +
.../catv_frame_sync_enc_bb_impl.h} | 26 +-
gr-dtv/lib/catv/catv_randomizer_bb_impl.cc | 104 +
.../catv/catv_randomizer_bb_impl.h} | 39 +-
gr-dtv/lib/catv/catv_reed_solomon_enc_bb_impl.cc | 153 ++
.../catv_reed_solomon_enc_bb_impl.h} | 32 +-
.../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 ++
.../catv_trellis_enc_bb_impl.h} | 36 +-
gr-dtv/lib/dvbs2/dvbs2_modulator_bc_impl.cc | 272 ++-
gr-dtv/lib/dvbs2/dvbs2_modulator_bc_impl.h | 3 +-
gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc | 178 +-
gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.h | 21 +-
gr-dtv/swig/dtv_swig.i | 17 +-
gr-filter/examples/synth_to_chan.py | 2 +-
gr-filter/lib/pfb_decimator_ccf_impl.cc | 32 +-
gr-filter/lib/pfb_decimator_ccf_impl.h | 6 +-
gr-qtgui/grc/qtgui_const_sink_x.xml | 18 +
gr-qtgui/grc/qtgui_freq_sink_x.xml | 35 +
gr-qtgui/grc/qtgui_histogram_sink_x.xml | 18 +
gr-qtgui/grc/qtgui_time_raster_x.xml | 17 +
gr-qtgui/grc/qtgui_time_sink_x.xml | 18 +
gr-qtgui/grc/qtgui_waterfall_sink_x.xml | 18 +
gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h | 1 +
.../include/gnuradio/qtgui/FrequencyDisplayPlot.h | 3 +
gr-qtgui/include/gnuradio/qtgui/const_sink_c.h | 1 +
gr-qtgui/include/gnuradio/qtgui/displayform.h | 3 +
gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h | 2 +
gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h | 3 +
gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h | 1 +
gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h | 3 +-
gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h | 1 +
.../include/gnuradio/qtgui/time_raster_sink_b.h | 1 +
.../include/gnuradio/qtgui/time_raster_sink_f.h | 1 +
gr-qtgui/include/gnuradio/qtgui/time_sink_c.h | 1 +
gr-qtgui/include/gnuradio/qtgui/time_sink_f.h | 1 +
gr-qtgui/include/gnuradio/qtgui/timecontrolpanel.h | 2 +
gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h | 1 +
gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h | 1 +
gr-qtgui/lib/DisplayPlot.cc | 9 +
gr-qtgui/lib/FrequencyDisplayPlot.cc | 13 +-
gr-qtgui/lib/WaterfallDisplayPlot.cc | 2 -
gr-qtgui/lib/const_sink_c_impl.cc | 6 +
gr-qtgui/lib/const_sink_c_impl.h | 1 +
gr-qtgui/lib/displayform.cc | 16 +
gr-qtgui/lib/freq_sink_c_impl.cc | 13 +
gr-qtgui/lib/freq_sink_c_impl.h | 2 +
gr-qtgui/lib/freq_sink_f_impl.cc | 13 +
gr-qtgui/lib/freq_sink_f_impl.h | 2 +
gr-qtgui/lib/freqcontrolpanel.cc | 5 +
gr-qtgui/lib/freqdisplayform.cc | 6 +
gr-qtgui/lib/histogram_sink_f_impl.cc | 6 +
gr-qtgui/lib/histogram_sink_f_impl.h | 1 +
gr-qtgui/lib/time_raster_sink_b_impl.cc | 6 +
gr-qtgui/lib/time_raster_sink_b_impl.h | 1 +
gr-qtgui/lib/time_raster_sink_f_impl.cc | 6 +
gr-qtgui/lib/time_raster_sink_f_impl.h | 1 +
gr-qtgui/lib/time_sink_c_impl.cc | 8 +-
gr-qtgui/lib/time_sink_c_impl.h | 1 +
gr-qtgui/lib/time_sink_f_impl.cc | 6 +
gr-qtgui/lib/time_sink_f_impl.h | 1 +
gr-qtgui/lib/timecontrolpanel.cc | 5 +
gr-qtgui/lib/waterfall_sink_c_impl.cc | 6 +
gr-qtgui/lib/waterfall_sink_c_impl.h | 1 +
gr-qtgui/lib/waterfall_sink_f_impl.cc | 6 +
gr-qtgui/lib/waterfall_sink_f_impl.h | 1 +
gr-uhd/apps/uhd_app.py | 7 +-
gr-uhd/examples/python/fm_tx4.py | 3 +-
gr-uhd/include/gnuradio/uhd/usrp_source.h | 5 +-
gr-uhd/lib/usrp_source_impl.cc | 35 +-
gr-uhd/lib/usrp_source_impl.h | 4 +-
gr-utils/python/modtool/modtool_add.py | 14 +-
gr-utils/python/modtool/templates.py | 2 +-
grc/gui/ActionHandler.py | 6 +-
grc/gui/Actions.py | 2 +-
grc/gui/BlockTreeWindow.py | 52 +-
grc/gui/Colors.py | 3 +-
grc/gui/DrawingArea.py | 27 +-
grc/gui/FileDialogs.py | 15 +
grc/gui/Preferences.py | 4 +
grc/gui/PropsDialog.py | 38 +-
grc/python/Block.py | 7 +-
grc/python/Platform.py | 25 +-
grc/python/extract_docs.py | 2 +-
155 files changed, 7283 insertions(+), 2837 deletions(-)
- [Commit-gnuradio] [gnuradio] 12/17: gr-fec, LDPC: use mult_matrices_mod2 function, (continued)
- [Commit-gnuradio] [gnuradio] 12/17: gr-fec, LDPC: use mult_matrices_mod2 function, git, 2016/04/14
- [Commit-gnuradio] [gnuradio] 04/17: gr-fec: LDPC python function - addressing an attribute error, git, 2016/04/14
- [Commit-gnuradio] [gnuradio] 06/17: gr-fec: LDPC python - adding a handy function, git, 2016/04/14
- [Commit-gnuradio] [gnuradio] 09/17: gr-fec: free memory for info word in LDPC gen mtrx encoder, git, 2016/04/14
- [Commit-gnuradio] [gnuradio] 10/17: gr-fec: free memory used for the LDPC H matrix in the destructor, git, 2016/04/14
- [Commit-gnuradio] [gnuradio] 02/17: gr-fec: LDPC python function - addressing an "undefined" error, git, 2016/04/14
- [Commit-gnuradio] [gnuradio] 14/17: float(version) doesn't work with "1.9.0"; fixed nx version checking, git, 2016/04/14
- [Commit-gnuradio] [gnuradio] 17/17: Merge remote-tracking branch 'tracierenea/fec_ldpc_H_fix' into maint, git, 2016/04/14
- [Commit-gnuradio] [gnuradio] 01/17: gr-fec: Fix memory allocation issue during encoding., git, 2016/04/14
- [Commit-gnuradio] [gnuradio] 13/17: grc: update year in copyright, git, 2016/04/14
- [Commit-gnuradio] [gnuradio] 16/17: Merge remote-tracking branch 'mmueller/fix_networkx_version_checking' into maint,
git <=
- [Commit-gnuradio] [gnuradio] 03/17: gr-fec: LPDC python function - addressing an "undefined" error, git, 2016/04/14
- [Commit-gnuradio] [gnuradio] 15/17: Merge remote-tracking branch 'gnuradio-wg-grc/maint_grcwg' into maint, git, 2016/04/14
- [Commit-gnuradio] [gnuradio] 07/17: gr-fec: Removing 2 bad matrices from the LDPC alist file collection, git, 2016/04/14