summaryrefslogtreecommitdiff
path: root/gr-trellis/src
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-08-31Added pccc combined turbo decoder and corresponding GRC blockAchilleas 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-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-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-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.
2011-01-30Fixed Makefiles to generate swig_doc.iBen Reynwar
2011-01-30Merged upstream from nextBen Reynwar
2011-01-23Fixed minor bug in fsm.cc for fsms with 1 state.Ben Reynwar
2010-12-10Use load-extension-global instead of load-extensionEric Blossom
2010-12-07trellis_generated.i has to be generated first, befofre we can generate ↵Rob Savoye
anything else.
2010-12-06Merge branch 'next' into guile-nextEric Blossom
* next: (116 commits) Adding new example script for using the new PFB arbitrary resampler interface. One resampler takes user-generated taps and another resampler just takes the resampling rate. Both input and output signals are plotted. Modifying blsk2 wrapper for PFB arbitrary resampler to allow the user to just specify the requested resampling rate without providing their own filter taps. uhd: reverting tag changes on uhd single usrp source, there seems to be issues with the work() logic uhd: removed default value chan=0 in the cc files WITH_INCLUDES _must_ be last uhd: replaced CFLAGS with CPPFLAGS variable, and fixed swig args FIXME uhd: default channel params to zero for single source and sink blocks Revert "Removed usrp2-firmware from being automatically built." Remove generated file from repo Removed usrp2-firmware from being automatically built. uhd: added libdir to UHD CFLAGS (shared by lib and swig) Swapping out preset keys until I work out some of their issues. Modifying QA tests for the sample tags. By default, it only checks the sizes of the tags since order is not specified or guarenteed. Block is a gr_block, so this sets its relative rate. Was required for using in the QA of the sample tags code. Removing global pmt constants. Were causing segfaults during make check. Must fix this later. Fixing up the UHD sample tag example to take command line options. Swapping order of testing rrate. Changing propagation policy enum type name and making a few other minor edits. Changing API for gr_skiphead to use uint64_t for the offset instead of size_t (still unsigned). Fixes issue #304. Adding typedef for uint64_t and int64_t so we can use them through SWIG. ... Passes make distcheck.
2010-12-03Regenerated Makefile.swig.gen'sEric Blossom
generated by cgit (git 2.34.1) at 2024-12-23 00:15:29 +0000