summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'maint'Nicholas Corgan2013-05-1015-72/+168
|\ | | | | | | | | Conflicts: host/tests/CMakeLists.txt
| * Added CMake variables to customize builds to match Debian package configurationsNicholas Corgan2013-05-1015-73/+168
| | | | | | | | | | | | * -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'Nicholas Corgan2013-05-101-1/+1
|\|
| * docs: man pages compress fullyNicholas Corgan2013-05-101-1/+1
| |
* | Merge branch 'maint'Nicholas Corgan2013-05-102-3/+3
|\|
| * Bumped up version to 3.5.3release_003_005_003Nicholas Corgan2013-05-102-3/+3
| |
* | Merge branch 'maint'Nicholas Corgan2013-05-102-4/+8
|\|
| * Merge branch 'fpga_master' into maintJosh Blum2013-05-092-4/+8
| |\
| | * E100: revert unnecessary change to fifo_to_gpmcJosh Blum2013-05-092-4/+8
| | | | | | | | | | | | | | | This change was intended to remove warnings as only 16 bits of the FIFO bus are used. However this change has unintentional consequences for receive performance.
* | | Merge branch 'maint'Nicholas Corgan2013-05-0313-9/+687
|\| |
| * | UHD has man pages nowNicholas Corgan2013-05-0313-9/+687
| | | | | | | | | | | | | | | * Linux installations will automatically install man pages * Moved usrp_n2xx_simple_net_burner and usrp2_card_burner into bin
* | | Merge branch 'maint'Nicholas Corgan2013-05-033-23/+55
|\| |
| * | Made uhd_images_downloader more robust to match Debian's uhd_firmware_installerNicholas Corgan2013-05-033-23/+55
| | | | | | | | | | | | | | | * Uses custom User Agent * Compares md5sum of downloaded zip file to stored value
* | | Merge branch 'maint'Nicholas Corgan2013-04-302-1/+4
|\| |
| * | Minor changes for Debian package complianceNicholas Corgan2013-04-302-1/+4
| | | | | | | | | | | | | | | * Made CMake script to find libusb-1.0 stronger * Added Debian watchfile
* | | Merge branch 'maint'Josh Blum2013-04-241-0/+1
|\| |
| * | uhd: added missing include iomanipJosh Blum2013-04-241-0/+1
| | |
* | | cmake: Added custom NSIS templatesNicholas Corgan2013-04-162-0/+992
| | | | | | | | | | | | | | | | | | * More personalized messages * Unused "UHD Desktop Icon" option removed * UHD Images Downloader, USRP2 Card Burner, and USRP-N2XX Net Burner added to Start Menu
* | | orc: fixed orc version check with pkg configJosh Blum2013-04-151-1/+9
| | |
* | | Merge branch 'maint'Josh Blum2013-04-125-34/+79
|\| | | | | | | | | | | | | | Conflicts: host/tests/time_spec_test.cpp
| * | uhd: switch the reusable barrier to condition variablesJosh Blum2013-04-123-28/+53
| | | | | | | | | | | | | | | | | | 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 callsJosh Blum2013-04-122-6/+37
| | | | | | | | | | | | | | | | | | | | | | | | 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 requestedJosh Blum2013-04-091-2/+11
| | |
* | | gps: flush uart buffer before waiting for timeJosh Blum2013-04-092-2/+4
| | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'maint'Josh Blum2013-04-091-1/+1
|\| |
| * | gps: use to_ticks in query app to avoid rounding issuesJosh Blum2013-04-091-1/+1
| | | | | | | | | | | | | | | | | | The to_ticks(1.0) is a preferable way to get whole seconds because it avoids possible rounding issues since just getting full seconds does not account for the frac seconds.
* | | gps: added print for pc clock time to query_gpsdoJosh Blum2013-04-091-0/+2
| | |
* | | Merge branch 'maint'Josh Blum2013-04-021-0/+1
|\| |
| * | Merge branch 'fpga_master' into maintJosh Blum2013-04-021-0/+1
| |\|
| | * E110: revert Makefile for E110, the UCF was accidentally removedJosh Blum2013-04-021-0/+1
| | |
* | | orc: added std cmake finder script for orcJosh Blum2013-03-292-5/+32
| | |
* | | Merge branch 'maint'Nicholas Corgan2013-03-271-1/+1
|\| |
| * | utils: Fixed usrp_n2xx_simple_net_burner warningNicholas Corgan2013-03-271-1/+1
| | |
* | | Merge branch 'maint'Josh Blum2013-03-263-12/+17
|\| |
| * | uhd: updated UHD_IMAGES_DOWNLOAD_SRC for 3.5.2release_003_005_002Josh Blum2013-03-261-1/+1
| | |
| * | utils: usrp_n2xx_simple_net_burner now has option to automatically rebootNicholas Corgan2013-03-261-10/+15
| | |
| * | uhd: update version to 3.5.2 for patch releaseJosh Blum2013-03-261-1/+1
| | |
* | | Merge branch 'maint'Nicholas Corgan2013-03-261-1/+1
|\| | | | | | | | | | | | | | Conflicts: host/docs/calibration.rst
| * | Merge branch 'maint34' into maintNicholas Corgan2013-03-261-1/+1
| |\ \ | | | | | | | | | | | | | | | | Conflicts: host/docs/calibration.rst
| | * | docs: fixed typo in calibration documentationNicholas Corgan2013-03-261-1/+1
| | | |
* | | | Merge branch 'maint'Josh Blum2013-03-2514-68/+76
|\| | |
| * | | Merge branch 'fpga_master' into maintJosh Blum2013-03-259-43/+58
| |\ \ \ | | | |/ | | |/|
| | * | e110: fixes from last commitJosh Blum2013-03-182-2/+1
| | | |
| | * | e100: switch to fixed length xfersJosh Blum2013-03-146-40/+51
| | | |
| | * | fpga: added logging to makefile commonJosh Blum2013-03-051-1/+1
| | | |
| | * | b100: tighten timing, added p2p constraint + ignoresJosh Blum2013-03-052-2/+7
| | | | | | | | | | | | | | | | Bumped u1p compat minor, now its 11.2
| * | | e100: switch to fixed length xfersJosh Blum2013-03-254-14/+18
| | | |
| * | | usrp1: fix eeprom write capability through fx2Josh Blum2013-03-251-11/+0
| | | | | | | | | | | | | | | | | | | | The vectorized eeprom write was faster but broken, removed overload which falls back to the one byte at a time.
* | | | cmake: uhd-usrp.rules location fixed to reflect FHS complianceNicholas Corgan2013-03-212-4/+4
| | | |
* | | | Merge branch 'maint'Nicholas Corgan2013-03-181-1/+1
|\| | |