aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Müller <marcus@hostalia.de>2014-12-12 11:37:53 +0100
committerMarcus Müller <marcus@hostalia.de>2014-12-12 11:37:53 +0100
commit125820ea682728141bce25d2d7f6e8609c36ec41 (patch)
tree1ffd743579dead3411dc8b91acd5abbf3572cacd
parenta22eb14f4d97b67a4c123157e44a5eff5333ec10 (diff)
downloaduhd-125820ea682728141bce25d2d7f6e8609c36ec41.tar.gz
uhd-125820ea682728141bce25d2d7f6e8609c36ec41.tar.bz2
uhd-125820ea682728141bce25d2d7f6e8609c36ec41.zip
host/examples: rm'ed refs to d'boards, IF freq.
To reflect a reality where some USRPs don't have daughterboards, and set_xx_bandwidth doesn't necessarily set an /IF/ bandwidth.
-rw-r--r--host/examples/rx_ascii_art_dft.cpp8
-rw-r--r--host/examples/rx_samples_to_file.cpp8
-rw-r--r--host/examples/rx_samples_to_udp.cpp8
-rw-r--r--host/examples/tx_samples_from_file.cpp8
-rw-r--r--host/examples/tx_waveforms.cpp8
-rw-r--r--host/examples/txrx_loopback_to_file.cpp16
6 files changed, 28 insertions, 28 deletions
diff --git a/host/examples/rx_ascii_art_dft.cpp b/host/examples/rx_ascii_art_dft.cpp
index 564a9e749..81208cf8b 100644
--- a/host/examples/rx_ascii_art_dft.cpp
+++ b/host/examples/rx_ascii_art_dft.cpp
@@ -47,9 +47,9 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
("rate", po::value<double>(&rate), "rate of incoming samples (sps)")
("freq", po::value<double>(&freq), "RF center frequency in Hz")
("gain", po::value<double>(&gain), "gain for the RF chain")
- ("ant", po::value<std::string>(&ant), "daughterboard antenna selection")
- ("subdev", po::value<std::string>(&subdev), "daughterboard subdevice specification")
- ("bw", po::value<double>(&bw), "daughterboard IF filter bandwidth in Hz")
+ ("ant", po::value<std::string>(&ant), "antenna selection")
+ ("subdev", po::value<std::string>(&subdev), "subdevice specification")
+ ("bw", po::value<double>(&bw), "analog frontend filter bandwidth in Hz")
// display parameters
("num-bins", po::value<size_t>(&num_bins)->default_value(512), "the number of bins in the DFT")
("frame-rate", po::value<double>(&frame_rate)->default_value(5), "frame rate of the display (fps)")
@@ -108,7 +108,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
std::cout << boost::format("Actual RX Gain: %f dB...") % usrp->get_rx_gain() << std::endl << std::endl;
}
- //set the IF filter bandwidth
+ //set the analog frontend filter bandwidth
if (vm.count("bw")){
std::cout << boost::format("Setting RX Bandwidth: %f MHz...") % bw << std::endl;
usrp->set_rx_bandwidth(bw);
diff --git a/host/examples/rx_samples_to_file.cpp b/host/examples/rx_samples_to_file.cpp
index fa3c21114..4fe438798 100644
--- a/host/examples/rx_samples_to_file.cpp
+++ b/host/examples/rx_samples_to_file.cpp
@@ -227,9 +227,9 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
("rate", po::value<double>(&rate)->default_value(1e6), "rate of incoming samples")
("freq", po::value<double>(&freq)->default_value(0.0), "RF center frequency in Hz")
("gain", po::value<double>(&gain), "gain for the RF chain")
- ("ant", po::value<std::string>(&ant), "daughterboard antenna selection")
- ("subdev", po::value<std::string>(&subdev), "daughterboard subdevice specification")
- ("bw", po::value<double>(&bw), "daughterboard IF filter bandwidth in Hz")
+ ("ant", po::value<std::string>(&ant), "antenna selection")
+ ("subdev", po::value<std::string>(&subdev), "subdevice specification")
+ ("bw", po::value<double>(&bw), "analog frontend filter bandwidth in Hz")
("ref", po::value<std::string>(&ref)->default_value("internal"), "reference source (internal, external, mimo)")
("wirefmt", po::value<std::string>(&wirefmt)->default_value("sc16"), "wire format (sc8 or sc16)")
("setup", po::value<double>(&setup_time)->default_value(1.0), "seconds of setup time")
@@ -298,7 +298,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
std::cout << boost::format("Actual RX Gain: %f dB...") % usrp->get_rx_gain() << std::endl << std::endl;
}
- //set the IF filter bandwidth
+ //set the analog frontend filter bandwidth
if (vm.count("bw")){
std::cout << boost::format("Setting RX Bandwidth: %f MHz...") % bw << std::endl;
usrp->set_rx_bandwidth(bw);
diff --git a/host/examples/rx_samples_to_udp.cpp b/host/examples/rx_samples_to_udp.cpp
index a8f0e0c36..9accdef83 100644
--- a/host/examples/rx_samples_to_udp.cpp
+++ b/host/examples/rx_samples_to_udp.cpp
@@ -47,9 +47,9 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
("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")
("gain", po::value<double>(&gain)->default_value(0), "gain for the RF chain")
- ("ant", po::value<std::string>(&ant), "daughterboard antenna selection")
- ("subdev", po::value<std::string>(&subdev), "daughterboard subdevice specification")
- ("bw", po::value<double>(&bw), "daughterboard IF filter bandwidth in Hz")
+ ("ant", po::value<std::string>(&ant), "antenna selection")
+ ("subdev", po::value<std::string>(&subdev), "subdevice specification")
+ ("bw", po::value<double>(&bw), "analog frontend filter bandwidth in Hz")
("port", po::value<std::string>(&port)->default_value("7124"), "server udp port")
("addr", po::value<std::string>(&addr)->default_value("192.168.1.10"), "resolvable server address")
("ref", po::value<std::string>(&ref)->default_value("internal"), "reference source (internal, external, mimo)")
@@ -91,7 +91,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
usrp->set_rx_gain(gain);
std::cout << boost::format("Actual RX Gain: %f dB...") % usrp->get_rx_gain() << std::endl << std::endl;
- //set the IF filter bandwidth
+ //set the analog frontend filter bandwidth
if (vm.count("bw")){
std::cout << boost::format("Setting RX Bandwidth: %f MHz...") % bw << std::endl;
usrp->set_rx_bandwidth(bw);
diff --git a/host/examples/tx_samples_from_file.cpp b/host/examples/tx_samples_from_file.cpp
index 3293f8bd4..e9d0e8721 100644
--- a/host/examples/tx_samples_from_file.cpp
+++ b/host/examples/tx_samples_from_file.cpp
@@ -85,9 +85,9 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
("freq", po::value<double>(&freq), "RF center frequency in Hz")
("lo_off", po::value<double>(&lo_off), "Offset for frontend LO in Hz (optional)")
("gain", po::value<double>(&gain), "gain for the RF chain")
- ("ant", po::value<std::string>(&ant), "daughterboard antenna selection")
- ("subdev", po::value<std::string>(&subdev), "daughterboard subdevice specification")
- ("bw", po::value<double>(&bw), "daughterboard IF filter bandwidth in Hz")
+ ("ant", po::value<std::string>(&ant), "antenna selection")
+ ("subdev", po::value<std::string>(&subdev), "subdevice specification")
+ ("bw", po::value<double>(&bw), "analog frontend filter bandwidth in Hz")
("ref", po::value<std::string>(&ref)->default_value("internal"), "reference source (internal, external, mimo)")
("wirefmt", po::value<std::string>(&wirefmt)->default_value("sc16"), "wire format (sc8 or sc16)")
("delay", po::value<double>(&delay)->default_value(0.0), "specify a delay between repeated transmission of file")
@@ -148,7 +148,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
std::cout << boost::format("Actual TX Gain: %f dB...") % usrp->get_tx_gain() << std::endl << std::endl;
}
- //set the IF filter bandwidth
+ //set the analog frontend filter bandwidth
if (vm.count("bw")){
std::cout << boost::format("Setting TX Bandwidth: %f MHz...") % bw << std::endl;
usrp->set_tx_bandwidth(bw);
diff --git a/host/examples/tx_waveforms.cpp b/host/examples/tx_waveforms.cpp
index a233cecb1..7e633262c 100644
--- a/host/examples/tx_waveforms.cpp
+++ b/host/examples/tx_waveforms.cpp
@@ -108,9 +108,9 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
("freq", po::value<double>(&freq), "RF center frequency in Hz")
("ampl", po::value<float>(&ampl)->default_value(float(0.3)), "amplitude of the waveform [0 to 0.7]")
("gain", po::value<double>(&gain), "gain for the RF chain")
- ("ant", po::value<std::string>(&ant), "daughterboard antenna selection")
- ("subdev", po::value<std::string>(&subdev), "daughterboard subdevice specification")
- ("bw", po::value<double>(&bw), "daughterboard IF filter bandwidth in Hz")
+ ("ant", po::value<std::string>(&ant), "antenna selection")
+ ("subdev", po::value<std::string>(&subdev), "subdevice specification")
+ ("bw", po::value<double>(&bw), "analog frontend filter bandwidth in Hz")
("wave-type", po::value<std::string>(&wave_type)->default_value("CONST"), "waveform type (CONST, SQUARE, RAMP, SINE)")
("wave-freq", po::value<double>(&wave_freq)->default_value(0), "waveform frequency in Hz")
("ref", po::value<std::string>(&ref)->default_value("internal"), "clock reference (internal, external, mimo)")
@@ -183,7 +183,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
std::cout << boost::format("Actual TX Gain: %f dB...") % usrp->get_tx_gain(channel_nums[ch]) << std::endl << std::endl;
}
- //set the IF filter bandwidth
+ //set the analog frontend filter bandwidth
if (vm.count("bw")){
std::cout << boost::format("Setting TX Bandwidth: %f MHz...") % bw << std::endl;
usrp->set_tx_bandwidth(bw, channel_nums[ch]);
diff --git a/host/examples/txrx_loopback_to_file.cpp b/host/examples/txrx_loopback_to_file.cpp
index 10d6b7af4..66c13308a 100644
--- a/host/examples/txrx_loopback_to_file.cpp
+++ b/host/examples/txrx_loopback_to_file.cpp
@@ -274,12 +274,12 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
("ampl", po::value<float>(&ampl)->default_value(float(0.3)), "amplitude of the waveform [0 to 0.7]")
("tx-gain", po::value<double>(&tx_gain), "gain for the transmit RF chain")
("rx-gain", po::value<double>(&rx_gain), "gain for the receive RF chain")
- ("tx-ant", po::value<std::string>(&tx_ant), "daughterboard transmit antenna selection")
- ("rx-ant", po::value<std::string>(&rx_ant), "daughterboard receive antenna selection")
- ("tx-subdev", po::value<std::string>(&tx_subdev), "daughterboard transmit subdevice specification")
- ("rx-subdev", po::value<std::string>(&rx_subdev), "daughterboard receive subdevice specification")
- ("tx-bw", po::value<double>(&tx_bw), "daughterboard transmit IF filter bandwidth in Hz")
- ("rx-bw", po::value<double>(&rx_bw), "daughterboard receive IF filter bandwidth in Hz")
+ ("tx-ant", po::value<std::string>(&tx_ant), "transmit antenna selection")
+ ("rx-ant", po::value<std::string>(&rx_ant), "receive antenna selection")
+ ("tx-subdev", po::value<std::string>(&tx_subdev), "transmit subdevice specification")
+ ("rx-subdev", po::value<std::string>(&rx_subdev), "receive subdevice specification")
+ ("tx-bw", po::value<double>(&tx_bw), "analog transmit filter bandwidth in Hz")
+ ("rx-bw", po::value<double>(&rx_bw), "analog receive filter bandwidth in Hz")
("wave-type", po::value<std::string>(&wave_type)->default_value("CONST"), "waveform type (CONST, SQUARE, RAMP, SINE)")
("wave-freq", po::value<double>(&wave_freq)->default_value(0), "waveform frequency in Hz")
("ref", po::value<std::string>(&ref)->default_value("internal"), "clock reference (internal, external, mimo)")
@@ -378,7 +378,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
std::cout << boost::format("Actual TX Gain: %f dB...") % tx_usrp->get_tx_gain(tx_channel_nums[ch]) << std::endl << std::endl;
}
- //set the IF filter bandwidth
+ //set the analog frontend filter bandwidth
if (vm.count("tx-bw")){
std::cout << boost::format("Setting TX Bandwidth: %f MHz...") % tx_bw << std::endl;
tx_usrp->set_tx_bandwidth(tx_bw, tx_channel_nums[ch]);
@@ -407,7 +407,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
std::cout << boost::format("Actual RX Gain: %f dB...") % rx_usrp->get_rx_gain() << std::endl << std::endl;
}
- //set the receive IF filter bandwidth
+ //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;
rx_usrp->set_rx_bandwidth(rx_bw);