aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ \ | | |/ | |/|
| * | docs: Specified min compiler versionsMartin Braun2015-01-131-4/+6
| | |
| * | cmake: Added a version macro for compile-time version checksMartin Braun2015-01-132-1/+13
| | |
| * | cmake: Added config.h back to the gameMartin Braun2015-01-134-1/+65
| | |
* | | Added support for MinGW cross-compileNicholas Corgan2015-01-137-8/+104
| | | | | | | | | | | | | | | | | | * Added CMake toolchain file, compatible with different versions * No dependency on MinGW runtime, all statically linked * Misc coding tweaks to allow MinGW to compile
* | | Merge branch 'maint'Martin Braun2015-01-1310-5/+74
|\| | | |/ |/|
| * e300: rssi sensor network supportJulian Arnold2015-01-124-2/+22
| |
| * b200: rssi sensorJulian Arnold2015-01-121-1/+3
| |
| * ad9361: rssi readoutJulian Arnold2015-01-124-2/+40
| |
| * examples: Fixed init_usrp for building with MSVCMartin Braun2015-01-121-0/+9
| |
* | Merge branch 'maint'Martin Braun2015-01-125-25/+47
|\|
| * x300: Fix for BUG #655: X300: Device Time Not Getting Set from GPSDOmichael-west2015-01-121-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-west2015-01-121-6/+6
| | | | | | | | dboard info for second mboard
| * convert: Fix sc12 unpack shiftingTom Tsou2015-01-121-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Resolve issue #666 "B200: Rx signal distortion when using SC12". During 12-bit unpacking, OTW samples are shifted into the high order bits of the 16-bit intermediate values. The remaining 4-bits are not zeroed and contain bits from adjacent samples. Consequently, signal distortion becomes noticable with spurs and other random signal garbage when operating at low signal levels. Signed-off-by: Tom Tsou <tom@tsou.cc>
| * images: Updated image creation scripts to include .tar.gz and .tar.xzMartin Braun2015-01-092-3/+27
| |
* | Merge branch 'maint'Martin Braun2015-01-082-35/+45
|\|
| * examples: Fixed multi-channel gain and freq setup for txrx_loopback_to_fileMartin Braun2015-01-081-33/+43
| |
| * e100: fixed typo in fpga_downloaderNicholas Corgan2015-01-071-2/+2
| |
* | Merge pull request #653 from EttusResearch/bprumo/120bwBen Hilburn2015-01-073-85/+103
|\ \ | | | | | | x300: support new 120 MHz bandwidth versions of the NI-branded X310s
| * | revert unnecessary change to the SR_LEDSBrooks Prumo2015-01-051-1/+1
| | |
| * | x300: support new 120 MHz bandwidth versions of the NI-branded X310sBrooks2014-12-223-85/+103
| | |
* | | math: fixed MSVC error regarding ambiguous std::log callNicholas Corgan2015-01-071-1/+1
| | |
* | | Merge branch 'maint'Martin Braun2015-01-079-52/+306
|\ \ \ | |/ / |/| / | |/ | | Conflicts: host/docs/usrp_e3x0.dox
| * docs: Major revisions and additionsMartin Braun2015-01-079-52/+306
| |
* | Adding support for NI VID + PIDs for USRP B2xx devices.Ben Hilburn2014-12-185-44/+134
| |
* | Updated fpga-src submodule for masterMartin Braun2014-12-162-1/+1
| |