| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into next | Johnathan Corgan | 2017-10-05 | 6 | -20/+54 |
|\ |
|
| * | Merge remote-tracking branch 'github/pr/1437' | Johnathan Corgan | 2017-10-05 | 2 | -1/+15 |
| |\ |
|
| | * | uhd: Parametrize recv timeout and single-packet option | Martin Braun | 2017-08-21 | 2 | -1/+15 |
| * | | gr-uhd: Added modification to UHD message-based tuning which will allow for t... | Jacob Gilbert | 2017-09-12 | 6 | -20/+38 |
| |/ |
|
* | | Merge branch 'master' into next | Johnathan Corgan | 2017-07-13 | 1 | -1/+2 |
|\| |
|
| * | Merge branch 'maint' | Johnathan Corgan | 2017-07-13 | 1 | -1/+2 |
| |\ |
|
| | * | uhd: Fixed tx streamer creation in usrp_sink | sugandhagupta | 2017-07-07 | 1 | -1/+2 |
* | | | Merge branch 'master' into next | Johnathan Corgan | 2017-03-22 | 1 | -6/+0 |
|\| | |
|
| * | | cmake: add log4cpp to runtime includes | Bastian Bloessl | 2017-03-22 | 1 | -4/+0 |
| * | | cmake: clean up | Bastian Bloessl | 2017-03-22 | 1 | -2/+0 |
* | | | uhd: Removed stray ifdefs | Martin Braun | 2017-03-10 | 1 | -2/+0 |
* | | | Merge remote-tracking branch 'noc0lour/use_stream_api_stream_cmd' into next | Johnathan Corgan | 2017-03-05 | 1 | -0/+5 |
|\ \ \ |
|
| * | | | gr-uhd: use stream api for issue_stream_cmd | Andrej Rode | 2017-01-30 | 1 | -0/+5 |
* | | | | uhd: fixed missing #ifdef from botched merge fixup | Johnathan Corgan | 2017-03-05 | 1 | -0/+1 |
* | | | | Merge branch 'master' into next | Johnathan Corgan | 2017-03-05 | 2 | -5/+2 |
|\ \ \ \
| |/ / /
|/| / /
| |/ / |
|
| * / | uhd: Always query current frequency when outputting tags | Martin Braun | 2017-02-24 | 2 | -5/+1 |
| |/ |
|
| * | Merge branch 'maint' | Johnathan Corgan | 2016-12-13 | 2 | -2/+5 |
| |\ |
|
* | \ | gr-uhd: disable boost thread interrupts during send() and recv() calls in wor... | Martin Braun | 2016-12-13 | 2 | -0/+4 |
|\ \ \ |
|
| * \ \ | Merge branch 'maint' | Martin Braun | 2016-12-13 | 2 | -2/+5 |
| |\ \ \
| | |/ /
| |/| /
| | |/ |
|
| | * | gr-uhd: disable boost thread interrupts during send() and recv() calls in work() | Andrej Rode | 2016-12-09 | 2 | -2/+5 |
* | | | Merge branch 'master' into next | Johnathan Corgan | 2016-12-13 | 2 | -0/+16 |
|\| | |
|
| * | | uhd: Use UHDs internal normalized gain methods | Martin Braun | 2016-12-11 | 2 | -0/+16 |
| |/ |
|
* | | uhd: Updated minimum version to 3.5.5 and removed deprecated code | Martin Braun | 2016-09-24 | 6 | -198/+16 |
* | | Merge branch 'master' into next | Johnathan Corgan | 2016-09-24 | 2 | -11/+11 |
|\| |
|
| * | uhd: Replace zero-timeout double-recv() with one recv() call | Martin Braun | 2016-09-23 | 2 | -11/+11 |
* | | Merge branch 'master' into next | Johnathan Corgan | 2016-09-19 | 1 | -1/+1 |
|\| |
|
| * | uhd: re-Fix order of include dirs done in 7ad6ff1b such that UHD_INCLUDE_DIRS... | Michael Dickens | 2016-09-19 | 1 | -1/+1 |
* | | Merge branch 'master' into next | Johnathan Corgan | 2016-09-15 | 1 | -1/+1 |
|\| |
|
| * | Merge branch 'maint' | Johnathan Corgan | 2016-09-15 | 1 | -1/+1 |
| |\ |
|
| | * | uhd: Fix order of include dirs | Martin Braun | 2016-09-15 | 1 | -1/+1 |
* | | | cmake: nuke cpack from existence | Johnathan Corgan | 2016-08-03 | 1 | -2/+2 |
* | | | Merge branch 'master' into next | Johnathan Corgan | 2016-08-01 | 1 | -0/+1 |
|\| | |
|
| * | | gr-uhd: create tag when issuing stream command | johschmitz | 2016-07-11 | 1 | -0/+1 |
| |/ |
|
* | | Merge branch 'master' into next | Johnathan Corgan | 2016-05-27 | 4 | -2/+115 |
|\| |
|
| * | Added controls for importing, exporting, and sharing LOs | Derek Kozel | 2016-05-23 | 4 | -2/+115 |
* | | Merge branch 'master' into next | Johnathan Corgan | 2016-05-11 | 2 | -0/+10 |
|\| |
|
| * | uhd: add command handler to add a time tag | Nathan West | 2016-05-02 | 2 | -0/+10 |
* | | Merge branch 'master' into next | Johnathan Corgan | 2016-04-27 | 4 | -112/+2 |
|\| |
|
| * | Revert "Merge remote-tracking branch 'dkozel/uhd_lo_api'" | Johnathan Corgan | 2016-04-27 | 4 | -112/+2 |
* | | Merge branch 'master' into next | Johnathan Corgan | 2016-04-26 | 4 | -2/+112 |
|\| |
|
| * | Added controls for importing, exporting, and sharing LOs | Derek Kozel | 2016-04-25 | 4 | -2/+112 |
* | | Merge branch 'gr_uhd_issue_stream_cmd_on_start' into next-gruhd-stream-cmd | Martin Braun | 2015-12-29 | 3 | -20/+35 |
|\| |
|
| * | gr-uhd: add parameter to enable/disable streaming when flowgraph starts | Johannes Schmitz | 2015-12-16 | 2 | -16/+23 |
| * | Check RX/TX streamers::sptr before flush/reset | Marcus Müller | 2015-12-16 | 2 | -4/+12 |
* | | Merge branch 'master' into next | Johnathan Corgan | 2015-12-07 | 2 | -0/+15 |
|\| |
|
| * | uhd: Added controlport interface for UHD sink's "command" message handler. | Tom Rondeau | 2015-12-06 | 2 | -0/+15 |
* | | Merge branch 'master' into next | Johnathan Corgan | 2015-10-17 | 3 | -10/+14 |
|\| |
|
| * | uhd: Adds ControlPort support to USRP source block's command message port. | Tom Rondeau | 2015-10-16 | 2 | -0/+14 |
| * | uhd: open support for controlport in static builds. | Tom Rondeau | 2015-10-16 | 1 | -10/+0 |
* | | Merge branch 'master' into next | Johnathan Corgan | 2015-09-13 | 3 | -2/+9 |
|\| |
|