gnuradio.git - GNU Radio

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'python3_fix' into next	Andrej Rode	2018-06-24	1	-69/+52
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	grc: move some of the param checkers to separate file	Sebastian Koslowski	2017-11-09	1	-10/+10
\| \|
\| *	grc: disable auto-conversion and implement json cache	Sebastian Koslowski	2017-11-08	1	-0/+2
\| \|
\| *	grc: added yaml/mako support	Sebastian Koslowski	2017-06-29	1	-11/+4
\| \| \| \| \| \| \| \|	Includes basic converter from XML/Cheetah to YAML/Mako based block format.
\| *	Merge remote-tracking branch 'upstream/next' into gtk3	Sebastian Koslowski	2016-09-12	1	-2/+1
\| \|\
\| * \	Merge remote-tracking branch 'upstream/next' into gtk3	Sebastian Koslowski	2016-08-09	1	-0/+1
\| \|\ \
\| * \| \|	grc: remove support for old msg queues	Sebastian Koslowski	2016-08-08	1	-1/+0
\| \| \| \|
\| * \| \|	grc: refactor: Port, Param, Options init clean-up	Sebastian Koslowski	2016-07-29	1	-0/+11
\| \| \| \|
\| * \| \|	grc-refactor: block state handling	Sebastian Koslowski	2016-07-13	1	-5/+0
\| \| \| \|
\| * \| \|	grc-refactor: move more port type color stuff to gui	Sebastian Koslowski	2016-07-13	1	-32/+24
\| \| \| \|
\| * \| \|	Merge remote-tracking branch 'grcwg/next_grcwg' into gtk3	Sebastian Koslowski	2016-07-13	1	-0/+1
\| \|\ \ \
\| * \| \| \|	grc: py3k compat using python-modernize	Sebastian Koslowski	2016-06-09	1	-3/+7
\| \| \| \| \|
\| * \| \| \|	grc-refactor: move param entry colors spec in gui package	Sebastian Koslowski	2016-05-30	1	-17/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' into next	Martin Braun	2018-02-03	1	-1/+1
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	Comment typo fixing.	luz.paz	2018-02-03	1	-1/+1
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Luzpaz went ahead and found typos using `codespell -q 3`.
* \| \| \|	grc: remove support for old msg queues	Sebastian Koslowski	2016-09-05	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	cherry-picked from gtk3 branch
* \| \| \|	grc: remove wxgui support from core	Sebastian Koslowski	2016-09-05	1	-1/+0
\|/ / /
* \| \|	grc: also read user default flow graph from env	Sebastian Koslowski	2016-08-03	1	-1/+1
\| \| \|
* \| \|	grc: look for default_flow_graph.grc in ~/.grc_gnuradio	Chris Kuethe	2016-08-03	1	-0/+1
\| \|/ \|/\| \| \| \| \|	allows users to create their own template flow graph
* \|	grc: separate core and OOT block trees via the category of each block	Sebastian Koslowski	2016-05-27	1	-0/+1
\|/ \| \| \| \| \| \|	Each block get assigned a module based on the root of its category. The category is set via a block_tree.xml or else from its <category> tag. The category root is only interpreted as module name if it is in square brackets. Else the default module 'Others' is used.
*	grc: add warning for block flagged deprecated	Sebastian Koslowski	2016-05-20	1	-0/+1
\|
*	grc: Added bits (unpacked bytes) as a data type	Martin Braun	2016-05-11	1	-4/+7
\| \| \| \| \|	Note: Sizeof is left at 1, so this causes no warnings where flow graphs used to work.
*	grc-refactor: move gui prefs to gui	Sebastian Koslowski	2016-04-05	1	-24/+1
\|
*	grc-refactor: Platform.py	Sebastian Koslowski	2016-02-17	1	-1/+1
\|
*	grc-refactor: rename grc/model/ to grc/core/	Sebastian Koslowski	2016-02-17	1	-0/+168