diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-03-11 14:11:05 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-03-11 14:11:05 -0700 |
| commit | 2ba2b35ed3c5fb845a18aa2f0abf68d38b70abc4 (patch) | |
| tree | 43c3b8354bdc0e27631e4a7767ceb257591244ca | |
| parent | 7a2eaa10c629bf4369434cf6dd9c67eca2877e89 (diff) | |
| parent | 21ccefb2facf3e85d0ab7146a6d4b93782688ade (diff) | |
| download | uhd-2ba2b35ed3c5fb845a18aa2f0abf68d38b70abc4.tar.gz uhd-2ba2b35ed3c5fb845a18aa2f0abf68d38b70abc4.tar.bz2 uhd-2ba2b35ed3c5fb845a18aa2f0abf68d38b70abc4.zip | |
Merge branch 'maint'
| -rw-r--r-- | host/docs/e3x0_imu_demo.png | bin | 0 -> 85901 bytes | |||
| -rw-r--r-- | host/lib/usrp/b200/b200_impl.cpp | 3 |
2 files changed, 2 insertions, 1 deletions
diff --git a/host/docs/e3x0_imu_demo.png b/host/docs/e3x0_imu_demo.png Binary files differnew file mode 100644 index 000000000..cbf156224 --- /dev/null +++ b/host/docs/e3x0_imu_demo.png diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp index 89af6a6e1..b1ab6ea7d 100644 --- a/host/lib/usrp/b200/b200_impl.cpp +++ b/host/lib/usrp/b200/b200_impl.cpp @@ -203,7 +203,8 @@ UHD_STATIC_BLOCK(register_b200_device) /*********************************************************************** * Structors **********************************************************************/ -b200_impl::b200_impl(const device_addr_t &device_addr) +b200_impl::b200_impl(const device_addr_t &device_addr) : + _tick_rate(0.0) // Forces a clock initialization at startup { _tree = property_tree::make(); _type = device::USRP; |
