aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | 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
| | | | | | | | | |
* | | | | | | | | | Merge branch 'maint'Ben Hilburn2014-05-141-0/+5
|\| | | | | | | | |
| * | | | | | | | | BUG #465: UHD: "Error: Connection refused" for USRP1 and B100michael-west2014-05-141-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added catch for unhandled error
* | | | | | | | | | Merge branch 'maint'Ben Hilburn2014-05-1471-4093/+117072
|\| | | | | | | | |
| * | | | | | | | | fpga: updating b200 and x300 FPGA source code for latest imagesBen Hilburn2014-05-1471-4093/+117072
| | | | | | | | | |
* | | | | | | | | | Merge branch 'maint'Nicholas Corgan2014-05-141-2/+2
|\| | | | | | | | |
| * | | | | | | | | cmake: updated uhd_images_downloader URL/md5sumNicholas Corgan2014-05-141-2/+2
| | | | | | | | | |
* | | | | | | | | | Merge branch 'maint'Nicholas Corgan2014-05-121-3/+3
|\| | | | | | | | |
| * | | | | | | | | log: replaced usage of deprecated boost::filesystem functionNicholas Corgan2014-05-121-3/+3
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'maint'Ben Hilburn2014-05-082-7/+27
|\| | | | | | | |
| * | | | | | | | 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
| | | | | | | | |
* | | | | | | | | usrp_n2xx_simple_net_burner: implement features from old Python burnerNicholas Corgan2014-05-071-31/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * --dont-check-rev ignores USRP revision, useful when EEPROM is corrupted * --overwrite-safe overwrites safe images after warning user of danger
* | | | | | | | | Merge branch 'maint'michael-west2014-05-061-1/+8
|\| | | | | | | |
| * | | | | | | | 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.
* | | | | | | | | Merge branch 'maint'Nicholas Corgan2014-05-062-4/+17
|\| | | | | | | |
| * | | | | | | | usrp2: fixed usrp2_card_burner.py and usrp_n2xx_simple_net_burner paths in ↵Nicholas Corgan2014-05-062-4/+17
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | incompatibility error messages
* | | | | | | | Merge branch 'maint'Nicholas Corgan2014-04-301-2/+2
|\| | | | | | |
| * | | | | | | cmake: fix UHD_VERSION determination when most recent tag contains hyphensNicholas Corgan2014-04-301-2/+2
| | | | | | | |
* | | | | | | | Merge branch 'maint'Ben Hilburn2014-04-2810-63/+220
|\| | | | | | |
| * | | | | | | 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
* | | | | | | | Merge branch 'maint'Ben Hilburn2014-04-211-1/+1
|\| | | | | | |
| * | | | | | | UHD: Bumping the ABI compatibility number for UHD-3.7.1.release_003_007_001Ben Hilburn2014-04-211-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'maint'Ben 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
| | | | | | | | |
* | | | | | | | | Merge branch 'maint'Nicholas Corgan2014-04-2114-41/+179
|\| | | | | | | |
| * | | | | | | | 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
| | | | | | | | | |