Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | b200: changed ad9361 ctrl/transaction magic number 64 to macro, as it is in ↵ | Balint Seeber | 2014-03-19 | 3 | -12/+15 |
| | | | | the FX3 FW | ||||
* | b200: explicitly detect libusb timeout | Balint Seeber | 2014-03-19 | 1 | -8/+19 |
| | |||||
* | b200: changed ad9361 read timeout handling (kicks in when requesting ↵ | Balint Seeber | 2014-03-19 | 2 | -4/+11 |
| | | | | master_clock_rate above 56MHz) | ||||
* | b200: addressed review comments (boost::uint16_t & source code long line ↵ | Balint Seeber | 2014-03-19 | 1 | -6/+19 |
| | | | | breaking) | ||||
* | Merge branch 'master' of github.com:EttusResearch/uhddev into b200/warn_mimo_mcr | Balint Seeber | 2014-02-20 | 3 | -30/+44 |
|\ | |||||
| * | b200: Fixed bug in rx_dsp_core_3000 that would assume 3 halfbands and X300 ↵ | Ashish Chaudhari | 2014-02-19 | 3 | -30/+44 |
| | | | | | | | | settings interface. | ||||
* | | b200: throw exception when master clock rate (tick rate) is requested to be ↵ | Balint Seeber | 2014-02-14 | 5 | -9/+79 |
|/ | | | | | | > max for certain # of channels (i.e. restrict to 30.72MHz for MIMO) Also includes sscanf type fix in b200_impl and longer timeout for AD9361 read | ||||
* | Updated images URL to UHD 3.7.0 imagesrelease_003_007_000 | Nicholas Corgan | 2014-02-14 | 1 | -1/+1 |
| | |||||
* | Pushing the bulk of UHD-3.7.0 code. | Ben Hilburn | 2014-02-14 | 29 | -258/+899 |
| | |||||
* | Merging USRP X300 and X310 support!! | Ben Hilburn | 2014-02-04 | 151 | -551/+14775 |
| | |||||
* | Merge branch 'origin/mwest/gain_name_check' | Ben Hilburn | 2014-02-04 | 2 | -9/+59 |
|\ | |||||
| * | Added check and handling for gain names. | Michael West | 2014-01-30 | 2 | -9/+59 |
| | | |||||
* | | uhd: so Coverity doesn't complain, removed variable declarations too | Balint Seeber | 2014-02-03 | 1 | -0/+2 |
| | | |||||
* | | uhd: disabled other use of _claimed and cond sync variables (no effect if ↵ | Balint Seeber | 2014-02-03 | 1 | -0/+2 |
| | | | | | | | | previous change is used anyway) | ||||
* | | uhd: disabled atomic 'claim' check for multi-threaded access to ↵ | Balint Seeber | 2014-02-03 | 1 | -1/+5 |
|/ | | | | | | | | | | recv_packet_demuxer_3000 The only caller is from super_packet_recv_handler, which is already not thread-safe. The only underlying transport (libusb1_zero_copy) is thread-safe, so this shouldn't have an impact. This solves the issue where (e.g. from GNU Radio), 'interrupt' is called on the worker thread while waiting for a join when worker thread is torn down (e.g. GR top block stop/wait/start), which would cause the demuxer to still think the transport was claimed, as an interrupted exception will be thrown in 'wait_for_completion' in the transport, and execution will not continue back into the demuxer to mark the transport as un-claimed, so future 'recv' streamer calls will always fail since the demux thinks the transport is still claimed from before. | ||||
* | Brought in UHD 3.6.2 MacPorts patches for OS X compatibility | Nicholas Corgan | 2014-01-27 | 2 | -4/+10 |
| | | | | * With OS X, boost::lexical_cast won't accept to_hex<boost::uint16_t> as a type | ||||
* | Merge branch 'uhd/adf435x-work' | Nicholas Corgan | 2014-01-24 | 22 | -674/+629 |
|\ | |||||
| * | 120 MHz daughterboard support, Integer-N tuning, ADF435x code consolidation | Nicholas Corgan | 2014-01-24 | 22 | -674/+629 |
| | | | | | | | | | | | | | | * Added support for new CBX-120, SBX-120, and WBX-120 daughterboards * Added implementation of Integer-N tuning for all CBX, SBX, and WBX daughterboards * Added --int-n option to examples to show how to use Integer-N tuning API * Removed duplicate ADF4350/ADF4351 code and moved it to common/adf435x_common.cpp | ||||
* | | Merge branch 'uhd/libusbx_prep' | Nicholas Corgan | 2014-01-24 | 1 | -2/+2 |
|\ \ | |||||
| * | | UHDPackage: with a libusbx static library being used for installers, remove ↵ | Nicholas Corgan | 2013-12-20 | 1 | -2/+2 |
| | | | | | | | | | | | | libusb-1.0 as package dependency | ||||
* | | | Merge branch 'bug298'release_003_006_002 | Nicholas Corgan | 2014-01-15 | 2 | -6/+37 |
|\ \ \ | |||||
| * | | | Added timed control commands to test_timed_commands example. Added radio ↵ | Michael West | 2014-01-15 | 2 | -6/+37 |
| | | | | | | | | | | | | | | | | core as subscriber to tick rate change for B200. | ||||
* | | | | Updated UHD images URL to new release package | Nicholas Corgan | 2014-01-15 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge remote-tracking branch; fixing timed_commands example | Ben Hilburn | 2014-01-14 | 1 | -4/+5 |
|\| | | | |||||
| * | | | BUG 298: B200: timed receive does not work on B210 | Michael West | 2014-01-09 | 1 | -4/+5 |
| |/ / | | | | | | | | | | | | | BUG 299: UHD: test_timed_commands divides difference by 100 Changed stream_now to false, added assignment of time_spec to command, and fixed typo. | ||||
* / / | manual: Added RF ranges of B2x0 devices | Martin Braun | 2014-01-13 | 1 | -2/+2 |
|/ / | |||||
* | | cleaning up gpsdo docs | Ben Hilburn | 2013-12-19 | 4 | -26/+22 |
| | | |||||
* | | Updated images URL to new 3.6.2 RC2 images package | Nicholas Corgan | 2013-12-13 | 1 | -2/+2 |
|/ | |||||
* | Merge branch 'uhd/no_default_strip' | Nicholas Corgan | 2013-12-13 | 1 | -3/+5 |
|\ | |||||
| * | cmake: removed binary-stripping from default GCC build behavior | Nicholas Corgan | 2013-12-09 | 1 | -3/+5 |
| | | |||||
* | | Merge remote-tracking branch 'origin/mergeme/fix_237' | Ben Hilburn | 2013-12-12 | 1 | -4/+5 |
|\ \ | |||||
| * | | msg_task: Fixed build on Ubuntu 10.04 LTS. | Moritz Fischer | 2013-12-12 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Includes for 'uint32_t/uint8_t' were missing. Compilers that care don't like if we just use uint32_t like this. * For portability boost::uint32_t and boost::uint8_t should preferrably be used. Signed-off-by: Moritz Fischer <moritz@ettus.com> | ||||
* | | | Merge remote-tracking branch 'origin/mergeme/win7_start_menu_docs' | Ben Hilburn | 2013-12-11 | 1 | -0/+4 |
|\ \ \ | |||||
| * | | | For Windows users, Doxygen and Manual documentation are available from Start ↵ | Nicholas Corgan | 2013-09-27 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | Menu | ||||
* | | | | Merging mwest's improvements to B2xx utility. | Ben Hilburn | 2013-12-11 | 4 | -91/+182 |
| | | | | |||||
* | | | | Merging Philip Balister's work for ARM cross-compilation. | Ben Hilburn | 2013-12-11 | 3 | -1/+26 |
| | | | | |||||
* | | | | Merge of mwest's fix to the sse2_fc32_to_sc16 converter. | Ben Hilburn | 2013-12-11 | 3 | -21/+22 |
| |_|/ |/| | | |||||
* | | | network_relay: added #include necessary for older versions of Boost on Windows | Nicholas Corgan | 2013-12-05 | 1 | -1/+2 |
| | | | |||||
* | | | Updated UHD version and images downloader URL for 3.6.2 release candidate 1003_006_002_rc1 | Nicholas Corgan | 2013-12-04 | 2 | -3/+3 |
| | | | |||||
* | | | lib: fixed use of -> to . after switching parameter from pointer to reference | Nicholas Corgan | 2013-12-03 | 1 | -1/+1 |
| | | | |||||
* | | | Final merge of Balint's 'kitchen_sink' B200 fixes. | Ben Hilburn | 2013-11-27 | 3 | -83/+177 |
| | | | |||||
* | | | cmake: remove Git hash from version string when 'rc' is present | Nicholas Corgan | 2013-11-27 | 1 | -2/+2 |
| | | | |||||
* | | | cmake: fixed installation of README and LICENSE files after filename changes | Nicholas Corgan | 2013-11-27 | 1 | -3/+2 |
| | | | |||||
* | | | UHDPackage: fix references to README and LICENSE files after name changes | Nicholas Corgan | 2013-11-27 | 1 | -3/+2 |
| | | | |||||
* | | | Merge Corgan's branch 'origin/n2xx/net_burner_path_fix' | Ben Hilburn | 2013-11-27 | 1 | -2/+10 |
|\ \ \ | |||||
| * | | | usrp_n2xx_simple_net_burner: ~ now expands into user's home directory | Nicholas Corgan | 2013-11-25 | 1 | -2/+10 |
| | |/ | |/| | |||||
* | | | Merge remote-tracking branch 'origin/uhd/new_images_downloader' | Ben Hilburn | 2013-11-27 | 1 | -119/+316 |
|\ \ \ | |||||
| * | | | uhd: re-wrote uhd_images_downloader (OO, new options, hopefully much more ↵ | Balint Seeber | 2013-11-22 | 1 | -119/+316 |
| |/ / | | | | | | | | | | robust and user-friendly) | ||||
* | | | Squashed merge of Coverity fixes. | Ben Hilburn | 2013-11-27 | 36 | -105/+214 |
| | | | |||||
* | | | Squashed commit uhd/cleanup. | Ben Hilburn | 2013-11-27 | 9 | -107/+3 |
|/ / |