summaryrefslogtreecommitdiff
path: root/gr-uhd/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' of gnuradio.org:gnuradio into nextTom Rondeau2013-03-181-1/+4
|\
| * Merge branch 'master' into nextTom Rondeau2013-03-131-1/+4
| |\
| | * log: replacing log4cxx with log4cpp.Tom Rondeau2013-03-131-3/+3
* | | ctrlport: adding ability to set/get sample rate of USRP source/sink over cont...Tom Rondeau2013-03-084-0/+48
|/ /
* | Merge branch 'master' into nextTom Rondeau2013-03-052-1/+70
|\|
| * Added Windows DLL resource filesNicholas Corgan2013-03-052-1/+70
* | Merge branch 'master' into nextTom Rondeau2013-03-031-2/+5
|\|
| * Merge branch 'master' into gr_logTom Rondeau2013-03-013-14/+20
| |\
| * \ Merge branch 'master' into gr_logTom Rondeau2012-09-061-4/+19
| |\ \
| * | | Fixing up the gr-log capabilities.Tom Rondeau2012-06-081-0/+4
* | | | ctrlport: allowing all components to use ControlPort.Tom Rondeau2013-03-011-0/+5
* | | | uhd: converted gr-uhd to v3.7 style.Tom Rondeau2013-02-1911-1172/+1639
* | | | Merge master/fix_build_dir_order into next, then fix conflicts and redo come ...Michael L Dickens2013-01-041-7/+9
|\ \ \ \ | | |_|/ | |/| |
| * | | Tweak INCLUDE dirs such that INCLUDE_DIRECTORIES and LINK_DIRECTORIES are ord...Michael L Dickens2013-01-011-7/+9
* | | | gruel: updating all GR blocks that use PMTs to use new naming.Tom Rondeau2012-12-212-19/+19
|/ / /
* | | Merge branch 'maint'Johnathan Corgan2012-10-131-2/+2
|\ \ \
| * | | uhd: fix pmt tuple ref namespace issueJosh Blum2012-10-131-2/+2
| | |/ | |/|
* | | 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-291-0/+5
|/ /
* | uhd: added rx tagging for changes in sample rate and center freqJosh Blum2012-06-201-2/+15
* | uhd: source will loop for samples forever until thread interruptJosh Blum2012-06-201-2/+4
* | Revert "uhd: allow source work to be stopped while fg runs"Johnathan Corgan2012-06-071-21/+1
* | uhd: allow source work to be stopped while fg runsJosh Blum2012-05-241-1/+21
|/
* Removed whitespace and added dtools/bin/remove-whitespace as a tool to do thi...Tom Rondeau2012-04-135-20/+20
* Merge branch 'master' into nextJohnathan Corgan2012-04-052-2/+2
|\
| * gr-uhd: minor aesthetic and consistency changesNicholas Corgan2012-04-052-2/+2
* | Merge branch 'master' into nextJohnathan Corgan2012-04-042-4/+12
|\|
| * gr-uhd: uhd_siggen, uhd_siggen_gui, and uhd_fft include information on the us...Nicholas Corgan2012-04-042-4/+12
* | Merge branch 'master' into nextJohnathan Corgan2012-04-032-0/+16
|\|
| * gr-uhd: get_usrp_info has help info and can only be called with a recent enou...Nicholas Corgan2012-04-032-8/+8
| * gr-uhd: uhd_usrp_source and uhd_usrp_sink can now multi_usrp's list_property_...Nicholas Corgan2012-04-032-0/+16
* | Merge branch 'master' into nextJohnathan Corgan2012-03-271-1/+1
|\|
| * Merge branch 'maint'Johnathan Corgan2012-03-271-1/+1
| |\
| | * uhd: fix dc offset call in uhd sourceJosh Blum2012-03-271-2/+2
* | | Merge branch 'master' into nextJohnathan Corgan2012-03-245-13/+127
|\| |
| * | Merge remote branch 'jblum/mergeme_uhd'Johnathan Corgan2012-03-246-15/+130
| |\ \
| | * | 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
| | * | uhd: perform abi compat check before making a blockJosh Blum2012-03-236-5/+55
| | * | uhd: added set_start_time calls to source/sinkJosh Blum2012-03-232-5/+39
| | * | uhd: added multi-finite-aquisitionJosh Blum2012-03-231-5/+33
| | |/
* | | Merge branch 'master' into nextJohnathan Corgan2012-03-162-0/+17
|\| |
| * | uhd: conditionalize set_user_register call on availability in UHD APIJohnathan Corgan2012-03-162-2/+10
| * | Merge remote branch 'gnuradio/maint' into gr-uhd-set-user-registerJohnathan Corgan2012-03-131-0/+5
| |\|
| * | uhd: add API call to set user registersJohnathan Corgan2012-01-102-0/+9
* | | Merge branch 'master' into nextJohnathan Corgan2012-01-271-0/+5
|\ \ \ | | |/ | |/|
| * | uhd: add utility function to convert raw gr_message to async_metadata_tJohnathan Corgan2012-01-261-0/+5
| |/
* | Merge branch 'master' into nextJohnathan Corgan2011-12-131-0/+19
|\|
| * uhd: added a finite acquisition call to usrp sourceJosh Blum2011-12-131-0/+19
* | Removed autotools, gr-waveform, some cleanupJohnathan Corgan2011-12-082-45/+0
|/