[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] branch next updated (50dc314 -> 6f85005)
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] branch next updated (50dc314 -> 6f85005) |
|
Date: |
Thu, 8 Sep 2016 21:46:01 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a change to branch next
in repository gnuradio.
from 50dc314 Merge remote-tracking branch
'skoslowski/remove_wx_gen_mode' into next
new 3ce34d5 digital: deprecate correlate_and_sync
new 4ecc974 Merge remote-tracking branch
'github/deprecate-correlate-and-sync'
new 60c1c7b Merge branch 'master' into next
new 4b19157 digital: remove correlate_and_sync (use corr_est)
new 8b55319 Merge remote-tracking branch
'github/rm-correlate-and-sync' into next
new 6d9a164 wxgui: removed
new 6f85005 Merge remote-tracking branch 'github/rm-wxgui' into next
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
CMakeLists.txt | 1 -
cmake/Modules/FindGnuradio.cmake | 3 +-
cmake/Modules/GnuradioConfig.cmake.in | 1 -
docs/doxygen/Doxyfile.in | 5 -
docs/doxygen/other/build_guide.dox | 2 -
docs/doxygen/other/group_defs.dox | 1 -
docs/sphinx/source/index.rst | 14 -
docs/sphinx/source/wxgui.rst | 5 -
docs/sphinx/source/wxgui_blocks.rst | 7 -
gnuradio-runtime/python/gnuradio/__init__.py | 1 -
gr-audio/examples/python/CMakeLists.txt | 1 -
gr-audio/examples/python/audio_fft.py | 138 -
gr-blocks/python/grc_gnuradio/README | 3 -
gr-digital/examples/CMakeLists.txt | 3 -
gr-digital/examples/demod/test_corr_and_sync.grc | 3332 --------------------
gr-digital/examples/demod/uhd_corr_and_sync_rx.grc | 1677 ----------
gr-digital/examples/demod/uhd_corr_and_sync_tx.grc | 1619 ----------
gr-digital/grc/digital_block_tree.xml | 1 -
gr-digital/grc/digital_correlate_and_sync_cc.xml | 36 -
gr-digital/include/gnuradio/digital/CMakeLists.txt | 1 -
.../gnuradio/digital/correlate_and_sync_cc.h | 90 -
gr-digital/lib/CMakeLists.txt | 1 -
gr-digital/lib/correlate_and_sync_cc_impl.cc | 172 -
gr-digital/lib/correlate_and_sync_cc_impl.h | 62 -
gr-digital/lib/modulate_vector.cc | 4 +-
gr-digital/python/digital/qa_correlate_and_sync.py | 104 -
gr-digital/swig/digital_swig.i | 3 -
gr-uhd/CMakeLists.txt | 1 -
gr-uhd/apps/CMakeLists.txt | 47 +-
gr-uhd/apps/hf_explorer/README | 28 -
gr-uhd/apps/hf_explorer/hfx.py | 755 -----
gr-uhd/apps/hf_explorer/hfx_help | 180 --
gr-uhd/apps/hf_radio/README.TXT | 60 -
gr-uhd/apps/hf_radio/hfir.sci | 59 -
gr-uhd/apps/hf_radio/input.py | 78 -
gr-uhd/apps/hf_radio/output.py | 43 -
gr-uhd/apps/hf_radio/radio.py | 320 --
gr-uhd/apps/hf_radio/radio.xml | 441 ---
gr-uhd/apps/hf_radio/ssb_taps | 1023 ------
gr-uhd/apps/hf_radio/ssbagc.py | 72 -
gr-uhd/apps/hf_radio/ssbdemod.py | 118 -
gr-uhd/apps/hf_radio/startup.py | 1 -
gr-uhd/apps/hf_radio/ui.py | 316 --
gr-uhd/apps/uhd_fft_wx | 348 --
gr-uhd/examples/python/CMakeLists.txt | 41 -
gr-uhd/examples/python/fm_tx4.py | 211 --
gr-uhd/examples/python/fm_tx_2_daughterboards.py | 216 --
gr-uhd/examples/python/freq_hopping.py | 220 --
gr-uhd/examples/python/max_power.py | 142 -
gr-uhd/examples/python/usrp_am_mw_rcv.py | 316 --
gr-uhd/examples/python/usrp_nbfm_ptt.py | 494 ---
gr-uhd/examples/python/usrp_nbfm_rcv.py | 384 ---
gr-uhd/examples/python/usrp_spectrum_sense.py | 318 --
gr-uhd/examples/python/usrp_tv_rcv.py | 446 ---
gr-uhd/examples/python/usrp_tv_rcv_nogui.py | 215 --
gr-uhd/examples/python/usrp_wfm_rcv.py | 290 --
gr-uhd/examples/python/usrp_wfm_rcv2_nogui.py | 157 -
gr-uhd/examples/python/usrp_wfm_rcv_fmdet.py | 353 ---
gr-uhd/examples/python/usrp_wfm_rcv_nogui.py | 179 --
gr-uhd/examples/python/usrp_wfm_rcv_pll.py | 350 --
gr-uhd/examples/python/usrp_wfm_rcv_sca.py | 407 ---
gr-uhd/examples/python/usrp_wxapt_rcv.py | 286 --
gr-wxgui/CMakeLists.txt | 91 -
gr-wxgui/README | 1 -
gr-wxgui/README.gl | 29 -
gr-wxgui/gr-wxgui.conf | 13 -
gr-wxgui/gr-wxgui.pc.in | 11 -
gr-wxgui/grc/CMakeLists.txt | 35 -
gr-wxgui/grc/__init__.py | 22 -
gr-wxgui/grc/notebook.xml | 70 -
gr-wxgui/grc/panel.py | 53 -
gr-wxgui/grc/top_block_gui.py | 87 -
gr-wxgui/grc/variable_check_box.xml | 85 -
gr-wxgui/grc/variable_chooser.xml | 123 -
gr-wxgui/grc/variable_slider.xml | 139 -
gr-wxgui/grc/variable_static_text.xml | 98 -
gr-wxgui/grc/variable_text_box.xml | 102 -
gr-wxgui/grc/wxgui_constellationsink2.xml | 141 -
gr-wxgui/grc/wxgui_fftsink2.xml | 246 --
gr-wxgui/grc/wxgui_histosink2.xml | 79 -
gr-wxgui/grc/wxgui_numbersink2.xml | 194 --
gr-wxgui/grc/wxgui_scopesink2.xml | 187 --
gr-wxgui/grc/wxgui_termsink.xml | 57 -
gr-wxgui/grc/wxgui_waterfallsink2.xml | 203 --
gr-wxgui/include/gnuradio/wxgui/CMakeLists.txt | 31 -
gr-wxgui/include/gnuradio/wxgui/api.h | 33 -
gr-wxgui/include/gnuradio/wxgui/histo_sink_f.h | 55 -
gr-wxgui/include/gnuradio/wxgui/oscope_guts.h | 131 -
gr-wxgui/include/gnuradio/wxgui/oscope_sink_f.h | 53 -
gr-wxgui/include/gnuradio/wxgui/oscope_sink_x.h | 91 -
gr-wxgui/include/gnuradio/wxgui/trigger_mode.h | 44 -
gr-wxgui/lib/CMakeLists.txt | 98 -
gr-wxgui/lib/gnuradio-wxgui.rc.in | 54 -
gr-wxgui/lib/histo_sink_f_impl.cc | 186 --
gr-wxgui/lib/histo_sink_f_impl.h | 63 -
gr-wxgui/lib/oscope_guts.cc | 439 ---
gr-wxgui/lib/oscope_sink_f_impl.cc | 83 -
gr-wxgui/lib/oscope_sink_f_impl.h | 51 -
gr-wxgui/lib/oscope_sink_x.cc | 161 -
gr-wxgui/python/wxgui/CMakeLists.txt | 85 -
gr-wxgui/python/wxgui/__init__.py | 32 -
gr-wxgui/python/wxgui/common.py | 296 --
gr-wxgui/python/wxgui/const_window.py | 211 --
gr-wxgui/python/wxgui/constants.py | 76 -
gr-wxgui/python/wxgui/constsink_gl.py | 142 -
gr-wxgui/python/wxgui/fft_window.py | 412 ---
gr-wxgui/python/wxgui/fftsink2.py | 41 -
gr-wxgui/python/wxgui/fftsink_gl.py | 204 --
gr-wxgui/python/wxgui/fftsink_nongl.py | 656 ----
gr-wxgui/python/wxgui/form.py | 391 ---
gr-wxgui/python/wxgui/forms/__init__.py | 102 -
gr-wxgui/python/wxgui/forms/converters.py | 154 -
gr-wxgui/python/wxgui/forms/forms.py | 675 ----
gr-wxgui/python/wxgui/gui.py | 135 -
gr-wxgui/python/wxgui/histo_window.py | 168 -
gr-wxgui/python/wxgui/histosink_gl.py | 113 -
gr-wxgui/python/wxgui/number_window.py | 219 --
gr-wxgui/python/wxgui/numbersink2.py | 173 -
gr-wxgui/python/wxgui/plot.py | 1834 -----------
gr-wxgui/python/wxgui/plotter/__init__.py | 24 -
gr-wxgui/python/wxgui/plotter/bar_plotter.py | 150 -
gr-wxgui/python/wxgui/plotter/channel_plotter.py | 249 --
gr-wxgui/python/wxgui/plotter/common.py | 149 -
gr-wxgui/python/wxgui/plotter/gltext.py | 507 ---
gr-wxgui/python/wxgui/plotter/grid_plotter_base.py | 458 ---
gr-wxgui/python/wxgui/plotter/plotter_base.py | 220 --
gr-wxgui/python/wxgui/plotter/waterfall_plotter.py | 294 --
gr-wxgui/python/wxgui/powermate.py | 448 ---
gr-wxgui/python/wxgui/pubsub.py | 153 -
gr-wxgui/python/wxgui/scope_window.py | 691 ----
gr-wxgui/python/wxgui/scopesink2.py | 41 -
gr-wxgui/python/wxgui/scopesink_gl.py | 239 --
gr-wxgui/python/wxgui/scopesink_nongl.py | 654 ----
gr-wxgui/python/wxgui/slider.py | 48 -
gr-wxgui/python/wxgui/stdgui2.py | 107 -
gr-wxgui/python/wxgui/termsink.py | 77 -
gr-wxgui/python/wxgui/waterfall_window.py | 328 --
gr-wxgui/python/wxgui/waterfallsink2.py | 41 -
gr-wxgui/python/wxgui/waterfallsink_gl.py | 176 --
gr-wxgui/python/wxgui/waterfallsink_nongl.py | 434 ---
gr-wxgui/swig/CMakeLists.txt | 55 -
gr-wxgui/swig/wxgui_swig.i | 43 -
142 files changed, 4 insertions(+), 31542 deletions(-)
delete mode 100644 docs/sphinx/source/wxgui.rst
delete mode 100644 docs/sphinx/source/wxgui_blocks.rst
delete mode 100755 gr-audio/examples/python/audio_fft.py
delete mode 100644 gr-digital/examples/demod/test_corr_and_sync.grc
delete mode 100644 gr-digital/examples/demod/uhd_corr_and_sync_rx.grc
delete mode 100644 gr-digital/examples/demod/uhd_corr_and_sync_tx.grc
delete mode 100644 gr-digital/grc/digital_correlate_and_sync_cc.xml
delete mode 100644 gr-digital/include/gnuradio/digital/correlate_and_sync_cc.h
delete mode 100644 gr-digital/lib/correlate_and_sync_cc_impl.cc
delete mode 100644 gr-digital/lib/correlate_and_sync_cc_impl.h
delete mode 100644 gr-digital/python/digital/qa_correlate_and_sync.py
delete mode 100644 gr-uhd/apps/hf_explorer/README
delete mode 100755 gr-uhd/apps/hf_explorer/hfx.py
delete mode 100644 gr-uhd/apps/hf_explorer/hfx_help
delete mode 100644 gr-uhd/apps/hf_radio/README.TXT
delete mode 100644 gr-uhd/apps/hf_radio/hfir.sci
delete mode 100644 gr-uhd/apps/hf_radio/input.py
delete mode 100644 gr-uhd/apps/hf_radio/output.py
delete mode 100755 gr-uhd/apps/hf_radio/radio.py
delete mode 100644 gr-uhd/apps/hf_radio/radio.xml
delete mode 100644 gr-uhd/apps/hf_radio/ssb_taps
delete mode 100644 gr-uhd/apps/hf_radio/ssbagc.py
delete mode 100644 gr-uhd/apps/hf_radio/ssbdemod.py
delete mode 100644 gr-uhd/apps/hf_radio/startup.py
delete mode 100755 gr-uhd/apps/hf_radio/ui.py
delete mode 100755 gr-uhd/apps/uhd_fft_wx
delete mode 100644 gr-uhd/examples/python/CMakeLists.txt
delete mode 100755 gr-uhd/examples/python/fm_tx4.py
delete mode 100755 gr-uhd/examples/python/fm_tx_2_daughterboards.py
delete mode 100755 gr-uhd/examples/python/freq_hopping.py
delete mode 100755 gr-uhd/examples/python/max_power.py
delete mode 100755 gr-uhd/examples/python/usrp_am_mw_rcv.py
delete mode 100755 gr-uhd/examples/python/usrp_nbfm_ptt.py
delete mode 100755 gr-uhd/examples/python/usrp_nbfm_rcv.py
delete mode 100755 gr-uhd/examples/python/usrp_spectrum_sense.py
delete mode 100755 gr-uhd/examples/python/usrp_tv_rcv.py
delete mode 100755 gr-uhd/examples/python/usrp_tv_rcv_nogui.py
delete mode 100755 gr-uhd/examples/python/usrp_wfm_rcv.py
delete mode 100755 gr-uhd/examples/python/usrp_wfm_rcv2_nogui.py
delete mode 100755 gr-uhd/examples/python/usrp_wfm_rcv_fmdet.py
delete mode 100755 gr-uhd/examples/python/usrp_wfm_rcv_nogui.py
delete mode 100755 gr-uhd/examples/python/usrp_wfm_rcv_pll.py
delete mode 100755 gr-uhd/examples/python/usrp_wfm_rcv_sca.py
delete mode 100755 gr-uhd/examples/python/usrp_wxapt_rcv.py
delete mode 100644 gr-wxgui/CMakeLists.txt
delete mode 100644 gr-wxgui/README
delete mode 100644 gr-wxgui/README.gl
delete mode 100644 gr-wxgui/gr-wxgui.conf
delete mode 100644 gr-wxgui/gr-wxgui.pc.in
delete mode 100644 gr-wxgui/grc/CMakeLists.txt
delete mode 100644 gr-wxgui/grc/__init__.py
delete mode 100644 gr-wxgui/grc/notebook.xml
delete mode 100644 gr-wxgui/grc/panel.py
delete mode 100644 gr-wxgui/grc/top_block_gui.py
delete mode 100644 gr-wxgui/grc/variable_check_box.xml
delete mode 100644 gr-wxgui/grc/variable_chooser.xml
delete mode 100644 gr-wxgui/grc/variable_slider.xml
delete mode 100644 gr-wxgui/grc/variable_static_text.xml
delete mode 100644 gr-wxgui/grc/variable_text_box.xml
delete mode 100644 gr-wxgui/grc/wxgui_constellationsink2.xml
delete mode 100644 gr-wxgui/grc/wxgui_fftsink2.xml
delete mode 100644 gr-wxgui/grc/wxgui_histosink2.xml
delete mode 100644 gr-wxgui/grc/wxgui_numbersink2.xml
delete mode 100644 gr-wxgui/grc/wxgui_scopesink2.xml
delete mode 100644 gr-wxgui/grc/wxgui_termsink.xml
delete mode 100644 gr-wxgui/grc/wxgui_waterfallsink2.xml
delete mode 100644 gr-wxgui/include/gnuradio/wxgui/CMakeLists.txt
delete mode 100644 gr-wxgui/include/gnuradio/wxgui/api.h
delete mode 100644 gr-wxgui/include/gnuradio/wxgui/histo_sink_f.h
delete mode 100644 gr-wxgui/include/gnuradio/wxgui/oscope_guts.h
delete mode 100644 gr-wxgui/include/gnuradio/wxgui/oscope_sink_f.h
delete mode 100644 gr-wxgui/include/gnuradio/wxgui/oscope_sink_x.h
delete mode 100644 gr-wxgui/include/gnuradio/wxgui/trigger_mode.h
delete mode 100644 gr-wxgui/lib/CMakeLists.txt
delete mode 100644 gr-wxgui/lib/gnuradio-wxgui.rc.in
delete mode 100644 gr-wxgui/lib/histo_sink_f_impl.cc
delete mode 100644 gr-wxgui/lib/histo_sink_f_impl.h
delete mode 100644 gr-wxgui/lib/oscope_guts.cc
delete mode 100644 gr-wxgui/lib/oscope_sink_f_impl.cc
delete mode 100644 gr-wxgui/lib/oscope_sink_f_impl.h
delete mode 100644 gr-wxgui/lib/oscope_sink_x.cc
delete mode 100644 gr-wxgui/python/wxgui/CMakeLists.txt
delete mode 100644 gr-wxgui/python/wxgui/__init__.py
delete mode 100644 gr-wxgui/python/wxgui/common.py
delete mode 100644 gr-wxgui/python/wxgui/const_window.py
delete mode 100644 gr-wxgui/python/wxgui/constants.py
delete mode 100644 gr-wxgui/python/wxgui/constsink_gl.py
delete mode 100644 gr-wxgui/python/wxgui/fft_window.py
delete mode 100644 gr-wxgui/python/wxgui/fftsink2.py
delete mode 100644 gr-wxgui/python/wxgui/fftsink_gl.py
delete mode 100644 gr-wxgui/python/wxgui/fftsink_nongl.py
delete mode 100644 gr-wxgui/python/wxgui/form.py
delete mode 100644 gr-wxgui/python/wxgui/forms/__init__.py
delete mode 100644 gr-wxgui/python/wxgui/forms/converters.py
delete mode 100644 gr-wxgui/python/wxgui/forms/forms.py
delete mode 100644 gr-wxgui/python/wxgui/gui.py
delete mode 100644 gr-wxgui/python/wxgui/histo_window.py
delete mode 100644 gr-wxgui/python/wxgui/histosink_gl.py
delete mode 100644 gr-wxgui/python/wxgui/number_window.py
delete mode 100644 gr-wxgui/python/wxgui/numbersink2.py
delete mode 100644 gr-wxgui/python/wxgui/plot.py
delete mode 100644 gr-wxgui/python/wxgui/plotter/__init__.py
delete mode 100644 gr-wxgui/python/wxgui/plotter/bar_plotter.py
delete mode 100644 gr-wxgui/python/wxgui/plotter/channel_plotter.py
delete mode 100644 gr-wxgui/python/wxgui/plotter/common.py
delete mode 100644 gr-wxgui/python/wxgui/plotter/gltext.py
delete mode 100644 gr-wxgui/python/wxgui/plotter/grid_plotter_base.py
delete mode 100644 gr-wxgui/python/wxgui/plotter/plotter_base.py
delete mode 100644 gr-wxgui/python/wxgui/plotter/waterfall_plotter.py
delete mode 100644 gr-wxgui/python/wxgui/powermate.py
delete mode 100644 gr-wxgui/python/wxgui/pubsub.py
delete mode 100644 gr-wxgui/python/wxgui/scope_window.py
delete mode 100644 gr-wxgui/python/wxgui/scopesink2.py
delete mode 100644 gr-wxgui/python/wxgui/scopesink_gl.py
delete mode 100644 gr-wxgui/python/wxgui/scopesink_nongl.py
delete mode 100644 gr-wxgui/python/wxgui/slider.py
delete mode 100644 gr-wxgui/python/wxgui/stdgui2.py
delete mode 100644 gr-wxgui/python/wxgui/termsink.py
delete mode 100644 gr-wxgui/python/wxgui/waterfall_window.py
delete mode 100644 gr-wxgui/python/wxgui/waterfallsink2.py
delete mode 100644 gr-wxgui/python/wxgui/waterfallsink_gl.py
delete mode 100644 gr-wxgui/python/wxgui/waterfallsink_nongl.py
delete mode 100644 gr-wxgui/swig/CMakeLists.txt
delete mode 100644 gr-wxgui/swig/wxgui_swig.i
- [Commit-gnuradio] [gnuradio] branch next updated (50dc314 -> 6f85005),
git <=
- [Commit-gnuradio] [gnuradio] 04/05: Merge remote-tracking branch 'github/rm-correlate-and-sync' into next, git, 2016/09/08
- [Commit-gnuradio] [gnuradio] 05/05: Merge remote-tracking branch 'github/rm-wxgui' into next, git, 2016/09/08
- [Commit-gnuradio] [gnuradio] 03/05: Merge branch 'master' into next, git, 2016/09/08
- [Commit-gnuradio] [gnuradio] 02/05: digital: remove correlate_and_sync (use corr_est), git, 2016/09/08
- [Commit-gnuradio] [gnuradio] 01/05: wxgui: removed, git, 2016/09/08