aboutsummaryrefslogtreecommitdiffstats
path: root/host/utils
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-11-15 16:22:18 -0800
committerJosh Blum <josh@joshknows.com>2011-11-15 16:22:18 -0800
commit18abd4dbbf29ec9372bdd2ee83288fc94c20534c (patch)
tree325ce37ad5dbec664bca112c9fae96604fe82073 /host/utils
parentf68a9271f448a8c8878e2f0fb03b801f345287b3 (diff)
downloaduhd-18abd4dbbf29ec9372bdd2ee83288fc94c20534c.tar.gz
uhd-18abd4dbbf29ec9372bdd2ee83288fc94c20534c.tar.bz2
uhd-18abd4dbbf29ec9372bdd2ee83288fc94c20534c.zip
uhd: support for applying cal corrections B100
Diffstat (limited to 'host/utils')
-rw-r--r--host/utils/uhd_cal_rx_iq_balance.cpp2
-rw-r--r--host/utils/uhd_cal_tx_dc_offset.cpp2
-rw-r--r--host/utils/uhd_cal_tx_iq_balance.cpp2
-rw-r--r--host/utils/usrp_cal_utils.hpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/host/utils/uhd_cal_rx_iq_balance.cpp b/host/utils/uhd_cal_rx_iq_balance.cpp
index 7924323a5..a05df60b2 100644
--- a/host/utils/uhd_cal_rx_iq_balance.cpp
+++ b/host/utils/uhd_cal_rx_iq_balance.cpp
@@ -249,7 +249,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
result.delta = best_suppression - initial_suppression;
results.push_back(result);
if (vm.count("verbose")){
- std::cout << boost::format("%f MHz: best suppression %fdB, corrected %fdB") % (rx_lo/1e6) % result.best % result.delta << std::endl;
+ std::cout << boost::format("%f MHz: best suppression %f dB, corrected %f dB") % (rx_lo/1e6) % result.best % result.delta << std::endl;
}
else std::cout << "." << std::flush;
}
diff --git a/host/utils/uhd_cal_tx_dc_offset.cpp b/host/utils/uhd_cal_tx_dc_offset.cpp
index 8615e231c..ed1b85bb3 100644
--- a/host/utils/uhd_cal_tx_dc_offset.cpp
+++ b/host/utils/uhd_cal_tx_dc_offset.cpp
@@ -246,7 +246,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
result.delta = initial_dc_dbrms - lowest_offset;
results.push_back(result);
if (vm.count("verbose")){
- std::cout << boost::format("%f MHz: lowest offset %fdB, corrected %fdB") % (tx_lo/1e6) % result.best % result.delta << std::endl;
+ std::cout << boost::format("%f MHz: lowest offset %f dB, corrected %f dB") % (tx_lo/1e6) % result.best % result.delta << std::endl;
}
else std::cout << "." << std::flush;
}
diff --git a/host/utils/uhd_cal_tx_iq_balance.cpp b/host/utils/uhd_cal_tx_iq_balance.cpp
index 29b6f5ede..8b49ef170 100644
--- a/host/utils/uhd_cal_tx_iq_balance.cpp
+++ b/host/utils/uhd_cal_tx_iq_balance.cpp
@@ -251,7 +251,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
result.delta = best_suppression - initial_suppression;
results.push_back(result);
if (vm.count("verbose")){
- std::cout << boost::format("%f MHz: best suppression %fdB, corrected %fdB") % (tx_lo/1e6) % result.best % result.delta << std::endl;
+ std::cout << boost::format("%f MHz: best suppression %f dB, corrected %f dB") % (tx_lo/1e6) % result.best % result.delta << std::endl;
}
else std::cout << "." << std::flush;
}
diff --git a/host/utils/usrp_cal_utils.hpp b/host/utils/usrp_cal_utils.hpp
index 5378b0d69..3058cd928 100644
--- a/host/utils/usrp_cal_utils.hpp
+++ b/host/utils/usrp_cal_utils.hpp
@@ -73,7 +73,7 @@ static inline void set_optimum_gain(uhd::usrp::multi_usrp::sptr usrp){
static inline std::vector<std::complex<float> > gen_table(void){
std::vector<std::complex<float> > wave_table(wave_table_len);
for (size_t i = 0; i < wave_table_len; i++){
- wave_table[i] = std::polar<float>(1.0, (tau*i)/wave_table_len);
+ wave_table[i] = std::complex<float>(std::polar(1.0, (tau*i)/wave_table_len));
}
return wave_table;
}