summaryrefslogtreecommitdiff
path: root/gr-uhd/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into nextJohnathan Corgan2017-10-056-20/+54
|\
| * Merge remote-tracking branch 'github/pr/1437'Johnathan Corgan2017-10-052-1/+15
| |\
| | * uhd: Parametrize recv timeout and single-packet optionMartin Braun2017-08-212-1/+15
| * | gr-uhd: Added modification to UHD message-based tuning which will allow for t...Jacob Gilbert2017-09-126-20/+38
| |/
* | Merge branch 'master' into nextJohnathan Corgan2017-07-131-1/+2
|\|
| * Merge branch 'maint'Johnathan Corgan2017-07-131-1/+2
| |\
| | * uhd: Fixed tx streamer creation in usrp_sinksugandhagupta2017-07-071-1/+2
* | | Merge branch 'master' into nextJohnathan Corgan2017-03-221-6/+0
|\| |
| * | cmake: add log4cpp to runtime includesBastian Bloessl2017-03-221-4/+0
| * | cmake: clean upBastian Bloessl2017-03-221-2/+0
* | | uhd: Removed stray ifdefsMartin Braun2017-03-101-2/+0
* | | Merge remote-tracking branch 'noc0lour/use_stream_api_stream_cmd' into nextJohnathan Corgan2017-03-051-0/+5
|\ \ \
| * | | gr-uhd: use stream api for issue_stream_cmdAndrej Rode2017-01-301-0/+5
* | | | uhd: fixed missing #ifdef from botched merge fixupJohnathan Corgan2017-03-051-0/+1
* | | | Merge branch 'master' into nextJohnathan Corgan2017-03-052-5/+2
|\ \ \ \ | |/ / / |/| / / | |/ /
| * / uhd: Always query current frequency when outputting tagsMartin Braun2017-02-242-5/+1
| |/
| * Merge branch 'maint'Johnathan Corgan2016-12-132-2/+5
| |\
* | \ gr-uhd: disable boost thread interrupts during send() and recv() calls in wor...Martin Braun2016-12-132-0/+4
|\ \ \
| * \ \ Merge branch 'maint'Martin Braun2016-12-132-2/+5
| |\ \ \ | | |/ / | |/| / | | |/
| | * gr-uhd: disable boost thread interrupts during send() and recv() calls in work()Andrej Rode2016-12-092-2/+5
* | | Merge branch 'master' into nextJohnathan Corgan2016-12-132-0/+16
|\| |
| * | uhd: Use UHDs internal normalized gain methodsMartin Braun2016-12-112-0/+16
| |/
* | uhd: Updated minimum version to 3.5.5 and removed deprecated codeMartin Braun2016-09-246-198/+16
* | Merge branch 'master' into nextJohnathan Corgan2016-09-242-11/+11
|\|
| * uhd: Replace zero-timeout double-recv() with one recv() callMartin Braun2016-09-232-11/+11
* | Merge branch 'master' into nextJohnathan Corgan2016-09-191-1/+1
|\|
| * uhd: re-Fix order of include dirs done in 7ad6ff1b such that UHD_INCLUDE_DIRS...Michael Dickens2016-09-191-1/+1
* | Merge branch 'master' into nextJohnathan Corgan2016-09-151-1/+1
|\|
| * Merge branch 'maint'Johnathan Corgan2016-09-151-1/+1
| |\
| | * uhd: Fix order of include dirsMartin Braun2016-09-151-1/+1
* | | cmake: nuke cpack from existenceJohnathan Corgan2016-08-031-2/+2
* | | Merge branch 'master' into nextJohnathan Corgan2016-08-011-0/+1
|\| |
| * | gr-uhd: create tag when issuing stream commandjohschmitz2016-07-111-0/+1
| |/
* | Merge branch 'master' into nextJohnathan Corgan2016-05-274-2/+115
|\|
| * Added controls for importing, exporting, and sharing LOsDerek Kozel2016-05-234-2/+115
* | Merge branch 'master' into nextJohnathan Corgan2016-05-112-0/+10
|\|
| * uhd: add command handler to add a time tagNathan West2016-05-022-0/+10
* | Merge branch 'master' into nextJohnathan Corgan2016-04-274-112/+2
|\|
| * Revert "Merge remote-tracking branch 'dkozel/uhd_lo_api'"Johnathan Corgan2016-04-274-112/+2
* | Merge branch 'master' into nextJohnathan Corgan2016-04-264-2/+112
|\|
| * Added controls for importing, exporting, and sharing LOsDerek Kozel2016-04-254-2/+112
* | Merge branch 'gr_uhd_issue_stream_cmd_on_start' into next-gruhd-stream-cmdMartin Braun2015-12-293-20/+35
|\|
| * gr-uhd: add parameter to enable/disable streaming when flowgraph startsJohannes Schmitz2015-12-162-16/+23
| * Check RX/TX streamers::sptr before flush/resetMarcus Müller2015-12-162-4/+12
* | Merge branch 'master' into nextJohnathan Corgan2015-12-072-0/+15
|\|
| * uhd: Added controlport interface for UHD sink's "command" message handler.Tom Rondeau2015-12-062-0/+15
* | Merge branch 'master' into nextJohnathan Corgan2015-10-173-10/+14
|\|
| * uhd: Adds ControlPort support to USRP source block's command message port.Tom Rondeau2015-10-162-0/+14
| * uhd: open support for controlport in static builds.Tom Rondeau2015-10-161-10/+0
* | Merge branch 'master' into nextJohnathan Corgan2015-09-133-2/+9
|\|