summaryrefslogtreecommitdiffstats
path: root/host/examples
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-02-10 12:15:04 -0800
committerJosh Blum <josh@joshknows.com>2011-02-10 12:15:04 -0800
commit80be2ec57a0fada29d04bd5cd0c102c622fac7a6 (patch)
tree54bf666d4f1f1906116f9e7a39bbdc7c09fa1652 /host/examples
parent1275c37b96953c04191e9a5dd8747766c723b7e1 (diff)
parent206a70cb823da9c338dcb83855a22ad251bb9cb7 (diff)
downloaduhd-80be2ec57a0fada29d04bd5cd0c102c622fac7a6.tar.gz
uhd-80be2ec57a0fada29d04bd5cd0c102c622fac7a6.tar.bz2
uhd-80be2ec57a0fada29d04bd5cd0c102c622fac7a6.zip
Merge branch 'usrp_e100_devel' into next
Conflicts: host/lib/usrp/usrp_e100/io_impl.cpp
Diffstat (limited to 'host/examples')
-rw-r--r--host/examples/rx_timed_samples.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/host/examples/rx_timed_samples.cpp b/host/examples/rx_timed_samples.cpp
index 9ebe36c5a..630b4a7a9 100644
--- a/host/examples/rx_timed_samples.cpp
+++ b/host/examples/rx_timed_samples.cpp
@@ -32,7 +32,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
std::string args;
double seconds_in_future;
size_t total_num_samps;
- double rate, freq;
+ double rate, freq, clock;
//setup the program options
po::options_description desc("Allowed options");
@@ -41,6 +41,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
("args", po::value<std::string>(&args)->default_value(""), "single uhd device address args")
("secs", po::value<double>(&seconds_in_future)->default_value(3), "number of seconds in the future to receive")
("nsamps", po::value<size_t>(&total_num_samps)->default_value(1000), "total number of samples to receive")
+ ("clock", po::value<double>(&clock), "master clock frequency in Hz")
("rate", po::value<double>(&rate)->default_value(100e6/16), "rate of incoming samples")
("freq", po::value<double>(&freq)->default_value(0), "rf center frequency in Hz")
("dilv", "specify to disable inner-loop verbose")
@@ -63,6 +64,12 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
uhd::usrp::multi_usrp::sptr usrp = uhd::usrp::multi_usrp::make(args);
std::cout << boost::format("Using Device: %s") % usrp->get_pp_string() << std::endl;
+ //optionally set the clock rate (do before setting anything else)
+ if (vm.count("clock")){
+ std::cout << boost::format("Setting master clock rate: %f MHz...") % (clock/1e6) << std::endl;
+ usrp->set_master_clock_rate(clock);
+ }
+
//set the rx sample rate
std::cout << boost::format("Setting RX Rate: %f Msps...") % (rate/1e6) << std::endl;
usrp->set_rx_rate(rate);