summaryrefslogtreecommitdiff
path: root/gr-uhd
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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.
* | 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.
* | UHD: improved capabilities for uhd_fft.grc.Ben Hilburn2012-10-031-102/+605
| |
* | 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
|/
* 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>.
| | * | Move uhd_siggen_base python file into gnuradio.uhd space.Tom Rondeau2012-04-023-3/+3
| | | |
| | * | fixes to uhd_siggen with base class.Tom Rondeau2012-04-022-2/+2
| | | |
| | * | build: removed .py extensions from uhd and shd installed Python programs.Tom Rondeau2012-04-027-7/+65
| | | |
* | | | Merge branch 'master' into nextJohnathan Corgan2012-04-047-17/+84
|\ \ \ \ | | |_|/ | |/| |
| * | | gr-uhd: uhd_siggen, uhd_siggen_gui, and uhd_fft include information on the ↵Nicholas Corgan2012-04-047-17/+84
| | | | | | | | | | | | | | | | user's UHD version and USRP configuration
* | | | Merge branch 'master' into nextJohnathan Corgan2012-04-036-3/+37
|\| | |
| * | | gr-uhd: corrected get_usrp_info descriptionNicholas Corgan2012-04-032-2/+2
| | | |
| * | | gr-uhd: get_usrp_info has help info and can only be called with a recent ↵Nicholas Corgan2012-04-036-13/+25
| | | | | | | | | | | | | | | | enough version of UHD
| * | | gr-uhd: uhd_usrp_source and uhd_usrp_sink can now multi_usrp's ↵Nicholas Corgan2012-04-034-0/+22
| | | | | | | | | | | | | | | | list_property_tree and get_usrp_info functions
* | | | Merge branch 'master' into nextJohnathan Corgan2012-04-021-0/+8
|\| | | | |/ / |/| | | | | | | | Conflicts: gr-uhd/swig/uhd_swig.i
| * | gr-uhd: Python users can now grab their current UHD version as a stringNicholas Corgan2012-04-021-0/+8
| | |
* | | Removes all references to guile and scheme, which are no longer needed.Tom Rondeau2012-04-013-192/+0
| |/ |/| | | | | The remaining pmt_serial_tags.scm is parsed by Python already. Future modifications could change this format to not confuse the point.
* | Merge branch 'master' into nextJohnathan Corgan2012-03-272-2/+2
|\|
| * Merge branch 'maint'Johnathan Corgan2012-03-272-2/+2
| |\
| | * uhd: fix dc offset call in uhd sourceJosh Blum2012-03-272-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SWIG/python cannot differentiate the calls set_dc_offset with an complex number or a boolean paramater. It seems to take the boolean as a complex number 1 or 0. Since the overloading is not working right: renamed set_dc_offset to set_auto_dc_offset for the boolean enable/disable paramater
* | | Merge branch 'master' into nextJohnathan Corgan2012-03-248-15/+171
|\| | | | | | | | | | | | | | Conflicts: gr-uhd/lib/Makefile.am
| * | Merge remote branch 'jblum/mergeme_uhd'Johnathan Corgan2012-03-248-17/+170
| |\ \
| | * | uhd: finite_acquisition_v timeout should be >> than stream timeJosh Blum2012-03-231-1/+1
| | | |
| | * | uhd: add a flush to finite_acquisition_vJosh Blum2012-03-231-0/+3
| | | |