Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'python3_fix' into next | Andrej Rode | 2018-06-24 | 49 | -287/+418 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manual merge conflict resolution has been applied to following conflicts: * Typos: * gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py * gr-blocks/python/blocks/qa_wavfile.py * gr-filter/examples/gr_filtdes_api.py * grc/blocks/parameter.xml * gr-uhd/python/uhd/__init__.py * ValueError -> RuntimeError: * gr-blocks/python/blocks/qa_hier_block2.py * relative Imports & other Py3k: * gr-digital/python/digital/psk_constellations.py * gr-digital/python/digital/qam_constellations.py * gr-digital/python/digital/test_soft_decisions.py * gr-digital/python/digital/gfsk.py * SequenceCompleter: * gr-utils/python/modtool/modtool_add.py * gr-utils/python/modtool/modtool_rename.py * gr-utils/python/modtool/modtool_rm.py * Updated API on next: * gr-blocks/grc/blocks_file_source.xml * gr-blocks/python/blocks/qa_file_source_sink.py * gr-qtgui/grc/qtgui_time_sink_x.xml * GRC Py3k Updates: * grc/core/Block.py * grc/core/Constants.py * grc/core/Platform.py * grc/core/utils/odict.py * grc/gui/Actions.py * grc/gui/Block.py * grc/gui/Executor.py * grc/gui/Port.py | ||||
| * | Fix typos from switch to Python 3 | Håkon Vågsether | 2017-08-21 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'next' into python3 | Johnathan Corgan | 2017-03-16 | 1 | -15/+19 |
| |\ | | | | | | | | | | | | | | | | Conflicts: gr-blocks/swig/blocks_swig.py.in gr-uhd/apps/uhd_app.py | ||||
| * | | python3: update non-GRC components to use python2 or python3 | Douglas Anderson | 2017-02-26 | 49 | -295/+426 |
| | | | |||||
* | | | Merge branch 'master' into next | Martin Braun | 2018-02-03 | 7 | -8/+8 |
|\ \ \ | |||||
| * | | | Comment typo fixing. | luz.paz | 2018-02-03 | 7 | -8/+8 |
| | | | | | | | | | | | | | | | | Luzpaz went ahead and found typos using `codespell -q 3`. | ||||
* | | | | Merge branch 'master' into next | Johnathan Corgan | 2017-06-22 | 1 | -8/+8 |
|\| | | | |_|/ |/| | | |||||
| * | | Merge branch 'maint' | Johnathan Corgan | 2017-06-22 | 1 | -8/+8 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: gr-uhd/apps/uhd_app.py | ||||
| | * | | runtime: replace pmt.pmt_swig.* namespace calls with pmt.* | gnieboer | 2017-06-11 | 1 | -8/+8 |
| | | | | |||||
* | | | | runtime: move thrift dependencies before command | Nathan West | 2017-03-15 | 1 | -10/+10 |
| | | | | |||||
* | | | | Merge branch 'master' into next | Johnathan Corgan | 2017-03-05 | 1 | -10/+14 |
|\| | | | |_|/ |/| | | | | | | | | Conflicts: gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt | ||||
| * | | Helped CMake maintain a clear dependency tree | Marcus Müller | 2017-01-23 | 1 | -16/+19 |
| |/ | | | | | | | | | | | | | | | by converting EXECUTE_COMMAND directives to add_custom_command with well-defined OUTPUT. This is all that was necessary to make GNU Radio build with Ninja in place of GNU Make. | ||||
* | | Merge branch 'master' into next | Johnathan Corgan | 2017-01-12 | 1 | -1/+1 |
|\| | |||||
| * | runtime: fix numpy warning | Bob Iannucci | 2017-01-12 | 1 | -1/+1 |
| | | | | | | | | The == operator on Numpy arrays is being redefined to work elementwise. Changing the == to 'is' should fix the problem. | ||||
* | | Merge branch 'master' into next | Johnathan Corgan | 2016-10-28 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | Conflicts: gr-digital/swig/CMakeLists.txt gr-digital/swig/digital_swig.i gr-trellis/swig/CMakeLists.txt | ||||
| * | gr-perf-monitorx: Remove unused PyQwt import. | Philip Balister | 2016-10-25 | 1 | -1/+1 |
| | | | | | | | | | | Reported-by: Kyle Unice <kyle.unice@L-3com.com> Signed-off-by: Philip Balister <philip@balister.org> | ||||
* | | Merge branch 'master' into next | Johnathan Corgan | 2016-10-02 | 1 | -0/+58 |
|\| | |||||
| * | runtime: add qa for flowgraph | Bastian Bloessl | 2016-10-01 | 1 | -0/+58 |
| | | |||||
* | | wxgui: removed | Johnathan Corgan | 2016-09-08 | 1 | -1/+0 |
| | | |||||
* | | cmake: nuke cpack from existence | Johnathan Corgan | 2016-08-03 | 5 | -9/+0 |
| | | | | | | | | | | | | CPack is not used, unmaintaned, and broken. This does not eliminate any MSVC build functionality. | ||||
* | | pager: deprecated in 3.7, removed for 3.8 | Johnathan Corgan | 2016-06-10 | 1 | -1/+0 |
| | | |||||
* | | Merge branch 'remove-noaa' into next | Johnathan Corgan | 2016-06-06 | 1 | -1/+0 |
|\ \ | |||||
| * | | noaa: remove for 3.8 release | Johnathan Corgan | 2016-06-06 | 1 | -1/+0 |
| | | | |||||
* | | | fcd: remove for 3.8 release | Johnathan Corgan | 2016-06-06 | 1 | -1/+0 |
|/ / | |||||
* | | Merge branch 'master' into next | Johnathan Corgan | 2016-04-14 | 1 | -2/+11 |
|\| | |||||
| * | float(version) doesn't work with "1.9.0"; fixed nx version checking | Marcus Müller | 2016-04-14 | 1 | -2/+11 |
| | | |||||
* | | Merge branch 'master' into next | Johnathan Corgan | 2016-03-27 | 1 | -17/+29 |
|\| | |||||
| * | ctrlport: gr-perf-monitorx: add small offset to avoid log(0) calls. | Tom Rondeau | 2016-03-09 | 1 | -2/+2 |
| | | |||||
| * | ctrlport: gr-perf-monitorx - don't stash the canvas, ask the figure. | Tom Rondeau | 2016-03-09 | 1 | -12/+8 |
| | | |||||
| * | ctrlport: Some version issues for running gr-perf-monitorx | Tom Rondeau | 2016-03-09 | 1 | -3/+19 |
| | | | | | | | | | | | | Newer Matplotlib and Networkx modules have altered a few things on us. Doing some extra checks and setup to work with, hopefully, all current versions. | ||||
* | | Merge branch 'master' into next | Johnathan Corgan | 2016-01-17 | 1 | -1/+1 |
|\| | |||||
| * | gru: Fixes an obsolete numpy function call. | Tom Rondeau | 2016-01-06 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into next | Johnathan Corgan | 2015-12-08 | 1 | -1/+50 |
|\| | |||||
| * | Merge branch 'maint' | Johnathan Corgan | 2015-12-08 | 1 | -1/+50 |
| |\ | |||||
| | * | runtime: fix hierarchical block message port flattening/GRC usage | Tim O'Shea | 2015-12-08 | 1 | -1/+50 |
| | | | |||||
* | | | Merge branch 'master' into next | Johnathan Corgan | 2015-11-11 | 1 | -0/+7 |
|\| | | |||||
| * | | runtime: add accessors for in_sig and out_sig in python blocks | Sebastian Koslowski | 2015-11-06 | 1 | -0/+7 |
| | | | |||||
* | | | Merge branch 'master' into next | Johnathan Corgan | 2015-10-17 | 2 | -0/+20 |
|\| | | |||||
| * | | ctrlport: provides a ControlPort model that connects directly with a | Tom Rondeau | 2015-10-16 | 2 | -0/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | block's message handler. We still need to register this in setup_rpc, but there might be a way to automate the registering of this during set_msg_handler if ControlPort is enabled. | ||||
* | | | Merge branch 'master' into next | Johnathan Corgan | 2015-10-07 | 1 | -15/+29 |
|\| | | |||||
| * | | random-analog: fixed reseed issue | Johannes Demel | 2015-09-28 | 1 | -15/+14 |
| | | | |||||
| * | | random-analog: added new uniform integer distribution source | Johannes Demel | 2015-09-28 | 1 | -11/+26 |
| | | | |||||
* | | | Merge branch 'master' into next | Johnathan Corgan | 2015-09-05 | 1 | -0/+64 |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: gr-atsc/lib/qa_atsci_fake_single_viterbi.cc gr-atsc/lib/qa_atsci_fs_correlator.cc gr-atsc/lib/qa_atsci_single_viterbi.cc | ||||
| * | | redo qa_random without print statements and scipy; add stand-alone ↵ | Stefan | 2015-09-04 | 1 | -100/+9 |
| | | | | | | | | | | | | evaluation script in gnuradio-runtime/apps | ||||
| * | | add test-case for reseed feature | Stefan | 2015-09-01 | 1 | -8/+30 |
| | | | |||||
| * | | add boost.random as random number generator | Stefan | 2015-09-01 | 1 | -0/+19 |
| | | | |||||
| * | | fix wrong laplacian random numbers and add testcase | Stefan | 2015-09-01 | 1 | -18/+33 |
| | | | |||||
| * | | include random.h in swig; add qa_random testcase | Stefan | 2015-09-01 | 1 | -0/+99 |
| | | | |||||
* | | | Merge branch 'master' into next | Johnathan Corgan | 2015-08-28 | 1 | -9/+14 |
|\| | | | | | | | | | | | | | | Conflicts: docs/sphinx/source/index.rst | ||||
| * | | Merge remote-tracking branch 'ckuethe/trap_import_errors' | Johnathan Corgan | 2015-08-28 | 1 | -8/+13 |
| |\ \ |