diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2011-01-17 22:51:14 -0800 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2011-01-17 22:51:14 -0800 |
| commit | 330a014dfc32b34a7fe5555d3ae2d87a25dc2466 (patch) | |
| tree | 5b744b8cdb13eda776028a046cf4e15dba0a668d /host/lib/usrp/usrp2/mboard_impl.cpp | |
| parent | caa911aa270ee4aef7244f3159b9fd402a454069 (diff) | |
| download | uhd-330a014dfc32b34a7fe5555d3ae2d87a25dc2466.tar.gz uhd-330a014dfc32b34a7fe5555d3ae2d87a25dc2466.tar.bz2 uhd-330a014dfc32b34a7fe5555d3ae2d87a25dc2466.zip | |
next: generalized the GPS interface to any USRP device. just give it a function to write/read strings to UART.
not sure if i'm happy with the interface; maybe inheriting is cleaner. this works though.
gps interface for usrp2 is disabled right now in mboard_impl.
Diffstat (limited to 'host/lib/usrp/usrp2/mboard_impl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp2/mboard_impl.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/host/lib/usrp/usrp2/mboard_impl.cpp b/host/lib/usrp/usrp2/mboard_impl.cpp index 95a3819b3..95f7013e7 100644 --- a/host/lib/usrp/usrp2/mboard_impl.cpp +++ b/host/lib/usrp/usrp2/mboard_impl.cpp @@ -17,6 +17,7 @@ #include "usrp2_impl.hpp" #include "usrp2_regs.hpp" +#include <uhd/usrp/gps_ctrl.hpp> #include <uhd/usrp/misc_utils.hpp> #include <uhd/usrp/dsp_utils.hpp> #include <uhd/usrp/mboard_props.hpp> @@ -65,7 +66,9 @@ usrp2_mboard_impl::usrp2_mboard_impl( //contruct the interfaces to mboard perifs _clock_ctrl = usrp2_clock_ctrl::make(_iface); _codec_ctrl = usrp2_codec_ctrl::make(_iface); - _gps_ctrl = usrp2_gps_ctrl::make(_iface); + //_gps_ctrl = gps_ctrl::make( + // _iface->get_gps_write_fn(), + // _iface->get_gps_read_fn()); //if(_gps_ctrl->gps_detected()) std::cout << "GPS time: " << _gps_ctrl->get_time() << std::endl; |