summaryrefslogtreecommitdiff
path: root/gr-trellis/src/lib
Commit message (Collapse)AuthorAgeFilesLines
* Removed autotools, gr-waveform, some cleanupJohnathan Corgan2011-12-083-395/+0
| | | | Nick Foster owes Nick Corgan a six-pack of beer!
* docs: fixes some warnings.Tom Rondeau2011-12-061-3/+3
| | | | There is way too much institutional knowledge in these makefiles now. Another reason I'm glad we're going to cmake, which is being kept more sane as all of the problems are already known.
* Fixed warnings generated by variable declaration order.Tom Rondeau2011-12-061-1/+1
|
* docs: more fixes for generated swig files. This worked before the merge, but ↵Tom Rondeau2011-12-051-0/+1
| | | | this forces the build system to generate these before processing the other swig files.
* docs: better install of swig docs .i files since we actually have a variable ↵Tom Rondeau2011-12-041-4/+5
| | | | to take care of it already.
* docs: fixing variable for location of header files (SOURCE not BINARY).Tom Rondeau2011-11-301-1/+1
|
* docs: more appropriate variable to use when setting the include/headers ↵Tom Rondeau2011-11-281-1/+1
| | | | directory.
* docs: installing generated _doc.i files under autotools.Tom Rondeau2011-11-281-0/+3
|
* docs: better use of BUILT_SOURCES so I'm not overriding the standard build ↵Tom Rondeau2011-11-271-2/+2
| | | | instructions for it.
* docs: Adding swig doc generation to Makefile.am files.Tom Rondeau2011-11-271-0/+9
|
* docs: forgot to have the generated .i files installed.Tom Rondeau2011-11-271-0/+1
|
* docs: added python doxygen docs to gr-trellisTom Rondeau2011-11-272-0/+7
|
* cmake: make the swig cxx file gen depend on the specified targetsJosh Blum2011-11-051-6/+4
| | | | made a handy helper macro in grmisc to make this simpler
* cmake: fixed up swig deps properly for make -j*Josh Blum2011-11-041-30/+19
| | | | | Also took the time to fix up the swig index file generation. This may have not-been auto-regenerating before as well.
* trellis: applying patch to gitignore from Achilleas Anastasopoulos.Tom Rondeau2011-10-271-0/+18
|
* the librariesJosh Blum2011-10-231-8/+1
|
* swig: fix rules for generated index filesJosh Blum2011-10-191-2/+2
|
* gr: changed the way trellis/gengen generated.i is madeJosh Blum2011-10-151-13/+25
|
* gr: the CMakeLists.txt took a chill pillJosh Blum2011-10-081-47/+47
|
* Merge branch 'next' into digitalJosh Blum2011-10-081-9/+6
|\
| * trellis: make the lib/swig depend on the generated targetsJosh Blum2011-10-031-0/+6
| |
| * swig: added python script to auto-extract dependenciesJosh Blum2011-09-291-9/+0
| |
* | Merge branch 'digital' of https://github.com/trondeau/gnuradio into digitalJosh Blum2011-09-281-4/+4
|\ \ | |/ |/| | | | | | | Conflicts: gr-digital/lib/Makefile.am gr-digital/python/__init__.py
| * Merge branch 'next' into digitalTom Rondeau2011-09-2617-77/+652
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | digital: updated build files for new gr-digital/include directory.Tom Rondeau2011-09-261-4/+4
| | |
* | | trellis: performed generation re-work on gr-trellis libJosh Blum2011-09-211-86/+92
| | |
* | | Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextJosh Blum2011-09-1218-2064/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' into nextTom Rondeau2011-09-0718-2064/+0
| |\ \
| | * | trellis: removing generated files.Tom Rondeau2011-09-0618-2064/+0
| | | |
* | | | Merge branch 'next' of gnuradio.org:gnuradio into nextJosh Blum2011-09-0530-65/+2710
|\| | | | | | | | | | | | | | | | | | | Conflicts: gr-trellis/src/lib/trellis_permutation.h
| * | | Merge branch 'master' into nextTom Rondeau2011-09-0229-65/+2706
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 Rondeau2011-09-0229-65/+2706
| | |\ \
| | | * | Added pccc combined turbo decoder and corresponding GRC blockAchilleas Anastasopoulos2011-08-3126-48/+2689
| | | | |
| | | * | Added SCCC encoder/decoder grc blocksi and examples. Also moved all grc ↵Achilleas Anastasopoulos2011-08-313-17/+17
| | | | | | | | | | | | | | | | | | | | blocks related to trellis inside the gr-trellis/grc directory
* | | | | Merge branch 'next' of gnuradio.org:gnuradio into nextJosh Blum2011-07-281-4/+4
|\| | | |
| * | | | fixed some more warnings; mostly in doxygen or order of variable initialization.Tom Rondeau2011-07-271-4/+4
| | | | |
* | | | | Merge branch 'next' of gnuradio.org:gnuradio into nextJosh Blum2011-07-263-3/+3
|\| | | |
| * | | | Merge branch 'master' into nextTom Rondeau2011-07-263-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 Rondeau2011-07-263-3/+3
| | |/ /
| * | | misc_next_branch_tweaks_to_build_on_osx_and_windowsJosh Blum2011-07-231-2/+2
| | | |
* | | | Merge branch 'next' of gnuradio.org:gnuradio into nextJosh Blum2011-07-231-2/+0
|\| | | | | | | | | | | | | | | | | | | Conflicts: gr-trellis/src/lib/trellis_constellation_metrics_cf.cc
| * | | trellis: fixed bug in trellis constellation metrics on when to include config.h.Tom Rondeau2011-07-201-3/+1
| | |/ | |/|
* | | trellis: added symbol visibility defines to gr-trellis, builds on MSVC and linuxJosh Blum2011-07-2219-44/+95
| | |
* | | gr: squashed cmakelists.txt into one commitJosh Blum2011-07-202-1/+217
|/ /
* | digital: work on build to make gr-trellis dependent on gr-digital.Tom Rondeau2011-07-102-7/+7
| |
* | gr-digital, gr-trellis: Fixing gr-trellis to work with constellation now ↵Ben Reynwar2011-06-216-37/+4
| | | | | | | | that it is in gr-digital.
* | Merge branch '8psk' of https://github.com/trondeau/gnuradio into 8pskBen Reynwar2011-06-1337-19/+2991
|\ \
| * | Merge branch 'master' into 8pskTom Rondeau2011-06-1337-19/+2991
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Rondeau2011-06-071-1/+1
| | |\
| | | * trellis: fix typo, had include config.h logic reversedJosh Blum2011-05-251-1/+1
| | | |