Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'maint' | Josh Blum | 2013-07-01 | 1 | -1/+1 |
|\ | |||||
| * | e100: fix compiler error use boost cstdint | Josh Blum | 2013-07-01 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'mergeme/cbx' | Josh Blum | 2013-06-10 | 6 | -7/+392 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: host/docs/calibration.rst host/lib/usrp/dboard/db_sbx_common.cpp | ||||
| * | | CBX support | Nicholas Corgan | 2013-06-07 | 6 | -13/+417 |
| | | | |||||
* | | | Merge branch 'maint' | Nicholas Corgan | 2013-05-10 | 2 | -10/+14 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: host/tests/CMakeLists.txt | ||||
| * | | Added CMake variables to customize builds to match Debian package configurations | Nicholas Corgan | 2013-05-10 | 2 | -10/+14 |
| | | | | | | | | | | | | | | | | | | * -DLIBUHD_PKG=ON installs with libuhd003 configuration * -DLIBUHDDEV_PKG=ON installs with libuhd-dev configuration * -DUHDHOST_PKG=ON installs with uhd-host configuration | ||||
* | | | Merge branch 'maint' | Josh Blum | 2013-04-12 | 3 | -22/+20 |
|\| | | | | | | | | | | | | | | Conflicts: host/tests/time_spec_test.cpp | ||||
| * | | uhd: switch the reusable barrier to condition variables | Josh Blum | 2013-04-12 | 2 | -16/+12 |
| | | | | | | | | | | | | | | | | | | This allows the converter threads in a multi-threaded streamer to wait quietly. In addition, the use of two barriers in the packet handlers was reduced to one, by adding a simple exit barrier inside the reusable barrier's wait method. | ||||
| * | | uhd: fixes for time_spec's to_ticks and from_ticks calls | Josh Blum | 2013-04-12 | 1 | -6/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | The fixes address rouding issues when the tick_rate is a non-integer. Conflicts: host/tests/time_spec_test.cpp | ||||
* | | | gps: only enable SERV:TRAC when requested | Josh Blum | 2013-04-09 | 1 | -2/+11 |
| | | | |||||
* | | | gps: flush uart buffer before waiting for time | Josh Blum | 2013-04-09 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | This addresses a bug only on the master branch. Also turn off the servo sensor, its too long a delay. We will need to conditionally enable this in a later commit. | ||||
* | | | orc: added std cmake finder script for orc | Josh Blum | 2013-03-29 | 1 | -5/+4 |
| | | | |||||
* | | | Merge branch 'maint' | Josh Blum | 2013-03-25 | 5 | -25/+18 |
|\| | | |||||
| * | | e100: switch to fixed length xfers | Josh Blum | 2013-03-25 | 4 | -14/+18 |
| | | | |||||
| * | | usrp1: fix eeprom write capability through fx2 | Josh Blum | 2013-03-25 | 1 | -11/+0 |
| | | | | | | | | | | | | | | | The vectorized eeprom write was faster but broken, removed overload which falls back to the one byte at a time. | ||||
* | | | usb: check for and use libusb_handle_events_timeout_completed | Josh Blum | 2013-03-11 | 2 | -2/+12 |
| | | | |||||
* | | | usb: use int for completed to match libusb example code | Josh Blum | 2013-03-11 | 1 | -8/+9 |
| | | | |||||
* | | | Merge branch 'maint' | Nicholas Corgan | 2013-02-28 | 2 | -0/+45 |
|\| | | |||||
| * | | Merge branch 'maint34' into maint | Nicholas Corgan | 2013-02-28 | 2 | -0/+45 |
| |\| | |||||
| | * | Added Windows DLL resource file to insert version into DLL | Nicholas Corgan | 2013-02-28 | 2 | -0/+45 |
| | | | |||||
* | | | 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 |
| | | | |||||
* | | | b100: added fw version property to query | Josh Blum | 2013-02-13 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'next' | Josh Blum | 2013-01-23 | 1 | -0/+8 |
|\ \ \ | |||||
| * | | | usrp: poke tune args into dboards that support it | Josh Blum | 2012-11-21 | 1 | -0/+8 |
| | | | | |||||
* | | | | Merge branch 'fhs_work' | Josh Blum | 2013-01-23 | 3 | -9/+9 |
|\ \ \ \ | |||||
| * | | | | uhd: work on moving binaries to lib/uhd | Josh Blum | 2012-11-08 | 3 | -9/+9 |
| | | | | | |||||
* | | | | | 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 | 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 | 10 | -20/+120 |
|\| | | | |||||
| * | | | Merge branch 'maint34' into maint | Nicholas Corgan | 2012-11-16 | 10 | -20/+120 |
| |\| | | | | | | | | | | | | | | | | | | | | | | 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 | 11 | -22/+121 |
| | | | | | | | | | | | | | | | | | | | | * Removed all host code dependencies on firmware headers * Put in CMake settings for CPack source | ||||
| | * | | wbx: updating the code to allow full range of the VCO. | Ben Hilburn | 2012-11-07 | 1 | -1/+1 |
| | | | | |||||
| | * | | wbx v4: fixing the drivers for the new rev of the WBX board | Ben Hilburn | 2012-11-07 | 2 | -32/+41 |
| | | | | |||||
* | | | | gps_ctrl: Lower the number of retries to two when waiting for the time. | Moritz Fischer | 2012-11-13 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Merge branch 'maint' | Josh Blum | 2012-11-06 | 2 | -33/+42 |
|\| | | |||||
| * | | wbx: updating the code to allow full range of the VCO. | Ben Hilburn | 2012-11-06 | 1 | -1/+1 |
| | | | |||||
| * | | wbx v4: fixing the drivers for the new rev of the WBX board | Ben Hilburn | 2012-11-06 | 2 | -32/+41 |
| | | | |||||
* | | | Merge branch 'maint' | Josh Blum | 2012-10-29 | 2 | -0/+4 |
|\| | | |||||
| * | | uhd: added barrier interrupt to work around thread issue | Josh Blum | 2012-10-29 | 2 | -0/+4 |
| | | | | | | | | | | | | | | | Force the barrier wait to throw a boost::thread_interrupted The threads were not getting the interruption_point on windows. | ||||
* | | | gps_ctrl.cpp: Partially rewritten, to use caching instead of throwing | Moritz Fischer | 2012-10-19 | 1 | -25/+109 |
|/ / | | | | | | | | | | | | | | | | | | | away the 'wrong' messages. The old way to do this was when a sensor was requested, to wait for the corresponding NMEA message to pass by, throwing away all the 'wrong' ones in the meantime. However, this leads to problems if the user requests combinations that are based on the same NMEA string. To avoid this we now try to cache the strings for a 'freshness' period. | ||||
* | | utils: USRP N2XX Simple Net Burner | Nicholas Corgan | 2012-10-10 | 2 | -5/+4 |
| | | | | | | | | | | * More automated C++ implementation of usrp_n2xx_net_burner.py * By default, installs images from standard image install directories |