Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Nicholas Corgan | 2013-02-28 | 3 | -1/+63 |
|\ | |||||
| * | Merge branch 'maint34' into maint | Nicholas Corgan | 2013-02-28 | 3 | -1/+63 |
| |\ | |||||
| | * | Added Windows DLL resource file to insert version into DLL | Nicholas Corgan | 2013-02-28 | 3 | -1/+63 |
| | | | |||||
* | | | Merge branch 'maint' | Nicholas Corgan | 2013-02-27 | 1 | -1/+1 |
|\| | | |||||
| * | | lib: addresses B100 FIFO timeout error | Nicholas Corgan | 2013-02-27 | 1 | -1/+1 |
| | | | |||||
* | | | b100: create an overflow packet on unknown SID error | Josh Blum | 2013-02-27 | 1 | -1/+29 |
| | | | |||||
* | | | b100: additional flushing when rx streamer created | Josh Blum | 2013-02-19 | 2 | -0/+12 |
| | | | |||||
* | | | Merge branch 'maint' | Nicholas Corgan | 2013-02-14 | 1 | -1/+1 |
|\| | | |||||
| * | | Merge branch 'maint34' into maint | Nicholas Corgan | 2013-02-14 | 1 | -1/+1 |
| |\| | |||||
| | * | cmake: changed DEB Boost dependency from libboost-dev to libboost-all-dev | Nicholas Corgan | 2013-02-14 | 1 | -1/+1 |
| | | | |||||
* | | | b100: added fw version property to query | Josh Blum | 2013-02-13 | 1 | -0/+1 |
| | | | |||||
* | | | uhd: added time spec unit test for large tick counts | Josh Blum | 2013-02-07 | 1 | -0/+11 |
| | | | |||||
* | | | Merge branch 'maint' | Nicholas Corgan | 2013-02-01 | 1 | -2/+2 |
|\| | | |||||
| * | | Merge branch 'maint34' into maint | Nicholas Corgan | 2013-02-01 | 1 | -2/+2 |
| |\| | |||||
| | * | cmake: Allows Unix systems with /usr/lib64 to use Boost installations in ↵ | Nicholas Corgan | 2013-02-01 | 1 | -2/+2 |
| | | | | | | | | | | | | non-standard locations | ||||
* | | | uhd: increment UHD_VERSION_ABI_STRING "3.6.0-0" | Josh Blum | 2013-01-23 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | Added tune args to tune request. Thefore the API of the master branch does not match 3.5.* release, by this system, the compat string should be the unrelease 3.6 - w/ compat -0. The -0 may increase w/ future ABI/API changes before 3.6 release. | ||||
* | | | Merge branch 'next' | Josh Blum | 2013-01-23 | 2 | -1/+22 |
|\ \ \ | |||||
| * | | | usrp: poke tune args into dboards that support it | Josh Blum | 2012-11-21 | 1 | -0/+8 |
| | | | | |||||
| * | | | uhd: added args member to tune_request object | Josh Blum | 2012-11-21 | 1 | -1/+14 |
| | | | | |||||
* | | | | Merge branch 'fhs_work' | Josh Blum | 2013-01-23 | 6 | -14/+14 |
|\ \ \ \ | |||||
| * | | | | uhd: work on moving binaries to lib/uhd | Josh Blum | 2012-11-08 | 6 | -14/+14 |
| | | | | | |||||
* | | | | | Merge branch 'maint' | Nicholas Corgan | 2013-01-16 | 2 | -2/+2 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | uhd: changed version number to 3.5.1release_003_005_001 | Josh Blum | 2013-01-16 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Merge branch 'maint34' into maint | Josh Blum | 2013-01-16 | 0 | -0/+0 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | Conflicts: host/cmake/Modules/UHDVersion.cmake | ||||
| | * | | | uhd: changed version number to 3.4.5release_003_004_005 | Josh Blum | 2013-01-16 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'maint' | Nicholas Corgan | 2013-01-15 | 1 | -2/+16 |
|\| | | | | |||||
| * | | | | udp: fix ENOBUFS with send/retry for udp socket | Josh Blum | 2013-01-15 | 1 | -2/+16 |
| | | | | | |||||
* | | | | | Merge branch 'maint' | Nicholas Corgan | 2013-01-09 | 1 | -1/+2 |
|\| | | | | |||||
| * | | | | Modify query_gpsdo_sensors to wait long enough to latch a PPS in before ↵ | Nick Foster | 2013-01-09 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | checking it. | ||||
* | | | | | Merge branch 'maint' | Nicholas Corgan | 2013-01-07 | 1 | -4/+4 |
|\| | | | | |||||
| * | | | | utils: usrp_n2xx_simple_net_burner accepts empty response to reset USRP | Nicholas Corgan | 2013-01-07 | 1 | -4/+4 |
| | | | | | |||||
* | | | | | docs: UHD/USRP rephrasing | Nicholas Corgan | 2012-12-18 | 14 | -64/+64 |
| | | | | | |||||
* | | | | | Merge branch 'maint' | Nicholas Corgan | 2012-12-18 | 2 | -2/+13 |
|\| | | | | |_|_|/ |/| | | | |||||
| * | | | Merge branch 'maint34' into maint | Nicholas Corgan | 2012-12-18 | 2 | -2/+13 |
| |\| | | |||||
| | * | | Merge branch 'xcvr2450_r21' into maint34 | Nicholas Corgan | 2012-12-18 | 1 | -1/+12 |
| | |\ \ | |||||
| | | * | | Fix syntax in XCVR driver. | Nick Foster | 2012-12-04 | 1 | -3/+3 |
| | | | | | |||||
| | | * | | xcvr2450: created xcvr2450 r21 that uses external divider | Josh Blum | 2012-12-04 | 1 | -1/+12 |
| | | | | | |||||
| | * | | | wbx: expand freq range low for r4 | Josh Blum | 2012-12-17 | 1 | -1/+1 |
| | |/ / | |||||
* | | | | Merge branch 'maint' | Nicholas Corgan | 2012-11-19 | 1 | -1/+1 |
|\| | | | |||||
| * | | | docs: fixed typo | Nicholas Corgan | 2012-11-19 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'maint' | Nicholas Corgan | 2012-11-19 | 18 | -27/+179 |
|\| | | | |||||
| * | | | Merge branch 'maint34' into maint | Nicholas Corgan | 2012-11-16 | 12 | -22/+129 |
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: host/lib/usrp/b100/b100_impl.cpp host/lib/usrp/usrp1/usrp1_impl.hpp | ||||
| | * | | lib/cmake: CPack source work | Nicholas Corgan | 2012-11-16 | 12 | -22/+128 |
| | | | | | | | | | | | | | | | | | | | | * Removed all host code dependencies on firmware headers * Put in CMake settings for CPack source | ||||
| | * | | examples: fix rx_samples_to_udp bytes vs samples | Josh Blum | 2012-11-14 | 1 | -2/+2 |
| | | | | |||||
| * | | | utils: cal apps immediately fail if dboard has no serial instead of after ↵ | Nicholas Corgan | 2012-11-16 | 5 | -4/+47 |
| | | | | | | | | | | | | | | | | test runs | ||||
| * | | | utils: images downloader defaults to UHD_IMAGES_DIR instead of ↵ | Nicholas Corgan | 2012-11-16 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | CMAKE_INSTALL_PREFIX | ||||
* | | | | Merge branch 'maint' | Josh Blum | 2012-11-13 | 1 | -1/+9 |
|\| | | | |||||
| * | | | Merge branch 'maint34' into maint | Josh Blum | 2012-11-13 | 1 | -1/+9 |
| |\| | | |||||
| | * | | cmake: UHD_VERSION ignores GIT_COUNT if the string 'release' is in ↵ | Nicholas Corgan | 2012-11-13 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | UHD_RELEASE_MODE rather than equaling 'release' | ||||
* | | | | gps_ctrl: Lower the number of retries to two when waiting for the time. | Moritz Fischer | 2012-11-13 | 1 | -1/+1 |
| | | | |