| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | Merging ctrlport2 into next branch. | Tom Rondeau | 2012-12-03 | 11 | -0/+2501 | |
| | | | | ||||||
| * | | | Merge branch 'master' into next | Tom Rondeau | 2012-12-03 | 1 | -2/+3 | |
| |\| | | ||||||
| | * | | QA: update the 'import pmt' statement to always draw the pmt module from the ↵ | Tom Rondeau | 2012-12-03 | 1 | -2/+3 | |
| | | | | | | | | | | | | | build directory. | |||||
| * | | | Merge branch 'master' into next | Johnathan Corgan | 2012-11-29 | 1 | -0/+70 | |
| |\| | | ||||||
| | * | | Adding PDU to tagged stream and tagged stream to PDU blocks along with QA python | Johnathan Corgan | 2012-11-29 | 1 | -0/+70 | |
| | | | | | | | | | | | | | non-stream-connected blocks still need a new thread context | |||||
| * | | | Merge branch 'master' into next | Johnathan Corgan | 2012-11-29 | 1 | -0/+6 | |
| |\| | | ||||||
| | * | | core: adding msg_connect, updating msg interface, adding symbolic block names | Tim O'Shea | 2012-11-29 | 1 | -0/+6 | |
| | | | | ||||||
| * | | | Revert "core: adding msg_connect, updating msg interface, adding symbolic ↵ | Johnathan Corgan | 2012-11-29 | 1 | -6/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | block names" (to be reapplied on master branch and re-merged in) This reverts commit 7fc857a18cdc47f333db56cfedd2a4ed1a8432a9. | |||||
| * | | | core: adding msg_connect, updating msg interface, adding symbolic block names | Tim O'Shea | 2012-11-28 | 1 | -0/+6 | |
| | | | | ||||||
| * | | | Merge branch 'master' into next | Tom Rondeau | 2012-11-27 | 4 | -1/+460 | |
| |\| | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/general/CMakeLists.txt gnuradio-core/src/lib/general/general.i | |||||
| | * | | Revert "Revert "Merge remote branch 'jblum-github/python_blocks2' into master"" | Tom Rondeau | 2012-11-27 | 4 | -1/+460 | |
| | |/ | | | | | | | | | | | | | | | | | | | This reverts commit 3a142bebafdc018bccc80cf124a375b53db03581. Since updating __init__.py for ticket 181, we should have fixed the same bug that was being seen here. Conflicts: gnuradio-core/src/python/gnuradio/gr/CMakeLists.txt | |||||
| * | | Merge branch 'master' into next | Johnathan Corgan | 2012-11-14 | 1 | -5/+0 | |
| |\| | | | | | | | | | | | | | | | | | Conflicts: gr-atsc/src/lib/CMakeLists.txt gr-digital/python/CMakeLists.txt gr-trellis/src/python/CMakeLists.txt gr-vocoder/python/CMakeLists.txt gr-wavelet/python/CMakeLists.txt | |||||
| | * | Merge branch 'maint' | Johnathan Corgan | 2012-11-14 | 1 | -5/+0 | |
| | |\ | ||||||
| | | * | gr: same change for common PYTHON test paths | Josh Blum | 2012-11-14 | 1 | -5/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | Conflicts: gr-analog/python/CMakeLists.txt gr-blocks/python/CMakeLists.txt | |||||
| | | * | gr: set a common GR_TEST_TARGET_DEPS for all module unit tests | Josh Blum | 2012-11-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each unit test shares common dependencies, but we have been neglecting to set these. In this changeset, we set one top level GR_TEST_TARGET_DEPS, and simply append module-specific dependencies for each test. This also helps to fix QA tests on windows which were missing the dependencies list. Conflicts: gr-analog/python/CMakeLists.txt gr-blocks/python/CMakeLists.txt | |||||
| * | | | fec: add new top-level component for FEC blocks | Johnathan Corgan | 2012-11-12 | 1 | -50/+0 | |
| | | | | | | | | | | | | | Removed viterbi and reed-solomon from gnuradio-core | |||||
| * | | | analog: removed noise and sig sources from core. | Tom Rondeau | 2012-11-10 | 2 | -208/+0 | |
| | | | | | | | | | | | | | Fixed QA code for components that do not use gr-analog. | |||||
| * | | | analog: removing frequency mod, phase mod, quad demod, and rail from ↵ | Tom Rondeau | 2012-11-06 | 1 | -56/+0 | |
| | | | | | | | | | | | | | gnuradio-core. | |||||
| * | | | Merge branch 'next' into next_analog | Tom Rondeau | 2012-11-05 | 1 | -19/+0 | |
| |\ \ \ | ||||||
| | * | | | Merge branch 'master' into next | Tom Rondeau | 2012-11-01 | 1 | -19/+0 | |
| | |\| | | ||||||
| | | * | | Removes some swig workaround code put in for ticket 181. | Tom Rondeau | 2012-10-19 | 1 | -19/+0 | |
| | | |/ | | | | | | | | | | This seems to fix the import problems recently seen on 12.10 for loading gnuradio-companion (due to 'from lxml import etree' which was actually due to 'import os' causing a segfault). | |||||
| * | | | analog: removing PLL blocks. Also moved blks2impl files that used PLLs to ↵ | Tom Rondeau | 2012-11-01 | 14 | -1605/+0 | |
| | | | | | | | | | | | | | | | | | | | gr-analog. This probably impacts a lot of examples; once we've removed all files in gnuradio-core, we'll need to retest. | |||||
| * | | | analog: removed all AGC blocks from gnuradio-core. | Tom Rondeau | 2012-10-31 | 1 | -433/+0 | |
| |/ / | | | | | | | Also replaces calls to gr.agc with analog.agc. | |||||
| * | | Examples: Fixed minor bugs in examples and blks2impl from namespace changes. | Ben Reynwar | 2012-09-04 | 3 | -9/+9 | |
| | | | ||||||
| * | | Merge branch 'master' into next | Johnathan Corgan | 2012-09-04 | 1 | -5/+6 | |
| |\| | ||||||
| | * | Merge branch 'maint' | Johnathan Corgan | 2012-09-04 | 1 | -5/+6 | |
| | |\ | ||||||
| | | * | core: only check for *.conf in prefs dirmaint-3.6.1 | Martin Braun | 2012-09-04 | 1 | -5/+6 | |
| | | | | ||||||
| * | | | Merge branch 'master' into next | Tom Rondeau | 2012-08-30 | 1 | -0/+66 | |
| |\| | | ||||||
| | * | | adding gr_endian_swap block | Tim O'Shea | 2012-08-30 | 1 | -0/+66 | |
| | | | | ||||||
| * | | | Merge remote branch 'reynwar/comments_next' into next | Johnathan Corgan | 2012-08-28 | 22 | -163/+202 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gr-digital/include/digital_constellation.h gr-digital/python/bpsk.py gr-digital/python/qpsk.py | |||||
| | * | | | docs: Changed arguments in python docstrings to new formatting style. | Ben Reynwar | 2012-08-14 | 16 | -173/+192 | |
| | | | | | ||||||
| | * | | | docs: Formatted python docstrings for sphinx docs. | Ben Reynwar | 2012-08-13 | 2 | -1/+9 | |
| | | | | | ||||||
| | * | | | Merged comments branch into comments_next branch. | Ben Reynwar | 2012-08-10 | 5 | -1/+25 | |
| | |\ \ \ | ||||||
| | | * | | | Merge branch 'master' into comments | Ben Reynwar | 2012-08-08 | 5 | -0/+331 | |
| | | |\| | | ||||||
| | | * | | | docs: Adding/editing top-level docstrings. | Ben Reynwar | 2012-05-21 | 5 | -1/+25 | |
| | | | | | | ||||||
| * | | | | | filter: fixing PFB GRC blocks. | Tom Rondeau | 2012-08-22 | 4 | -340/+0 | |
| | | | | | | | | | | | | | | | | | | | | | Removing from grc dir and using Python-wrapper blocks for GRC components in gr-filter. Updated Python wrapper to take an empty tuple (generated by GRC when no input for a vector type) to auto-generate the taps for the PFBs. | |||||
| * | | | | | core: fixing location of some components for the new hierarchy. | Tom Rondeau | 2012-08-22 | 2 | -156/+0 | |
| | | | | | | | | | | | | | | | | | | | | | ctest and digital examples working again. | |||||
| * | | | | | core: removed fft blocks from core (now only in gr-fft). | Tom Rondeau | 2012-08-20 | 1 | -212/+0 | |
| | | | | | | ||||||
| * | | | | | core: fixed default upper-limit on noutput_items to make sure we don't ↵ | Tom Rondeau | 2012-08-20 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | normally hit it. | |||||
| * | | | | | Merge branch 'next' into wip/filter-rm-next | Johnathan Corgan | 2012-07-07 | 4 | -455/+1 | |
| |\ \ \ \ \ | ||||||
| | * \ \ \ \ | Merge branch 'master' into next | Johnathan Corgan | 2012-07-07 | 4 | -455/+1 | |
| | |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/general/CMakeLists.txt | |||||
| | | * | | | | Revert "Merge remote branch 'jblum-github/python_blocks2' into master" | Johnathan Corgan | 2012-07-07 | 4 | -455/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f8581fb475267e1a97eaab962e423559fb4bfce2, reversing changes made to 73800434abfb8c6efcf069222b5f0fea9c86870b. | |||||
| * | | | | | | Merge branch 'next' into wip/filter-rm-next | Johnathan Corgan | 2012-07-03 | 4 | -1/+455 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/swig/CMakeLists.txt | |||||
| | * | | | | | Merge branch 'master' into next | Johnathan Corgan | 2012-07-01 | 4 | -1/+455 | |
| | |\| | | | | | |/ / / | |/| | | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/general/CMakeLists.txt | |||||
| | | * | | | Merge remote branch 'jblum-github/python_blocks2' into master | Johnathan Corgan | 2012-07-01 | 4 | -1/+455 | |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/CMakeLists.txt gnuradio-core/src/lib/general/general.i | |||||
| | | | * | | | python-blocks: replace assertItemsEqual with assertEqual | Josh Blum | 2012-04-27 | 1 | -6/+6 | |
| | | | | | | | ||||||
| | | | * | | | this is squashed python blocks support | Josh Blum | 2012-04-17 | 4 | -1/+455 | |
| | | | | | | | ||||||
| * | | | | | | core: fix missing update from dc172e5d | Johnathan Corgan | 2012-06-24 | 1 | -6/+1 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'next' into wip/filter-rm-next | Johnathan Corgan | 2012-06-23 | 1 | -0/+43 | |
| |\| | | | | | ||||||
| | * | | | | | Merge branch 'master' into next | Tom Rondeau | 2012-06-23 | 1 | -0/+43 | |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/general/CMakeLists.txt gnuradio-core/src/lib/general/general.i | |||||
 |
index : gnuradio.git | |
| GNU Radio | admin@gnuradio.org |
| summaryrefslogtreecommitdiff |