Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | b200: reverted decim mask for scaling factor, and instead conditionally add ↵ | Balint Seeber | 2014-03-31 | 1 | -3/+5 |
| | | | | new X3x0 host rates (get_host_rates) with '_is_b200' | ||||
* | b200: RX DSP scaling mask is 1 bit too narrow for decim 256 | Balint Seeber | 2014-03-31 | 1 | -1/+1 |
| | |||||
* | x300: Fix the assumed max header size | Martin Braun | 2014-03-28 | 2 | -18/+15 |
| | |||||
* | Merge branch adding warning regarding MCR on the B2xx. | Ben Hilburn | 2014-03-27 | 7 | -25/+129 |
|\ | |||||
| * | 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: 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 | ||||
* | | | b200: update FPGA loading percentage every 1% instead of 10% | Nicholas Corgan | 2014-03-27 | 1 | -1/+1 |
| | | | |||||
* | | | Pulling in patch from Marcus Leech for includes and older OSes. | Ben Hilburn | 2014-03-26 | 2 | -0/+9 |
| | | | |||||
* | | | b200: Added missing include to b200_impl | Moritz Fischer | 2014-03-23 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | * In order to use std::ceil and std::floor, on older compilers we need to still add an include for cmath. Tested-by: Marcus D. Leech <mleech@ripnet.com> Signed-off-by: Moritz Fischer <moritz@ettus.com> | ||||
* | | | gps: Removed superfluous include. | Moritz Fischer | 2014-03-23 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | * This file doesn't need boost::container::vector. Tested-by: Marcus D. Leech <mleech@ripnet.com> Signed-off-by: Moritz Fischer <moritz@ettus.com> | ||||
* | | | More reference clock lock detection clean up | michael-west | 2014-03-18 | 1 | -10/+28 |
| | | | | | | | | | | | | | | | - Removed check for lock when clock source is changed (including runtime error on failure to lock). - Added separate checks and warning messages for failures to lock the clock during intialization. | ||||
* | | | Modified reference clock lock check to only be performed on Rev E or later. | michael-west | 2014-03-17 | 2 | -10/+18 |
| | | | |||||
* | | | uhd: Addressed Balints and Bens comments for subdev addressing | Martin Braun | 2014-03-17 | 3 | -17/+23 |
| | | | |||||
* | | | Merge clock and PPS fixes. | Ben Hilburn | 2014-03-15 | 6 | -53/+130 |
|\ \ \ | |||||
| * | | | Addressed comments from review. | michael-west | 2014-03-15 | 4 | -40/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | - Fixed typos. - Renamed reset() to reset_clocks(). - Created wait_for_ref_locked() function. | ||||
| * | | | - Added wait for reference clock to lock. | michael-west | 2014-02-21 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | - Modified wait for GPSDO time setting to timeout after 1 second. | ||||
| * | | | Fixed bug found during testing where internal clock reference was taking ↵ | Michael West | 2014-02-20 | 3 | -11/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | several seconds to lock. Added reset to the clock control and called it whenever the clock reference is changed. | ||||
| * | | | - Fix for BUG #264: ./test_pps_input --source external passes even with no 1 ↵ | Michael West | 2014-02-18 | 4 | -37/+81 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | PPS on external input on X3xx - Fixed behavior of PPS and clock references to be consistent and intuitive. -- Added detection of clock reference and PPS. -- Changed order of precedence to external, gpsdo, internal for default of clock and PPS. -- Throws runtime error if the user requests a reference clock or PPS that is not present. - Bumped FPGA compatibility to 4. | ||||
* | | | Merging fixes for subdev specs in B2xx. | Ben Hilburn | 2014-03-14 | 3 | -47/+42 |
|\ \ \ | |||||
| * | | | b200: Added channel mapping capabilities | Martin Braun | 2014-02-25 | 3 | -47/+42 |
| | |/ | |/| | |||||
* | | | Merge Ethernet, MTU, and frame size fixes. | Ben Hilburn | 2014-03-14 | 2 | -14/+13 |
|\ \ \ | |||||
| * | | | x300 mtu: Removed magic number, minor manual updates | Martin Braun | 2014-02-18 | 2 | -14/+13 |
| | |/ | |/| | |||||
* | | | Merge branch 'origin/martin/subdev_spec_bug_B' | Ben Hilburn | 2014-03-14 | 4 | -131/+155 |
|\ \ \ | |||||
| * \ \ | x300: Merged Michaels segfault fix | Martin Braun | 2014-03-10 | 1 | -11/+12 |
| |\ \ \ | |||||
| | * | | | - Fixed segmentation fault when using X3x0 with daughterboards in 4x4 ↵ | michael-west | 2014-03-06 | 1 | -11/+12 |
| | | |/ | | |/| | | | | | | | | | | | | | | | | | configuration. - Updated index of dboard_manager dictionary to include mboard. | ||||
| * | | | x300: Added comments on mb/chan search code | Martin Braun | 2014-03-10 | 1 | -0/+4 |
| | | | | |||||
| * | | | Removed spurious UHD_VAR. | Martin Braun | 2014-03-10 | 2 | -10/+0 |
| | | | | |||||
| * | | | uhd: added channel mapping support to multi_usrp | Martin Braun | 2014-03-10 | 1 | -0/+12 |
| | | | | |||||
| * | | | x300: added channel mapping capabilities | Martin Braun | 2014-03-10 | 3 | -73/+111 |
| | | | | |||||
| * | | | x300: merged subdev update routines for tx and rx | Martin Braun | 2014-03-10 | 3 | -46/+26 |
| | | | | |||||
| * | | | x300: remove data that was duplicating property tree | Martin Braun | 2014-03-10 | 2 | -20/+19 |
| |/ / | |||||
* / / | Addressed comments from code review. | michael-west | 2014-02-21 | 1 | -26/+14 |
|/ / | | | | | | | | | - Created macro for gain name error. - Fixed typos. | ||||
* / | 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. | ||||
* | Pushing the bulk of UHD-3.7.0 code. | Ben Hilburn | 2014-02-14 | 12 | -183/+359 |
| | |||||
* | Merging USRP X300 and X310 support!! | Ben Hilburn | 2014-02-04 | 37 | -122/+4765 |
| | |||||
* | Merge branch 'origin/mwest/gain_name_check' | Ben Hilburn | 2014-02-04 | 1 | -6/+56 |
|\ | |||||
| * | Added check and handling for gain names. | Michael West | 2014-01-30 | 1 | -6/+56 |
| | | |||||
* | | 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 | 1 | -2/+5 |
| | | | | * 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 | 14 | -658/+583 |
|\ | |||||
| * | 120 MHz daughterboard support, Integer-N tuning, ADF435x code consolidation | Nicholas Corgan | 2014-01-24 | 14 | -658/+583 |
| | | | | | | | | | | | | | | * 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 | ||||
* | | Added timed control commands to test_timed_commands example. Added radio ↵ | Michael West | 2014-01-15 | 1 | -0/+2 |
| | | | | | | | | core as subscriber to tick rate change for B200. | ||||
* | | cleaning up gpsdo docs | Ben Hilburn | 2013-12-19 | 1 | -21/+19 |
|/ | |||||
* | Merging mwest's improvements to B2xx utility. | Ben Hilburn | 2013-12-11 | 2 | -0/+25 |
| |