[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 05/05: Merge remote-tracking branch 'github
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 05/05: Merge remote-tracking branch 'github/rm-wxgui' into next |
|
Date: |
Thu, 8 Sep 2016 21:46:03 +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 6f8500527ed828313c76deeb6b5a0e4f563e7889
Merge: 8b55319 6d9a164
Author: Johnathan Corgan <address@hidden>
Date: Thu Sep 8 14:34:12 2016 -0700
Merge remote-tracking branch 'github/rm-wxgui' into next
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-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 -
128 files changed, 2 insertions(+), 24439 deletions(-)