aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'maint'Martin Braun2015-01-278-45/+98
|\ | | | | | | | | Conflicts: host/docs/usrp_e3x0.dox
| * Merge branch 'maint' into maintMartin Braun2015-01-278-46/+99
| |\
| | * e300: Bumped FPGA compat number to 6.Ashish Chaudhari2015-01-261-1/+1
| | |
| | * Merge branch 'maint' into e300/clk_pps_updatesAshish Chaudhari2015-01-263-9/+24
| | |\
| | | * Merge branch 'maint' into ashish/cat_6db_gain_fixAshish Chaudhari2015-01-260-0/+0
| | | |\
| | | * | ad9361: Removed unnecessary digital TX attenuationAshish Chaudhari2015-01-231-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 ratiosAshish Chaudhari2015-01-231-1/+1
| | | | |
| | * | | e300: Several bugfixes for E300 clk/pps selection codeAshish Chaudhari2015-01-233-26/+6
| | | | |
| | * | | e300: UHD support for refclk disciplining using PPS.Ashish Chaudhari2015-01-225-20/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Only supported value for clk_source is internal - time_source automatically changes the disciplining pulse source - Added ref_locked sensor
* | | | | Merge branch 'maint'Martin Braun2015-01-271-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules
| * | | | Moved fpga-src remote to http for anonymous updating.michael-west2015-01-271-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'maint'Martin Braun2015-01-233-8/+17
|\| | |
| * | | fixup! ad9361: More check for interpolation/decim ratiosAshish Chaudhari2015-01-231-1/+1
| | |/ | |/|
| * | Merge remote-tracking branch 'origin/maint' into ashish/bug672Ashish Chaudhari2015-01-238-12/+1650
| |\ \
| | * | ad9361: More check for interpolation/decim ratiosMartin Braun2015-01-232-7/+16
| | |/
| * | b200: Bugfix#672: Enable the correct half-bandsAshish Chaudhari2015-01-211-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 Braun2015-01-227-5/+1723
|\ \ \ | | |/ | |/|
| * | UBX: Add documentationmichael-west2015-01-221-3/+44
| | |
| * | UBX: Add UBX Supportmichael-west2015-01-225-2/+1590
| |/
| * e300: Updated docsJonathon Pendlum2015-01-211-0/+89
| | | | | | | | | | - Describe frontend antenna and filter switches - Added text to clarify the filter edges and added a decimal point of precision for TX filters
* | Merge branch 'maint'Martin Braun2015-01-201-4/+4
|\|
| * e300: gps: Replace misleading 'GPSDO' with 'GPS'.Moritz Fischer2015-01-201-4/+4
| | | | | | | | Signed-off-by: Moritz Fischer <moritz@ettus.com>
* | e200: Expose temperature sensor through property tree (sensors/temp)Julian Arnold2015-01-204-1/+17
| |
* | b200: Expose temperature sensor through property tree (sensors/temp)Julian Arnold2015-01-201-0/+2
| |
* | ad9361: Added relative temperature sensorJulian Arnold2015-01-204-1/+61
| | | | | | | | This allows to read a relative temperature from an AD9361 device.
* | Merge branch 'maint'Martin Braun2015-01-206-12/+31
|\| | | | | | | | | Conflicts: host/include/uhd/types/direction.hpp
| * ad9361: bugfix for ad9361 gain value truncationJon Kiser2015-01-202-6/+10
| |
| * uhd: Added direction typeMartin Braun2015-01-202-1/+36
| |
| * e300: Changed (max) serial number from 6 to 8.Moritz Fischer2015-01-202-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 Braun2015-01-1911-23/+237
|\| | | | | | | | | Conflicts: host/include/uhd/types/CMakeLists.txt
| * uhd: Added endianness typeMartin Braun2015-01-192-0/+33
| |
| * B200: Bug #656. Added FIR coeffs for filters with Fs/4 stop band.Ian Buckley2015-01-194-17/+69
| | | | | | | | AD9361 driver can now select coeffs for different interpolation ratios.
| * docs: Added page on static buildsMartin Braun2015-01-191-0/+40
| |
| * cmake: Added ENABLE_STATIC_LIBS optionMartin Braun2015-01-194-6/+95
| | | | | | | | | | | | | | - Allows building static libraries - For users calling find_package(UHD), provides extra options for building apps statically linking UHD. - Updated the init_usrp example to link UHD statically.
* | Merge branch 'maint'Martin Braun2015-01-166-280/+483
|\|
| * UHD: Fixes for dboard calibration utilities.michael-west2015-01-164-249/+483
| |
| * e300: Removed duplicate FPGA loading functionMoritz Fischer2015-01-152-31/+0
| | | | | | | | Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com>
* | Merge branch 'maint'Martin Braun2015-01-151-1/+5
|\|
| * cmake: Check for devel version before writing version macroMartin Braun2015-01-151-1/+5
| |
* | Merge branch 'maint'Martin Braun2015-01-146-4/+118
|\|
| * docs: Amended docs for conversion routinesMartin Braun2015-01-146-4/+118
| |
* | Merge branch 'maint'Martin Braun2015-01-143-1/+12
|\|
| * b200: Added lo_locked sensorMartin Braun2015-01-143-1/+12
| |
* | Merge branch 'maint'Martin Braun2015-01-141-13/+60
|\|
| * convert: Removed default-all-lines 12-bit packerMartin Braun2015-01-141-21/+6
| |
| * convert: Limit sc12 converter buffer overwriteTom Tsou2015-01-141-12/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch addresses issue #648 "B200: TX with SC12 format and MIMO". The observed MIMO header corruption was caused by overwriting the end of the packed 12-bit sample output buffer. The overwrite was due to the converter call always writing out 4 complex samples even if less than 4 samples were available. The extra samples would corrupt data with zero padding. Avoid the overwrite condition by only writing the minimum number of 32-bit lines necessary rather than the entire 12 byte struct. Samples 32-bit lines 1 1 2 2 3 3 4 3 Signed-off-by: Tom Tsou <tom@tsou.cc>
* | Merge pull request #670 from EttusResearch/vkakade/list_NI_b200Ben Hilburn2015-01-131-10/+12
|\ \ | | | | | | b2xx_fx3_utils corrections.
| * | Corrected the function to construct EEPROM vector.vkakade2015-01-121-9/+9
| | |
| * | Added NI PID and VID to known values for easy enumeration.vkakade2015-01-121-1/+3
| | |
* | | Merge branch 'maint'Martin Braun2015-01-137-6/+84
|\ \ \ | | |/ | |/|