Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'usrp_n2xx_net_burner_gui' | Josh Blum | 2011-03-27 | 4 | -27/+227 |
|\ | |||||
| * | usrp2: added usrp_n2xx_net_burner_gui to build system installation | Josh Blum | 2011-03-26 | 2 | -0/+1 |
| | | |||||
| * | usrp2: created net burner gui wrapper for N series | Josh Blum | 2011-03-26 | 3 | -27/+226 |
| | | | | | | | | | | | | | | | | | | | | | | The gui looks and works much like the card burner gui. However, the possible devices are not enumerated. Handles errors, resetting, and showing progress. Added hooks to net burner for progress callbacks (progress meter). Changed --ip option to --addr (any resolvable address will work). Fixes issue with "timeout" on reset, by catching socket.timeout. Updated the manual to reflect using the gui app and --addr option. | ||||
* | | Merge branch 'mac_packaging' | Josh Blum | 2011-03-27 | 6 | -45/+63 |
|\ \ | |||||
| * | | uhd: work on mac osx packaging | Josh Blum | 2011-03-25 | 6 | -45/+63 |
| |/ | | | | | | | | | | | | | Renamed README type files to have .txt extension (needed for CPACK_RESOURCE_FILE_*). Tweaks to the cpack setup on CPACK_RESOURCE_FILE_* and handling for when UHD_PACKAGE_MODE==AUTO. As of this commit, the mac packages do not contain the .dylib files (do not know why yet). | ||||
* | | Merge branch 'fix/usrp_n2xx_serial_bootloader' | Josh Blum | 2011-03-27 | 1 | -5/+6 |
|\ \ | |||||
| * | | usrp2: fixed serial bootloader for N series | Josh Blum | 2011-03-26 | 1 | -5/+6 |
| | | | |||||
* | | | usrp2: fix typo, now building n200 fpga images | Josh Blum | 2011-03-25 | 1 | -1/+1 |
| | | | |||||
* | | | usrp2: modified firmware build rules to chain the dependencies (better for ↵ | Josh Blum | 2011-03-25 | 1 | -4/+8 |
| | | | | | | | | | | | | make -j4) | ||||
* | | | uhd: added USRP-N200 build support to images Makefile | Josh Blum | 2011-03-25 | 1 | -4/+22 |
| | | | |||||
* | | | Merge branch 'fpga_master' into n200_support | Josh Blum | 2011-03-25 | 1 | -0/+98 |
|\ \ \ | |_|/ |/| | | |||||
| * | | u2p: N200 Makefile | Matt Ettus | 2011-03-25 | 1 | -0/+98 |
| | | | |||||
* | | | uhd: update copyright headers with automated script | Josh Blum | 2011-03-23 | 36 | -36/+36 |
| | | | |||||
* | | | usrp-e100: added module compat num check, made fpga compat constant more obvious | Josh Blum | 2011-03-11 | 3 | -6/+15 |
| |/ |/| | |||||
* | | uhd: try to be smart when setting up cpack when UHD_PACKAGE_MODE=AUTO | Josh Blum | 2011-03-22 | 2 | -5/+35 |
| | | |||||
* | | uhd: added libusb1 to CPACK_RPM_PACKAGE_REQUIRES | Josh Blum | 2011-03-22 | 1 | -1/+1 |
| | | |||||
* | | uhd: work on debian package requirements in cpack setup | Josh Blum | 2011-03-22 | 2 | -14/+5 |
| | | |||||
* | | uhd: setup UHD_VERSION and CPACK_PACKAGE_FILE_NAME | Josh Blum | 2011-03-22 | 3 | -1/+10 |
| | | |||||
* | | uhd: setup cpack components for component based installers | Josh Blum | 2011-03-21 | 12 | -14/+54 |
| | | |||||
* | | usrp2: use the discovered mtu to clip the user specified mtu | Josh Blum | 2011-03-21 | 1 | -8/+11 |
| | | |||||
* | | uhd: added comments/documentation to clock_config | Josh Blum | 2011-03-21 | 1 | -0/+7 |
| | | |||||
* | | usb: fix callback cast in libusb zero copy under msvc | Josh Blum | 2011-03-21 | 1 | -1/+1 |
| | | |||||
* | | usrp-e100: reinstate the VCO calibration timeout message | Josh Blum | 2011-03-06 | 1 | -3/+0 |
| | | |||||
* | | usrp: dboard iface can inherit from i2c iface | Josh Blum | 2011-03-17 | 1 | -18/+1 |
| | | |||||
* | | uhd: whoops, spi convenience functions have 32 bit data | Josh Blum | 2011-03-17 | 2 | -4/+4 |
| | | |||||
* | | usrp-e100: disabling VCO cal check, its not right, and the warning alarms people | Josh Blum | 2011-03-05 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'usb-cancel' into next | Josh Blum | 2011-03-17 | 1 | -6/+14 |
|\ \ | | | | | | | | | | | | | Conflicts: host/lib/transport/libusb1_zero_copy.cpp | ||||
| * | | USB zero copy impl: proper cleanup for canceled transfers -- wait for cancel ↵ | Nick Foster | 2011-03-16 | 1 | -6/+14 |
| | | | | | | | | | | | | before freeing | ||||
* | | | Merge branch 'boost_fs_string' into next | Josh Blum | 2011-03-17 | 3 | -5/+5 |
|\ \ \ | |||||
| * | | | uhd: replace file_string() with string() for deprecation reasons | Josh Blum | 2011-03-15 | 3 | -5/+5 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Patch from moritz.fischer@student.kit.edu [1] http://www.boost.org/doc/libs/1_46_1/libs/filesystem/v3/doc/deprecated.html [2] http://www.boost.org/doc/libs/1_46_1/libs/filesystem/v3/doc/index.htm Boost 1.36 appears to have string(), so this should be safe to use. | ||||
* | | | Merge branch 'master' into next | Josh Blum | 2011-03-17 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | E100: fix test clock output enable | Nick Foster | 2011-03-16 | 1 | -1/+1 |
| |/ / | |||||
| * | | uhd: copied examples changes from next onto master branch | Josh Blum | 2011-03-15 | 8 | -139/+515 |
| | | | |||||
* | | | Merge branch 'fpga_master' into next | Josh Blum | 2011-03-17 | 2 | -16/+8 |
|\ \ \ | | |/ | |/| | |||||
| * | | u1e: removed old directory from make | Matt Ettus | 2011-03-15 | 1 | -1/+0 |
| | | | |||||
| * | | u1e: keep up with fixes made for u2/u2p, make it compile again | Matt Ettus | 2011-03-15 | 2 | -16/+8 |
| | | | |||||
* | | | usrp_e : Check packet length received from FPGA in case of corruption. | Philip Balister | 2011-03-17 | 1 | -5/+9 |
| | | | | | | | | | | | | | | | If the packet length in invalid, do not calculate the checksum to avoid segfaulting. | ||||
* | | | usrp_e : Add usrp e1xx gpio test program the usrp e100 utils directory. | Philip Balister | 2011-03-17 | 2 | -2/+3 |
| | | | |||||
* | | | usrp_e100: Move gpio test program to utils. | Philip Balister | 2011-03-16 | 1 | -0/+0 |
| | | | | | | | | | | | | Still needs changing to use the new register map header. | ||||
* | | | usrp_e100: Delete old test scripts. | Philip Balister | 2011-03-16 | 9 | -162/+0 |
| | | | |||||
* | | | uhd: added missing set_tx_antenna() in tx waveforms | Josh Blum | 2011-03-15 | 1 | -0/+3 |
| | | | |||||
* | | | usrp2: fixed mtu discovery bug, was using the last failed value | Josh Blum | 2011-03-14 | 1 | -15/+11 |
| | | | |||||
* | | | usrp_e1xx : Remove reset offset from register map. | Philip Balister | 2011-03-14 | 1 | -1/+0 |
| | | | |||||
* | | | Merge branch 'windows_fix' into next | Josh Blum | 2011-03-14 | 1 | -2/+3 |
|\ \ \ | |||||
| * | | | usrp2: minor fix to use more ntohl | Josh Blum | 2011-03-14 | 1 | -2/+3 |
| | | | | |||||
* | | | | usrp_e : Remove commented out FPGA reset code. | Philip Balister | 2011-03-14 | 1 | -3/+0 |
|/ / / | | | | | | | | | | | | | | | | The reset is done in the device driver open. Reseting from uhd is bad because the driver has to re-initialize the spi and i2c controllers after resetting the fpga. | ||||
* | | | usrp2: clip the mtu discovery if its within default MTU + a few | Josh Blum | 2011-03-13 | 1 | -0/+6 |
| | | | |||||
* | | | uhd: make CMAKE_BUILD_TYPE a visible variable in the gui | Josh Blum | 2011-03-13 | 1 | -0/+1 |
| | | | |||||
* | | | usrp2: also store expected_time in-between states | Josh Blum | 2011-03-11 | 1 | -4/+5 |
| | | | |||||
* | | | uhd: created rx_multi_samples for multi-channel example | Josh Blum | 2011-03-11 | 4 | -14/+161 |
| | | |