gnuradio.git - GNU Radio

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'next' into digital	Tom Rondeau	2011-09-26	35	-84/+2145
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: gnuradio-core/src/lib/general/general.i gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.cc gnuradio-core/src/lib/general/gr_pll_freqdet_cf.cc gnuradio-core/src/lib/general/gr_pll_refout_cc.cc gnuradio-core/src/python/gnuradio/gr/qa_pll_carriertracking.py gnuradio-core/src/python/gnuradio/gr/qa_pll_freqdet.py gnuradio-core/src/python/gnuradio/gr/qa_pll_refout.py gr-digital/lib/digital_constellation_receiver_cb.cc gr-digital/python/Makefile.am gr-digital/python/__init__.py gr-digital/python/generic_mod_demod.py gr-digital/python/pkt.py gr-digital/python/psk2.py gr-digital/python/qam.py
\| *	Merge branch 'master' into next	Johnathan Corgan	2011-09-24	2	-6/+16
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: gr-qtgui/apps/usrp_display.py
\| \| *	trellis: fixed import statements; fixed test_cpm to convert numpy stuff to ↵	Tom Rondeau	2011-09-23	2	-6/+16
\| \| \| \| \| \| \| \| \| \| \| \|	types GNU Radio blocks can handle.
\| * \|	Merge branch 'master' into next	Tom Rondeau	2011-09-07	18	-2064/+0
\| \|\\|
\| \| *	trellis: removing generated files.	Tom Rondeau	2011-09-06	18	-2064/+0
\| \| \|
\| * \|	Merge branch 'master' into next	Tom Rondeau	2011-09-02	45	-66/+4183
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: Minor fixes in turbo GRC blocks Minor fixes in turbo GRC blocks and one more example added. Added pccc combined turbo decoder and corresponding GRC block More examples and turbo decoder blocks added. Added more turbo encoder/decoder blocks and examples. Added SCCC encoder/decoder grc blocksi and examples. Also moved all grc blocks related to trellis inside the gr-trellis/grc directory added grc directory in gr-trellis updated Makefile.am and block_tree.xml to reflect changes in grc file for gr-trellis Moved grc files from grc/block to gr-trellis/grc
\| \| *	Merge branch 'turbo'	Tom Rondeau	2011-09-02	45	-66/+4183
\| \| \|\
\| \| \| *	Minor fixes in turbo GRC blocks	Achilleas Anastasopoulos	2011-09-01	11	-12/+17
\| \| \| \|
\| \| \| *	Minor fixes in turbo GRC blocks and one more example added.	Achilleas Anastasopoulos	2011-09-01	1	-1/+1
\| \| \| \|
\| \| \| *	Added pccc combined turbo decoder and corresponding GRC block	Achilleas Anastasopoulos	2011-08-31	28	-49/+2861
\| \| \| \|
\| \| \| *	More examples and turbo decoder blocks added.	Achilleas Anastasopoulos	2011-08-31	3	-5/+123
\| \| \| \|
\| \| \| *	Added more turbo encoder/decoder blocks and examples.	Achilleas Anastasopoulos	2011-08-31	4	-2/+217
\| \| \| \|
\| \| \| *	Added SCCC encoder/decoder grc blocksi and examples. Also moved all grc ↵	Achilleas Anastasopoulos	2011-08-31	11	-25/+297
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	blocks related to trellis inside the gr-trellis/grc directory
\| \| \| *	added grc directory in gr-trellis	Achilleas Anastasopoulos	2011-06-13	10	-9/+64
\| \| \| \|
\| \| \| *	Moved grc files from grc/block to gr-trellis/grc	Achilleas Anastasopoulos	2011-06-12	7	-0/+640
\| \| \| \|
\| * \| \|	fixed some more warnings; mostly in doxygen or order of variable initialization.	Tom Rondeau	2011-07-27	1	-4/+4
\| \| \| \|
\| * \| \|	Merge branch 'master' into next	Tom Rondeau	2011-07-26	3	-3/+3
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: doxygen: fixed doxygen warnings. Fixed type warning. Fixed warnings about doxygen format. Fixed return warnings. Fixed warnings about variable intialization order.
\| \| * \|	Fixed warnings about variable intialization order.	Tom Rondeau	2011-07-26	3	-3/+3
\| \| \|/
\| * \|	misc_next_branch_tweaks_to_build_on_osx_and_windows	Josh Blum	2011-07-23	1	-2/+2
\| \| \|
\| * \|	trellis: fixed bug in trellis constellation metrics on when to include config.h.	Tom Rondeau	2011-07-20	1	-3/+1
\| \| \|
* \| \|	digital: updated build files for new gr-digital/include directory.	Tom Rondeau	2011-09-26	1	-4/+4
\|/ /
* \|	trellis: fixing trellis build and qa structure. run_tests.in adds gr-digital ↵	Tom Rondeau	2011-07-12	2	-5/+12
\| \| \| \| \| \| \| \|	to the PYTHONPATH so that the QA code can import digital_swig.
* \|	digital: work on build to make gr-trellis dependent on gr-digital.	Tom Rondeau	2011-07-10	2	-7/+7
\| \|
* \|	gr-digital, gr-trellis: Fixing gr-trellis to work with constellation now ↵	Ben Reynwar	2011-06-21	6	-37/+4
\| \| \| \| \| \| \| \|	that it is in gr-digital.
* \|	Merge branch '8psk' of https://github.com/trondeau/gnuradio into 8psk	Ben Reynwar	2011-06-13	55	-151/+3350
\|\ \
\| * \|	Merge branch 'master' into 8psk	Tom Rondeau	2011-06-13	55	-151/+3350
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: gr-qtgui/lib/qtgui_time_sink_c.cc gr-trellis/src/lib/Makefile.am gr-trellis/src/lib/calc_metric.h gr-trellis/src/lib/trellis.i gr-trellis/src/lib/trellis_constellation_metrics_cf.i gr-trellis/src/lib/trellis_metric_type.h gr-trellis/src/lib/trellis_sccc_encoder_XX.i.t
\| \| *	Merge branch 'mergeme/fix/trellis/metrics_typo'	Tom Rondeau	2011-06-07	1	-1/+1
\| \| \|\
\| \| \| *	trellis: fix typo, had include config.h logic reversed	Josh Blum	2011-05-25	1	-1/+1
\| \| \| \|
\| \| * \|	Merge branch 'master' into turbo	Tom Rondeau	2011-06-05	8	-179/+147
\| \| \|\\|
\| \| * \|	trellis: fixed Makefile by removing non-existant file names.	Tom Rondeau	2011-06-05	1	-2/+0
\| \| \| \|
\| \| * \|	Updated some of the examples in gr-trellis to use the options parser	Achilleas Anastasopoulos	2011-06-02	6	-177/+78
\| \| \| \|
\| \| * \|	updated gr-trellis documentation	Achilleas Anastasopoulos	2011-03-24	1	-2/+12
\| \| \| \|
\| \| * \|	Added Makefile.gen back to repo	Achilleas Anastasopoulos	2011-02-22	2	-1/+156
\| \| \| \|
\| \| * \|	added pccc decoder + examples	Achilleas Anastasopoulos	2011-02-21	9	-56/+624
\| \| \| \|
\| \| * \|	added pccc (parallel concatenated convlutional code) encoder	Achilleas Anastasopoulos	2011-02-20	9	-0/+249
\| \| \| \|
\| \| * \|	updated documentation	Achilleas Anastasopoulos	2011-02-20	2	-6/+18
\| \| \| \|
\| \| * \|	added sccc_decoder block (without the metrics part)	Achilleas Anastasopoulos	2011-02-20	9	-0/+543
\| \| \| \|
\| \| * \|	added a scaling parameter in trellis_sccc_decoder, needed	Achilleas Anastasopoulos	2011-02-20	6	-11/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for sum-product metric calculation
\| \| * \|	added sccc turbo decoder block + example test_sccc_turbo1.py	Achilleas Anastasopoulos	2011-02-19	6	-23/+265
\| \| \| \|
\| \| * \|	templated siso_combined	Achilleas Anastasopoulos	2011-02-18	5	-433/+153
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	removed Makefile.gen from git tracking
\| \| * \|	removed "audio" dependencies from test files in gr-trellis	Achilleas Anastasopoulos	2011-02-18	12	-12/+0
\| \| \| \|
\| \| * \|	core algorithms such as viterbi/siso were refactored	Achilleas Anastasopoulos	2011-02-18	22	-19/+1524
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and implemented using templates. Minor renaming of some files
\| \| * \|	inital commit of turbo stuff:	Achilleas Anastasopoulos	2011-02-17	7	-1/+246
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	added sccc encoder block + minor fixes
* \| \| \|	Modifying gr_trellis for gr_constellation -> digital_constellation change.	Ben Reynwar	2011-05-10	5	-13/+19
\|/ / /
* \| \|	Updated copyright notice dates.	Ben Reynwar	2011-02-27	4	-4/+4
\| \| \|
* \| \|	Removing docstring generation from this branch.	Ben Reynwar	2011-02-27	1	-1/+1
\| \| \|
* \| \|	Constellation objects accept n-dimensional points. (i.e. n complex numbers ↵	Ben Reynwar	2011-02-20	2	-10/+18
\| \| \| \| \| \| \| \| \| \| \| \|	correspond to one symbol value.)
* \| \|	Added tests to qa_trellis.py.	Ben Reynwar	2011-02-06	1	-28/+91
\| \| \|
* \| \|	Added comments to fsm.h	Ben Reynwar	2011-02-06	1	-2/+98
\| \| \|
* \| \|	Added trellis_constellation_metrics_cf. It is equivalent to ↵	Ben Reynwar	2011-02-06	6	-9/+168
\| \| \| \| \| \| \| \| \| \| \| \|	trellis_metrics_c but it uses the constellation object's calc_metric method. This method is also added here. trellis_metric_type.h is moved to gr_metric_type since constellation object is now dependent on it.