summaryrefslogtreecommitdiff
path: root/gr-trellis
AgeCommit message (Collapse)Author
2011-09-26Merge branch 'next' into digitalTom Rondeau
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
2011-09-26digital: updated build files for new gr-digital/include directory.Tom Rondeau
2011-09-24Merge branch 'master' into nextJohnathan Corgan
Conflicts: gr-qtgui/apps/usrp_display.py
2011-09-23trellis: fixed import statements; fixed test_cpm to convert numpy stuff to ↵Tom Rondeau
types GNU Radio blocks can handle.
2011-09-07Merge branch 'master' into nextTom Rondeau
2011-09-06trellis: removing generated files.Tom Rondeau
2011-09-02Merge branch 'master' into nextTom Rondeau
* 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
2011-09-02Merge branch 'turbo'Tom Rondeau
2011-09-01Minor fixes in turbo GRC blocksAchilleas Anastasopoulos
2011-09-01Minor fixes in turbo GRC blocks and one more example added.Achilleas Anastasopoulos
2011-08-31Added pccc combined turbo decoder and corresponding GRC blockAchilleas Anastasopoulos
2011-08-31More examples and turbo decoder blocks added.Achilleas Anastasopoulos
2011-08-31Added more turbo encoder/decoder blocks and examples.Achilleas Anastasopoulos
2011-08-31Added SCCC encoder/decoder grc blocksi and examples. Also moved all grc ↵Achilleas Anastasopoulos
blocks related to trellis inside the gr-trellis/grc directory
2011-07-27fixed some more warnings; mostly in doxygen or order of variable initialization.Tom Rondeau
2011-07-26Merge branch 'master' into nextTom Rondeau
* master: doxygen: fixed doxygen warnings. Fixed type warning. Fixed warnings about doxygen format. Fixed return warnings. Fixed warnings about variable intialization order.
2011-07-26Fixed warnings about variable intialization order.Tom Rondeau
2011-07-23misc_next_branch_tweaks_to_build_on_osx_and_windowsJosh Blum
2011-07-20trellis: fixed bug in trellis constellation metrics on when to include config.h.Tom Rondeau
2011-07-12trellis: fixing trellis build and qa structure. run_tests.in adds gr-digital ↵Tom Rondeau
to the PYTHONPATH so that the QA code can import digital_swig.
2011-07-10digital: work on build to make gr-trellis dependent on gr-digital.Tom Rondeau
2011-06-21gr-digital, gr-trellis: Fixing gr-trellis to work with constellation now ↵Ben Reynwar
that it is in gr-digital.
2011-06-13added grc directory in gr-trellisAchilleas Anastasopoulos
2011-06-13Merge branch '8psk' of https://github.com/trondeau/gnuradio into 8pskBen Reynwar
2011-06-13Merge branch 'master' into 8pskTom Rondeau
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
2011-06-12Moved grc files from grc/block to gr-trellis/grcAchilleas Anastasopoulos
2011-06-07Merge branch 'mergeme/fix/trellis/metrics_typo'Tom Rondeau
2011-06-05Merge branch 'master' into turboTom Rondeau
2011-06-05trellis: fixed Makefile by removing non-existant file names.Tom Rondeau
2011-06-02Updated some of the examples in gr-trellis to use the options parserAchilleas Anastasopoulos
2011-05-25trellis: fix typo, had include config.h logic reversedJosh Blum
2011-05-10Modifying gr_trellis for gr_constellation -> digital_constellation change.Ben Reynwar
2011-03-24updated gr-trellis documentationAchilleas Anastasopoulos
2011-02-27Updated copyright notice dates.Ben Reynwar
2011-02-27Removing docstring generation from this branch.Ben Reynwar
2011-02-22Added Makefile.gen back to repoAchilleas Anastasopoulos
2011-02-21added pccc decoder + examplesAchilleas Anastasopoulos
2011-02-20Constellation objects accept n-dimensional points. (i.e. n complex numbers ↵Ben Reynwar
correspond to one symbol value.)
2011-02-20added pccc (parallel concatenated convlutional code) encoderAchilleas Anastasopoulos
2011-02-20updated documentationAchilleas Anastasopoulos
2011-02-20added sccc_decoder block (without the metrics part)Achilleas Anastasopoulos
2011-02-20added a scaling parameter in trellis_sccc_decoder, neededAchilleas Anastasopoulos
for sum-product metric calculation
2011-02-19added sccc turbo decoder block + example test_sccc_turbo1.pyAchilleas Anastasopoulos
2011-02-18templated siso_combinedAchilleas Anastasopoulos
removed Makefile.gen from git tracking
2011-02-18removed "audio" dependencies from test files in gr-trellisAchilleas Anastasopoulos
2011-02-18core algorithms such as viterbi/siso were refactoredAchilleas Anastasopoulos
and implemented using templates. Minor renaming of some files
2011-02-17inital commit of turbo stuff:Achilleas Anastasopoulos
added sccc encoder block + minor fixes
2011-02-06Added tests to qa_trellis.py.Ben Reynwar
2011-02-06Added comments to fsm.hBen Reynwar
2011-02-06Added trellis_constellation_metrics_cf. It is equivalent to ↵Ben Reynwar
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.