diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-02-12 11:04:29 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-02-12 11:04:29 +0100 |
| commit | 8086c2e32c8a71e3b50c63620a18f63b994628aa (patch) | |
| tree | 08247dcad2cb3ba1e4d973be7b50962203e04d93 /host/examples | |
| parent | e28d7844b0c9d206bf5b7737a44c22f29e761ec1 (diff) | |
| parent | ec7eedcca8418970e081b4875c2d5c147611025b (diff) | |
| download | uhd-8086c2e32c8a71e3b50c63620a18f63b994628aa.tar.gz uhd-8086c2e32c8a71e3b50c63620a18f63b994628aa.tar.bz2 uhd-8086c2e32c8a71e3b50c63620a18f63b994628aa.zip | |
Merge branch 'maint'
Conflicts:
host/examples/rx_samples_to_file.cpp
Diffstat (limited to 'host/examples')
| -rw-r--r-- | host/examples/rx_ascii_art_dft.cpp | 4 | ||||
| -rw-r--r-- | host/examples/rx_samples_to_file.cpp | 4 | ||||
| -rw-r--r-- | host/examples/rx_samples_to_udp.cpp | 4 | ||||
| -rw-r--r-- | host/examples/txrx_loopback_to_file.cpp | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/host/examples/rx_ascii_art_dft.cpp b/host/examples/rx_ascii_art_dft.cpp index 81208cf8b..c73e57459 100644 --- a/host/examples/rx_ascii_art_dft.cpp +++ b/host/examples/rx_ascii_art_dft.cpp @@ -110,9 +110,9 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ //set the analog frontend filter bandwidth if (vm.count("bw")){ - std::cout << boost::format("Setting RX Bandwidth: %f MHz...") % bw << std::endl; + std::cout << boost::format("Setting RX Bandwidth: %f MHz...") % (bw/1e6) << std::endl; usrp->set_rx_bandwidth(bw); - std::cout << boost::format("Actual RX Bandwidth: %f MHz...") % usrp->get_rx_bandwidth() << std::endl << std::endl; + std::cout << boost::format("Actual RX Bandwidth: %f MHz...") % (usrp->get_rx_bandwidth()/1e6) << std::endl << std::endl; } //set the antenna diff --git a/host/examples/rx_samples_to_file.cpp b/host/examples/rx_samples_to_file.cpp index 4e6d8139f..f71c4ed47 100644 --- a/host/examples/rx_samples_to_file.cpp +++ b/host/examples/rx_samples_to_file.cpp @@ -304,9 +304,9 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ //set the IF filter bandwidth if (vm.count("bw")) { - std::cout << boost::format("Setting RX Bandwidth: %f MHz...") % bw << std::endl; + std::cout << boost::format("Setting RX Bandwidth: %f MHz...") % (bw/1e6) << std::endl; usrp->set_rx_bandwidth(bw); - std::cout << boost::format("Actual RX Bandwidth: %f MHz...") % usrp->get_rx_bandwidth() << std::endl << std::endl; + std::cout << boost::format("Actual RX Bandwidth: %f MHz...") % (usrp->get_rx_bandwidth()/1e6) << std::endl << std::endl; } //set the antenna diff --git a/host/examples/rx_samples_to_udp.cpp b/host/examples/rx_samples_to_udp.cpp index 9accdef83..9a8a3f4ac 100644 --- a/host/examples/rx_samples_to_udp.cpp +++ b/host/examples/rx_samples_to_udp.cpp @@ -93,9 +93,9 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ //set the analog frontend filter bandwidth if (vm.count("bw")){ - std::cout << boost::format("Setting RX Bandwidth: %f MHz...") % bw << std::endl; + std::cout << boost::format("Setting RX Bandwidth: %f MHz...") % (bw/1e6) << std::endl; usrp->set_rx_bandwidth(bw); - std::cout << boost::format("Actual RX Bandwidth: %f MHz...") % usrp->get_rx_bandwidth() << std::endl << std::endl; + std::cout << boost::format("Actual RX Bandwidth: %f MHz...") % (usrp->get_rx_bandwidth()/1e6) << std::endl << std::endl; } //set the antenna diff --git a/host/examples/txrx_loopback_to_file.cpp b/host/examples/txrx_loopback_to_file.cpp index 7ef77801b..d98c5187d 100644 --- a/host/examples/txrx_loopback_to_file.cpp +++ b/host/examples/txrx_loopback_to_file.cpp @@ -374,9 +374,9 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ //set the receive analog frontend filter bandwidth if (vm.count("rx-bw")){ - std::cout << boost::format("Setting RX Bandwidth: %f MHz...") % rx_bw << std::endl; + std::cout << boost::format("Setting RX Bandwidth: %f MHz...") % (rx_bw/1e6) << std::endl; rx_usrp->set_rx_bandwidth(rx_bw, channel); - std::cout << boost::format("Actual RX Bandwidth: %f MHz...") % rx_usrp->get_rx_bandwidth(channel) << std::endl << std::endl; + std::cout << boost::format("Actual RX Bandwidth: %f MHz...") % (rx_usrp->get_rx_bandwidth(channel)/1e6) << std::endl << std::endl; } } //set the receive antenna |