summaryrefslogtreecommitdiffstats
path: root/host
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-09-06 09:59:34 -0700
committerJosh Blum <josh@joshknows.com>2011-09-06 09:59:34 -0700
commit725f72a4517d97a0d95038d3b80b3f8c7a0ec1b0 (patch)
tree767fc7d76e0a0d7c2dc7cf4fd4bf1119bf57305b /host
parent1df3e9b1619af5c4e652ec143930916a87d4789a (diff)
downloaduhd-725f72a4517d97a0d95038d3b80b3f8c7a0ec1b0.tar.gz
uhd-725f72a4517d97a0d95038d3b80b3f8c7a0ec1b0.tar.bz2
uhd-725f72a4517d97a0d95038d3b80b3f8c7a0ec1b0.zip
uhd: add mimo cable config option to rx_multi_samples
Diffstat (limited to 'host')
-rw-r--r--host/examples/rx_multi_samples.cpp20
1 files changed, 18 insertions, 2 deletions
diff --git a/host/examples/rx_multi_samples.cpp b/host/examples/rx_multi_samples.cpp
index 08b2d399d..8f6d7c939 100644
--- a/host/examples/rx_multi_samples.cpp
+++ b/host/examples/rx_multi_samples.cpp
@@ -43,7 +43,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
("secs", po::value<double>(&seconds_in_future)->default_value(1.5), "number of seconds in the future to receive")
("nsamps", po::value<size_t>(&total_num_samps)->default_value(10000), "total number of samples to receive")
("rate", po::value<double>(&rate)->default_value(100e6/16), "rate of incoming samples")
- ("sync", po::value<std::string>(&sync)->default_value("now"), "synchronization method: now, pps")
+ ("sync", po::value<std::string>(&sync)->default_value("now"), "synchronization method: now, pps, mimo")
("subdev", po::value<std::string>(&subdev), "subdev spec (homogeneous across motherboards)")
("dilv", "specify to disable inner-loop verbose")
;
@@ -87,13 +87,29 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
std::cout << boost::format("Setting device timestamp to 0...") << std::endl;
if (sync == "now"){
+ //This is not a true time lock, the devices will be off by a few RTT.
+ //Rather, this is just to allow for demonstration of the code below.
usrp->set_time_now(uhd::time_spec_t(0.0));
- boost::this_thread::sleep(boost::posix_time::milliseconds(50)); //wait for mimo cable time sync
}
else if (sync == "pps"){
usrp->set_time_unknown_pps(uhd::time_spec_t(0.0));
boost::this_thread::sleep(boost::posix_time::seconds(1)); //wait for pps sync pulse
}
+ else if (sync == "mimo"){
+ UHD_ASSERT_THROW(usrp->get_num_mboards() == 2);
+
+ //make mboard 1 a slave over the MIMO Cable
+ uhd::clock_config_t clock_config;
+ clock_config.ref_source = uhd::clock_config_t::REF_MIMO;
+ clock_config.pps_source = uhd::clock_config_t::PPS_MIMO;
+ usrp->set_clock_config(clock_config, 1);
+
+ //set time on the master (mboard 0)
+ usrp->set_time_now(uhd::time_spec_t(0.0), 0);
+
+ //sleep a bit while the slave locks its time to the master
+ boost::this_thread::sleep(boost::posix_time::milliseconds(100));
+ }
//setup streaming
std::cout << std::endl;