Commit graph

35 commits

Author SHA1 Message Date
Martin Braun
99c2730bc9 Remove all boost:: namespace prefix for uint32_t, int32_t etc. (fixed-width types)
- Also removes all references to boost/cstdint.hpp and replaces it with
  stdint.h (The 'correct' replacement would be <cstdint>, but not all of our
  compilers support that).
2016-11-08 08:02:22 -08:00
Martin Braun
83912104a9 Merge branch 'UHD-3.9.LTS' into maint
This provides the GPS fixes.

Conflicts:
	host/CMakeLists.txt
	tools/debs/upload_debs.sh
2016-09-02 11:27:37 -07:00
michael-west
2f1d2af82c Octoclock: Simplify GPSDO UART so it does not strip or add characters 2016-09-02 11:10:46 -07:00
michael-west
59ed6e1a0f GPSDO: Make sure read_uart() returns only complete strings for all devices. 2016-09-02 11:10:46 -07:00
Martin Braun
3df0f6e9e4 Merge branch 'maint'
Conflicts:
	host/lib/usrp/dboard/db_wbx_version2.cpp
	host/lib/usrp/dboard/db_wbx_version3.cpp
2016-08-01 18:49:22 -07:00
michael-west
e1dec92e3c Octoclock: Fixed issues related to missing strings from GPSDO.
- Corrected case when num_wraps overflowed
- Added limit to cache age
2016-06-28 17:09:53 -07:00
michael-west
e1139b2542 Octoclock: Fix firmware version compatibility 2016-06-27 13:58:28 -07:00
Martin Braun
f693349f12 Merge branch 'maint' 2016-06-17 14:35:17 -07:00
Nicholas Corgan
aa16659587 octoclock: bugfixes, bumped firmware compat number to 4
* host: consistency in setting packet sequence numbers
* firmware: populate packet length field when setting GPSDO cache
* both: logic for dealing with mismatching compatibility numbers

Reviewed-By: Michael West <michael.west@ettus.com>
Reviewed-By: Martin Braun <martin.braun@ettus.com>
2016-06-17 11:37:45 -07:00
michael-west
86630133e4 Octoclock: Fix off by one errors in uart code 2016-06-16 18:46:07 -07:00
Martin Braun
8cde538c6d Merge branch 'maint' 2016-06-14 13:21:54 -07:00
Nicholas Corgan
8c3996d12b Spelling fixes 2016-06-14 08:41:21 -07:00
Martin Braun
c69222a15c Merge branch 'maint' 2016-06-06 16:51:53 -07:00
Marcus Müller
2004bbdb02 octoclock: Fix multi-line #define statements
Now, use `do{...} while(0)` to pack multiple statements
into a single one that isn't fragile.

Currently

```
if(state_just_right)
	OCTOCLOCK_SEND_AND_RECV(all,the,options);
```

would introduce annoying bugs.

Generally, there's no good reason this is a `#define` rather than a
C/C++ function.

The `OCTOCLOCK_PACKET_MATCHES` should probably be a C function, too,
or simply an overloaded `==` operator on to `const octoclock_packet_t&`.
2016-06-06 16:48:52 -07:00
Ashish Chaudhari
27a08ccddc prop_tree: Multiple API enhancements to uhd::property
- Added desired and coerced values and accessors to property
- Added support to register desired subscribers
- set APIs don't reallocate storage for a property value
- Renamed callback method registration APIs
- Registering 2 coercers or publishers for a property will throw
- Registering a coercer and a publisher for the same property will throw
2016-02-11 14:36:20 -08:00
Ashish Chaudhari
f44f7f2ca7 Merge branch 'maint'
Conflicts:
	host/lib/usrp/b200/b200_impl.hpp
	host/lib/usrp/e300/e300_fpga_defs.hpp
	host/lib/usrp/x300/x300_fw_common.h
2015-12-15 15:17:36 -08:00
Nicholas Corgan
373fec2fb1 ihex: Windows fixes 2015-12-14 13:26:45 -08:00
Martin Braun
87860fc322 octoclock: Now uses internal ihex parser 2015-12-14 13:26:44 -08:00
Martin Braun
b17b440d75 cmake: Cleaned up output, removed duplicate OctoClock component registration 2015-11-17 12:55:06 -08:00
Nicholas Corgan
c7564bc99e octoclock: fixed still-in-bootloader error message 2015-10-06 11:33:07 -07:00
Nicholas Corgan
0ce526f302 Fixed minor warnings
* Unreferenced exceptions in try-catch statements
* Incorrect function documentation
* Unlabelled unused variables
2015-09-01 13:23:19 -07:00
Nicholas Corgan
d35a0e28b6 octoclock: replaced Intel hex -> binary converter 2015-08-14 12:30:53 -07:00
Nicholas Corgan
bc9dd05988 C API cleanup, feature additions
* Cleaned up usage of handles vs. handle pointers
* Store global string for last error thrown
* Removed uhd::device_addr_t handle, added std::vector<std::string> handle
2015-08-12 12:19:20 -07:00
Nicholas Corgan
0dbaf46b5c cmake: added variable to LIBUHD_REGISTER_COMPONENT macro to make required, set LibUHD to required
* If required component's dependencies aren't met, CMake will throw an error unless user specifically disables it
2015-08-11 10:51:23 -07:00
Nicholas Corgan
f1ebf68829 C API: feature additions, bugfixes
* Wrapped uhd::device_addrs_t, added find functions for multi_usrp, multi_usrp_clock
* Replaced getopt with public domain implementation
* Minor bugfixes
2015-08-07 11:23:59 -07:00
Nicholas Corgan
30f87afcba uhd: C API wrapper
* multi_usrp, multi_usrp_clock, and associated classes accessible through C
* Added Doxygen documentation explaining structure and API
* Simple RX and TX streaming examples
* Unit tests for different parts of C interface and C++ error conversion
2015-08-06 10:42:23 -07:00
Nicholas Corgan
bb62ab84fd image_loader: force user to specify device
* On utility level, force user to use --args=type=foo
* In each loader, throw an error if args are ambiguous
2015-08-05 13:04:04 -07:00
Nicholas Corgan
0595900ecc Added uhd::image_loader class and uhd_image_loader utility
* Single class for loading firmware/FPGA images onto devices instead of multiple utilities
* Loading functions are registered for each device, corresponding to their --args="type=foo" name
* Deprecation warnings added to all product-specific image loading utilities
2015-07-15 09:32:18 -07:00
Nicholas Corgan
d9656de88f OctoClock bugfixes
* Bumped compatibility version to 3
* firmware: Ethernet, clkdist bugfixes
* lib: fixed invalid rev detection
2015-07-09 09:13:41 -07:00
Nicholas Corgan
988c597026 Consolidated byte_vector common code into single file 2015-03-27 14:44:26 -07:00
Nicholas Corgan
1200721b69 Warning fixes
* CMake now not applying C++ flags to C files
* GCC 4.4: anti-aliasing rules
* MSVC: narrowing, differences in subclass function parameters
* Clang: uninitialized variables
2015-03-27 09:35:29 -07:00
Martin Braun
fae746179c uhd: Fixed multiple compiler warnings (unused variables, missing literal f) 2015-03-11 16:58:09 -07:00
Ben Hilburn
75d519706b Merging new UHD_IMAGES_DIR utilities and bug fixes.
Also includes NI-USRP Windows Registry Key fixes.
2015-01-27 16:07:43 -08:00
Nicholas Corgan
2de96cd57c OctoClock: bugfixes/improvements
* Fixed Ethernet initialization problem
* Improved external reference detection
* Added gratuitous ARP, sent upon power-up
* Tweaked host-side timing for initialization and firmware burning
* Fixed logic for dealing with firmware incompatibility
* Misc efficiency/reliability improvements to firmware's network code
2014-08-20 09:42:26 -07:00
Nicholas Corgan
a6e18604be OctoClock firmware upgrade, added host driver
* OctoClock can communicate with UHD over Ethernet
* Can read NMEA strings from GPSDO and send to host
* Added multi_usrp_clock class for clock devices
* uhd::device can now filter to return only USRP devices or clock devices
* New OctoClock bootloader can accept firmware download over Ethernet
* Added octoclock_burn_eeprom,octoclock_firmware_burner utilities
* Added test_clock_synch example to show clock API
2014-07-23 07:37:32 -07:00