Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into vivado | Ashish Chaudhari | 2015-04-21 | 17 | -1109/+1585 |
|\ | | | | | | | | | Conflicts: host/lib/usrp/x300/x300_clock_ctrl.cpp | ||||
| * | Merge branch 'maint' | Martin Braun | 2015-04-20 | 1 | -0/+1 |
| |\ | | | | | | | | | | | | | Conflicts: host/CMakeLists.txt | ||||
| | * | uhd: Fixed missing include | Martin Braun | 2015-04-20 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'maint' | Martin Braun | 2015-04-14 | 5 | -10/+24 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: host/lib/usrp/b200/b200_io_impl.cpp host/lib/usrp/common/ad9361_driver/ad9361_device.cpp host/lib/usrp/common/ad9361_driver/ad9361_device.h | ||||
| | * | e300: Added warning for high bandwidth usage | Martin Braun | 2015-04-14 | 1 | -0/+10 |
| | | | |||||
| | * | b200: Added warning for high bandwidth usage | Martin Braun | 2015-04-14 | 1 | -0/+10 |
| | | | |||||
| | * | ad9361: Removed recommended max clock rate warning | Martin Braun | 2015-04-14 | 3 | -9/+4 |
| | | | |||||
| * | | Merge branch 'maint' | Martin Braun | 2015-04-14 | 1 | -6/+6 |
| |\| | | | | | | | | | | | | | Conflicts: host/CMakeLists.txt | ||||
| | * | dboards: Fixed type deduction for older compilers on max287x code | Michael West | 2015-04-14 | 1 | -6/+6 |
| | | | |||||
| * | | Merge branch 'maint' | Martin Braun | 2015-04-10 | 12 | -1092/+1554 |
| |\| | |||||
| | * | Increase command FIFO depth of N2x0 and X3x0 to 64. | michael-west | 2015-04-10 | 3 | -4/+4 |
| | | | |||||
| | * | UBX Phase Synchronization Support | michael-west | 2015-04-10 | 1 | -64/+187 |
| | | | | | | | | | | | | - Added configuration and assertion of SYNC signal | ||||
| | * | X300: Change dboard clock rate to 50 MHz | michael-west | 2015-04-10 | 4 | -345/+480 |
| | | | |||||
| | * | Fix for BUG #683: UHD: Need to factor out MAX287x code for UBX and CBX | michael-west | 2015-04-10 | 4 | -714/+918 |
| | | | | | | | | | | | | | | | - Factored out MAX287x code into common header file - Added necessary code for MAX2871 synchronization. | ||||
| | * | usrp1: codec_ctrl: Fix compiler warning. | Moritz Fischer | 2015-04-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | Use std::abs() instead of abs(). Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com> | ||||
| * | | b200: Remove now obsolete check for recommended max clock rate | Martin Braun | 2015-04-10 | 1 | -2/+1 |
| | | | |||||
* | | | Merge branch 'master' into vivado | Ashish Chaudhari | 2015-04-09 | 24 | -41/+130 |
|\| | | |||||
| * | | Merge branch 'maint' | Martin Braun | 2015-04-08 | 1 | -1/+1 |
| |\| | |||||
| | * | e300: remote_codec_ctrl: Fixed typo in error message | Moritz Fischer | 2015-04-08 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'maint' | Martin Braun | 2015-04-06 | 20 | -37/+126 |
| |\| | |||||
| | * | B200: Change Catalina Reg 0x06 for RX data setup/hold timing issue @ ↵ | Ian Buckley | 2015-04-06 | 1 | -1/+1 |
| | | | | | | | | | | | | 30.72MHz. Issue #726 | ||||
| | * | e100: Support command time access through dboard_iface. | michael-west | 2015-04-03 | 2 | -6/+6 |
| | | | |||||
| | * | uhd: Add ability to get and set command time through dboard_iface. | michael-west | 2015-04-03 | 18 | -31/+120 |
| | | | | | | | | | | | | | | | This creates a wb_iface child class called timed_wb_iface, which adds support for timed commands. | ||||
| * | | b200: Bumped FPGA compat number to 5 | Ashish Chaudhari | 2015-04-02 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'maint' | Martin Braun | 2015-03-31 | 2 | -2/+2 |
| |\| | | | | | | | | | | | | | Conflicts: host/docs/usrp_e3x0.dox | ||||
| | * | x300: Fix for Bug #714: Phase wobble across four channels on two devices | Neel Pandeya | 2015-03-30 | 1 | -1/+1 |
| | | | | | | | | | | | | - Increased filter loop bandwith on clock control chip | ||||
| | * | db_tvrx2: fixed boost::format bug | Marcus Müller | 2015-03-30 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into ashish/vivado | Ashish Chaudhari | 2015-03-30 | 37 | -216/+932 |
|\| | | |||||
| * | | Merge branch 'maint' | Martin Braun | 2015-03-27 | 1 | -2/+3 |
| |\| | |||||
| | * | usrp1: fixed check for loaded firmware | Nicholas Corgan | 2015-03-27 | 1 | -2/+3 |
| | | | |||||
| * | | Consolidated byte_vector common code into single file | Nicholas Corgan | 2015-03-27 | 5 | -74/+63 |
| | | | |||||
| * | | Fixed master-specific warnings | Nicholas Corgan | 2015-03-27 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | * MinGW: unused parameter warning, MSVC-specific pragma * MSVC: bool narrowing | ||||
| * | | Merge branch 'maint' | Martin Braun | 2015-03-27 | 23 | -74/+81 |
| |\| | |||||
| | * | Warning fixes | Nicholas Corgan | 2015-03-27 | 27 | -92/+105 |
| | | | | | | | | | | | | | | | | | | | | | * CMake now not applying C++ flags to C files * GCC 4.4: anti-aliasing rules * MSVC: narrowing, differences in subclass function parameters * Clang: uninitialized variables | ||||
| * | | e3xx: filter API implementation. Supports listing of RX/TX filters, querying ↵ | Julian Arnold | 2015-03-19 | 4 | -0/+52 |
| | | | | | | | | | | | | RX/TX filter information and writing of analog and FIR filters | ||||
| * | | b2xx: filter API implementation. Supports listing of RX/TX filters, querying ↵ | Julian Arnold | 2015-03-19 | 5 | -58/+723 |
| | | | | | | | | | | | | RX/TX filter information and writing of analog and FIR filters | ||||
| * | | Merge branch 'maint' | Ashish Chaudhari | 2015-03-18 | 2 | -4/+6 |
| |\| | |||||
| | * | b200: Updated hashing algorithm for platform consistency | dcaswell | 2015-03-16 | 1 | -3/+5 |
| | | | | | | | | | | | | Now identical between 32- and 64-bit platforms. | ||||
| | * | b200: Fixed var name typo | Martin Braun | 2015-03-13 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into ashish/vivado | Ashish Chaudhari | 2015-03-17 | 53 | -496/+1941 |
|\| | | |||||
| * | | ad9361: DC and IQ correction only done if df > 100MHz during a tune request | Julian Arnold | 2015-03-13 | 2 | -6/+15 |
| | | | |||||
| * | | Merge branch 'maint' | Martin Braun | 2015-03-12 | 3 | -6/+6 |
| |\| | |||||
| | * | e300: Fix missing namespace prefixes. | Moritz Fischer | 2015-03-12 | 3 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | In several files we were lacking boost:: namespace prefixes, which led to build failures on certain configurations. Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com> | ||||
| * | | Merge branch 'uhd/gpio_rename' | Martin Braun | 2015-03-11 | 4 | -23/+40 |
| |\ \ | |||||
| | * | | gpio: Renamed enums to avoid clash with generic, compiler-provided names | Martin Braun | 2015-03-11 | 4 | -23/+40 |
| | | | | |||||
| * | | | Merge branch 'maint' | Martin Braun | 2015-03-11 | 7 | -15/+15 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: host/include/uhd/transport/vrt_if_packet.hpp | ||||
| | * | | uhd: Fixed several type-cast related warnings for naggy compilers | Martin Braun | 2015-03-11 | 4 | -6/+6 |
| | | | | |||||
| | * | | uhd: Fixed multiple compiler warnings (unused variables, missing literal f) | Martin Braun | 2015-03-11 | 4 | -9/+9 |
| | | | | |||||
| * | | | uhd: Fixed multiple compiler warnings | Michael Dickens | 2015-03-11 | 2 | -15/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | - Use ULL and LL etc. so compiler doesn't need to decide constant's types - define the empty 'while' loop to include {} to make older compilers happy - Use explicit type names for BOOST_CHECK_EQUAL | ||||
| * | | | nirio: hopefully fix #pragma declarations; "push" and "pop" introduced in ↵ | Michael Dickens | 2015-03-11 | 4 | -18/+24 |
| | | | | | | | | | | | | | | | | GCC 4.6; works with all clang. |