Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' into master | Ben Hilburn | 2015-01-28 | 1 | -6/+5 |
|\ | | | | | | | | | | | | | | | | | Resolved Conflicts: host/docs/usrp_e3x0.dox host/include/uhd/utils/paths.hpp host/lib/transport/nirio/nifpga_lvbitx.cpp host/lib/usrp/b200/b200_impl.cpp host/lib/utils/paths.cpp | ||||
| * | Merging new UHD_IMAGES_DIR utilities and bug fixes. | Ben Hilburn | 2015-01-27 | 10 | -40/+38 |
| | | | | | | | | Also includes NI-USRP Windows Registry Key fixes. | ||||
* | | Merge branch 'maint' | Martin Braun | 2015-01-27 | 7 | -44/+94 |
|\| | | | | | | | | | Conflicts: host/docs/usrp_e3x0.dox | ||||
| * | e300: Bumped FPGA compat number to 6. | Ashish Chaudhari | 2015-01-26 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'maint' into e300/clk_pps_updates | Ashish Chaudhari | 2015-01-26 | 3 | -9/+24 |
| |\ | |||||
| | * | ad9361: Removed unnecessary digital TX attenuation | Ashish Chaudhari | 2015-01-23 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | - Fix ported from He. The current TX filter does not need the additional -6dB of headroom. Set it to zero so we meet our max power specs. | ||||
| | * | fixup! ad9361: More check for interpolation/decim ratios | Ashish Chaudhari | 2015-01-23 | 1 | -1/+1 |
| | | | |||||
| * | | e300: Several bugfixes for E300 clk/pps selection code | Ashish Chaudhari | 2015-01-23 | 3 | -26/+6 |
| | | | |||||
| * | | e300: UHD support for refclk disciplining using PPS. | Ashish Chaudhari | 2015-01-22 | 4 | -18/+82 |
| | | | | | | | | | | | | | | | | | | - Only supported value for clk_source is internal - time_source automatically changes the disciplining pulse source - Added ref_locked sensor | ||||
* | | | Merge branch 'maint' | Martin Braun | 2015-01-23 | 3 | -8/+17 |
|\ \ \ | |||||
| * | | | fixup! ad9361: More check for interpolation/decim ratios | Ashish Chaudhari | 2015-01-23 | 1 | -1/+1 |
| | |/ | |/| | |||||
| * | | Merge remote-tracking branch 'origin/maint' into ashish/bug672 | Ashish Chaudhari | 2015-01-23 | 4 | -7/+1451 |
| |\ \ | |||||
| | * | | ad9361: More check for interpolation/decim ratios | Martin Braun | 2015-01-23 | 2 | -7/+16 |
| | |/ | |||||
| * | | b200: Bugfix#672: Enable the correct half-bands | Ashish Chaudhari | 2015-01-21 | 1 | -1/+1 |
| | | | | | | | | | | | | - The control bits for the small and the large half-bands were swapped which would cause the large HB to run too fast. Swapped hb0 and hb1 bits to fix the issue. | ||||
* | | | Merge branch 'maint' | Martin Braun | 2015-01-22 | 2 | -0/+1435 |
|\ \ \ | | |/ | |/| | |||||
| * | | UBX: Add UBX Support | michael-west | 2015-01-22 | 2 | -0/+1435 |
| |/ | |||||
* | | e200: Expose temperature sensor through property tree (sensors/temp) | Julian Arnold | 2015-01-20 | 4 | -1/+17 |
| | | |||||
* | | b200: Expose temperature sensor through property tree (sensors/temp) | Julian Arnold | 2015-01-20 | 1 | -0/+2 |
| | | |||||
* | | ad9361: Added relative temperature sensor | Julian Arnold | 2015-01-20 | 4 | -1/+61 |
| | | | | | | | | This allows to read a relative temperature from an AD9361 device. | ||||
* | | Merge branch 'maint' | Martin Braun | 2015-01-20 | 4 | -10/+29 |
|\| | | | | | | | | | Conflicts: host/include/uhd/types/direction.hpp | ||||
| * | ad9361: bugfix for ad9361 gain value truncation | Jon Kiser | 2015-01-20 | 2 | -6/+10 |
| | | |||||
| * | e300: Changed (max) serial number from 6 to 8. | Moritz Fischer | 2015-01-20 | 2 | -4/+19 |
| | | | | | | | | | | | | | | | | | | | | This works without hickup because we store the serial as a \0 terminated string. Note: We now also write the data version fields, as they might come in handy one day. Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com> | ||||
* | | Merge branch 'maint' | Martin Braun | 2015-01-19 | 4 | -17/+69 |
|\| | | | | | | | | | Conflicts: host/include/uhd/types/CMakeLists.txt | ||||
| * | B200: Bug #656. Added FIR coeffs for filters with Fs/4 stop band. | Ian Buckley | 2015-01-19 | 4 | -17/+69 |
| | | | | | | | | AD9361 driver can now select coeffs for different interpolation ratios. | ||||
* | | Merge branch 'maint' | Martin Braun | 2015-01-16 | 2 | -31/+0 |
|\| | |||||
| * | e300: Removed duplicate FPGA loading function | Moritz Fischer | 2015-01-15 | 2 | -31/+0 |
| | | | | | | | | Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com> | ||||
* | | Merge branch 'maint' | Martin Braun | 2015-01-14 | 3 | -1/+12 |
|\| | |||||
| * | b200: Added lo_locked sensor | Martin Braun | 2015-01-14 | 3 | -1/+12 |
| | | |||||
* | | Merge branch 'maint' | Martin Braun | 2015-01-13 | 9 | -5/+65 |
|\| | |||||
| * | e300: rssi sensor network support | Julian Arnold | 2015-01-12 | 4 | -2/+22 |
| | | |||||
| * | b200: rssi sensor | Julian Arnold | 2015-01-12 | 1 | -1/+3 |
| | | |||||
| * | ad9361: rssi readout | Julian Arnold | 2015-01-12 | 4 | -2/+40 |
| | | |||||
* | | Merge branch 'maint' | Martin Braun | 2015-01-12 | 2 | -14/+12 |
|\| | |||||
| * | x300: Fix for BUG #655: X300: Device Time Not Getting Set from GPSDO | michael-west | 2015-01-12 | 1 | -8/+6 |
| | | | | | | | | - Moved setting of tick rate before setting of PPS time | ||||
| * | uhd: Fix for BUG #650: multi_usrp::get_usrp_tx/rx_info returning incorrect ↵ | michael-west | 2015-01-12 | 1 | -6/+6 |
| | | | | | | | | dboard info for second mboard | ||||
* | | Merge branch 'maint' | Martin Braun | 2015-01-08 | 1 | -2/+2 |
|\| | |||||
| * | e100: fixed typo in fpga_downloader | Nicholas Corgan | 2015-01-07 | 1 | -2/+2 |
| | | |||||
* | | revert unnecessary change to the SR_LEDS | Brooks Prumo | 2015-01-05 | 1 | -1/+1 |
| | | |||||
* | | x300: support new 120 MHz bandwidth versions of the NI-branded X310s | Brooks | 2014-12-22 | 2 | -84/+102 |
| | | |||||
* | | Adding support for NI VID + PIDs for USRP B2xx devices. | Ben Hilburn | 2014-12-18 | 2 | -12/+63 |
| | | |||||
* | | Merge branch 'maint' | Martin Braun | 2014-12-16 | 4 | -4/+4 |
|\| | |||||
| * | e300,x300: Bumped FPGA compat number | Ashish Chaudhari | 2014-12-16 | 2 | -2/+2 |
| | | | | | | | | | | - X300: FPGA compat 9 - E300: FPGA compat 5 | ||||
| * | e300,x300: Moved LED register space as not to overlap w/ GPIOs | Ashish Chaudhari | 2014-12-16 | 2 | -2/+2 |
| | | |||||
* | | Merge branch 'maint' | Martin Braun | 2014-12-15 | 2 | -2/+2 |
|\| | | | | | | | | | Conflicts: host/examples/rx_samples_to_file.cpp | ||||
| * | b200: Fix for PLL setting not being applied intermittently | Ashish Chaudhari | 2014-12-10 | 2 | -2/+2 |
| | | | | | | | | - Made the methods in adf4001_ctrl virtual | ||||
* | | Merge branch 'maint' | Martin Braun | 2014-12-08 | 1 | -3/+4 |
|\| | |||||
| * | b200: select valid 10 MHz ref (update GPIO) *before* updating ADF4001 ↵ | Balint Seeber | 2014-12-08 | 1 | -3/+4 |
| | | | | | | | | external ref selection | ||||
* | | x300: Fixed minor issues in X300 clk code | Ashish Chaudhari | 2014-12-05 | 1 | -2/+2 |
| | | | | | | | | | | - Bugfix for #638 - get_ref_locked will check lock status one last time before giving up | ||||
* | | x300: Made use of new CHDR packing routines | Martin Braun | 2014-12-03 | 1 | -43/+9 |
| | | |||||
* | | Merge branch 'maint' | Martin Braun | 2014-12-02 | 1 | -1/+10 |
|\| |