summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | Merge branch 'master' into mwest/b200_docsmichael-west2014-03-252601-115480/+1571126
| |\ \
| | * \ Merge branch 'master' of github.com:EttusResearch/uhddevmichael-west2014-03-2512-3423/+3448
| | |\ \
| | * \ \ Merge branch 'master' of github.com:EttusResearch/uhddevmichael-west2014-03-181-1/+2
| | |\ \ \
| | | * \ \ Merge branch 'maint'Nicholas Corgan2014-03-181-1/+2
| | | |\ \ \
| * | | | | | Addressed comments from review.michael-west2014-03-251-15/+14
| * | | | | | Merge branch 'master' into mwest/b200_docsMichael West2014-01-172-6/+37
| |\ \ \ \ \ \
| * | | | | | | Added hardware reference to B200 documentation.Michael West2014-01-171-0/+114
* | | | | | | | Merge branch 'origin/uhd/win_package_name' into maintBen Hilburn2014-05-141-1/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | cmake: add option to specify MSVC version in package filenameNicholas Corgan2014-05-071-1/+15
* | | | | | | | | BUG #465: UHD: "Error: Connection refused" for USRP1 and B100michael-west2014-05-141-0/+5
* | | | | | | | | fpga: updating b200 and x300 FPGA source code for latest imagesBen Hilburn2014-05-1471-4093/+117072
* | | | | | | | | cmake: updated uhd_images_downloader URL/md5sumNicholas Corgan2014-05-141-2/+2
* | | | | | | | | log: replaced usage of deprecated boost::filesystem functionNicholas Corgan2014-05-121-3/+3
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | 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
* | | | | | | | 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
|/ / / / / / / /
* / / / / / / / usrp2: fixed usrp2_card_burner.py and usrp_n2xx_simple_net_burner paths in in...Nicholas Corgan2014-05-062-4/+17
|/ / / / / / /
* | | | | | | 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
| * | | | | | | x300: Added synchronization between device claiming and checking.Ashish Chaudhari2014-04-242-5/+40
| * | | | | | | x300: Cleanup for PCIe flushingAshish Chaudhari2014-04-242-38/+44
| * | | | | | | x300: Added hardware flush mechanism to PCIe logic.Ashish Chaudhari2014-04-246-47/+162
|/ / / / / / /
* | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | uhd: Fixed bug in cal tools that would always use A-side settings, also some ...Martin Braun2014-04-104-96/+53
* | | | | | | | | | Merge branch 'origin/b200/issue_418'Ben Hilburn2014-04-107-11/+92
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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
| |/ / / / / / / / /