summaryrefslogtreecommitdiff
path: root/gr-uhd
Commit message (Collapse)AuthorAgeFilesLines
* pmt: fixing a few files with older pmt naming style.Tom Rondeau2013-01-132-10/+10
|
* Merge master/fix_build_dir_order into next, then fix conflicts and redo come ↵Michael L Dickens2013-01-044-14/+18
|\ | | | | | | of the INCLUDE_DIRS order
| * Tweak INCLUDE dirs such that INCLUDE_DIRECTORIES and LINK_DIRECTORIES are ↵Michael L Dickens2013-01-014-14/+18
| | | | | | | | ordered as: internal build and source for this component, other components (internal build and source, or already installed), non-project non-system dependencies (e.g., Qt, Boost, Python), system dependencies (e.g., CoreAudio).
* | Merge branch 'pmt_rename' into nextTom Rondeau2013-01-024-31/+31
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/io/gr_pdu.cc gruel/src/lib/pmt/pmt.cc gruel/src/lib/pmt/qa_pmt_prims.cc gruel/src/lib/pmt/unv_template.cc.t gruel/src/swig/pmt_swig.i
| * | gruel: updating all GR blocks that use PMTs to use new naming.Tom Rondeau2012-12-214-31/+31
| | |
* | | analog: fixing up UHD apps to use gr-analog module.Tom Rondeau2012-12-312-7/+8
| | |
* | | grc: updating GRC exmaples for new component changes.Tom Rondeau2012-12-274-19/+19
| | |
* | | blocks: removes blocks moved to gr-blocks from gnuradio-core.Tom Rondeau2012-12-2122-71/+91
|/ / | | | | | | Also fixes up some other missing moves.
* | Merge branch 'master' into nextTom Rondeau2012-12-121-2/+0
|\| | | | | | | | | Conflicts: gr-digital/swig/CMakeLists.txt
| * Merge branch 'maint'Tom Rondeau2012-12-121-2/+0
| |\
| | * build: removing core_swig from GR_SWIG_TARGET_DEPS. Seems to have been the ↵Tom Rondeau2012-12-121-2/+0
| | | | | | | | | | | | cause of the parallel build woes.
* | | Merge branch 'master' into nextJohnathan Corgan2012-11-191-1/+1
|\| |
| * | Merge branch 'maint'Johnathan Corgan2012-11-191-1/+1
| |\|
| | * uhd: include gnuradio paths for swig build firstJosh Blum2012-11-191-1/+1
| | | | | | | | | | | | | | | This fixes a potential issue where swig sees old installed headers, where it should be seeing in-tree headers.
* | | analog: fixing up GRC and other examples to use gr-analog for sig and noise ↵Tom Rondeau2012-11-101-227/+315
| | | | | | | | | | | | sources.
* | | analog: Removing reference to gr.sig_source_X and gr.noise_source_X where ↵Tom Rondeau2012-11-063-39/+41
| | | | | | | | | | | | | | | | | | | | | | | | possible. Passing make and make test. Examples and apps need testing. gr-filter relies on sig_source and noise_source, so can't remove them from core.
* | | all: Python, GRC, and examples to properly pull blocks from filter and analog.Tom Rondeau2012-11-0615-208/+230
| | |
* | | analog: removing PLL blocks. Also moved blks2impl files that used PLLs to ↵Tom Rondeau2012-11-011-14/+16
| | | | | | | | | | | | | | | | | | 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 Rondeau2012-10-314-7/+11
| | | | | | | | | | | | Also replaces calls to gr.agc with analog.agc.
* | | Merge branch 'master' into nextJohnathan Corgan2012-10-132-4/+4
|\| |
| * | Merge branch 'maint'Johnathan Corgan2012-10-132-4/+4
| |\|
| | * uhd: fix pmt tuple ref namespace issueJosh Blum2012-10-132-4/+4
| | | | | | | | | | | | | | | | | | | | | The pmt_tuple_ref should be prefixed with pmt:: just like all of the other calls. I am uncertain as to why this is compiling (we are not using namespace pmt), unless there is a hidden using namespace somewhere in a global header. But it will be good to get the code right as a general purpose example.
* | | Merge branch 'master' into nextTom Rondeau2012-10-031-102/+605
|\| |
| * | UHD: improved capabilities for uhd_fft.grc.Ben Hilburn2012-10-031-102/+605
| | |
* | | Merge branch 'master' into nextJohnathan Corgan2012-09-293-5/+24
|\| |
| * | uhd: work does not block, OK to return 0 on ERROR_CODE_TIMEOUTJosh Blum2012-09-291-5/+4
| | |
| * | uhd: provide source block hook for issue stream cmdJosh Blum2012-09-293-0/+20
| |/
* / docs: Changed arguments in python docstrings to new formatting style.Ben Reynwar2012-08-1415-18/+34
|/
* Merge branch 'maint'Johnathan Corgan2012-07-031-0/+2
|\ | | | | | | | | Conflicts: gruel/src/swig/CMakeLists.txt
| * swig: added GR_SWIG_TARGET_DEPS core_swig to other swig buildsJohnathan Corgan2012-07-031-0/+2
| | | | | | | | | | | | | | | | | | I have not encountered an issue, however this is the correct thing to do. Now individual components swig builds depend on the gr core swig target. Conflicts: gr-filter/swig/CMakeLists.txt
* | uhd: added rx tagging for changes in sample rate and center freqJosh Blum2012-06-202-2/+21
| |
* | uhd: source will loop for samples forever until thread interruptJosh Blum2012-06-201-2/+4
|/ | | | | | This should solve the case of stopping the receiver, while leaving the work thread in a live state. It also makes set stream time work for times > timeout.
* Revert "uhd: allow source work to be stopped while fg runs"Johnathan Corgan2012-06-071-21/+1
| | | | This reverts commit c78d307ecd5dac4e28190e5aa9b8377538f65ffa.
* Merge remote-tracking branch 'jblum/wip_uhd_stopper'Johnathan Corgan2012-06-021-1/+21
|\
| * uhd: allow source work to be stopped while fg runsJosh Blum2012-05-241-1/+21
| |
* | Merge branch 'maint'Johnathan Corgan2012-05-291-1/+1
|\ \ | |/ |/|
| * Fixed package dependencies for gnuradio-core and gr-wavelet, added support ↵Nicholas Corgan2012-05-171-1/+1
| | | | | | | | for Ubuntu 12.04 and Fedora 17
* | Merge branch 'maint'Johnathan Corgan2012-04-272-2/+2
|\|
| * gr-uhd: updated USRP Sink and USRP Source help messagesNicholas Corgan2012-04-262-2/+2
| |
* | Merge branch 'maint'Tom Rondeau2012-04-241-97/+137
|\|
| * uhd: updating/fixing WBFM example.Marcus Leech2012-04-241-97/+137
| |
* | gr-uhd: uhd_fft and uhd_siggen_base.py now use subdev names instead of ↵Nicholas Corgan2012-04-232-6/+6
|/ | | | dboard id's
* gr-uhd: uhd_rx_cfile outputs USRP configuration instead of args if user has ↵Nicholas Corgan2012-04-161-1/+21
| | | | that feature enabled
* Removed whitespace and added dtools/bin/remove-whitespace as a tool to do ↵Tom Rondeau2012-04-1353-453/+453
| | | | | | this in the future. The sed script was provided by Moritz Fischer.
* Merge branch 'master' into nextJohnathan Corgan2012-04-056-19/+32
|\
| * gr-uhd: uhd_fft and uhd_siggen account for cases where mboard/dboard has no ↵Nicholas Corgan2012-04-052-12/+26
| | | | | | | | serial
| * gr-uhd: minor aesthetic and consistency changesNicholas Corgan2012-04-056-9/+8
| |
* | Merge remote branch 'tom/cmake_builds' into nextJohnathan Corgan2012-04-0437-35/+10672
|\ \
| * \ Merge branch 'rm_python_ext' into cmake_buildsTom Rondeau2012-04-0337-35/+10672
| |\ \ | | | | | | | | | | | | | | | | Conflicts: CMakeLists.txt
| | * | examples: Reworked locations and installation of examples.Tom Rondeau2012-04-0330-27/+10606
| | | | | | | | | | | | | | | | All python and GRC examples directly associated with a top-level component are now in that examples directory. Examples are split into c++, python, and grc dirs but are all installed into $prefix/share/gnuradio/examples/<component>.