summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix for BUG 456: LED TX/RX colors backwards on X300michael-west2014-05-161-2/+2
| | | | - Corrected bit masks so TX will light the red LED and RX will light the green LED
* Merge branch 'origin/martin/multi_usrp/bug_dc_offset' into maintBen Hilburn2014-05-081-5/+25
|\
| * multi_usrp: Throws warnings for some tree propsMartin Braun2014-05-051-5/+25
| | | | | | | | | | | | | | Until now, multi would simply access some property and assume it exists. A call for set_tx_dc_offset() on a B210 would thus throw errors. This checks for B-series-only leaf nodes before doing anything and displays a warning instead.
* | msg_task: return std::vector<boost::uint8_t> instead of std::vector<uint8_t>Nicholas Corgan2014-05-071-2/+2
| |
* | Merge branch 'mwest/gpsdo_empty_strings' into maintmichael-west2014-05-061-1/+8
|\ \
| * | BUG #460: X300: GPGGA sensor most often empty, while RMC is usually OKmichael-west2014-05-061-1/+8
|/ / | | | | | | | | | | - It was found that strings containing only a newline character were being returned by N-series and X-series devices. - Added better handling of strings received under 6 bytes. - Added erasing of end of line characters.
* / usrp2: fixed usrp2_card_burner.py and usrp_n2xx_simple_net_burner paths in ↵Nicholas Corgan2014-05-062-4/+17
|/ | | | incompatibility error messages
* cmake: fix UHD_VERSION determination when most recent tag contains hyphensNicholas Corgan2014-04-301-2/+2
|
* Merge branch 'ashish/fpga-busy-bugfix' into maintBen Hilburn2014-04-2810-63/+220
|\
| * x300: Bumped FPGA compat number to 6.Ashish Chaudhari2014-04-281-1/+1
| |
| * x300: Fixed DMA busy logic after review feedback.Ashish Chaudhari2014-04-282-2/+2
| |
| * x300: Changed bus_clk frequency to 166.67MHz.Ashish Chaudhari2014-04-282-6/+6
| |
| * x300: Bumped FPGA compat number to 5.Ashish Chaudhari2014-04-251-1/+1
| |
| * x300: Addressed review feedbackAshish Chaudhari2014-04-252-12/+13
| | | | | | | | | | - Fixed synchronization for unclaim - Removed stray RIO addr space set
| * x300: Added synchronization between device claiming and checking.Ashish Chaudhari2014-04-242-5/+40
| | | | | | | | | | - We now maintain a registry of pcie ZPU transports - Added static mutex for claimer
| * x300: Cleanup for PCIe flushingAshish Chaudhari2014-04-242-38/+44
| |
| * x300: Added hardware flush mechanism to PCIe logic.Ashish Chaudhari2014-04-246-47/+162
|/ | | | | - Added DMA enabled states to DMA logic to allow for hardware data flushing during init. - niusrprio_session will now check for FPGA busy before downloading
* UHD: Bumping the ABI compatibility number for UHD-3.7.1.release_003_007_001Ben Hilburn2014-04-211-1/+1
|
* Merge branch 'origin/uhd/issue_448_itemsize' into maintBen Hilburn2014-04-211-1/+1
|\
| * multi_usrp: Fixed bug which caused unspecified OTW-format to crash appsMartin Braun2014-04-151-1/+1
| |
* | Updated UHD version to 3.7.1, changed images information accordinglyNicholas Corgan2014-04-212-3/+3
| |
* | uhd: updating CHANGELOG for UHD-3.7.1Ben Hilburn2014-04-211-0/+21
| |
* | Merge branch 'origin/uhd/readme_fix' into maintBen Hilburn2014-04-2112-38/+155
|\ \
| * | UHD tools: improving READMEs, fixing licenses.Ben Hilburn2014-04-216-4/+92
| | |
| * | uhd tools: removing old impact programmer (it has been renamed)Ben Hilburn2014-04-211-148/+0
| | |
| * | UHD: Updating README in tools/ directory.Ben Hilburn2014-04-213-31/+170
| | |
| * | UHD: Introducing Readme.md in host/Ben Hilburn2014-04-212-2/+39
| | |
| * | readme fixNicholas Corgan2014-04-213-2/+3
|/ /
* / x300: removing intelligent PPS detection until further developmentBen Hilburn2014-04-151-1/+2
|/
* Merge branch 'origin/uhd/cal_msg' into maintBen Hilburn2014-04-113-3/+6
|\
| * uhd: Cal tools had ambiguous help message, referring to XCVR boards.Martin Braun2014-03-283-3/+6
| |
* | Merge branch 'origin/ncorgan/tvrx2_fix'Ben Hilburn2014-04-101-3/+3
|\ \ | | | | | | | | | Fix bug with regard to TVRX2 refclock dividers.
| * | tvrx2: fix ref_clock logic when using N2x0Nicholas Corgan2014-04-091-3/+3
| | |
* | | Merge branch 'origin/uhd/cal_tools_subdev_B'Ben Hilburn2014-04-104-96/+53
|\ \ \ | | | | | | | | | | | | Fixing issue with subdev selection in cal tools.
| * | | uhd: Fixed bug in cal tools that would always use A-side settings, also some ↵Martin Braun2014-04-104-96/+53
| | | | | | | | | | | | | | | | refactoring
* | | | Merge branch 'origin/b200/issue_418'Ben Hilburn2014-04-107-11/+92
|\ \ \ \ | | | | | | | | | | | | | | | Fixing unsafe sscanf call.
| * | | | b100+b200+usrp1: removed potentially unsafe sscanf callMartin Braun2014-04-103-11/+14
| | | | |
| * | | | uhd: Added a cast routine from hex string -> anythingMartin Braun2014-04-104-0/+78
| |/ / /
* | | | Merge remote-tracking branch 'origin/bug403'Ben Hilburn2014-04-101-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Properly initializing time and clock source on N-Series to prevent small drift prior to lock.
| * | | | Fix for BUG #403: Visible frequency drift on Finite Rx with N210 & SBXmichael-west2014-04-081-2/+4
| | | | | | | | | | | | | | | | | | | | - Added initialization of clock and time sources
* | | | | Merge branch 'origin/uhd/issue_294_errcode'Ben Hilburn2014-04-1011-24/+128
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Convert numeric errors to PP strings that are actually useful.
| * | | | | uhd: Added nicer error reporting to rx examplesMartin Braun2014-04-107-21/+18
| | | | | |
| * | | | | uhd: Added nicer error reporting to cal toolsMartin Braun2014-04-101-2/+2
| | | | | |
| * | | | | uhd: Added pp routines for error codes and rx metadataMartin Braun2014-04-103-1/+108
| | | | | |
| * | | | | x3x0 docs: the word 'firmware' is misleadingBen Hilburn2014-04-101-19/+23
| | | | | |
* | | | | | Merge branch 'martin/warn_sampling_rate'Ben Hilburn2014-04-1012-9/+65
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Warn users if they request a sample rate greater than the interface bandwidth.
| * \ \ \ \ \ Merge branch 'martin/warn_sampling_rate'Martin Braun2014-04-100-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: host/include/uhd/usrp/multi_usrp.hpp
| | * | | | | | uhd: Added max link rate info for usrp1, usrp2 and b100Martin Braun2014-04-015-1/+5
| | | | | | | |
| | * | | | | | b200: Added max link rate infoMartin Braun2014-04-012-1/+4
| | | | | | | |
| | * | | | | | uhd: multi_usrp now understands link rate info and can check for itMartin Braun2014-04-012-6/+43
| | | | | | | |