Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | cmake: allow for custom DLL resource file | Nicholas Corgan | 2015-06-22 | 1 | -1/+17 |
| | | | | | * Use -DCUSTOM_RC_FILE=(filepath) option to use custom RC file * Defaults to host/lib/uhd.rc.in if none specified | ||||
* | byte_vector: removed duplicate code | Nicholas Corgan | 2015-06-18 | 1 | -13/+0 |
| | |||||
* | Merge branch 'maint' | Martin Braun | 2015-06-09 | 10 | -24/+90 |
|\ | | | | | | | | | | | | | Conflicts: host/lib/usrp/common/ad9361_ctrl.hpp host/lib/usrp/common/ad9361_driver/ad9361_device.h host/lib/usrp/e300/e300_remote_codec_ctrl.hpp | ||||
| * | E300: Implement get_freq() for E300 network mode. | michael-west | 2015-05-22 | 3 | -0/+18 |
| | | |||||
| * | B200/E300: Fix incorrect readback of frequency. | michael-west | 2015-05-22 | 6 | -3/+31 |
| | | | | | | | | When the LO is tuned it changes the frequency on both channels. The frequency value read back for the first channel was not updated when the LO frequency for the other channel was tuned to a different value. | ||||
| * | x300: Updated clock rate / ref freq warnings for clarity | Martin Braun | 2015-05-22 | 1 | -16/+28 |
| | | |||||
| * | ad9361: Minor clarifications on req_rate and baseband_bw | Martin Braun | 2015-05-19 | 2 | -4/+13 |
| | | |||||
| * | fixup! e300: gps: If gps is detected, set device time to gps time on init. | Moritz Fischer | 2015-05-12 | 1 | -0/+3 |
| | | | | | | | | Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com> | ||||
| * | convert: Add sc16-sc16 SSE converter | Tom Tsou | 2015-05-11 | 2 | -0/+202 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sc16-sc16 wire to host type converter is effectively an I/Q swap or 16-bit byteswap for little and big endian cases respectively. This implmentation is a subset of fc32 and fc64 converters without the floating point portion and scaling. The resulting byte ordering is as follows: ----------------- | A | B | C | D | Wire ----------------- 0 1 2 3 ----------------- | C | D | A | B | Litte-endian ----------------- 0 1 2 3 ----------------- | B | A | D | C | Big-endian ----------------- 0 1 2 3 Signed-off-by: Tom Tsou <tom.tsou@ettus.com> | ||||
* | | fixup! e300: gps: If gps is detected, set device time to gps time on init. | Moritz Fischer | 2015-05-14 | 1 | -0/+3 |
| | | | | | | | | Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com> | ||||
* | | convert: Add sc16-sc16 SSE converter | Tom Tsou | 2015-05-14 | 2 | -0/+202 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sc16-sc16 wire to host type converter is effectively an I/Q swap or 16-bit byteswap for little and big endian cases respectively. This implmentation is a subset of fc32 and fc64 converters without the floating point portion and scaling. The resulting byte ordering is as follows: ----------------- | A | B | C | D | Wire ----------------- 0 1 2 3 ----------------- | C | D | A | B | Litte-endian ----------------- 0 1 2 3 ----------------- | B | A | D | C | Big-endian ----------------- 0 1 2 3 Signed-off-by: Tom Tsou <tom.tsou@ettus.com> | ||||
* | | b200: Added another rate check for auto tick rate mode | Martin Braun | 2015-05-11 | 1 | -0/+8 |
| | | |||||
* | | b200: Removed stray messages | Martin Braun | 2015-05-11 | 1 | -2/+0 |
| | | |||||
* | | Merge branch 'maint' | Martin Braun | 2015-05-11 | 1 | -2/+1 |
|\| | | | | | | | | | | | | | Conflicts: fpga-src host/CMakeLists.txt host/cmake/Modules/UHDVersion.cmake | ||||
| * | b200: Changed the max byte rate over USB2 | Marcus Müller | 2015-05-06 | 1 | -2/+1 |
| | | | | | | | | | | Max rate is now set to 53248000, allowing for more than 8MS/s, which is closer to the actual value that USB2 can handle. | ||||
| * | B200: Made find function properly ignore missing "product" value (BUG #770) | michael-west | 2015-05-05 | 1 | -3/+1 |
| | | |||||
* | | b200: Replaced float comparisons with uhd::math::fp* operations | Martin Braun | 2015-05-07 | 1 | -5/+16 |
| | | |||||
* | | B200: Made find function properly ignore missing "product" value (BUG #770) | michael-west | 2015-05-04 | 1 | -3/+1 |
| | | |||||
* | | Merge branch 'maint' | Martin Braun | 2015-05-04 | 2 | -4/+8 |
|\| | |||||
| * | e300: gps: If gps doesn't have lock return 0 as time. | Moritz Fischer | 2015-05-01 | 2 | -11/+7 |
| | | | | | | | | Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com> | ||||
| * | e300: gps: Keep antenna power supply and pps running all the time. | Moritz Fischer | 2015-05-01 | 2 | -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 Fischer | 2015-05-01 | 1 | -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> | ||||
* | | Merge branch 'master' into vivado | Ashish Chaudhari | 2015-04-30 | 9 | -92/+200 |
|\ \ | |||||
| * | | Merge branch 'maint' | Martin Braun | 2015-04-30 | 1 | -2/+2 |
| |\| | | | | | | | | | | | | | | | | Conflicts: fpga-src host/CMakeLists.txt | ||||
| | * | b200: Fixed compiler warning | Martin Braun | 2015-04-30 | 1 | -2/+2 |
| | | | |||||
| * | | uhd: Added args arg to print_utility_warning | Martin Braun | 2015-04-30 | 1 | -3/+3 |
| | | | |||||
| * | | Merge branch 'maint' | Martin Braun | 2015-04-27 | 3 | -22/+29 |
| |\| | |||||
| | * | b200: Added convenience subdev override for consistent subdev experience | Martin Braun | 2015-04-27 | 3 | -22/+29 |
| | | | |||||
| * | | b200: Throw error for unreachable sampling rates | Martin Braun | 2015-04-24 | 1 | -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 Braun | 2015-04-24 | 3 | -5/+21 |
| |\| | |||||
| | * | b200: Fixed FE swapping register | Martin Braun | 2015-04-24 | 2 | -5/+19 |
| | | | |||||
| | * | ubx: pfd frequency fix (relevant for X300 operation) | Michael West | 2015-04-23 | 1 | -0/+2 |
| | | | |||||
| * | | b200: Bumped FPGA compat number to 7. | Ashish Chaudhari | 2015-04-23 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'maint' | Ashish Chaudhari | 2015-04-23 | 3 | -16/+33 |
| |\| | | | | | | | | | | | | | | | | Conflicts: host/lib/usrp/b200/b200_impl.cpp host/lib/usrp/b200/b200_impl.hpp | ||||
| | * | b200: Bumped FPGA compat number to 6 | Ashish Chaudhari | 2015-04-23 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'maint' into mwest/b200_rev5 | Ashish Chaudhari | 2015-04-23 | 4 | -5/+28 |
| | |\ | |||||
| | * | | B200: Bumped FPGA compat number to 5 | michael-west | 2015-04-17 | 2 | -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 Braun | 2015-04-16 | 3 | -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-west | 2015-04-15 | 2 | -11/+15 |
| | | | | |||||
| | * | | UHD host code changes for B200 rev 5 support. | michael-west | 2015-04-15 | 2 | -13/+26 |
| | | | | |||||
| | * | | B200: UHD now detects loaded FW on NI-USRP devices | Ben Hilburn | 2015-04-15 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | Conflicts: host/lib/transport/libusb1_base.cpp | ||||
| * | | | Merge branch 'maint' | Martin Braun | 2015-04-23 | 2 | -3/+25 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | USRP2: Separate FPGA compat numbers for USRP2 and N200. | michael-west | 2015-04-23 | 2 | -3/+25 |
| | | | | |||||
| | * | | b200: Boost 1.58-related fixes in B200 IO code. | Michael Dickens | 2015-04-20 | 1 | -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, []). | ||||
| * | | | b2x0: Cleaned up device lookup (moved all constants to one place) | Martin Braun | 2015-04-21 | 3 | -52/+81 |
| | | | | |||||
| * | | | b200: Boost 1.58-related fixes in B200 IO code. | Michael Dickens | 2015-04-21 | 1 | -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, []). | ||||
* | | | | e300: Increase FPGA compatibility number | Jonathon Pendlum | 2015-04-29 | 1 | -1/+1 |
| | | | | |||||
* | | | | e300: Adjusted minimum frequency to account for MIMO mode | Jonathon Pendlum | 2015-04-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | - In MIMO mode, tick rate will be 1/2 the interface rate | ||||
* | | | | e300: Added minimum master clock rate restriction | Jonathon Pendlum | 2015-04-24 | 2 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | - Master clock rate cannot be less than 10 MHz, which is the MMCM's minimum operating frequency in the FPGA's capture interface. | ||||
* | | | | e300: Reduced AD9361's RX data delay to improve timing in FPGA capture interface | Jonathon Pendlum | 2015-04-24 | 1 | -1/+1 |
| | | | |