aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'maint'Martin Braun2015-05-052-3/+2
|\|
| * B200: Made find function properly ignore missing "product" value (BUG #770)michael-west2015-05-051-3/+1
| |
| * doc: e3x0: Added partno. for E310 locking power connector.Moritz Fischer2015-05-051-1/+1
| | | | | | | | Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com>
| * doc: e300: Remove bandwidth promises.Moritz Fischer2015-05-051-1/+0
| | | | | | | | Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com>
| * doc: e300: gpio: Fix typo for GPIO example.Moritz Fischer2015-05-051-1/+1
| | | | | | | | | | | | The example code given in the docs would set the wrong bit. Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com>
* | B200: Made find function properly ignore missing "product" value (BUG #770)michael-west2015-05-041-3/+1
| |
* | Merge branch 'maint'Martin Braun2015-05-043-4/+12
|\|
| * uhd: utils: query_gpsdo: Explicitly set time_source to 'gpsdo'.Moritz Fischer2015-05-011-0/+4
| | | | | | | | Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com>
| * e300: gps: If gps doesn't have lock return 0 as time.Moritz Fischer2015-05-012-11/+7
| | | | | | | | Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com>
| * e300: gps: Keep antenna power supply and pps running all the time.Moritz Fischer2015-05-012-6/+3
| | | | | | | | | | | | | | | | This is a change from behaviour so far. Before the GPS was only on while UHD is running. This behaviour was confusing users, and didn't match our other devices. Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com>
| * e300: gps: If gps is detected, set device time to gps time on init.Moritz Fischer2015-05-011-0/+11
| | | | | | | | | | | | | | Before the device time wasn't set for E310 on initialization. This will allow 'query_gpsdo_sensors' to pass if gps has lock. Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com>
* | Updated FPGA submoduleAshish Chaudhari2015-05-011-0/+0
| |
* | Updated FPGA Images Package for Vivado supportAshish Chaudhari2015-05-011-2/+2
| | | | | | | | - Affect USRP X3x0 and USRP E310
* | Merge branch 'master' into vivadoAshish Chaudhari2015-04-3022-115/+389
|\ \
| * | Merge branch 'maint'Martin Braun2015-04-303-3/+2
| |\| | | | | | | | | | | | | | | | Conflicts: fpga-src host/CMakeLists.txt
| | * Updated FPGA submoduleMartin Braun2015-04-301-0/+0
| | |
| | * docs: Removed stray CMake messageMartin Braun2015-04-301-1/+0
| | |
| | * b200: Fixed compiler warningMartin Braun2015-04-301-2/+2
| | |
| | * Updated Images Package for B200Martin Braun2015-04-301-2/+2
| | |
| * | Updated Images Package for B200Martin Braun2015-04-301-2/+2
| | |
| * | Merge branch 'maint'Martin Braun2015-04-302-2/+4
| |\|
| | * docs: Track doc updates on fpga-srcMartin Braun2015-04-302-2/+4
| | |
| * | uhd: Added args arg to print_utility_warningMartin Braun2015-04-302-4/+4
| | |
| * | Merge branch 'maint'Martin Braun2015-04-273-22/+29
| |\|
| | * b200: Added convenience subdev override for consistent subdev experienceMartin Braun2015-04-273-22/+29
| | |
| * | Merge branch 'maint'Martin Braun2015-04-274-4/+39
| |\|
| | * docs: Added FPGA manualMartin Braun2015-04-274-4/+39
| | | | | | | | | | | | | | | | | | | | | | | | The actual FPGA manual pages are in the FPGA repository. Only if the submodule is checked out will it build the manual pages. If the submodule is not checked out, it will create a link to the FPGA manual hosted online.
| * | b200: Throw error for unreachable sampling ratesMartin Braun2015-04-241-1/+18
| | | | | | | | | | | | | | | When auto tick rate is used, and the sampling rate exceeds the limits, throw an error instead of coercing to the default rate.
| * | Merge branch 'maint'Martin Braun2015-04-243-5/+21
| |\|
| | * b200: Fixed FE swapping registerMartin Braun2015-04-242-5/+19
| | |
| | * ubx: pfd frequency fix (relevant for X300 operation)Michael West2015-04-231-0/+2
| | |
| * | b200: Bumped FPGA compat number to 7.Ashish Chaudhari2015-04-231-1/+1
| | |
| * | Merge branch 'maint'Ashish Chaudhari2015-04-237-24/+158
| |\| | | | | | | | | | | | | | | | Conflicts: host/lib/usrp/b200/b200_impl.cpp host/lib/usrp/b200/b200_impl.hpp
| | * b200: Bumped FPGA compat number to 6Ashish Chaudhari2015-04-231-1/+1
| | |
| | * Merge branch 'maint' into mwest/b200_rev5Ashish Chaudhari2015-04-238-15/+51
| | |\
| | * | B200: Bumped FPGA compat number to 5michael-west2015-04-172-5/+7
| | | | | | | | | | | | | | | | B200: Added bit to SR_MISC_OUT register to control ATR mapping from radio to frontend
| | * | b2x0: Cleaned up device lookup (moved all constants to one place)Martin Braun2015-04-163-47/+84
| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: host/lib/usrp/b200/b200_iface.hpp host/lib/usrp/b200/b200_impl.cpp
| | * | B200: Stricter checking of product and revision for frontend mapping.michael-west2015-04-152-11/+15
| | | |
| | * | UHD host code changes for B200 rev 5 support.michael-west2015-04-152-13/+26
| | | |
| | * | B200: UHD now detects loaded FW on NI-USRP devicesBen Hilburn2015-04-151-0/+1
| | | | | | | | | | | | | | | | | | | | Conflicts: host/lib/transport/libusb1_base.cpp
| | * | FX3: Updating FW to support NI-USRP VID and PIDsBen Hilburn2015-04-153-3/+120
| | | | | | | | | | | | | | | | | | | | Conflicts: firmware/fx3/b200/b200_usb_descriptors.c
| | * | FX3: Updating FX3 FW build docsBen Hilburn2015-04-151-5/+5
| | | | | | | | | | | | | | | | | | | | Conflicts: firmware/fx3/README.md
| * | | Merge branch 'maint'Martin Braun2015-04-232-3/+25
| |\ \ \ | | | |/ | | |/|
| | * | USRP2: Separate FPGA compat numbers for USRP2 and N200.michael-west2015-04-232-3/+25
| | | |
| | * | cmake: Improve usage of C modulesMartin Braun2015-04-203-7/+1
| | | |
| | * | b200: Boost 1.58-related fixes in B200 IO code.Michael Dickens2015-04-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | When returning an invalid payload in handle_async_task, Boost 1.58 does not allow NULL to be returned; instead, to be more compatible, use the correct type initialized to (0, []).
| | * | utils: added integer, range and double property tree accessorsMarcus Müller2015-04-201-1/+20
| | | | | | | | | | | | | | | | This amends uhd_usrp_probe's ability to query the property tree.
| * | | b2x0: Cleaned up device lookup (moved all constants to one place)Martin Braun2015-04-213-52/+81
| | | |
| * | | cmake: Improve usage of C modulesMartin Braun2015-04-213-7/+1
| | | |
| * | | b200: Boost 1.58-related fixes in B200 IO code.Michael Dickens2015-04-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | When returning an invalid payload in handle_async_task, Boost 1.58 does not allow NULL to be returned; instead, to be more compatible, use the correct type initialized to (0, []).