aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'maint'Martin Braun2015-02-163-25/+31
|\
| * usrp2: fixed image compatibility error messageNicholas Corgan2015-02-161-1/+1
| | | | | | | | * Point to usrp2_card_burner_gui.py instead of usrp2_card_burner.py
| * UBX: Revert LO shutdown method in ubx_xcvr destructormichael-west2015-02-161-4/+4
| |
| * UBX: Serialize SPI transactionsmichael-west2015-02-161-27/+31
| |
| * Merge pull request #696 from EttusResearch/crymble/bug692Ashish Chaudhari2015-02-121-1/+3
| |\ | | | | | | b200: Bugfix#692: b200_find now returns an empty device vector when hint...
| | * b200: Bugfix#692: b200_find now returns an empty device vector when hint ↵mcrymble2015-02-061-1/+3
| | | | | | | | | | | | contains addr0/resource0/etc style keys.
* | | multi_usrp: Added a normalized gain settingMartin Braun2015-02-122-0/+108
| | | | | | | | | | | | | | | Adds more methods: {set,get}_normalized_{tx,rx}_gain() which allow changing and reading back the gain within [0, 1].
* | | Merge branch 'maint'Martin Braun2015-02-1212-42/+49
|\| | | | | | | | | | | | | | Conflicts: host/examples/rx_samples_to_file.cpp
| * | Merge branch 'bhilburn/uhdcalibpath' into maintAshish Chaudhari2015-02-112-9/+20
| |\ \
| | * | Creating the $UHD_CONFIG_DIR env var, here used for custom cal data storage.Ben Hilburn2015-02-112-6/+14
| | | | | | | | | | | | | | | | This is a renaming of the previously created $UHDCALIBPATH.
| | * | uhd::paths - fixing `get_app_path` to use correct `get_env_var` functionBen Hilburn2015-02-101-4/+7
| | | | | | | | | | | | | | | | | | | | Also added new enviornment variable, "UHDCALIBPATH", so that users can use something other than system-required environment paths.
| * | | ad936x: removing gain_offset from rx set_gainJon Kiser2015-02-112-21/+6
| | | |
| * | | uhd::paths: Fixed empty string in error messageBen Hilburn2015-02-101-0/+1
| |/ /
| * / examples: Show set_rx_bandwidth units properly in MHz in all examplesRajib Bhattacharjea2015-02-094-8/+8
| |/ | | | | | | | | Conflicts: host/examples/rx_samples_to_file.cpp
| * uhd: Fixed cmake variable for images source for packagingAshish Chaudhari2015-02-041-4/+4
| | | | | | | | - UHD_IMAGES_SRC_DIR is now used to pull in images for packaging
| * uhd: Added image script outputs to .gitignoreAshish Chaudhari2015-02-041-0/+5
| |
| * e300/docs: updated manual with E3x0 audio jack pinoutJon Kiser2015-02-032-0/+5
| |
* | Merge branch 'maint'Martin Braun2015-01-302-4/+5
|\|
| * cmake: fixed setting RC_TRIMMED_VERSION_PATCHNicholas Corgan2015-01-301-1/+1
| |
| * uhd: Fixed build failure for metadata.hpp on WindowsMartin Braun2015-01-301-3/+4
| |
* | Merge branch 'maint'Martin Braun2015-01-298-10/+42
|\| | | | | | | | | Conflicts: fpga-src
| * 3.8.2 ReleaseMartin Braun2015-01-285-4/+18
| | | | | | | | | | | | - Updated fpga-src - Updated version strings - Updated images package
| * cmake: Dev branches can get a named versionMartin Braun2015-01-284-3/+20
| |
| * nirio/status: added UHD_API to status functionsNicholas Corgan2015-01-281-3/+4
| |
* | Merge branch 'maint' into masterBen Hilburn2015-01-2812-176/+346
|\| | | | | | | | | | | | | | | | | 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
| * Merge paths-fix branch into maint.Martin Braun2015-01-2829-312/+416
| |\
| | * Merging new UHD_IMAGES_DIR utilities and bug fixes.Ben Hilburn2015-01-2729-312/+416
| | | | | | | | | | | | Also includes NI-USRP Windows Registry Key fixes.
| * | e300: doc: Added clock and time sync sectionAshish Chaudhari2015-01-281-1/+11
| |/
| * e300: doc: Addressed Sean Nowlan's commentsMoritz Fischer2015-01-271-2/+2
| | | | | | | | | | | | | | | | | | * Build UHD: Added -DCMAKE_INSTALL_PREFIX=/usr * Build GNU Radio: Replaced -DGR_ENABLE_ATSC with -DENABLE_GR_ATSC Signed-off-by: Moritz Fischer <moritz@ettus.com>
* | convert: Added logging point in get_converter()Martin Braun2015-01-271-1/+16
| |
* | convert: Modifications to id_typeMartin Braun2015-01-272-4/+14
| | | | | | | | | | - Converter ID symbols are exported - to_string() function for lighter feedback
* | uhd: Added an update() method for dictsMartin Braun2015-01-274-1/+64
| | | | | | | | Very similar to Python's dict.update().
* | Merge branch 'maint'Martin Braun2015-01-271-1/+36
|\|
| * e300: doc: Added paragraph on IMU.Moritz Fischer2015-01-271-1/+36
| | | | | | | | Signed-off-by: Moritz Fischer <moritz@ettus.com>
* | 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.