summaryrefslogtreecommitdiff
path: root/gr-trellis
Commit message (Collapse)AuthorAgeFilesLines
* swig: fix rules for generated index filesJosh Blum2011-10-191-2/+2
|
* cmake: fix that component depends on component hackJosh 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-086-85/+85
|
* 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-2635-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
| * | digital: updated build files for new gr-digital/include directory.Tom Rondeau2011-09-261-4/+4
| | |
* | | Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextJosh Blum2011-09-262-6/+16
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' into nextJohnathan Corgan2011-09-242-6/+16
| |\ \ | | | | | | | | | | | | | | | | Conflicts: gr-qtgui/apps/usrp_display.py
| | * | trellis: fixed import statements; fixed test_cpm to convert numpy stuff to ↵Tom Rondeau2011-09-232-6/+16
| | | | | | | | | | | | | | | | types GNU Radio blocks can handle.
* | | | 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-0548-67/+4225
|\| | | | | | | | | | | | | | | | | | | Conflicts: gr-trellis/src/lib/trellis_permutation.h
| * | | Merge branch 'master' into nextTom Rondeau2011-09-0245-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 Rondeau2011-09-0245-66/+4183
| | |\ \
| | | * | Minor fixes in turbo GRC blocksAchilleas Anastasopoulos2011-09-0111-12/+17
| | | | |
| | | * | Minor fixes in turbo GRC blocks and one more example added.Achilleas Anastasopoulos2011-09-011-1/+1
| | | | |
| | | * | Added pccc combined turbo decoder and corresponding GRC blockAchilleas Anastasopoulos2011-08-3128-49/+2861
| | | | |
| | | * | More examples and turbo decoder blocks added.Achilleas Anastasopoulos2011-08-313-5/+123
| | | | |
| | | * | Added more turbo encoder/decoder blocks and examples.Achilleas Anastasopoulos2011-08-314-2/+217
| | | | |
| | | * | Added SCCC encoder/decoder grc blocksi and examples. Also moved all grc ↵Achilleas Anastasopoulos2011-08-3111-25/+297
| | | | | | | | | | | | | | | | | | | | blocks related to trellis inside the gr-trellis/grc directory
| | | * | added grc directory in gr-trellisAchilleas Anastasopoulos2011-06-1310-9/+64
| | | | |
| | | * | Moved grc files from grc/block to gr-trellis/grcAchilleas Anastasopoulos2011-06-127-0/+640
| | | | |
* | | | | cmake: language tweak for component group descriptionJosh Blum2011-08-021-1/+1
| | | | |
* | | | | 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
| | | |
* | | | vocoder: updated cmake build for new blocks (also fixed some tests)Josh Blum2011-07-231-1/+1
| | | |
* | | | 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-2220-47/+95
| | |
* | | digital: added cmake support for gr-digital (unix only)Josh Blum2011-07-202-0/+2
| | |
* | | gr: squashed cmakelists.txt into one commitJosh Blum2011-07-206-1/+508
|/ /
* | trellis: fixing trellis build and qa structure. run_tests.in adds gr-digital ↵Tom Rondeau2011-07-122-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 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-1355-151/+3350
|\ \
| * | Merge branch 'master' into 8pskTom Rondeau2011-06-1355-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 Rondeau2011-06-071-1/+1
| | |\
| | | * trellis: fix typo, had include config.h logic reversedJosh Blum2011-05-251-1/+1
| | | |
| | * | Merge branch 'master' into turboTom Rondeau2011-06-058-179/+147
| | |\|
| | * | trellis: fixed Makefile by removing non-existant file names.Tom Rondeau2011-06-051-2/+0
| | | |