diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-01-27 09:12:54 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-01-27 09:12:54 +0100 |
| commit | 94e11cb457fc7cc9b5fa5259881ec5b729eff201 (patch) | |
| tree | 8437e1890af5fc959420e2a6cc651a85c538f31c /host/lib/usrp/e300/e300_network.cpp | |
| parent | 5047677c784077be82d11be26277260e6350a5bc (diff) | |
| parent | d238f12252870d73df125649d965edc2a05debf5 (diff) | |
| download | uhd-94e11cb457fc7cc9b5fa5259881ec5b729eff201.tar.gz uhd-94e11cb457fc7cc9b5fa5259881ec5b729eff201.tar.bz2 uhd-94e11cb457fc7cc9b5fa5259881ec5b729eff201.zip | |
Merge branch 'maint'
Conflicts:
host/docs/usrp_e3x0.dox
Diffstat (limited to 'host/lib/usrp/e300/e300_network.cpp')
| -rw-r--r-- | host/lib/usrp/e300/e300_network.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/host/lib/usrp/e300/e300_network.cpp b/host/lib/usrp/e300/e300_network.cpp index 1ebb8a2ad..7ed83c6c6 100644 --- a/host/lib/usrp/e300/e300_network.cpp +++ b/host/lib/usrp/e300/e300_network.cpp @@ -334,6 +334,9 @@ static void e300_sensor_tunnel( } else if (uhd::ntohx(in->which) == GPS_LOCK) { in->value = uhd::htonx<boost::uint32_t>( sensor_manager->get_gps_lock().to_bool() ? 1 : 0); + } else if (uhd::ntohx(in->which) == REF_LOCK) { + in->value = uhd::htonx<boost::uint32_t>( + sensor_manager->get_ref_lock().to_bool() ? 1 : 0); } else if (uhd::ntohx(in->which) == GPS_TIME) { in->value = uhd::htonx<boost::uint32_t>( sensor_manager->get_gps_time().to_int()); @@ -624,7 +627,7 @@ network_server_impl::network_server_impl(const uhd::device_addr_t &device_addr) // This is horrible ... why do I have to sleep here? boost::this_thread::sleep(boost::posix_time::milliseconds(100)); _sensor_manager = e300_sensor_manager::make_local( - gps::ublox::ubx::control::make("/dev/ttyPS1", 9600)); + gps::ublox::ubx::control::make("/dev/ttyPS1", 9600), _global_regs); } }}} // namespace |