Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Tweak INCLUDE dirs such that INCLUDE_DIRECTORIES and LINK_DIRECTORIES are ↵ | Michael L Dickens | 2013-01-01 | 4 | -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 'maint' | Tom Rondeau | 2012-12-12 | 1 | -2/+0 |
|\ | |||||
| * | build: removing core_swig from GR_SWIG_TARGET_DEPS. Seems to have been the ↵ | Tom Rondeau | 2012-12-12 | 1 | -2/+0 |
| | | | | | | | | cause of the parallel build woes. | ||||
* | | Merge branch 'maint' | Johnathan Corgan | 2012-11-19 | 1 | -1/+1 |
|\| | |||||
| * | uhd: include gnuradio paths for swig build first | Josh Blum | 2012-11-19 | 1 | -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 Corgan | 2012-10-13 | 2 | -4/+4 |
|\| | |||||
| * | uhd: fix pmt tuple ref namespace issue | Josh Blum | 2012-10-13 | 2 | -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 Hilburn | 2012-10-03 | 1 | -102/+605 |
| | | |||||
* | | uhd: work does not block, OK to return 0 on ERROR_CODE_TIMEOUT | Josh Blum | 2012-09-29 | 1 | -5/+4 |
| | | |||||
* | | uhd: provide source block hook for issue stream cmd | Josh Blum | 2012-09-29 | 3 | -0/+20 |
|/ | |||||
* | Merge branch 'maint' | Johnathan Corgan | 2012-07-03 | 1 | -0/+2 |
|\ | | | | | | | | | Conflicts: gruel/src/swig/CMakeLists.txt | ||||
| * | swig: added GR_SWIG_TARGET_DEPS core_swig to other swig builds | Johnathan Corgan | 2012-07-03 | 1 | -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 freq | Josh Blum | 2012-06-20 | 2 | -2/+21 |
| | | |||||
* | | uhd: source will loop for samples forever until thread interrupt | Josh Blum | 2012-06-20 | 1 | -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 Corgan | 2012-06-07 | 1 | -21/+1 |
| | | | | This reverts commit c78d307ecd5dac4e28190e5aa9b8377538f65ffa. | ||||
* | Merge remote-tracking branch 'jblum/wip_uhd_stopper' | Johnathan Corgan | 2012-06-02 | 1 | -1/+21 |
|\ | |||||
| * | uhd: allow source work to be stopped while fg runs | Josh Blum | 2012-05-24 | 1 | -1/+21 |
| | | |||||
* | | Merge branch 'maint' | Johnathan Corgan | 2012-05-29 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Fixed package dependencies for gnuradio-core and gr-wavelet, added support ↵ | Nicholas Corgan | 2012-05-17 | 1 | -1/+1 |
| | | | | | | | | for Ubuntu 12.04 and Fedora 17 | ||||
* | | Merge branch 'maint' | Johnathan Corgan | 2012-04-27 | 2 | -2/+2 |
|\| | |||||
| * | gr-uhd: updated USRP Sink and USRP Source help messages | Nicholas Corgan | 2012-04-26 | 2 | -2/+2 |
| | | |||||
* | | Merge branch 'maint' | Tom Rondeau | 2012-04-24 | 1 | -97/+137 |
|\| | |||||
| * | uhd: updating/fixing WBFM example. | Marcus Leech | 2012-04-24 | 1 | -97/+137 |
| | | |||||
* | | gr-uhd: uhd_fft and uhd_siggen_base.py now use subdev names instead of ↵ | Nicholas Corgan | 2012-04-23 | 2 | -6/+6 |
|/ | | | | dboard id's | ||||
* | gr-uhd: uhd_rx_cfile outputs USRP configuration instead of args if user has ↵ | Nicholas Corgan | 2012-04-16 | 1 | -1/+21 |
| | | | | that feature enabled | ||||
* | Removed whitespace and added dtools/bin/remove-whitespace as a tool to do ↵ | Tom Rondeau | 2012-04-13 | 53 | -453/+453 |
| | | | | | | this in the future. The sed script was provided by Moritz Fischer. | ||||
* | Merge branch 'master' into next | Johnathan Corgan | 2012-04-05 | 6 | -19/+32 |
|\ | |||||
| * | gr-uhd: uhd_fft and uhd_siggen account for cases where mboard/dboard has no ↵ | Nicholas Corgan | 2012-04-05 | 2 | -12/+26 |
| | | | | | | | | serial | ||||
| * | gr-uhd: minor aesthetic and consistency changes | Nicholas Corgan | 2012-04-05 | 6 | -9/+8 |
| | | |||||
* | | Merge remote branch 'tom/cmake_builds' into next | Johnathan Corgan | 2012-04-04 | 37 | -35/+10672 |
|\ \ | |||||
| * \ | Merge branch 'rm_python_ext' into cmake_builds | Tom Rondeau | 2012-04-03 | 37 | -35/+10672 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: CMakeLists.txt | ||||
| | * | | examples: Reworked locations and installation of examples. | Tom Rondeau | 2012-04-03 | 30 | -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 Rondeau | 2012-04-02 | 3 | -3/+3 |
| | | | | |||||
| | * | | fixes to uhd_siggen with base class. | Tom Rondeau | 2012-04-02 | 2 | -2/+2 |
| | | | | |||||
| | * | | build: removed .py extensions from uhd and shd installed Python programs. | Tom Rondeau | 2012-04-02 | 7 | -7/+65 |
| | | | | |||||
* | | | | Merge branch 'master' into next | Johnathan Corgan | 2012-04-04 | 7 | -17/+84 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | gr-uhd: uhd_siggen, uhd_siggen_gui, and uhd_fft include information on the ↵ | Nicholas Corgan | 2012-04-04 | 7 | -17/+84 |
| | | | | | | | | | | | | | | | | user's UHD version and USRP configuration | ||||
* | | | | Merge branch 'master' into next | Johnathan Corgan | 2012-04-03 | 6 | -3/+37 |
|\| | | | |||||
| * | | | gr-uhd: corrected get_usrp_info description | Nicholas Corgan | 2012-04-03 | 2 | -2/+2 |
| | | | | |||||
| * | | | gr-uhd: get_usrp_info has help info and can only be called with a recent ↵ | Nicholas Corgan | 2012-04-03 | 6 | -13/+25 |
| | | | | | | | | | | | | | | | | enough version of UHD | ||||
| * | | | gr-uhd: uhd_usrp_source and uhd_usrp_sink can now multi_usrp's ↵ | Nicholas Corgan | 2012-04-03 | 4 | -0/+22 |
| | | | | | | | | | | | | | | | | list_property_tree and get_usrp_info functions | ||||
* | | | | Merge branch 'master' into next | Johnathan Corgan | 2012-04-02 | 1 | -0/+8 |
|\| | | | |/ / |/| | | | | | | | | Conflicts: gr-uhd/swig/uhd_swig.i | ||||
| * | | gr-uhd: Python users can now grab their current UHD version as a string | Nicholas Corgan | 2012-04-02 | 1 | -0/+8 |
| | | | |||||
* | | | Removes all references to guile and scheme, which are no longer needed. | Tom Rondeau | 2012-04-01 | 3 | -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 next | Johnathan Corgan | 2012-03-27 | 2 | -2/+2 |
|\| | |||||
| * | Merge branch 'maint' | Johnathan Corgan | 2012-03-27 | 2 | -2/+2 |
| |\ | |||||
| | * | uhd: fix dc offset call in uhd source | Josh Blum | 2012-03-27 | 2 | -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 next | Johnathan Corgan | 2012-03-24 | 8 | -15/+171 |
|\| | | | | | | | | | | | | | | Conflicts: gr-uhd/lib/Makefile.am | ||||
| * | | Merge remote branch 'jblum/mergeme_uhd' | Johnathan Corgan | 2012-03-24 | 8 | -17/+170 |
| |\ \ | |||||
| | * | | uhd: finite_acquisition_v timeout should be >> than stream time | Josh Blum | 2012-03-23 | 1 | -1/+1 |
| | | | |