From 88e02e0d55f7a80180402c7c86132d22a43ec551 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Fri, 11 Nov 2011 16:06:50 -0800 Subject: uhd: created rx IQ imbalance app to parallel tx --- host/utils/usrp_cal_utils.hpp | 85 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 host/utils/usrp_cal_utils.hpp (limited to 'host/utils/usrp_cal_utils.hpp') diff --git a/host/utils/usrp_cal_utils.hpp b/host/utils/usrp_cal_utils.hpp new file mode 100644 index 000000000..3e2aa6ae0 --- /dev/null +++ b/host/utils/usrp_cal_utils.hpp @@ -0,0 +1,85 @@ +// +// Copyright 2010 Ettus Research LLC +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// + +#include +#include +#include +#include + +struct result_t{double freq, real_corr, imag_corr, sup;}; + +/*********************************************************************** + * Constants + **********************************************************************/ +static const double tau = 6.28318531; +static const double alpha = 0.0001; //very tight iir filter +static const size_t wave_table_len = 8192; +static const size_t num_search_steps = 5; +static const size_t num_search_iters = 7; +static const size_t skip_initial_samps = 20; + +/*********************************************************************** + * Sinusoid wave table + **********************************************************************/ +static inline std::vector > gen_table(void){ + std::vector > wave_table(wave_table_len); + for (size_t i = 0; i < wave_table_len; i++){ + wave_table[i] = std::polar(1.0, (tau*i)/wave_table_len); + } + return wave_table; +} + +static inline std::complex wave_table_lookup(const size_t index){ + static const std::vector > wave_table = gen_table(); + return wave_table[index % wave_table_len]; +} + +/*********************************************************************** + * Compute power of a tone + **********************************************************************/ +static inline double compute_tone_dbrms( + const std::vector > &samples, + const double freq //freq is fractional +){ + //shift the samples so the tone at freq is down at DC + std::vector > shifted(samples.size() - skip_initial_samps); + for (size_t i = 0; i < shifted.size(); i++){ + shifted[i] = std::complex(samples[i+skip_initial_samps]) * std::polar(1.0, -freq*tau*i); + } + + //filter the samples with a narrow low pass + std::complex iir_output = 0, iir_last = 0; + double output = 0; + for (size_t i = 0; i < shifted.size(); i++){ + iir_output = alpha * shifted[i] + (1-alpha)*iir_last; + iir_last = iir_output; + output += std::abs(iir_output); + } + + return 20*std::log10(output/shifted.size()); +} + +/*********************************************************************** + * Write a dat file + **********************************************************************/ +static inline void write_samples_to_file( + const std::vector > &samples, const std::string &file +){ + std::ofstream outfile(file.c_str(), std::ofstream::binary); + outfile.write((const char*)&samples.front(), samples.size()*sizeof(std::complex)); + outfile.close(); +} -- cgit v1.2.3 From e108294eed585aa8602631fe90fea4cf7b5e23c2 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Fri, 11 Nov 2011 18:41:05 -0800 Subject: uhd: share more common code in cal utils --- host/utils/usrp_cal_utils.hpp | 54 +++++++++++++++++++++++++++++++++ host/utils/usrp_gen_rx_fe_cal_table.cpp | 48 +---------------------------- host/utils/usrp_gen_tx_fe_cal_table.cpp | 48 +---------------------------- 3 files changed, 56 insertions(+), 94 deletions(-) (limited to 'host/utils/usrp_cal_utils.hpp') diff --git a/host/utils/usrp_cal_utils.hpp b/host/utils/usrp_cal_utils.hpp index 3e2aa6ae0..3cfe2b2ed 100644 --- a/host/utils/usrp_cal_utils.hpp +++ b/host/utils/usrp_cal_utils.hpp @@ -15,11 +15,19 @@ // along with this program. If not, see . // +#include +#include +#include +#include +#include +#include #include #include #include #include +namespace fs = boost::filesystem; + struct result_t{double freq, real_corr, imag_corr, sup;}; /*********************************************************************** @@ -83,3 +91,49 @@ static inline void write_samples_to_file( outfile.write((const char*)&samples.front(), samples.size()*sizeof(std::complex)); outfile.close(); } + +/*********************************************************************** + * Store data to file + **********************************************************************/ +static void store_results( + uhd::usrp::multi_usrp::sptr usrp, + const std::vector &results, + const std::string &XX, + const std::string &xx +){ + //extract eeprom serial + uhd::property_tree::sptr tree = usrp->get_device()->get_tree(); + const uhd::fs_path db_path = "/mboards/0/dboards/A/" + xx + "_eeprom"; + const uhd::usrp::dboard_eeprom_t db_eeprom = tree->access(db_path).get(); + if (db_eeprom.serial.empty()) throw std::runtime_error(XX + " dboard has empty serial!"); + + //make the calibration file path + fs::path cal_data_path = fs::path(uhd::get_app_path()) / ".uhd"; + fs::create_directory(cal_data_path); + cal_data_path = cal_data_path / "cal"; + fs::create_directory(cal_data_path); + cal_data_path = cal_data_path / (xx + "_fe_cal_v0.1_" + db_eeprom.serial + ".csv"); + if (fs::exists(cal_data_path)){ + fs::rename(cal_data_path, cal_data_path.string() + str(boost::format(".%d") % time(NULL))); + } + + //fill the calibration file + std::ofstream cal_data(cal_data_path.string().c_str()); + cal_data << boost::format("name, %s Frontend Calibration\n") % XX; + cal_data << boost::format("serial, %s\n") % db_eeprom.serial; + cal_data << boost::format("timestamp, %d\n") % time(NULL); + cal_data << boost::format("version, 0, 1\n"); + cal_data << boost::format("DATA STARTS HERE\n"); + cal_data << "lo_frequency, iq_correction_real, iq_correction_imag, measured_suppression\n"; + + for (size_t i = 0; i < results.size(); i++){ + cal_data + << results[i].freq << ", " + << results[i].real_corr << ", " + << results[i].imag_corr << ", " + << results[i].sup << "\n" + ; + } + + std::cout << "wrote cal data to " << cal_data_path << std::endl; +} diff --git a/host/utils/usrp_gen_rx_fe_cal_table.cpp b/host/utils/usrp_gen_rx_fe_cal_table.cpp index 4d5d4168e..a365c9be7 100644 --- a/host/utils/usrp_gen_rx_fe_cal_table.cpp +++ b/host/utils/usrp_gen_rx_fe_cal_table.cpp @@ -20,22 +20,17 @@ #include #include #include -#include #include -#include #include #include #include -#include #include #include -#include #include #include #include namespace po = boost::program_options; -namespace fs = boost::filesystem; /*********************************************************************** * Transmit thread @@ -115,47 +110,6 @@ static void capture_samples(uhd::usrp::multi_usrp::sptr usrp, uhd::rx_streamer:: } } -/*********************************************************************** - * Store data to file - **********************************************************************/ -static void store_results(uhd::usrp::multi_usrp::sptr usrp, const std::vector &results){ - //extract eeprom serial - uhd::property_tree::sptr tree = usrp->get_device()->get_tree(); - const uhd::fs_path db_path = "/mboards/0/dboards/A/rx_eeprom"; - const uhd::usrp::dboard_eeprom_t db_eeprom = tree->access(db_path).get(); - if (db_eeprom.serial.empty()) throw std::runtime_error("RX dboard has empty serial!"); - - //make the calibration file path - fs::path cal_data_path = fs::path(uhd::get_app_path()) / ".uhd"; - fs::create_directory(cal_data_path); - cal_data_path = cal_data_path / "cal"; - fs::create_directory(cal_data_path); - cal_data_path = cal_data_path / ("rx_fe_cal_v0.1_" + db_eeprom.serial + ".csv"); - if (fs::exists(cal_data_path)){ - fs::rename(cal_data_path, cal_data_path.string() + str(boost::format(".%d") % time(NULL))); - } - - //fill the calibration file - std::ofstream cal_data(cal_data_path.string().c_str()); - cal_data << boost::format("name, RX Frontend Calibration\n"); - cal_data << boost::format("serial, %s\n") % db_eeprom.serial; - cal_data << boost::format("timestamp, %d\n") % time(NULL); - cal_data << boost::format("version, 0, 1\n"); - cal_data << boost::format("DATA STARTS HERE\n"); - cal_data << "rx_lo_frequency, rx_iq_correction_real, rx_iq_correction_imag, measured_suppression\n"; - - for (size_t i = 0; i < results.size(); i++){ - cal_data - << results[i].freq << ", " - << results[i].real_corr << ", " - << results[i].imag_corr << ", " - << results[i].sup << "\n" - ; - } - - std::cout << "wrote cal data to " << cal_data_path << std::endl; -} - /*********************************************************************** * Main **********************************************************************/ @@ -304,7 +258,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ threads.interrupt_all(); threads.join_all(); - store_results(usrp, results); + store_results(usrp, results, "RX", "rx"); return 0; } diff --git a/host/utils/usrp_gen_tx_fe_cal_table.cpp b/host/utils/usrp_gen_tx_fe_cal_table.cpp index 1e4a9d11f..bf19e4a37 100644 --- a/host/utils/usrp_gen_tx_fe_cal_table.cpp +++ b/host/utils/usrp_gen_tx_fe_cal_table.cpp @@ -20,21 +20,16 @@ #include #include #include -#include #include -#include #include #include #include -#include #include #include -#include #include #include namespace po = boost::program_options; -namespace fs = boost::filesystem; /*********************************************************************** * Transmit thread @@ -116,47 +111,6 @@ static void capture_samples(uhd::usrp::multi_usrp::sptr usrp, uhd::rx_streamer:: } } -/*********************************************************************** - * Store data to file - **********************************************************************/ -static void store_results(uhd::usrp::multi_usrp::sptr usrp, const std::vector &results){ - //extract eeprom serial - uhd::property_tree::sptr tree = usrp->get_device()->get_tree(); - const uhd::fs_path db_path = "/mboards/0/dboards/A/tx_eeprom"; - const uhd::usrp::dboard_eeprom_t db_eeprom = tree->access(db_path).get(); - if (db_eeprom.serial.empty()) throw std::runtime_error("TX dboard has empty serial!"); - - //make the calibration file path - fs::path cal_data_path = fs::path(uhd::get_app_path()) / ".uhd"; - fs::create_directory(cal_data_path); - cal_data_path = cal_data_path / "cal"; - fs::create_directory(cal_data_path); - cal_data_path = cal_data_path / ("tx_fe_cal_v0.1_" + db_eeprom.serial + ".csv"); - if (fs::exists(cal_data_path)){ - fs::rename(cal_data_path, cal_data_path.string() + str(boost::format(".%d") % time(NULL))); - } - - //fill the calibration file - std::ofstream cal_data(cal_data_path.string().c_str()); - cal_data << boost::format("name, TX Frontend Calibration\n"); - cal_data << boost::format("serial, %s\n") % db_eeprom.serial; - cal_data << boost::format("timestamp, %d\n") % time(NULL); - cal_data << boost::format("version, 0, 1\n"); - cal_data << boost::format("DATA STARTS HERE\n"); - cal_data << "tx_lo_frequency, tx_iq_correction_real, tx_iq_correction_imag, measured_suppression\n"; - - for (size_t i = 0; i < results.size(); i++){ - cal_data - << results[i].freq << ", " - << results[i].real_corr << ", " - << results[i].imag_corr << ", " - << results[i].sup << "\n" - ; - } - - std::cout << "wrote cal data to " << cal_data_path << std::endl; -} - /*********************************************************************** * Main **********************************************************************/ @@ -306,7 +260,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ threads.interrupt_all(); threads.join_all(); - store_results(usrp, results); + store_results(usrp, results, "TX", "tx"); return 0; } -- cgit v1.2.3 From 5a77062d33ff675e8f395a8a871e8e6632a204a0 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Mon, 14 Nov 2011 15:58:49 -0800 Subject: uhd: added tx dc offset calibration + tweaks --- host/lib/usrp/common/apply_corrections.cpp | 11 +- host/utils/CMakeLists.txt | 5 +- host/utils/usrp_cal_utils.hpp | 14 +- host/utils/usrp_gen_rx_fe_cal_table.cpp | 264 ---------------------------- host/utils/usrp_gen_rx_iq_cal_table.cpp | 265 ++++++++++++++++++++++++++++ host/utils/usrp_gen_tx_dc_cal_table.cpp | 262 ++++++++++++++++++++++++++++ host/utils/usrp_gen_tx_fe_cal_table.cpp | 266 ---------------------------- host/utils/usrp_gen_tx_iq_cal_table.cpp | 267 +++++++++++++++++++++++++++++ 8 files changed, 815 insertions(+), 539 deletions(-) delete mode 100644 host/utils/usrp_gen_rx_fe_cal_table.cpp create mode 100644 host/utils/usrp_gen_rx_iq_cal_table.cpp create mode 100644 host/utils/usrp_gen_tx_dc_cal_table.cpp delete mode 100644 host/utils/usrp_gen_tx_fe_cal_table.cpp create mode 100644 host/utils/usrp_gen_tx_iq_cal_table.cpp (limited to 'host/utils/usrp_cal_utils.hpp') diff --git a/host/lib/usrp/common/apply_corrections.cpp b/host/lib/usrp/common/apply_corrections.cpp index c3ac4256a..720c51633 100644 --- a/host/lib/usrp/common/apply_corrections.cpp +++ b/host/lib/usrp/common/apply_corrections.cpp @@ -142,7 +142,14 @@ void uhd::usrp::apply_tx_fe_corrections( sub_tree, "dboards/" + slot + "/tx_eeprom", "tx_frontends/" + slot + "/iq_balance/value", - "tx_fe_cal_v0.1_", + "tx_iq_cal_v0.1_", + lo_freq + ); + apply_fe_corrections( + sub_tree, + "dboards/" + slot + "/tx_eeprom", + "tx_frontends/" + slot + "/dc_offset/value", + "tx_dc_cal_v0.1_", lo_freq ); } @@ -162,7 +169,7 @@ void uhd::usrp::apply_rx_fe_corrections( sub_tree, "dboards/" + slot + "/rx_eeprom", "rx_frontends/" + slot + "/iq_balance/value", - "rx_fe_cal_v0.1_", + "rx_iq_cal_v0.1_", lo_freq ); } diff --git a/host/utils/CMakeLists.txt b/host/utils/CMakeLists.txt index 1185b06cc..6c17be22c 100644 --- a/host/utils/CMakeLists.txt +++ b/host/utils/CMakeLists.txt @@ -37,8 +37,9 @@ ENDFOREACH(util_source) SET(util_share_sources usrp_burn_db_eeprom.cpp usrp_burn_mb_eeprom.cpp - usrp_gen_rx_fe_cal_table.cpp - usrp_gen_tx_fe_cal_table.cpp + usrp_gen_rx_iq_cal_table.cpp + usrp_gen_tx_iq_cal_table.cpp + usrp_gen_tx_dc_cal_table.cpp ) IF(ENABLE_USB) diff --git a/host/utils/usrp_cal_utils.hpp b/host/utils/usrp_cal_utils.hpp index 3cfe2b2ed..c9695d305 100644 --- a/host/utils/usrp_cal_utils.hpp +++ b/host/utils/usrp_cal_utils.hpp @@ -28,7 +28,7 @@ namespace fs = boost::filesystem; -struct result_t{double freq, real_corr, imag_corr, sup;}; +struct result_t{double freq, real_corr, imag_corr, best, delta;}; /*********************************************************************** * Constants @@ -39,6 +39,8 @@ static const size_t wave_table_len = 8192; static const size_t num_search_steps = 5; static const size_t num_search_iters = 7; static const size_t skip_initial_samps = 20; +static const double default_freq_step = 13.7e3; +static const size_t default_num_samps = 10000; /*********************************************************************** * Sinusoid wave table @@ -99,7 +101,8 @@ static void store_results( uhd::usrp::multi_usrp::sptr usrp, const std::vector &results, const std::string &XX, - const std::string &xx + const std::string &xx, + const std::string &what ){ //extract eeprom serial uhd::property_tree::sptr tree = usrp->get_device()->get_tree(); @@ -112,7 +115,7 @@ static void store_results( fs::create_directory(cal_data_path); cal_data_path = cal_data_path / "cal"; fs::create_directory(cal_data_path); - cal_data_path = cal_data_path / (xx + "_fe_cal_v0.1_" + db_eeprom.serial + ".csv"); + cal_data_path = cal_data_path / str(boost::format("%s_%s_cal_v0.1_%s.csv") % xx % what % db_eeprom.serial); if (fs::exists(cal_data_path)){ fs::rename(cal_data_path, cal_data_path.string() + str(boost::format(".%d") % time(NULL))); } @@ -124,14 +127,15 @@ static void store_results( cal_data << boost::format("timestamp, %d\n") % time(NULL); cal_data << boost::format("version, 0, 1\n"); cal_data << boost::format("DATA STARTS HERE\n"); - cal_data << "lo_frequency, iq_correction_real, iq_correction_imag, measured_suppression\n"; + cal_data << "lo_frequency, correction_real, correction_imag, measured, delta\n"; for (size_t i = 0; i < results.size(); i++){ cal_data << results[i].freq << ", " << results[i].real_corr << ", " << results[i].imag_corr << ", " - << results[i].sup << "\n" + << results[i].best << ", " + << results[i].delta << "\n" ; } diff --git a/host/utils/usrp_gen_rx_fe_cal_table.cpp b/host/utils/usrp_gen_rx_fe_cal_table.cpp deleted file mode 100644 index a365c9be7..000000000 --- a/host/utils/usrp_gen_rx_fe_cal_table.cpp +++ /dev/null @@ -1,264 +0,0 @@ -// -// Copyright 2010 Ettus Research LLC -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -// - -#include "usrp_cal_utils.hpp" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace po = boost::program_options; - -/*********************************************************************** - * Transmit thread - **********************************************************************/ -static void tx_thread(uhd::usrp::multi_usrp::sptr usrp, const double tx_wave_ampl){ - uhd::set_thread_priority_safe(); - - //create a transmit streamer - uhd::stream_args_t stream_args("fc32"); //complex floats - uhd::tx_streamer::sptr tx_stream = usrp->get_tx_stream(stream_args); - - //setup variables and allocate buffer - uhd::tx_metadata_t md; - md.has_time_spec = false; - std::vector > buff(tx_stream->get_max_num_samps()*10); - - //fill buff and send until interrupted - while (not boost::this_thread::interruption_requested()){ - for (size_t i = 0; i < buff.size(); i++){ - buff[i] = float(tx_wave_ampl); - } - tx_stream->send(&buff.front(), buff.size(), md); - } - - //send a mini EOB packet - md.end_of_burst = true; - tx_stream->send("", 0, md); -} - -/*********************************************************************** - * Tune RX and TX routine - **********************************************************************/ -static double tune_rx_and_tx(uhd::usrp::multi_usrp::sptr usrp, const double rx_lo_freq, const double tx_offset){ - //tune the receiver with no cordic - uhd::tune_request_t rx_tune_req(rx_lo_freq); - rx_tune_req.dsp_freq_policy = uhd::tune_request_t::POLICY_MANUAL; - rx_tune_req.dsp_freq = 0; - usrp->set_rx_freq(rx_tune_req); - - //tune the transmitter with no cordic - uhd::tune_request_t tx_tune_req(usrp->get_rx_freq() - tx_offset); - tx_tune_req.dsp_freq_policy = uhd::tune_request_t::POLICY_MANUAL; - tx_tune_req.dsp_freq = 0; - usrp->set_tx_freq(tx_tune_req); - - //wait for the LOs to become locked - boost::this_thread::sleep(boost::posix_time::milliseconds(50)); - boost::system_time start = boost::get_system_time(); - while (not usrp->get_tx_sensor("lo_locked").to_bool() or not usrp->get_rx_sensor("lo_locked").to_bool()){ - if (boost::get_system_time() > start + boost::posix_time::milliseconds(100)){ - throw std::runtime_error("timed out waiting for TX and/or RX LO to lock"); - } - } - - return usrp->get_rx_freq(); -} - -/*********************************************************************** - * Data capture routine - **********************************************************************/ -static void capture_samples(uhd::usrp::multi_usrp::sptr usrp, uhd::rx_streamer::sptr rx_stream, std::vector > &buff){ - uhd::stream_cmd_t stream_cmd(uhd::stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_DONE); - stream_cmd.num_samps = buff.size(); - stream_cmd.stream_now = true; - usrp->issue_stream_cmd(stream_cmd); - uhd::rx_metadata_t md; - const size_t num_rx_samps = rx_stream->recv(&buff.front(), buff.size(), md); - - //validate the received data - if (md.error_code != uhd::rx_metadata_t::ERROR_CODE_NONE){ - throw std::runtime_error(str(boost::format( - "Unexpected error code 0x%x" - ) % md.error_code)); - } - if (num_rx_samps != buff.size()){ - throw std::runtime_error("did not get all the samples requested"); - } -} - -/*********************************************************************** - * Main - **********************************************************************/ -int UHD_SAFE_MAIN(int argc, char *argv[]){ - std::string args; - double rate, tx_wave_ampl, tx_offset, freq_step, tx_gain, rx_gain; - size_t nsamps; - - po::options_description desc("Allowed options"); - desc.add_options() - ("help", "help message") - ("verbose", "enable some verbose") - ("args", po::value(&args)->default_value(""), "device address args [default = \"\"]") - ("rate", po::value(&rate)->default_value(12.5e6), "RX and TX sample rate in Hz") - ("tx_wave_ampl", po::value(&tx_wave_ampl)->default_value(0.7), "Transmit wave amplitude in counts") - ("tx_offset", po::value(&tx_offset)->default_value(.9344e6), "TX LO offset from the RX LO in Hz") - ("tx_gain", po::value(&tx_gain)->default_value(0), "TX gain in dB") - ("rx_gain", po::value(&rx_gain)->default_value(0), "RX gain in dB") - ("freq_step", po::value(&freq_step)->default_value(10e6), "Step size for LO sweep in Hz") - ("nsamps", po::value(&nsamps)->default_value(10000), "Samples per data capture") - ; - - po::variables_map vm; - po::store(po::parse_command_line(argc, argv, desc), vm); - po::notify(vm); - - //print the help message - if (vm.count("help")){ - std::cout << boost::format("USRP Generate RX Frontend Calibration Table %s") % desc << std::endl; - std::cout << - "This application measures leakage between RX and TX on an XCVR daughterboard to self-calibrate.\n" - << std::endl; - return ~0; - } - - //create a usrp device - std::cout << std::endl; - std::cout << boost::format("Creating the usrp device with: %s...") % args << std::endl; - uhd::usrp::multi_usrp::sptr usrp = uhd::usrp::multi_usrp::make(args); - - //set the antennas to cal - if (not uhd::has(usrp->get_rx_antennas(), "CAL") or not uhd::has(usrp->get_tx_antennas(), "CAL")){ - throw std::runtime_error("This board does not have the CAL antenna option, cannot self-calibrate."); - } - usrp->set_rx_antenna("CAL"); - usrp->set_tx_antenna("CAL"); - - //set the sample rates - usrp->set_rx_rate(rate); - usrp->set_tx_rate(rate); - - //set midrange rx gain, default 0 tx gain - usrp->set_tx_gain(tx_gain); - usrp->set_rx_gain(rx_gain); - - //create a receive streamer - uhd::stream_args_t stream_args("fc32"); //complex floats - uhd::rx_streamer::sptr rx_stream = usrp->get_rx_stream(stream_args); - - //create a transmitter thread - boost::thread_group threads; - threads.create_thread(boost::bind(&tx_thread, usrp, tx_wave_ampl)); - - //re-usable buffer for samples - std::vector > buff(nsamps); - - //store the results here - std::vector results; - - const uhd::meta_range_t freq_range = usrp->get_rx_freq_range(); - for (double rx_lo_i = freq_range.start()+50e6; rx_lo_i < freq_range.stop()-50e6; rx_lo_i += freq_step){ - const double rx_lo = tune_rx_and_tx(usrp, rx_lo_i, tx_offset); - - //bounds and results from searching - std::complex best_correction; - double phase_corr_start = -.3, phase_corr_stop = .3, phase_corr_step; - double ampl_corr_start = -.3, ampl_corr_stop = .3, ampl_corr_step; - double best_suppression = 0, best_phase_corr = 0, best_ampl_corr = 0; - - for (size_t i = 0; i < num_search_iters; i++){ - - phase_corr_step = (phase_corr_stop - phase_corr_start)/(num_search_steps-1); - ampl_corr_step = (ampl_corr_stop - ampl_corr_start)/(num_search_steps-1); - - for (double phase_corr = phase_corr_start; phase_corr <= phase_corr_stop + phase_corr_step/2; phase_corr += phase_corr_step){ - for (double ampl_corr = ampl_corr_start; ampl_corr <= ampl_corr_stop + ampl_corr_step/2; ampl_corr += ampl_corr_step){ - - const std::complex correction = std::polar(ampl_corr+1, phase_corr*tau); - usrp->set_rx_iq_balance(correction); - - //receive some samples - capture_samples(usrp, rx_stream, buff); - - const double actual_rx_rate = usrp->get_rx_rate(); - const double actual_tx_freq = usrp->get_tx_freq(); - const double actual_rx_freq = usrp->get_rx_freq(); - const double bb_tone_freq = actual_tx_freq - actual_rx_freq; - const double bb_imag_freq = -bb_tone_freq; - - const double tone_dbrms = compute_tone_dbrms(buff, bb_tone_freq/actual_rx_rate); - const double imag_dbrms = compute_tone_dbrms(buff, bb_imag_freq/actual_rx_rate); - const double suppression = tone_dbrms - imag_dbrms; - - //std::cout << "bb_tone_freq " << bb_tone_freq << std::endl; - //std::cout << "bb_imag_freq " << bb_imag_freq << std::endl; - //std::cout << "tone_dbrms " << tone_dbrms << std::endl; - //std::cout << "imag_dbrms " << imag_dbrms << std::endl; - //std::cout << "suppression " << (tone_dbrms - imag_dbrms) << std::endl; - - if (suppression > best_suppression){ - best_correction = correction; - best_suppression = suppression; - best_phase_corr = phase_corr; - best_ampl_corr = ampl_corr; - } - - }} - - //std::cout << "best_phase_corr " << best_phase_corr << std::endl; - //std::cout << "best_ampl_corr " << best_ampl_corr << std::endl; - //std::cout << "best_suppression " << best_suppression << std::endl; - - phase_corr_start = best_phase_corr - phase_corr_step; - phase_corr_stop = best_phase_corr + phase_corr_step; - ampl_corr_start = best_ampl_corr - ampl_corr_step; - ampl_corr_stop = best_ampl_corr + ampl_corr_step; - } - - if (best_suppression > 30){ //most likely valid, keep result - result_t result; - result.freq = rx_lo; - result.real_corr = best_correction.real(); - result.imag_corr = best_correction.imag(); - result.sup = best_suppression; - results.push_back(result); - } - if (vm.count("verbose")){ - std::cout << boost::format("%f MHz: best suppression %fdB") % (rx_lo/1e6) % best_suppression << std::endl; - } - else std::cout << "." << std::flush; - - } - std::cout << std::endl; - - //stop the transmitter - threads.interrupt_all(); - threads.join_all(); - - store_results(usrp, results, "RX", "rx"); - - return 0; -} diff --git a/host/utils/usrp_gen_rx_iq_cal_table.cpp b/host/utils/usrp_gen_rx_iq_cal_table.cpp new file mode 100644 index 000000000..71c447e65 --- /dev/null +++ b/host/utils/usrp_gen_rx_iq_cal_table.cpp @@ -0,0 +1,265 @@ +// +// Copyright 2010 Ettus Research LLC +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// + +#include "usrp_cal_utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace po = boost::program_options; + +/*********************************************************************** + * Transmit thread + **********************************************************************/ +static void tx_thread(uhd::usrp::multi_usrp::sptr usrp, const double tx_wave_ampl){ + uhd::set_thread_priority_safe(); + + //create a transmit streamer + uhd::stream_args_t stream_args("fc32"); //complex floats + uhd::tx_streamer::sptr tx_stream = usrp->get_tx_stream(stream_args); + + //setup variables and allocate buffer + uhd::tx_metadata_t md; + md.has_time_spec = false; + std::vector > buff(tx_stream->get_max_num_samps()*10); + + //fill buff and send until interrupted + while (not boost::this_thread::interruption_requested()){ + for (size_t i = 0; i < buff.size(); i++){ + buff[i] = float(tx_wave_ampl); + } + tx_stream->send(&buff.front(), buff.size(), md); + } + + //send a mini EOB packet + md.end_of_burst = true; + tx_stream->send("", 0, md); +} + +/*********************************************************************** + * Tune RX and TX routine + **********************************************************************/ +static double tune_rx_and_tx(uhd::usrp::multi_usrp::sptr usrp, const double rx_lo_freq, const double tx_offset){ + //tune the receiver with no cordic + uhd::tune_request_t rx_tune_req(rx_lo_freq); + rx_tune_req.dsp_freq_policy = uhd::tune_request_t::POLICY_MANUAL; + rx_tune_req.dsp_freq = 0; + usrp->set_rx_freq(rx_tune_req); + + //tune the transmitter with no cordic + uhd::tune_request_t tx_tune_req(usrp->get_rx_freq() - tx_offset); + tx_tune_req.dsp_freq_policy = uhd::tune_request_t::POLICY_MANUAL; + tx_tune_req.dsp_freq = 0; + usrp->set_tx_freq(tx_tune_req); + + //wait for the LOs to become locked + boost::this_thread::sleep(boost::posix_time::milliseconds(50)); + boost::system_time start = boost::get_system_time(); + while (not usrp->get_tx_sensor("lo_locked").to_bool() or not usrp->get_rx_sensor("lo_locked").to_bool()){ + if (boost::get_system_time() > start + boost::posix_time::milliseconds(100)){ + throw std::runtime_error("timed out waiting for TX and/or RX LO to lock"); + } + } + + return usrp->get_rx_freq(); +} + +/*********************************************************************** + * Data capture routine + **********************************************************************/ +static void capture_samples(uhd::usrp::multi_usrp::sptr usrp, uhd::rx_streamer::sptr rx_stream, std::vector > &buff){ + uhd::stream_cmd_t stream_cmd(uhd::stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_DONE); + stream_cmd.num_samps = buff.size(); + stream_cmd.stream_now = true; + usrp->issue_stream_cmd(stream_cmd); + uhd::rx_metadata_t md; + const size_t num_rx_samps = rx_stream->recv(&buff.front(), buff.size(), md); + + //validate the received data + if (md.error_code != uhd::rx_metadata_t::ERROR_CODE_NONE){ + throw std::runtime_error(str(boost::format( + "Unexpected error code 0x%x" + ) % md.error_code)); + } + if (num_rx_samps != buff.size()){ + throw std::runtime_error("did not get all the samples requested"); + } +} + +/*********************************************************************** + * Main + **********************************************************************/ +int UHD_SAFE_MAIN(int argc, char *argv[]){ + std::string args; + double rate, tx_wave_ampl, tx_offset, freq_step, tx_gain, rx_gain; + size_t nsamps; + + po::options_description desc("Allowed options"); + desc.add_options() + ("help", "help message") + ("verbose", "enable some verbose") + ("args", po::value(&args)->default_value(""), "device address args [default = \"\"]") + ("rate", po::value(&rate)->default_value(12.5e6), "RX and TX sample rate in Hz") + ("tx_wave_ampl", po::value(&tx_wave_ampl)->default_value(0.7), "Transmit wave amplitude in counts") + ("tx_offset", po::value(&tx_offset)->default_value(.9344e6), "TX LO offset from the RX LO in Hz") + ("tx_gain", po::value(&tx_gain)->default_value(0), "TX gain in dB") + ("rx_gain", po::value(&rx_gain)->default_value(0), "RX gain in dB") + ("freq_step", po::value(&freq_step)->default_value(default_freq_step), "Step size for LO sweep in Hz") + ("nsamps", po::value(&nsamps)->default_value(default_num_samps), "Samples per data capture") + ; + + po::variables_map vm; + po::store(po::parse_command_line(argc, argv, desc), vm); + po::notify(vm); + + //print the help message + if (vm.count("help")){ + std::cout << boost::format("USRP Generate RX Frontend Calibration Table %s") % desc << std::endl; + std::cout << + "This application measures leakage between RX and TX on an XCVR daughterboard to self-calibrate.\n" + << std::endl; + return ~0; + } + + //create a usrp device + std::cout << std::endl; + std::cout << boost::format("Creating the usrp device with: %s...") % args << std::endl; + uhd::usrp::multi_usrp::sptr usrp = uhd::usrp::multi_usrp::make(args); + + //set the antennas to cal + if (not uhd::has(usrp->get_rx_antennas(), "CAL") or not uhd::has(usrp->get_tx_antennas(), "CAL")){ + throw std::runtime_error("This board does not have the CAL antenna option, cannot self-calibrate."); + } + usrp->set_rx_antenna("CAL"); + usrp->set_tx_antenna("CAL"); + + //set the sample rates + usrp->set_rx_rate(rate); + usrp->set_tx_rate(rate); + + //set midrange rx gain, default 0 tx gain + usrp->set_tx_gain(tx_gain); + usrp->set_rx_gain(rx_gain); + + //create a receive streamer + uhd::stream_args_t stream_args("fc32"); //complex floats + uhd::rx_streamer::sptr rx_stream = usrp->get_rx_stream(stream_args); + + //create a transmitter thread + boost::thread_group threads; + threads.create_thread(boost::bind(&tx_thread, usrp, tx_wave_ampl)); + + //re-usable buffer for samples + std::vector > buff(nsamps); + + //store the results here + std::vector results; + + const uhd::meta_range_t freq_range = usrp->get_rx_freq_range(); + for (double rx_lo_i = freq_range.start()+50e6; rx_lo_i < freq_range.stop()-50e6; rx_lo_i += freq_step){ + const double rx_lo = tune_rx_and_tx(usrp, rx_lo_i, tx_offset); + + //frequency constants for this tune event + const double actual_rx_rate = usrp->get_rx_rate(); + const double actual_tx_freq = usrp->get_tx_freq(); + const double actual_rx_freq = usrp->get_rx_freq(); + const double bb_tone_freq = actual_tx_freq - actual_rx_freq; + const double bb_imag_freq = -bb_tone_freq; + + //capture initial uncorrected value + usrp->set_rx_iq_balance(std::polar(1.0, 0.0)); + capture_samples(usrp, rx_stream, buff); + const double initial_suppression = compute_tone_dbrms(buff, bb_tone_freq/actual_rx_rate) - compute_tone_dbrms(buff, bb_imag_freq/actual_rx_rate); + + //bounds and results from searching + std::complex best_correction; + double phase_corr_start = -.3, phase_corr_stop = .3, phase_corr_step; + double ampl_corr_start = -.3, ampl_corr_stop = .3, ampl_corr_step; + double best_suppression = 0, best_phase_corr = 0, best_ampl_corr = 0; + + for (size_t i = 0; i < num_search_iters; i++){ + + phase_corr_step = (phase_corr_stop - phase_corr_start)/(num_search_steps-1); + ampl_corr_step = (ampl_corr_stop - ampl_corr_start)/(num_search_steps-1); + + for (double phase_corr = phase_corr_start; phase_corr <= phase_corr_stop + phase_corr_step/2; phase_corr += phase_corr_step){ + for (double ampl_corr = ampl_corr_start; ampl_corr <= ampl_corr_stop + ampl_corr_step/2; ampl_corr += ampl_corr_step){ + + const std::complex correction = std::polar(ampl_corr+1, phase_corr*tau); + usrp->set_rx_iq_balance(correction); + + //receive some samples + capture_samples(usrp, rx_stream, buff); + + const double tone_dbrms = compute_tone_dbrms(buff, bb_tone_freq/actual_rx_rate); + const double imag_dbrms = compute_tone_dbrms(buff, bb_imag_freq/actual_rx_rate); + const double suppression = tone_dbrms - imag_dbrms; + + if (suppression > best_suppression){ + best_correction = correction; + best_suppression = suppression; + best_phase_corr = phase_corr; + best_ampl_corr = ampl_corr; + } + + }} + + //std::cout << "best_phase_corr " << best_phase_corr << std::endl; + //std::cout << "best_ampl_corr " << best_ampl_corr << std::endl; + //std::cout << "best_suppression " << best_suppression << std::endl; + + phase_corr_start = best_phase_corr - phase_corr_step; + phase_corr_stop = best_phase_corr + phase_corr_step; + ampl_corr_start = best_ampl_corr - ampl_corr_step; + ampl_corr_stop = best_ampl_corr + ampl_corr_step; + } + + if (best_suppression > 30){ //most likely valid, keep result + result_t result; + result.freq = rx_lo; + result.real_corr = best_correction.real(); + result.imag_corr = best_correction.imag(); + result.best = best_suppression; + 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; + } + else std::cout << "." << std::flush; + } + + } + std::cout << std::endl; + + //stop the transmitter + threads.interrupt_all(); + threads.join_all(); + + store_results(usrp, results, "RX", "rx", "iq"); + + return 0; +} diff --git a/host/utils/usrp_gen_tx_dc_cal_table.cpp b/host/utils/usrp_gen_tx_dc_cal_table.cpp new file mode 100644 index 000000000..570203496 --- /dev/null +++ b/host/utils/usrp_gen_tx_dc_cal_table.cpp @@ -0,0 +1,262 @@ +// +// Copyright 2010 Ettus Research LLC +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// + +#include "usrp_cal_utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace po = boost::program_options; + +/*********************************************************************** + * Transmit thread + **********************************************************************/ +static void tx_thread(uhd::usrp::multi_usrp::sptr usrp, const double tx_wave_freq, const double tx_wave_ampl){ + uhd::set_thread_priority_safe(); + + //create a transmit streamer + uhd::stream_args_t stream_args("fc32"); //complex floats + uhd::tx_streamer::sptr tx_stream = usrp->get_tx_stream(stream_args); + + //setup variables and allocate buffer + uhd::tx_metadata_t md; + md.has_time_spec = false; + std::vector > buff(tx_stream->get_max_num_samps()*10); + + //values for the wave table lookup + size_t index = 0; + const double tx_rate = usrp->get_tx_rate(); + const size_t step = boost::math::iround(wave_table_len * tx_wave_freq/tx_rate); + + //fill buff and send until interrupted + while (not boost::this_thread::interruption_requested()){ + for (size_t i = 0; i < buff.size(); i++){ + buff[i] = float(tx_wave_ampl) * wave_table_lookup(index += step); + } + tx_stream->send(&buff.front(), buff.size(), md); + } + + //send a mini EOB packet + md.end_of_burst = true; + tx_stream->send("", 0, md); +} + +/*********************************************************************** + * Tune RX and TX routine + **********************************************************************/ +static double tune_rx_and_tx(uhd::usrp::multi_usrp::sptr usrp, const double tx_lo_freq, const double rx_offset){ + //tune the transmitter with no cordic + uhd::tune_request_t tx_tune_req(tx_lo_freq); + tx_tune_req.dsp_freq_policy = uhd::tune_request_t::POLICY_MANUAL; + tx_tune_req.dsp_freq = 0; + usrp->set_tx_freq(tx_tune_req); + + //tune the receiver + usrp->set_rx_freq(usrp->get_tx_freq() - rx_offset); + + //wait for the LOs to become locked + boost::this_thread::sleep(boost::posix_time::milliseconds(50)); + boost::system_time start = boost::get_system_time(); + while (not usrp->get_tx_sensor("lo_locked").to_bool() or not usrp->get_rx_sensor("lo_locked").to_bool()){ + if (boost::get_system_time() > start + boost::posix_time::milliseconds(100)){ + throw std::runtime_error("timed out waiting for TX and/or RX LO to lock"); + } + } + + return usrp->get_tx_freq(); +} + +/*********************************************************************** + * Data capture routine + **********************************************************************/ +static void capture_samples(uhd::usrp::multi_usrp::sptr usrp, uhd::rx_streamer::sptr rx_stream, std::vector > &buff){ + uhd::stream_cmd_t stream_cmd(uhd::stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_DONE); + stream_cmd.num_samps = buff.size(); + stream_cmd.stream_now = true; + usrp->issue_stream_cmd(stream_cmd); + uhd::rx_metadata_t md; + const size_t num_rx_samps = rx_stream->recv(&buff.front(), buff.size(), md); + + //validate the received data + if (md.error_code != uhd::rx_metadata_t::ERROR_CODE_NONE){ + throw std::runtime_error(str(boost::format( + "Unexpected error code 0x%x" + ) % md.error_code)); + } + if (num_rx_samps != buff.size()){ + throw std::runtime_error("did not get all the samples requested"); + } +} + +/*********************************************************************** + * Main + **********************************************************************/ +int UHD_SAFE_MAIN(int argc, char *argv[]){ + std::string args; + double rate, tx_wave_freq, tx_wave_ampl, rx_offset, freq_step, tx_gain, rx_gain; + size_t nsamps; + + po::options_description desc("Allowed options"); + desc.add_options() + ("help", "help message") + ("verbose", "enable some verbose") + ("args", po::value(&args)->default_value(""), "device address args [default = \"\"]") + ("rate", po::value(&rate)->default_value(12.5e6), "RX and TX sample rate in Hz") + ("tx_wave_freq", po::value(&tx_wave_freq)->default_value(507.123e3), "Transmit wave frequency in Hz") + ("tx_wave_ampl", po::value(&tx_wave_ampl)->default_value(0.7), "Transmit wave amplitude in counts") + ("rx_offset", po::value(&rx_offset)->default_value(.9344e6), "RX LO offset from the TX LO in Hz") + ("tx_gain", po::value(&tx_gain)->default_value(0), "TX gain in dB") + ("rx_gain", po::value(&rx_gain)->default_value(0), "RX gain in dB") + ("freq_step", po::value(&freq_step)->default_value(default_freq_step), "Step size for LO sweep in Hz") + ("nsamps", po::value(&nsamps)->default_value(default_num_samps), "Samples per data capture") + ; + + po::variables_map vm; + po::store(po::parse_command_line(argc, argv, desc), vm); + po::notify(vm); + + //print the help message + if (vm.count("help")){ + std::cout << boost::format("USRP Generate TX Frontend Calibration Table %s") % desc << std::endl; + std::cout << + "This application measures leakage between RX and TX on an XCVR daughterboard to self-calibrate.\n" + << std::endl; + return ~0; + } + + //create a usrp device + std::cout << std::endl; + std::cout << boost::format("Creating the usrp device with: %s...") % args << std::endl; + uhd::usrp::multi_usrp::sptr usrp = uhd::usrp::multi_usrp::make(args); + + //set the antennas to cal + if (not uhd::has(usrp->get_rx_antennas(), "CAL") or not uhd::has(usrp->get_tx_antennas(), "CAL")){ + throw std::runtime_error("This board does not have the CAL antenna option, cannot self-calibrate."); + } + usrp->set_rx_antenna("CAL"); + usrp->set_tx_antenna("CAL"); + + //set the sample rates + usrp->set_rx_rate(rate); + usrp->set_tx_rate(rate); + + //set midrange rx gain, default 0 tx gain + usrp->set_tx_gain(tx_gain); + usrp->set_rx_gain(rx_gain); + + //create a receive streamer + uhd::stream_args_t stream_args("fc32"); //complex floats + uhd::rx_streamer::sptr rx_stream = usrp->get_rx_stream(stream_args); + + //create a transmitter thread + boost::thread_group threads; + threads.create_thread(boost::bind(&tx_thread, usrp, tx_wave_freq, tx_wave_ampl)); + + //re-usable buffer for samples + std::vector > buff(nsamps); + + //store the results here + std::vector results; + + const uhd::meta_range_t freq_range = usrp->get_tx_freq_range(); + for (double tx_lo_i = freq_range.start()+50e6; tx_lo_i < freq_range.stop()-50e6; tx_lo_i += freq_step){ + const double tx_lo = tune_rx_and_tx(usrp, tx_lo_i, rx_offset); + + //frequency constants for this tune event + const double actual_rx_rate = usrp->get_rx_rate(); + const double actual_tx_freq = usrp->get_tx_freq(); + const double actual_rx_freq = usrp->get_rx_freq(); + const double bb_dc_freq = actual_tx_freq - actual_rx_freq; + + //capture initial uncorrected value + usrp->set_tx_dc_offset(std::complex(0, 0)); + capture_samples(usrp, rx_stream, buff); + const double initial_dc_dbrms = compute_tone_dbrms(buff, bb_dc_freq/actual_rx_rate); + + //bounds and results from searching + double dc_i_start = -.01, dc_i_stop = .01, dc_i_step; + double dc_q_start = -.01, dc_q_stop = .01, dc_q_step; + double lowest_offset = 0, best_dc_i = 0, best_dc_q = 0; + + for (size_t i = 0; i < num_search_iters; i++){ + + dc_i_step = (dc_i_stop - dc_i_start)/(num_search_steps-1); + dc_q_step = (dc_q_stop - dc_q_start)/(num_search_steps-1); + + for (double dc_i = dc_i_start; dc_i <= dc_i_stop + dc_i_step/2; dc_i += dc_i_step){ + for (double dc_q = dc_q_start; dc_q <= dc_q_stop + dc_q_step/2; dc_q += dc_q_step){ + + const std::complex correction(dc_i, dc_q); + usrp->set_tx_dc_offset(correction); + + //receive some samples + capture_samples(usrp, rx_stream, buff); + + const double dc_dbrms = compute_tone_dbrms(buff, bb_dc_freq/actual_rx_rate); + + if (dc_dbrms < lowest_offset){ + lowest_offset = dc_dbrms; + best_dc_i = dc_i; + best_dc_q = dc_q; + } + + }} + + //std::cout << "best_dc_i " << best_dc_i << std::endl; + //std::cout << "best_dc_q " << best_dc_q << std::endl; + //std::cout << "lowest_offset " << lowest_offset << std::endl; + + dc_i_start = best_dc_i - dc_i_step; + dc_i_stop = best_dc_i + dc_i_step; + dc_q_start = best_dc_q - dc_q_step; + dc_q_stop = best_dc_q + dc_q_step; + } + + if (lowest_offset < -90){ //most likely valid, keep result + result_t result; + result.freq = tx_lo; + result.real_corr = best_dc_i; + result.imag_corr = best_dc_q; + result.best = lowest_offset; + 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; + } + else std::cout << "." << std::flush; + } + + } + std::cout << std::endl; + + //stop the transmitter + threads.interrupt_all(); + threads.join_all(); + + store_results(usrp, results, "TX", "tx", "dc"); + + return 0; +} diff --git a/host/utils/usrp_gen_tx_fe_cal_table.cpp b/host/utils/usrp_gen_tx_fe_cal_table.cpp deleted file mode 100644 index bf19e4a37..000000000 --- a/host/utils/usrp_gen_tx_fe_cal_table.cpp +++ /dev/null @@ -1,266 +0,0 @@ -// -// Copyright 2010 Ettus Research LLC -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -// - -#include "usrp_cal_utils.hpp" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace po = boost::program_options; - -/*********************************************************************** - * Transmit thread - **********************************************************************/ -static void tx_thread(uhd::usrp::multi_usrp::sptr usrp, const double tx_wave_freq, const double tx_wave_ampl){ - uhd::set_thread_priority_safe(); - - //create a transmit streamer - uhd::stream_args_t stream_args("fc32"); //complex floats - uhd::tx_streamer::sptr tx_stream = usrp->get_tx_stream(stream_args); - - //setup variables and allocate buffer - uhd::tx_metadata_t md; - md.has_time_spec = false; - std::vector > buff(tx_stream->get_max_num_samps()*10); - - //values for the wave table lookup - size_t index = 0; - const double tx_rate = usrp->get_tx_rate(); - const size_t step = boost::math::iround(wave_table_len * tx_wave_freq/tx_rate); - - //fill buff and send until interrupted - while (not boost::this_thread::interruption_requested()){ - for (size_t i = 0; i < buff.size(); i++){ - buff[i] = float(tx_wave_ampl) * wave_table_lookup(index += step); - } - tx_stream->send(&buff.front(), buff.size(), md); - } - - //send a mini EOB packet - md.end_of_burst = true; - tx_stream->send("", 0, md); -} - -/*********************************************************************** - * Tune RX and TX routine - **********************************************************************/ -static double tune_rx_and_tx(uhd::usrp::multi_usrp::sptr usrp, const double tx_lo_freq, const double rx_offset){ - //tune the transmitter with no cordic - uhd::tune_request_t tx_tune_req(tx_lo_freq); - tx_tune_req.dsp_freq_policy = uhd::tune_request_t::POLICY_MANUAL; - tx_tune_req.dsp_freq = 0; - usrp->set_tx_freq(tx_tune_req); - - //tune the receiver - usrp->set_rx_freq(usrp->get_tx_freq() - rx_offset); - - //wait for the LOs to become locked - boost::this_thread::sleep(boost::posix_time::milliseconds(50)); - boost::system_time start = boost::get_system_time(); - while (not usrp->get_tx_sensor("lo_locked").to_bool() or not usrp->get_rx_sensor("lo_locked").to_bool()){ - if (boost::get_system_time() > start + boost::posix_time::milliseconds(100)){ - throw std::runtime_error("timed out waiting for TX and/or RX LO to lock"); - } - } - - return usrp->get_tx_freq(); -} - -/*********************************************************************** - * Data capture routine - **********************************************************************/ -static void capture_samples(uhd::usrp::multi_usrp::sptr usrp, uhd::rx_streamer::sptr rx_stream, std::vector > &buff){ - uhd::stream_cmd_t stream_cmd(uhd::stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_DONE); - stream_cmd.num_samps = buff.size(); - stream_cmd.stream_now = true; - usrp->issue_stream_cmd(stream_cmd); - uhd::rx_metadata_t md; - const size_t num_rx_samps = rx_stream->recv(&buff.front(), buff.size(), md); - - //validate the received data - if (md.error_code != uhd::rx_metadata_t::ERROR_CODE_NONE){ - throw std::runtime_error(str(boost::format( - "Unexpected error code 0x%x" - ) % md.error_code)); - } - if (num_rx_samps != buff.size()){ - throw std::runtime_error("did not get all the samples requested"); - } -} - -/*********************************************************************** - * Main - **********************************************************************/ -int UHD_SAFE_MAIN(int argc, char *argv[]){ - std::string args; - double rate, tx_wave_freq, tx_wave_ampl, rx_offset, freq_step, tx_gain, rx_gain; - size_t nsamps; - - po::options_description desc("Allowed options"); - desc.add_options() - ("help", "help message") - ("verbose", "enable some verbose") - ("args", po::value(&args)->default_value(""), "device address args [default = \"\"]") - ("rate", po::value(&rate)->default_value(12.5e6), "RX and TX sample rate in Hz") - ("tx_wave_freq", po::value(&tx_wave_freq)->default_value(507.123e3), "Transmit wave frequency in Hz") - ("tx_wave_ampl", po::value(&tx_wave_ampl)->default_value(0.7), "Transmit wave amplitude in counts") - ("rx_offset", po::value(&rx_offset)->default_value(.9344e6), "RX LO offset from the TX LO in Hz") - ("tx_gain", po::value(&tx_gain)->default_value(0), "TX gain in dB") - ("rx_gain", po::value(&rx_gain)->default_value(0), "RX gain in dB") - ("freq_step", po::value(&freq_step)->default_value(10e6), "Step size for LO sweep in Hz") - ("nsamps", po::value(&nsamps)->default_value(10000), "Samples per data capture") - ; - - po::variables_map vm; - po::store(po::parse_command_line(argc, argv, desc), vm); - po::notify(vm); - - //print the help message - if (vm.count("help")){ - std::cout << boost::format("USRP Generate TX Frontend Calibration Table %s") % desc << std::endl; - std::cout << - "This application measures leakage between RX and TX on an XCVR daughterboard to self-calibrate.\n" - << std::endl; - return ~0; - } - - //create a usrp device - std::cout << std::endl; - std::cout << boost::format("Creating the usrp device with: %s...") % args << std::endl; - uhd::usrp::multi_usrp::sptr usrp = uhd::usrp::multi_usrp::make(args); - - //set the antennas to cal - if (not uhd::has(usrp->get_rx_antennas(), "CAL") or not uhd::has(usrp->get_tx_antennas(), "CAL")){ - throw std::runtime_error("This board does not have the CAL antenna option, cannot self-calibrate."); - } - usrp->set_rx_antenna("CAL"); - usrp->set_tx_antenna("CAL"); - - //set the sample rates - usrp->set_rx_rate(rate); - usrp->set_tx_rate(rate); - - //set midrange rx gain, default 0 tx gain - usrp->set_tx_gain(tx_gain); - usrp->set_rx_gain(rx_gain); - - //create a receive streamer - uhd::stream_args_t stream_args("fc32"); //complex floats - uhd::rx_streamer::sptr rx_stream = usrp->get_rx_stream(stream_args); - - //create a transmitter thread - boost::thread_group threads; - threads.create_thread(boost::bind(&tx_thread, usrp, tx_wave_freq, tx_wave_ampl)); - - //re-usable buffer for samples - std::vector > buff(nsamps); - - //store the results here - std::vector results; - - const uhd::meta_range_t freq_range = usrp->get_tx_freq_range(); - for (double tx_lo_i = freq_range.start()+50e6; tx_lo_i < freq_range.stop()-50e6; tx_lo_i += freq_step){ - const double tx_lo = tune_rx_and_tx(usrp, tx_lo_i, rx_offset); - - //bounds and results from searching - std::complex best_correction; - double phase_corr_start = -.3, phase_corr_stop = .3, phase_corr_step; - double ampl_corr_start = -.3, ampl_corr_stop = .3, ampl_corr_step; - double best_suppression = 0, best_phase_corr = 0, best_ampl_corr = 0; - - for (size_t i = 0; i < num_search_iters; i++){ - - phase_corr_step = (phase_corr_stop - phase_corr_start)/(num_search_steps-1); - ampl_corr_step = (ampl_corr_stop - ampl_corr_start)/(num_search_steps-1); - - for (double phase_corr = phase_corr_start; phase_corr <= phase_corr_stop + phase_corr_step/2; phase_corr += phase_corr_step){ - for (double ampl_corr = ampl_corr_start; ampl_corr <= ampl_corr_stop + ampl_corr_step/2; ampl_corr += ampl_corr_step){ - - const std::complex correction = std::polar(ampl_corr+1, phase_corr*tau); - usrp->set_tx_iq_balance(correction); - - //receive some samples - capture_samples(usrp, rx_stream, buff); - - const double actual_rx_rate = usrp->get_rx_rate(); - const double actual_tx_freq = usrp->get_tx_freq(); - const double actual_rx_freq = usrp->get_rx_freq(); - const double bb_tone_freq = actual_tx_freq + tx_wave_freq - actual_rx_freq; - const double bb_imag_freq = actual_tx_freq - tx_wave_freq - actual_rx_freq; - - const double tone_dbrms = compute_tone_dbrms(buff, bb_tone_freq/actual_rx_rate); - const double imag_dbrms = compute_tone_dbrms(buff, bb_imag_freq/actual_rx_rate); - const double suppression = tone_dbrms - imag_dbrms; - - //std::cout << "bb_tone_freq " << bb_tone_freq << std::endl; - //std::cout << "bb_imag_freq " << bb_imag_freq << std::endl; - //std::cout << "tone_dbrms " << tone_dbrms << std::endl; - //std::cout << "imag_dbrms " << imag_dbrms << std::endl; - //std::cout << "suppression " << (tone_dbrms - imag_dbrms) << std::endl; - - if (suppression > best_suppression){ - best_correction = correction; - best_suppression = suppression; - best_phase_corr = phase_corr; - best_ampl_corr = ampl_corr; - } - - }} - - //std::cout << "best_phase_corr " << best_phase_corr << std::endl; - //std::cout << "best_ampl_corr " << best_ampl_corr << std::endl; - //std::cout << "best_suppression " << best_suppression << std::endl; - - phase_corr_start = best_phase_corr - phase_corr_step; - phase_corr_stop = best_phase_corr + phase_corr_step; - ampl_corr_start = best_ampl_corr - ampl_corr_step; - ampl_corr_stop = best_ampl_corr + ampl_corr_step; - } - - if (best_suppression > 30){ //most likely valid, keep result - result_t result; - result.freq = tx_lo; - result.real_corr = best_correction.real(); - result.imag_corr = best_correction.imag(); - result.sup = best_suppression; - results.push_back(result); - } - if (vm.count("verbose")){ - std::cout << boost::format("%f MHz: best suppression %fdB") % (tx_lo/1e6) % best_suppression << std::endl; - } - else std::cout << "." << std::flush; - - } - std::cout << std::endl; - - //stop the transmitter - threads.interrupt_all(); - threads.join_all(); - - store_results(usrp, results, "TX", "tx"); - - return 0; -} diff --git a/host/utils/usrp_gen_tx_iq_cal_table.cpp b/host/utils/usrp_gen_tx_iq_cal_table.cpp new file mode 100644 index 000000000..a2b98d8e6 --- /dev/null +++ b/host/utils/usrp_gen_tx_iq_cal_table.cpp @@ -0,0 +1,267 @@ +// +// Copyright 2010 Ettus Research LLC +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// + +#include "usrp_cal_utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace po = boost::program_options; + +/*********************************************************************** + * Transmit thread + **********************************************************************/ +static void tx_thread(uhd::usrp::multi_usrp::sptr usrp, const double tx_wave_freq, const double tx_wave_ampl){ + uhd::set_thread_priority_safe(); + + //create a transmit streamer + uhd::stream_args_t stream_args("fc32"); //complex floats + uhd::tx_streamer::sptr tx_stream = usrp->get_tx_stream(stream_args); + + //setup variables and allocate buffer + uhd::tx_metadata_t md; + md.has_time_spec = false; + std::vector > buff(tx_stream->get_max_num_samps()*10); + + //values for the wave table lookup + size_t index = 0; + const double tx_rate = usrp->get_tx_rate(); + const size_t step = boost::math::iround(wave_table_len * tx_wave_freq/tx_rate); + + //fill buff and send until interrupted + while (not boost::this_thread::interruption_requested()){ + for (size_t i = 0; i < buff.size(); i++){ + buff[i] = float(tx_wave_ampl) * wave_table_lookup(index += step); + } + tx_stream->send(&buff.front(), buff.size(), md); + } + + //send a mini EOB packet + md.end_of_burst = true; + tx_stream->send("", 0, md); +} + +/*********************************************************************** + * Tune RX and TX routine + **********************************************************************/ +static double tune_rx_and_tx(uhd::usrp::multi_usrp::sptr usrp, const double tx_lo_freq, const double rx_offset){ + //tune the transmitter with no cordic + uhd::tune_request_t tx_tune_req(tx_lo_freq); + tx_tune_req.dsp_freq_policy = uhd::tune_request_t::POLICY_MANUAL; + tx_tune_req.dsp_freq = 0; + usrp->set_tx_freq(tx_tune_req); + + //tune the receiver + usrp->set_rx_freq(usrp->get_tx_freq() - rx_offset); + + //wait for the LOs to become locked + boost::this_thread::sleep(boost::posix_time::milliseconds(50)); + boost::system_time start = boost::get_system_time(); + while (not usrp->get_tx_sensor("lo_locked").to_bool() or not usrp->get_rx_sensor("lo_locked").to_bool()){ + if (boost::get_system_time() > start + boost::posix_time::milliseconds(100)){ + throw std::runtime_error("timed out waiting for TX and/or RX LO to lock"); + } + } + + return usrp->get_tx_freq(); +} + +/*********************************************************************** + * Data capture routine + **********************************************************************/ +static void capture_samples(uhd::usrp::multi_usrp::sptr usrp, uhd::rx_streamer::sptr rx_stream, std::vector > &buff){ + uhd::stream_cmd_t stream_cmd(uhd::stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_DONE); + stream_cmd.num_samps = buff.size(); + stream_cmd.stream_now = true; + usrp->issue_stream_cmd(stream_cmd); + uhd::rx_metadata_t md; + const size_t num_rx_samps = rx_stream->recv(&buff.front(), buff.size(), md); + + //validate the received data + if (md.error_code != uhd::rx_metadata_t::ERROR_CODE_NONE){ + throw std::runtime_error(str(boost::format( + "Unexpected error code 0x%x" + ) % md.error_code)); + } + if (num_rx_samps != buff.size()){ + throw std::runtime_error("did not get all the samples requested"); + } +} + +/*********************************************************************** + * Main + **********************************************************************/ +int UHD_SAFE_MAIN(int argc, char *argv[]){ + std::string args; + double rate, tx_wave_freq, tx_wave_ampl, rx_offset, freq_step, tx_gain, rx_gain; + size_t nsamps; + + po::options_description desc("Allowed options"); + desc.add_options() + ("help", "help message") + ("verbose", "enable some verbose") + ("args", po::value(&args)->default_value(""), "device address args [default = \"\"]") + ("rate", po::value(&rate)->default_value(12.5e6), "RX and TX sample rate in Hz") + ("tx_wave_freq", po::value(&tx_wave_freq)->default_value(507.123e3), "Transmit wave frequency in Hz") + ("tx_wave_ampl", po::value(&tx_wave_ampl)->default_value(0.7), "Transmit wave amplitude in counts") + ("rx_offset", po::value(&rx_offset)->default_value(.9344e6), "RX LO offset from the TX LO in Hz") + ("tx_gain", po::value(&tx_gain)->default_value(0), "TX gain in dB") + ("rx_gain", po::value(&rx_gain)->default_value(0), "RX gain in dB") + ("freq_step", po::value(&freq_step)->default_value(default_freq_step), "Step size for LO sweep in Hz") + ("nsamps", po::value(&nsamps)->default_value(default_num_samps), "Samples per data capture") + ; + + po::variables_map vm; + po::store(po::parse_command_line(argc, argv, desc), vm); + po::notify(vm); + + //print the help message + if (vm.count("help")){ + std::cout << boost::format("USRP Generate TX Frontend Calibration Table %s") % desc << std::endl; + std::cout << + "This application measures leakage between RX and TX on an XCVR daughterboard to self-calibrate.\n" + << std::endl; + return ~0; + } + + //create a usrp device + std::cout << std::endl; + std::cout << boost::format("Creating the usrp device with: %s...") % args << std::endl; + uhd::usrp::multi_usrp::sptr usrp = uhd::usrp::multi_usrp::make(args); + + //set the antennas to cal + if (not uhd::has(usrp->get_rx_antennas(), "CAL") or not uhd::has(usrp->get_tx_antennas(), "CAL")){ + throw std::runtime_error("This board does not have the CAL antenna option, cannot self-calibrate."); + } + usrp->set_rx_antenna("CAL"); + usrp->set_tx_antenna("CAL"); + + //set the sample rates + usrp->set_rx_rate(rate); + usrp->set_tx_rate(rate); + + //set midrange rx gain, default 0 tx gain + usrp->set_tx_gain(tx_gain); + usrp->set_rx_gain(rx_gain); + + //create a receive streamer + uhd::stream_args_t stream_args("fc32"); //complex floats + uhd::rx_streamer::sptr rx_stream = usrp->get_rx_stream(stream_args); + + //create a transmitter thread + boost::thread_group threads; + threads.create_thread(boost::bind(&tx_thread, usrp, tx_wave_freq, tx_wave_ampl)); + + //re-usable buffer for samples + std::vector > buff(nsamps); + + //store the results here + std::vector results; + + const uhd::meta_range_t freq_range = usrp->get_tx_freq_range(); + for (double tx_lo_i = freq_range.start()+50e6; tx_lo_i < freq_range.stop()-50e6; tx_lo_i += freq_step){ + const double tx_lo = tune_rx_and_tx(usrp, tx_lo_i, rx_offset); + + //frequency constants for this tune event + const double actual_rx_rate = usrp->get_rx_rate(); + const double actual_tx_freq = usrp->get_tx_freq(); + const double actual_rx_freq = usrp->get_rx_freq(); + const double bb_tone_freq = actual_tx_freq + tx_wave_freq - actual_rx_freq; + const double bb_imag_freq = actual_tx_freq - tx_wave_freq - actual_rx_freq; + + //capture initial uncorrected value + usrp->set_tx_iq_balance(std::polar(1.0, 0.0)); + capture_samples(usrp, rx_stream, buff); + const double initial_suppression = compute_tone_dbrms(buff, bb_tone_freq/actual_rx_rate) - compute_tone_dbrms(buff, bb_imag_freq/actual_rx_rate); + + //bounds and results from searching + std::complex best_correction; + double phase_corr_start = -.3, phase_corr_stop = .3, phase_corr_step; + double ampl_corr_start = -.3, ampl_corr_stop = .3, ampl_corr_step; + double best_suppression = 0, best_phase_corr = 0, best_ampl_corr = 0; + + for (size_t i = 0; i < num_search_iters; i++){ + + phase_corr_step = (phase_corr_stop - phase_corr_start)/(num_search_steps-1); + ampl_corr_step = (ampl_corr_stop - ampl_corr_start)/(num_search_steps-1); + + for (double phase_corr = phase_corr_start; phase_corr <= phase_corr_stop + phase_corr_step/2; phase_corr += phase_corr_step){ + for (double ampl_corr = ampl_corr_start; ampl_corr <= ampl_corr_stop + ampl_corr_step/2; ampl_corr += ampl_corr_step){ + + const std::complex correction = std::polar(ampl_corr+1, phase_corr*tau); + usrp->set_tx_iq_balance(correction); + + //receive some samples + capture_samples(usrp, rx_stream, buff); + + const double tone_dbrms = compute_tone_dbrms(buff, bb_tone_freq/actual_rx_rate); + const double imag_dbrms = compute_tone_dbrms(buff, bb_imag_freq/actual_rx_rate); + const double suppression = tone_dbrms - imag_dbrms; + + if (suppression > best_suppression){ + best_correction = correction; + best_suppression = suppression; + best_phase_corr = phase_corr; + best_ampl_corr = ampl_corr; + } + + }} + + //std::cout << "best_phase_corr " << best_phase_corr << std::endl; + //std::cout << "best_ampl_corr " << best_ampl_corr << std::endl; + //std::cout << "best_suppression " << best_suppression << std::endl; + + phase_corr_start = best_phase_corr - phase_corr_step; + phase_corr_stop = best_phase_corr + phase_corr_step; + ampl_corr_start = best_ampl_corr - ampl_corr_step; + ampl_corr_stop = best_ampl_corr + ampl_corr_step; + } + + if (best_suppression > 30){ //most likely valid, keep result + result_t result; + result.freq = tx_lo; + result.real_corr = best_correction.real(); + result.imag_corr = best_correction.imag(); + result.best = best_suppression; + 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; + } + else std::cout << "." << std::flush; + } + + } + std::cout << std::endl; + + //stop the transmitter + threads.interrupt_all(); + threads.join_all(); + + store_results(usrp, results, "TX", "tx", "iq"); + + return 0; +} -- cgit v1.2.3 From ff2e730a0dc7f67241942143c120e02a838f932e Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Mon, 14 Nov 2011 17:32:46 -0800 Subject: uhd: different interp methods for IQ vs DC --- host/lib/usrp/common/apply_corrections.cpp | 42 ++++- host/utils/CMakeLists.txt | 6 +- host/utils/usrp_cal_rx_iq_balance.cpp | 265 ++++++++++++++++++++++++++++ host/utils/usrp_cal_tx_dc_offset.cpp | 262 ++++++++++++++++++++++++++++ host/utils/usrp_cal_tx_iq_balance.cpp | 267 +++++++++++++++++++++++++++++ host/utils/usrp_cal_utils.hpp | 2 +- host/utils/usrp_gen_rx_iq_cal_table.cpp | 265 ---------------------------- host/utils/usrp_gen_tx_dc_cal_table.cpp | 262 ---------------------------- host/utils/usrp_gen_tx_iq_cal_table.cpp | 267 ----------------------------- 9 files changed, 837 insertions(+), 801 deletions(-) create mode 100644 host/utils/usrp_cal_rx_iq_balance.cpp create mode 100644 host/utils/usrp_cal_tx_dc_offset.cpp create mode 100644 host/utils/usrp_cal_tx_iq_balance.cpp delete mode 100644 host/utils/usrp_gen_rx_iq_cal_table.cpp delete mode 100644 host/utils/usrp_gen_tx_dc_cal_table.cpp delete mode 100644 host/utils/usrp_gen_tx_iq_cal_table.cpp (limited to 'host/utils/usrp_cal_utils.hpp') diff --git a/host/lib/usrp/common/apply_corrections.cpp b/host/lib/usrp/common/apply_corrections.cpp index 720c51633..e3ec9baab 100644 --- a/host/lib/usrp/common/apply_corrections.cpp +++ b/host/lib/usrp/common/apply_corrections.cpp @@ -54,7 +54,7 @@ static bool fe_cal_comp(fe_cal_t a, fe_cal_t b){ static uhd::dict > fe_cal_cache; -static std::complex get_fe_iq_correction( +static std::complex get_fe_dc_correction( const std::string &key, const double lo_freq ){ const std::vector &datas = fe_cal_cache[key]; @@ -80,6 +80,35 @@ static std::complex get_fe_iq_correction( ); } +static std::complex get_fe_iq_correction( + const std::string &key, const double lo_freq +){ + const std::vector &datas = fe_cal_cache[key]; + + //search for lo freq + size_t lo_index = 0; + size_t hi_index = datas.size()-1; + for (size_t i = 0; i < datas.size(); i++){ + if (datas[i].lo_freq > lo_freq){ + hi_index = i; + break; + } + lo_index = i; + } + + if (lo_index == 0) return std::complex(datas[lo_index].iq_corr_real, datas[lo_index].iq_corr_imag); + if (hi_index == lo_index) return std::complex(datas[hi_index].iq_corr_real, datas[hi_index].iq_corr_imag); + + const std::complex lo_val(datas[lo_index].iq_corr_real, datas[lo_index].iq_corr_imag); + const std::complex hi_val(datas[hi_index].iq_corr_real, datas[hi_index].iq_corr_imag); + + //interpolation time + return std::polar( + linear_interp(lo_freq, datas[lo_index].lo_freq, std::abs(lo_val), datas[hi_index].lo_freq, std::abs(hi_val)), + linear_interp(lo_freq, datas[lo_index].lo_freq, std::arg(lo_val), datas[hi_index].lo_freq, std::arg(hi_val)) + ); +} + static void apply_fe_corrections( uhd::property_tree::sptr sub_tree, const uhd::fs_path &db_path, @@ -124,8 +153,15 @@ static void apply_fe_corrections( } - sub_tree->access >(fe_path) - .set(get_fe_iq_correction(cal_data_path.string(), lo_freq)); + if (file_prefix.find("dc") != std::string::npos){ + sub_tree->access >(fe_path) + .set(get_fe_dc_correction(cal_data_path.string(), lo_freq)); + } + else if (file_prefix.find("iq") != std::string::npos){ + sub_tree->access >(fe_path) + .set(get_fe_iq_correction(cal_data_path.string(), lo_freq)); + } + else throw uhd::runtime_error("could not determine interpolation function"); } /*********************************************************************** diff --git a/host/utils/CMakeLists.txt b/host/utils/CMakeLists.txt index 6c17be22c..92807f882 100644 --- a/host/utils/CMakeLists.txt +++ b/host/utils/CMakeLists.txt @@ -37,9 +37,9 @@ ENDFOREACH(util_source) SET(util_share_sources usrp_burn_db_eeprom.cpp usrp_burn_mb_eeprom.cpp - usrp_gen_rx_iq_cal_table.cpp - usrp_gen_tx_iq_cal_table.cpp - usrp_gen_tx_dc_cal_table.cpp + usrp_cal_rx_iq_balance.cpp + usrp_cal_tx_dc_offset.cpp + usrp_cal_tx_iq_balance.cpp ) IF(ENABLE_USB) diff --git a/host/utils/usrp_cal_rx_iq_balance.cpp b/host/utils/usrp_cal_rx_iq_balance.cpp new file mode 100644 index 000000000..7b7fdaec9 --- /dev/null +++ b/host/utils/usrp_cal_rx_iq_balance.cpp @@ -0,0 +1,265 @@ +// +// Copyright 2010 Ettus Research LLC +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// + +#include "usrp_cal_utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace po = boost::program_options; + +/*********************************************************************** + * Transmit thread + **********************************************************************/ +static void tx_thread(uhd::usrp::multi_usrp::sptr usrp, const double tx_wave_ampl){ + uhd::set_thread_priority_safe(); + + //create a transmit streamer + uhd::stream_args_t stream_args("fc32"); //complex floats + uhd::tx_streamer::sptr tx_stream = usrp->get_tx_stream(stream_args); + + //setup variables and allocate buffer + uhd::tx_metadata_t md; + md.has_time_spec = false; + std::vector > buff(tx_stream->get_max_num_samps()*10); + + //fill buff and send until interrupted + while (not boost::this_thread::interruption_requested()){ + for (size_t i = 0; i < buff.size(); i++){ + buff[i] = float(tx_wave_ampl); + } + tx_stream->send(&buff.front(), buff.size(), md); + } + + //send a mini EOB packet + md.end_of_burst = true; + tx_stream->send("", 0, md); +} + +/*********************************************************************** + * Tune RX and TX routine + **********************************************************************/ +static double tune_rx_and_tx(uhd::usrp::multi_usrp::sptr usrp, const double rx_lo_freq, const double tx_offset){ + //tune the receiver with no cordic + uhd::tune_request_t rx_tune_req(rx_lo_freq); + rx_tune_req.dsp_freq_policy = uhd::tune_request_t::POLICY_MANUAL; + rx_tune_req.dsp_freq = 0; + usrp->set_rx_freq(rx_tune_req); + + //tune the transmitter with no cordic + uhd::tune_request_t tx_tune_req(usrp->get_rx_freq() - tx_offset); + tx_tune_req.dsp_freq_policy = uhd::tune_request_t::POLICY_MANUAL; + tx_tune_req.dsp_freq = 0; + usrp->set_tx_freq(tx_tune_req); + + //wait for the LOs to become locked + boost::this_thread::sleep(boost::posix_time::milliseconds(50)); + boost::system_time start = boost::get_system_time(); + while (not usrp->get_tx_sensor("lo_locked").to_bool() or not usrp->get_rx_sensor("lo_locked").to_bool()){ + if (boost::get_system_time() > start + boost::posix_time::milliseconds(100)){ + throw std::runtime_error("timed out waiting for TX and/or RX LO to lock"); + } + } + + return usrp->get_rx_freq(); +} + +/*********************************************************************** + * Data capture routine + **********************************************************************/ +static void capture_samples(uhd::usrp::multi_usrp::sptr usrp, uhd::rx_streamer::sptr rx_stream, std::vector > &buff){ + uhd::stream_cmd_t stream_cmd(uhd::stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_DONE); + stream_cmd.num_samps = buff.size(); + stream_cmd.stream_now = true; + usrp->issue_stream_cmd(stream_cmd); + uhd::rx_metadata_t md; + const size_t num_rx_samps = rx_stream->recv(&buff.front(), buff.size(), md); + + //validate the received data + if (md.error_code != uhd::rx_metadata_t::ERROR_CODE_NONE){ + throw std::runtime_error(str(boost::format( + "Unexpected error code 0x%x" + ) % md.error_code)); + } + if (num_rx_samps != buff.size()){ + throw std::runtime_error("did not get all the samples requested"); + } +} + +/*********************************************************************** + * Main + **********************************************************************/ +int UHD_SAFE_MAIN(int argc, char *argv[]){ + std::string args; + double rate, tx_wave_ampl, tx_offset, freq_step, tx_gain, rx_gain; + size_t nsamps; + + po::options_description desc("Allowed options"); + desc.add_options() + ("help", "help message") + ("verbose", "enable some verbose") + ("args", po::value(&args)->default_value(""), "device address args [default = \"\"]") + ("rate", po::value(&rate)->default_value(12.5e6), "RX and TX sample rate in Hz") + ("tx_wave_ampl", po::value(&tx_wave_ampl)->default_value(0.7), "Transmit wave amplitude in counts") + ("tx_offset", po::value(&tx_offset)->default_value(.9344e6), "TX LO offset from the RX LO in Hz") + ("tx_gain", po::value(&tx_gain)->default_value(0), "TX gain in dB") + ("rx_gain", po::value(&rx_gain)->default_value(0), "RX gain in dB") + ("freq_step", po::value(&freq_step)->default_value(default_freq_step), "Step size for LO sweep in Hz") + ("nsamps", po::value(&nsamps)->default_value(default_num_samps), "Samples per data capture") + ; + + po::variables_map vm; + po::store(po::parse_command_line(argc, argv, desc), vm); + po::notify(vm); + + //print the help message + if (vm.count("help")){ + std::cout << boost::format("USRP Generate RX IQ Balance Calibration Table %s") % desc << std::endl; + std::cout << + "This application measures leakage between RX and TX on an XCVR daughterboard to self-calibrate.\n" + << std::endl; + return ~0; + } + + //create a usrp device + std::cout << std::endl; + std::cout << boost::format("Creating the usrp device with: %s...") % args << std::endl; + uhd::usrp::multi_usrp::sptr usrp = uhd::usrp::multi_usrp::make(args); + + //set the antennas to cal + if (not uhd::has(usrp->get_rx_antennas(), "CAL") or not uhd::has(usrp->get_tx_antennas(), "CAL")){ + throw std::runtime_error("This board does not have the CAL antenna option, cannot self-calibrate."); + } + usrp->set_rx_antenna("CAL"); + usrp->set_tx_antenna("CAL"); + + //set the sample rates + usrp->set_rx_rate(rate); + usrp->set_tx_rate(rate); + + //set midrange rx gain, default 0 tx gain + usrp->set_tx_gain(tx_gain); + usrp->set_rx_gain(rx_gain); + + //create a receive streamer + uhd::stream_args_t stream_args("fc32"); //complex floats + uhd::rx_streamer::sptr rx_stream = usrp->get_rx_stream(stream_args); + + //create a transmitter thread + boost::thread_group threads; + threads.create_thread(boost::bind(&tx_thread, usrp, tx_wave_ampl)); + + //re-usable buffer for samples + std::vector > buff(nsamps); + + //store the results here + std::vector results; + + const uhd::meta_range_t freq_range = usrp->get_rx_freq_range(); + for (double rx_lo_i = freq_range.start()+50e6; rx_lo_i < freq_range.stop()-50e6; rx_lo_i += freq_step){ + const double rx_lo = tune_rx_and_tx(usrp, rx_lo_i, tx_offset); + + //frequency constants for this tune event + const double actual_rx_rate = usrp->get_rx_rate(); + const double actual_tx_freq = usrp->get_tx_freq(); + const double actual_rx_freq = usrp->get_rx_freq(); + const double bb_tone_freq = actual_tx_freq - actual_rx_freq; + const double bb_imag_freq = -bb_tone_freq; + + //capture initial uncorrected value + usrp->set_rx_iq_balance(std::polar(1.0, 0.0)); + capture_samples(usrp, rx_stream, buff); + const double initial_suppression = compute_tone_dbrms(buff, bb_tone_freq/actual_rx_rate) - compute_tone_dbrms(buff, bb_imag_freq/actual_rx_rate); + + //bounds and results from searching + std::complex best_correction; + double phase_corr_start = -.3, phase_corr_stop = .3, phase_corr_step; + double ampl_corr_start = -.3, ampl_corr_stop = .3, ampl_corr_step; + double best_suppression = 0, best_phase_corr = 0, best_ampl_corr = 0; + + for (size_t i = 0; i < num_search_iters; i++){ + + phase_corr_step = (phase_corr_stop - phase_corr_start)/(num_search_steps-1); + ampl_corr_step = (ampl_corr_stop - ampl_corr_start)/(num_search_steps-1); + + for (double phase_corr = phase_corr_start; phase_corr <= phase_corr_stop + phase_corr_step/2; phase_corr += phase_corr_step){ + for (double ampl_corr = ampl_corr_start; ampl_corr <= ampl_corr_stop + ampl_corr_step/2; ampl_corr += ampl_corr_step){ + + const std::complex correction = std::polar(ampl_corr+1, phase_corr*tau); + usrp->set_rx_iq_balance(correction); + + //receive some samples + capture_samples(usrp, rx_stream, buff); + + const double tone_dbrms = compute_tone_dbrms(buff, bb_tone_freq/actual_rx_rate); + const double imag_dbrms = compute_tone_dbrms(buff, bb_imag_freq/actual_rx_rate); + const double suppression = tone_dbrms - imag_dbrms; + + if (suppression > best_suppression){ + best_correction = correction; + best_suppression = suppression; + best_phase_corr = phase_corr; + best_ampl_corr = ampl_corr; + } + + }} + + //std::cout << "best_phase_corr " << best_phase_corr << std::endl; + //std::cout << "best_ampl_corr " << best_ampl_corr << std::endl; + //std::cout << "best_suppression " << best_suppression << std::endl; + + phase_corr_start = best_phase_corr - phase_corr_step; + phase_corr_stop = best_phase_corr + phase_corr_step; + ampl_corr_start = best_ampl_corr - ampl_corr_step; + ampl_corr_stop = best_ampl_corr + ampl_corr_step; + } + + if (best_suppression > 30){ //most likely valid, keep result + result_t result; + result.freq = rx_lo; + result.real_corr = best_correction.real(); + result.imag_corr = best_correction.imag(); + result.best = best_suppression; + 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; + } + else std::cout << "." << std::flush; + } + + } + std::cout << std::endl; + + //stop the transmitter + threads.interrupt_all(); + threads.join_all(); + + store_results(usrp, results, "RX", "rx", "iq"); + + return 0; +} diff --git a/host/utils/usrp_cal_tx_dc_offset.cpp b/host/utils/usrp_cal_tx_dc_offset.cpp new file mode 100644 index 000000000..2c75242c7 --- /dev/null +++ b/host/utils/usrp_cal_tx_dc_offset.cpp @@ -0,0 +1,262 @@ +// +// Copyright 2010 Ettus Research LLC +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// + +#include "usrp_cal_utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace po = boost::program_options; + +/*********************************************************************** + * Transmit thread + **********************************************************************/ +static void tx_thread(uhd::usrp::multi_usrp::sptr usrp, const double tx_wave_freq, const double tx_wave_ampl){ + uhd::set_thread_priority_safe(); + + //create a transmit streamer + uhd::stream_args_t stream_args("fc32"); //complex floats + uhd::tx_streamer::sptr tx_stream = usrp->get_tx_stream(stream_args); + + //setup variables and allocate buffer + uhd::tx_metadata_t md; + md.has_time_spec = false; + std::vector > buff(tx_stream->get_max_num_samps()*10); + + //values for the wave table lookup + size_t index = 0; + const double tx_rate = usrp->get_tx_rate(); + const size_t step = boost::math::iround(wave_table_len * tx_wave_freq/tx_rate); + + //fill buff and send until interrupted + while (not boost::this_thread::interruption_requested()){ + for (size_t i = 0; i < buff.size(); i++){ + buff[i] = float(tx_wave_ampl) * wave_table_lookup(index += step); + } + tx_stream->send(&buff.front(), buff.size(), md); + } + + //send a mini EOB packet + md.end_of_burst = true; + tx_stream->send("", 0, md); +} + +/*********************************************************************** + * Tune RX and TX routine + **********************************************************************/ +static double tune_rx_and_tx(uhd::usrp::multi_usrp::sptr usrp, const double tx_lo_freq, const double rx_offset){ + //tune the transmitter with no cordic + uhd::tune_request_t tx_tune_req(tx_lo_freq); + tx_tune_req.dsp_freq_policy = uhd::tune_request_t::POLICY_MANUAL; + tx_tune_req.dsp_freq = 0; + usrp->set_tx_freq(tx_tune_req); + + //tune the receiver + usrp->set_rx_freq(usrp->get_tx_freq() - rx_offset); + + //wait for the LOs to become locked + boost::this_thread::sleep(boost::posix_time::milliseconds(50)); + boost::system_time start = boost::get_system_time(); + while (not usrp->get_tx_sensor("lo_locked").to_bool() or not usrp->get_rx_sensor("lo_locked").to_bool()){ + if (boost::get_system_time() > start + boost::posix_time::milliseconds(100)){ + throw std::runtime_error("timed out waiting for TX and/or RX LO to lock"); + } + } + + return usrp->get_tx_freq(); +} + +/*********************************************************************** + * Data capture routine + **********************************************************************/ +static void capture_samples(uhd::usrp::multi_usrp::sptr usrp, uhd::rx_streamer::sptr rx_stream, std::vector > &buff){ + uhd::stream_cmd_t stream_cmd(uhd::stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_DONE); + stream_cmd.num_samps = buff.size(); + stream_cmd.stream_now = true; + usrp->issue_stream_cmd(stream_cmd); + uhd::rx_metadata_t md; + const size_t num_rx_samps = rx_stream->recv(&buff.front(), buff.size(), md); + + //validate the received data + if (md.error_code != uhd::rx_metadata_t::ERROR_CODE_NONE){ + throw std::runtime_error(str(boost::format( + "Unexpected error code 0x%x" + ) % md.error_code)); + } + if (num_rx_samps != buff.size()){ + throw std::runtime_error("did not get all the samples requested"); + } +} + +/*********************************************************************** + * Main + **********************************************************************/ +int UHD_SAFE_MAIN(int argc, char *argv[]){ + std::string args; + double rate, tx_wave_freq, tx_wave_ampl, rx_offset, freq_step, tx_gain, rx_gain; + size_t nsamps; + + po::options_description desc("Allowed options"); + desc.add_options() + ("help", "help message") + ("verbose", "enable some verbose") + ("args", po::value(&args)->default_value(""), "device address args [default = \"\"]") + ("rate", po::value(&rate)->default_value(12.5e6), "RX and TX sample rate in Hz") + ("tx_wave_freq", po::value(&tx_wave_freq)->default_value(507.123e3), "Transmit wave frequency in Hz") + ("tx_wave_ampl", po::value(&tx_wave_ampl)->default_value(0.7), "Transmit wave amplitude in counts") + ("rx_offset", po::value(&rx_offset)->default_value(.9344e6), "RX LO offset from the TX LO in Hz") + ("tx_gain", po::value(&tx_gain)->default_value(0), "TX gain in dB") + ("rx_gain", po::value(&rx_gain)->default_value(0), "RX gain in dB") + ("freq_step", po::value(&freq_step)->default_value(default_freq_step), "Step size for LO sweep in Hz") + ("nsamps", po::value(&nsamps)->default_value(default_num_samps), "Samples per data capture") + ; + + po::variables_map vm; + po::store(po::parse_command_line(argc, argv, desc), vm); + po::notify(vm); + + //print the help message + if (vm.count("help")){ + std::cout << boost::format("USRP Generate TX DC Offset Calibration Table %s") % desc << std::endl; + std::cout << + "This application measures leakage between RX and TX on an XCVR daughterboard to self-calibrate.\n" + << std::endl; + return ~0; + } + + //create a usrp device + std::cout << std::endl; + std::cout << boost::format("Creating the usrp device with: %s...") % args << std::endl; + uhd::usrp::multi_usrp::sptr usrp = uhd::usrp::multi_usrp::make(args); + + //set the antennas to cal + if (not uhd::has(usrp->get_rx_antennas(), "CAL") or not uhd::has(usrp->get_tx_antennas(), "CAL")){ + throw std::runtime_error("This board does not have the CAL antenna option, cannot self-calibrate."); + } + usrp->set_rx_antenna("CAL"); + usrp->set_tx_antenna("CAL"); + + //set the sample rates + usrp->set_rx_rate(rate); + usrp->set_tx_rate(rate); + + //set midrange rx gain, default 0 tx gain + usrp->set_tx_gain(tx_gain); + usrp->set_rx_gain(rx_gain); + + //create a receive streamer + uhd::stream_args_t stream_args("fc32"); //complex floats + uhd::rx_streamer::sptr rx_stream = usrp->get_rx_stream(stream_args); + + //create a transmitter thread + boost::thread_group threads; + threads.create_thread(boost::bind(&tx_thread, usrp, tx_wave_freq, tx_wave_ampl)); + + //re-usable buffer for samples + std::vector > buff(nsamps); + + //store the results here + std::vector results; + + const uhd::meta_range_t freq_range = usrp->get_tx_freq_range(); + for (double tx_lo_i = freq_range.start()+50e6; tx_lo_i < freq_range.stop()-50e6; tx_lo_i += freq_step){ + const double tx_lo = tune_rx_and_tx(usrp, tx_lo_i, rx_offset); + + //frequency constants for this tune event + const double actual_rx_rate = usrp->get_rx_rate(); + const double actual_tx_freq = usrp->get_tx_freq(); + const double actual_rx_freq = usrp->get_rx_freq(); + const double bb_dc_freq = actual_tx_freq - actual_rx_freq; + + //capture initial uncorrected value + usrp->set_tx_dc_offset(std::complex(0, 0)); + capture_samples(usrp, rx_stream, buff); + const double initial_dc_dbrms = compute_tone_dbrms(buff, bb_dc_freq/actual_rx_rate); + + //bounds and results from searching + double dc_i_start = -.01, dc_i_stop = .01, dc_i_step; + double dc_q_start = -.01, dc_q_stop = .01, dc_q_step; + double lowest_offset = 0, best_dc_i = 0, best_dc_q = 0; + + for (size_t i = 0; i < num_search_iters; i++){ + + dc_i_step = (dc_i_stop - dc_i_start)/(num_search_steps-1); + dc_q_step = (dc_q_stop - dc_q_start)/(num_search_steps-1); + + for (double dc_i = dc_i_start; dc_i <= dc_i_stop + dc_i_step/2; dc_i += dc_i_step){ + for (double dc_q = dc_q_start; dc_q <= dc_q_stop + dc_q_step/2; dc_q += dc_q_step){ + + const std::complex correction(dc_i, dc_q); + usrp->set_tx_dc_offset(correction); + + //receive some samples + capture_samples(usrp, rx_stream, buff); + + const double dc_dbrms = compute_tone_dbrms(buff, bb_dc_freq/actual_rx_rate); + + if (dc_dbrms < lowest_offset){ + lowest_offset = dc_dbrms; + best_dc_i = dc_i; + best_dc_q = dc_q; + } + + }} + + //std::cout << "best_dc_i " << best_dc_i << std::endl; + //std::cout << "best_dc_q " << best_dc_q << std::endl; + //std::cout << "lowest_offset " << lowest_offset << std::endl; + + dc_i_start = best_dc_i - dc_i_step; + dc_i_stop = best_dc_i + dc_i_step; + dc_q_start = best_dc_q - dc_q_step; + dc_q_stop = best_dc_q + dc_q_step; + } + + if (lowest_offset < -90){ //most likely valid, keep result + result_t result; + result.freq = tx_lo; + result.real_corr = best_dc_i; + result.imag_corr = best_dc_q; + result.best = lowest_offset; + 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; + } + else std::cout << "." << std::flush; + } + + } + std::cout << std::endl; + + //stop the transmitter + threads.interrupt_all(); + threads.join_all(); + + store_results(usrp, results, "TX", "tx", "dc"); + + return 0; +} diff --git a/host/utils/usrp_cal_tx_iq_balance.cpp b/host/utils/usrp_cal_tx_iq_balance.cpp new file mode 100644 index 000000000..c7cda49c7 --- /dev/null +++ b/host/utils/usrp_cal_tx_iq_balance.cpp @@ -0,0 +1,267 @@ +// +// Copyright 2010 Ettus Research LLC +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// + +#include "usrp_cal_utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace po = boost::program_options; + +/*********************************************************************** + * Transmit thread + **********************************************************************/ +static void tx_thread(uhd::usrp::multi_usrp::sptr usrp, const double tx_wave_freq, const double tx_wave_ampl){ + uhd::set_thread_priority_safe(); + + //create a transmit streamer + uhd::stream_args_t stream_args("fc32"); //complex floats + uhd::tx_streamer::sptr tx_stream = usrp->get_tx_stream(stream_args); + + //setup variables and allocate buffer + uhd::tx_metadata_t md; + md.has_time_spec = false; + std::vector > buff(tx_stream->get_max_num_samps()*10); + + //values for the wave table lookup + size_t index = 0; + const double tx_rate = usrp->get_tx_rate(); + const size_t step = boost::math::iround(wave_table_len * tx_wave_freq/tx_rate); + + //fill buff and send until interrupted + while (not boost::this_thread::interruption_requested()){ + for (size_t i = 0; i < buff.size(); i++){ + buff[i] = float(tx_wave_ampl) * wave_table_lookup(index += step); + } + tx_stream->send(&buff.front(), buff.size(), md); + } + + //send a mini EOB packet + md.end_of_burst = true; + tx_stream->send("", 0, md); +} + +/*********************************************************************** + * Tune RX and TX routine + **********************************************************************/ +static double tune_rx_and_tx(uhd::usrp::multi_usrp::sptr usrp, const double tx_lo_freq, const double rx_offset){ + //tune the transmitter with no cordic + uhd::tune_request_t tx_tune_req(tx_lo_freq); + tx_tune_req.dsp_freq_policy = uhd::tune_request_t::POLICY_MANUAL; + tx_tune_req.dsp_freq = 0; + usrp->set_tx_freq(tx_tune_req); + + //tune the receiver + usrp->set_rx_freq(usrp->get_tx_freq() - rx_offset); + + //wait for the LOs to become locked + boost::this_thread::sleep(boost::posix_time::milliseconds(50)); + boost::system_time start = boost::get_system_time(); + while (not usrp->get_tx_sensor("lo_locked").to_bool() or not usrp->get_rx_sensor("lo_locked").to_bool()){ + if (boost::get_system_time() > start + boost::posix_time::milliseconds(100)){ + throw std::runtime_error("timed out waiting for TX and/or RX LO to lock"); + } + } + + return usrp->get_tx_freq(); +} + +/*********************************************************************** + * Data capture routine + **********************************************************************/ +static void capture_samples(uhd::usrp::multi_usrp::sptr usrp, uhd::rx_streamer::sptr rx_stream, std::vector > &buff){ + uhd::stream_cmd_t stream_cmd(uhd::stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_DONE); + stream_cmd.num_samps = buff.size(); + stream_cmd.stream_now = true; + usrp->issue_stream_cmd(stream_cmd); + uhd::rx_metadata_t md; + const size_t num_rx_samps = rx_stream->recv(&buff.front(), buff.size(), md); + + //validate the received data + if (md.error_code != uhd::rx_metadata_t::ERROR_CODE_NONE){ + throw std::runtime_error(str(boost::format( + "Unexpected error code 0x%x" + ) % md.error_code)); + } + if (num_rx_samps != buff.size()){ + throw std::runtime_error("did not get all the samples requested"); + } +} + +/*********************************************************************** + * Main + **********************************************************************/ +int UHD_SAFE_MAIN(int argc, char *argv[]){ + std::string args; + double rate, tx_wave_freq, tx_wave_ampl, rx_offset, freq_step, tx_gain, rx_gain; + size_t nsamps; + + po::options_description desc("Allowed options"); + desc.add_options() + ("help", "help message") + ("verbose", "enable some verbose") + ("args", po::value(&args)->default_value(""), "device address args [default = \"\"]") + ("rate", po::value(&rate)->default_value(12.5e6), "RX and TX sample rate in Hz") + ("tx_wave_freq", po::value(&tx_wave_freq)->default_value(507.123e3), "Transmit wave frequency in Hz") + ("tx_wave_ampl", po::value(&tx_wave_ampl)->default_value(0.7), "Transmit wave amplitude in counts") + ("rx_offset", po::value(&rx_offset)->default_value(.9344e6), "RX LO offset from the TX LO in Hz") + ("tx_gain", po::value(&tx_gain)->default_value(0), "TX gain in dB") + ("rx_gain", po::value(&rx_gain)->default_value(0), "RX gain in dB") + ("freq_step", po::value(&freq_step)->default_value(default_freq_step), "Step size for LO sweep in Hz") + ("nsamps", po::value(&nsamps)->default_value(default_num_samps), "Samples per data capture") + ; + + po::variables_map vm; + po::store(po::parse_command_line(argc, argv, desc), vm); + po::notify(vm); + + //print the help message + if (vm.count("help")){ + std::cout << boost::format("USRP Generate TX IQ Balance Calibration Table %s") % desc << std::endl; + std::cout << + "This application measures leakage between RX and TX on an XCVR daughterboard to self-calibrate.\n" + << std::endl; + return ~0; + } + + //create a usrp device + std::cout << std::endl; + std::cout << boost::format("Creating the usrp device with: %s...") % args << std::endl; + uhd::usrp::multi_usrp::sptr usrp = uhd::usrp::multi_usrp::make(args); + + //set the antennas to cal + if (not uhd::has(usrp->get_rx_antennas(), "CAL") or not uhd::has(usrp->get_tx_antennas(), "CAL")){ + throw std::runtime_error("This board does not have the CAL antenna option, cannot self-calibrate."); + } + usrp->set_rx_antenna("CAL"); + usrp->set_tx_antenna("CAL"); + + //set the sample rates + usrp->set_rx_rate(rate); + usrp->set_tx_rate(rate); + + //set midrange rx gain, default 0 tx gain + usrp->set_tx_gain(tx_gain); + usrp->set_rx_gain(rx_gain); + + //create a receive streamer + uhd::stream_args_t stream_args("fc32"); //complex floats + uhd::rx_streamer::sptr rx_stream = usrp->get_rx_stream(stream_args); + + //create a transmitter thread + boost::thread_group threads; + threads.create_thread(boost::bind(&tx_thread, usrp, tx_wave_freq, tx_wave_ampl)); + + //re-usable buffer for samples + std::vector > buff(nsamps); + + //store the results here + std::vector results; + + const uhd::meta_range_t freq_range = usrp->get_tx_freq_range(); + for (double tx_lo_i = freq_range.start()+50e6; tx_lo_i < freq_range.stop()-50e6; tx_lo_i += freq_step){ + const double tx_lo = tune_rx_and_tx(usrp, tx_lo_i, rx_offset); + + //frequency constants for this tune event + const double actual_rx_rate = usrp->get_rx_rate(); + const double actual_tx_freq = usrp->get_tx_freq(); + const double actual_rx_freq = usrp->get_rx_freq(); + const double bb_tone_freq = actual_tx_freq + tx_wave_freq - actual_rx_freq; + const double bb_imag_freq = actual_tx_freq - tx_wave_freq - actual_rx_freq; + + //capture initial uncorrected value + usrp->set_tx_iq_balance(std::polar(1.0, 0.0)); + capture_samples(usrp, rx_stream, buff); + const double initial_suppression = compute_tone_dbrms(buff, bb_tone_freq/actual_rx_rate) - compute_tone_dbrms(buff, bb_imag_freq/actual_rx_rate); + + //bounds and results from searching + std::complex best_correction; + double phase_corr_start = -.3, phase_corr_stop = .3, phase_corr_step; + double ampl_corr_start = -.3, ampl_corr_stop = .3, ampl_corr_step; + double best_suppression = 0, best_phase_corr = 0, best_ampl_corr = 0; + + for (size_t i = 0; i < num_search_iters; i++){ + + phase_corr_step = (phase_corr_stop - phase_corr_start)/(num_search_steps-1); + ampl_corr_step = (ampl_corr_stop - ampl_corr_start)/(num_search_steps-1); + + for (double phase_corr = phase_corr_start; phase_corr <= phase_corr_stop + phase_corr_step/2; phase_corr += phase_corr_step){ + for (double ampl_corr = ampl_corr_start; ampl_corr <= ampl_corr_stop + ampl_corr_step/2; ampl_corr += ampl_corr_step){ + + const std::complex correction = std::polar(ampl_corr+1, phase_corr*tau); + usrp->set_tx_iq_balance(correction); + + //receive some samples + capture_samples(usrp, rx_stream, buff); + + const double tone_dbrms = compute_tone_dbrms(buff, bb_tone_freq/actual_rx_rate); + const double imag_dbrms = compute_tone_dbrms(buff, bb_imag_freq/actual_rx_rate); + const double suppression = tone_dbrms - imag_dbrms; + + if (suppression > best_suppression){ + best_correction = correction; + best_suppression = suppression; + best_phase_corr = phase_corr; + best_ampl_corr = ampl_corr; + } + + }} + + //std::cout << "best_phase_corr " << best_phase_corr << std::endl; + //std::cout << "best_ampl_corr " << best_ampl_corr << std::endl; + //std::cout << "best_suppression " << best_suppression << std::endl; + + phase_corr_start = best_phase_corr - phase_corr_step; + phase_corr_stop = best_phase_corr + phase_corr_step; + ampl_corr_start = best_ampl_corr - ampl_corr_step; + ampl_corr_stop = best_ampl_corr + ampl_corr_step; + } + + if (best_suppression > 30){ //most likely valid, keep result + result_t result; + result.freq = tx_lo; + result.real_corr = best_correction.real(); + result.imag_corr = best_correction.imag(); + result.best = best_suppression; + 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; + } + else std::cout << "." << std::flush; + } + + } + std::cout << std::endl; + + //stop the transmitter + threads.interrupt_all(); + threads.join_all(); + + store_results(usrp, results, "TX", "tx", "iq"); + + return 0; +} diff --git a/host/utils/usrp_cal_utils.hpp b/host/utils/usrp_cal_utils.hpp index c9695d305..c08d869ed 100644 --- a/host/utils/usrp_cal_utils.hpp +++ b/host/utils/usrp_cal_utils.hpp @@ -39,7 +39,7 @@ static const size_t wave_table_len = 8192; static const size_t num_search_steps = 5; static const size_t num_search_iters = 7; static const size_t skip_initial_samps = 20; -static const double default_freq_step = 13.7e3; +static const double default_freq_step = 13.7e6; static const size_t default_num_samps = 10000; /*********************************************************************** diff --git a/host/utils/usrp_gen_rx_iq_cal_table.cpp b/host/utils/usrp_gen_rx_iq_cal_table.cpp deleted file mode 100644 index 71c447e65..000000000 --- a/host/utils/usrp_gen_rx_iq_cal_table.cpp +++ /dev/null @@ -1,265 +0,0 @@ -// -// Copyright 2010 Ettus Research LLC -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -// - -#include "usrp_cal_utils.hpp" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace po = boost::program_options; - -/*********************************************************************** - * Transmit thread - **********************************************************************/ -static void tx_thread(uhd::usrp::multi_usrp::sptr usrp, const double tx_wave_ampl){ - uhd::set_thread_priority_safe(); - - //create a transmit streamer - uhd::stream_args_t stream_args("fc32"); //complex floats - uhd::tx_streamer::sptr tx_stream = usrp->get_tx_stream(stream_args); - - //setup variables and allocate buffer - uhd::tx_metadata_t md; - md.has_time_spec = false; - std::vector > buff(tx_stream->get_max_num_samps()*10); - - //fill buff and send until interrupted - while (not boost::this_thread::interruption_requested()){ - for (size_t i = 0; i < buff.size(); i++){ - buff[i] = float(tx_wave_ampl); - } - tx_stream->send(&buff.front(), buff.size(), md); - } - - //send a mini EOB packet - md.end_of_burst = true; - tx_stream->send("", 0, md); -} - -/*********************************************************************** - * Tune RX and TX routine - **********************************************************************/ -static double tune_rx_and_tx(uhd::usrp::multi_usrp::sptr usrp, const double rx_lo_freq, const double tx_offset){ - //tune the receiver with no cordic - uhd::tune_request_t rx_tune_req(rx_lo_freq); - rx_tune_req.dsp_freq_policy = uhd::tune_request_t::POLICY_MANUAL; - rx_tune_req.dsp_freq = 0; - usrp->set_rx_freq(rx_tune_req); - - //tune the transmitter with no cordic - uhd::tune_request_t tx_tune_req(usrp->get_rx_freq() - tx_offset); - tx_tune_req.dsp_freq_policy = uhd::tune_request_t::POLICY_MANUAL; - tx_tune_req.dsp_freq = 0; - usrp->set_tx_freq(tx_tune_req); - - //wait for the LOs to become locked - boost::this_thread::sleep(boost::posix_time::milliseconds(50)); - boost::system_time start = boost::get_system_time(); - while (not usrp->get_tx_sensor("lo_locked").to_bool() or not usrp->get_rx_sensor("lo_locked").to_bool()){ - if (boost::get_system_time() > start + boost::posix_time::milliseconds(100)){ - throw std::runtime_error("timed out waiting for TX and/or RX LO to lock"); - } - } - - return usrp->get_rx_freq(); -} - -/*********************************************************************** - * Data capture routine - **********************************************************************/ -static void capture_samples(uhd::usrp::multi_usrp::sptr usrp, uhd::rx_streamer::sptr rx_stream, std::vector > &buff){ - uhd::stream_cmd_t stream_cmd(uhd::stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_DONE); - stream_cmd.num_samps = buff.size(); - stream_cmd.stream_now = true; - usrp->issue_stream_cmd(stream_cmd); - uhd::rx_metadata_t md; - const size_t num_rx_samps = rx_stream->recv(&buff.front(), buff.size(), md); - - //validate the received data - if (md.error_code != uhd::rx_metadata_t::ERROR_CODE_NONE){ - throw std::runtime_error(str(boost::format( - "Unexpected error code 0x%x" - ) % md.error_code)); - } - if (num_rx_samps != buff.size()){ - throw std::runtime_error("did not get all the samples requested"); - } -} - -/*********************************************************************** - * Main - **********************************************************************/ -int UHD_SAFE_MAIN(int argc, char *argv[]){ - std::string args; - double rate, tx_wave_ampl, tx_offset, freq_step, tx_gain, rx_gain; - size_t nsamps; - - po::options_description desc("Allowed options"); - desc.add_options() - ("help", "help message") - ("verbose", "enable some verbose") - ("args", po::value(&args)->default_value(""), "device address args [default = \"\"]") - ("rate", po::value(&rate)->default_value(12.5e6), "RX and TX sample rate in Hz") - ("tx_wave_ampl", po::value(&tx_wave_ampl)->default_value(0.7), "Transmit wave amplitude in counts") - ("tx_offset", po::value(&tx_offset)->default_value(.9344e6), "TX LO offset from the RX LO in Hz") - ("tx_gain", po::value(&tx_gain)->default_value(0), "TX gain in dB") - ("rx_gain", po::value(&rx_gain)->default_value(0), "RX gain in dB") - ("freq_step", po::value(&freq_step)->default_value(default_freq_step), "Step size for LO sweep in Hz") - ("nsamps", po::value(&nsamps)->default_value(default_num_samps), "Samples per data capture") - ; - - po::variables_map vm; - po::store(po::parse_command_line(argc, argv, desc), vm); - po::notify(vm); - - //print the help message - if (vm.count("help")){ - std::cout << boost::format("USRP Generate RX Frontend Calibration Table %s") % desc << std::endl; - std::cout << - "This application measures leakage between RX and TX on an XCVR daughterboard to self-calibrate.\n" - << std::endl; - return ~0; - } - - //create a usrp device - std::cout << std::endl; - std::cout << boost::format("Creating the usrp device with: %s...") % args << std::endl; - uhd::usrp::multi_usrp::sptr usrp = uhd::usrp::multi_usrp::make(args); - - //set the antennas to cal - if (not uhd::has(usrp->get_rx_antennas(), "CAL") or not uhd::has(usrp->get_tx_antennas(), "CAL")){ - throw std::runtime_error("This board does not have the CAL antenna option, cannot self-calibrate."); - } - usrp->set_rx_antenna("CAL"); - usrp->set_tx_antenna("CAL"); - - //set the sample rates - usrp->set_rx_rate(rate); - usrp->set_tx_rate(rate); - - //set midrange rx gain, default 0 tx gain - usrp->set_tx_gain(tx_gain); - usrp->set_rx_gain(rx_gain); - - //create a receive streamer - uhd::stream_args_t stream_args("fc32"); //complex floats - uhd::rx_streamer::sptr rx_stream = usrp->get_rx_stream(stream_args); - - //create a transmitter thread - boost::thread_group threads; - threads.create_thread(boost::bind(&tx_thread, usrp, tx_wave_ampl)); - - //re-usable buffer for samples - std::vector > buff(nsamps); - - //store the results here - std::vector results; - - const uhd::meta_range_t freq_range = usrp->get_rx_freq_range(); - for (double rx_lo_i = freq_range.start()+50e6; rx_lo_i < freq_range.stop()-50e6; rx_lo_i += freq_step){ - const double rx_lo = tune_rx_and_tx(usrp, rx_lo_i, tx_offset); - - //frequency constants for this tune event - const double actual_rx_rate = usrp->get_rx_rate(); - const double actual_tx_freq = usrp->get_tx_freq(); - const double actual_rx_freq = usrp->get_rx_freq(); - const double bb_tone_freq = actual_tx_freq - actual_rx_freq; - const double bb_imag_freq = -bb_tone_freq; - - //capture initial uncorrected value - usrp->set_rx_iq_balance(std::polar(1.0, 0.0)); - capture_samples(usrp, rx_stream, buff); - const double initial_suppression = compute_tone_dbrms(buff, bb_tone_freq/actual_rx_rate) - compute_tone_dbrms(buff, bb_imag_freq/actual_rx_rate); - - //bounds and results from searching - std::complex best_correction; - double phase_corr_start = -.3, phase_corr_stop = .3, phase_corr_step; - double ampl_corr_start = -.3, ampl_corr_stop = .3, ampl_corr_step; - double best_suppression = 0, best_phase_corr = 0, best_ampl_corr = 0; - - for (size_t i = 0; i < num_search_iters; i++){ - - phase_corr_step = (phase_corr_stop - phase_corr_start)/(num_search_steps-1); - ampl_corr_step = (ampl_corr_stop - ampl_corr_start)/(num_search_steps-1); - - for (double phase_corr = phase_corr_start; phase_corr <= phase_corr_stop + phase_corr_step/2; phase_corr += phase_corr_step){ - for (double ampl_corr = ampl_corr_start; ampl_corr <= ampl_corr_stop + ampl_corr_step/2; ampl_corr += ampl_corr_step){ - - const std::complex correction = std::polar(ampl_corr+1, phase_corr*tau); - usrp->set_rx_iq_balance(correction); - - //receive some samples - capture_samples(usrp, rx_stream, buff); - - const double tone_dbrms = compute_tone_dbrms(buff, bb_tone_freq/actual_rx_rate); - const double imag_dbrms = compute_tone_dbrms(buff, bb_imag_freq/actual_rx_rate); - const double suppression = tone_dbrms - imag_dbrms; - - if (suppression > best_suppression){ - best_correction = correction; - best_suppression = suppression; - best_phase_corr = phase_corr; - best_ampl_corr = ampl_corr; - } - - }} - - //std::cout << "best_phase_corr " << best_phase_corr << std::endl; - //std::cout << "best_ampl_corr " << best_ampl_corr << std::endl; - //std::cout << "best_suppression " << best_suppression << std::endl; - - phase_corr_start = best_phase_corr - phase_corr_step; - phase_corr_stop = best_phase_corr + phase_corr_step; - ampl_corr_start = best_ampl_corr - ampl_corr_step; - ampl_corr_stop = best_ampl_corr + ampl_corr_step; - } - - if (best_suppression > 30){ //most likely valid, keep result - result_t result; - result.freq = rx_lo; - result.real_corr = best_correction.real(); - result.imag_corr = best_correction.imag(); - result.best = best_suppression; - 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; - } - else std::cout << "." << std::flush; - } - - } - std::cout << std::endl; - - //stop the transmitter - threads.interrupt_all(); - threads.join_all(); - - store_results(usrp, results, "RX", "rx", "iq"); - - return 0; -} diff --git a/host/utils/usrp_gen_tx_dc_cal_table.cpp b/host/utils/usrp_gen_tx_dc_cal_table.cpp deleted file mode 100644 index 570203496..000000000 --- a/host/utils/usrp_gen_tx_dc_cal_table.cpp +++ /dev/null @@ -1,262 +0,0 @@ -// -// Copyright 2010 Ettus Research LLC -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -// - -#include "usrp_cal_utils.hpp" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace po = boost::program_options; - -/*********************************************************************** - * Transmit thread - **********************************************************************/ -static void tx_thread(uhd::usrp::multi_usrp::sptr usrp, const double tx_wave_freq, const double tx_wave_ampl){ - uhd::set_thread_priority_safe(); - - //create a transmit streamer - uhd::stream_args_t stream_args("fc32"); //complex floats - uhd::tx_streamer::sptr tx_stream = usrp->get_tx_stream(stream_args); - - //setup variables and allocate buffer - uhd::tx_metadata_t md; - md.has_time_spec = false; - std::vector > buff(tx_stream->get_max_num_samps()*10); - - //values for the wave table lookup - size_t index = 0; - const double tx_rate = usrp->get_tx_rate(); - const size_t step = boost::math::iround(wave_table_len * tx_wave_freq/tx_rate); - - //fill buff and send until interrupted - while (not boost::this_thread::interruption_requested()){ - for (size_t i = 0; i < buff.size(); i++){ - buff[i] = float(tx_wave_ampl) * wave_table_lookup(index += step); - } - tx_stream->send(&buff.front(), buff.size(), md); - } - - //send a mini EOB packet - md.end_of_burst = true; - tx_stream->send("", 0, md); -} - -/*********************************************************************** - * Tune RX and TX routine - **********************************************************************/ -static double tune_rx_and_tx(uhd::usrp::multi_usrp::sptr usrp, const double tx_lo_freq, const double rx_offset){ - //tune the transmitter with no cordic - uhd::tune_request_t tx_tune_req(tx_lo_freq); - tx_tune_req.dsp_freq_policy = uhd::tune_request_t::POLICY_MANUAL; - tx_tune_req.dsp_freq = 0; - usrp->set_tx_freq(tx_tune_req); - - //tune the receiver - usrp->set_rx_freq(usrp->get_tx_freq() - rx_offset); - - //wait for the LOs to become locked - boost::this_thread::sleep(boost::posix_time::milliseconds(50)); - boost::system_time start = boost::get_system_time(); - while (not usrp->get_tx_sensor("lo_locked").to_bool() or not usrp->get_rx_sensor("lo_locked").to_bool()){ - if (boost::get_system_time() > start + boost::posix_time::milliseconds(100)){ - throw std::runtime_error("timed out waiting for TX and/or RX LO to lock"); - } - } - - return usrp->get_tx_freq(); -} - -/*********************************************************************** - * Data capture routine - **********************************************************************/ -static void capture_samples(uhd::usrp::multi_usrp::sptr usrp, uhd::rx_streamer::sptr rx_stream, std::vector > &buff){ - uhd::stream_cmd_t stream_cmd(uhd::stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_DONE); - stream_cmd.num_samps = buff.size(); - stream_cmd.stream_now = true; - usrp->issue_stream_cmd(stream_cmd); - uhd::rx_metadata_t md; - const size_t num_rx_samps = rx_stream->recv(&buff.front(), buff.size(), md); - - //validate the received data - if (md.error_code != uhd::rx_metadata_t::ERROR_CODE_NONE){ - throw std::runtime_error(str(boost::format( - "Unexpected error code 0x%x" - ) % md.error_code)); - } - if (num_rx_samps != buff.size()){ - throw std::runtime_error("did not get all the samples requested"); - } -} - -/*********************************************************************** - * Main - **********************************************************************/ -int UHD_SAFE_MAIN(int argc, char *argv[]){ - std::string args; - double rate, tx_wave_freq, tx_wave_ampl, rx_offset, freq_step, tx_gain, rx_gain; - size_t nsamps; - - po::options_description desc("Allowed options"); - desc.add_options() - ("help", "help message") - ("verbose", "enable some verbose") - ("args", po::value(&args)->default_value(""), "device address args [default = \"\"]") - ("rate", po::value(&rate)->default_value(12.5e6), "RX and TX sample rate in Hz") - ("tx_wave_freq", po::value(&tx_wave_freq)->default_value(507.123e3), "Transmit wave frequency in Hz") - ("tx_wave_ampl", po::value(&tx_wave_ampl)->default_value(0.7), "Transmit wave amplitude in counts") - ("rx_offset", po::value(&rx_offset)->default_value(.9344e6), "RX LO offset from the TX LO in Hz") - ("tx_gain", po::value(&tx_gain)->default_value(0), "TX gain in dB") - ("rx_gain", po::value(&rx_gain)->default_value(0), "RX gain in dB") - ("freq_step", po::value(&freq_step)->default_value(default_freq_step), "Step size for LO sweep in Hz") - ("nsamps", po::value(&nsamps)->default_value(default_num_samps), "Samples per data capture") - ; - - po::variables_map vm; - po::store(po::parse_command_line(argc, argv, desc), vm); - po::notify(vm); - - //print the help message - if (vm.count("help")){ - std::cout << boost::format("USRP Generate TX Frontend Calibration Table %s") % desc << std::endl; - std::cout << - "This application measures leakage between RX and TX on an XCVR daughterboard to self-calibrate.\n" - << std::endl; - return ~0; - } - - //create a usrp device - std::cout << std::endl; - std::cout << boost::format("Creating the usrp device with: %s...") % args << std::endl; - uhd::usrp::multi_usrp::sptr usrp = uhd::usrp::multi_usrp::make(args); - - //set the antennas to cal - if (not uhd::has(usrp->get_rx_antennas(), "CAL") or not uhd::has(usrp->get_tx_antennas(), "CAL")){ - throw std::runtime_error("This board does not have the CAL antenna option, cannot self-calibrate."); - } - usrp->set_rx_antenna("CAL"); - usrp->set_tx_antenna("CAL"); - - //set the sample rates - usrp->set_rx_rate(rate); - usrp->set_tx_rate(rate); - - //set midrange rx gain, default 0 tx gain - usrp->set_tx_gain(tx_gain); - usrp->set_rx_gain(rx_gain); - - //create a receive streamer - uhd::stream_args_t stream_args("fc32"); //complex floats - uhd::rx_streamer::sptr rx_stream = usrp->get_rx_stream(stream_args); - - //create a transmitter thread - boost::thread_group threads; - threads.create_thread(boost::bind(&tx_thread, usrp, tx_wave_freq, tx_wave_ampl)); - - //re-usable buffer for samples - std::vector > buff(nsamps); - - //store the results here - std::vector results; - - const uhd::meta_range_t freq_range = usrp->get_tx_freq_range(); - for (double tx_lo_i = freq_range.start()+50e6; tx_lo_i < freq_range.stop()-50e6; tx_lo_i += freq_step){ - const double tx_lo = tune_rx_and_tx(usrp, tx_lo_i, rx_offset); - - //frequency constants for this tune event - const double actual_rx_rate = usrp->get_rx_rate(); - const double actual_tx_freq = usrp->get_tx_freq(); - const double actual_rx_freq = usrp->get_rx_freq(); - const double bb_dc_freq = actual_tx_freq - actual_rx_freq; - - //capture initial uncorrected value - usrp->set_tx_dc_offset(std::complex(0, 0)); - capture_samples(usrp, rx_stream, buff); - const double initial_dc_dbrms = compute_tone_dbrms(buff, bb_dc_freq/actual_rx_rate); - - //bounds and results from searching - double dc_i_start = -.01, dc_i_stop = .01, dc_i_step; - double dc_q_start = -.01, dc_q_stop = .01, dc_q_step; - double lowest_offset = 0, best_dc_i = 0, best_dc_q = 0; - - for (size_t i = 0; i < num_search_iters; i++){ - - dc_i_step = (dc_i_stop - dc_i_start)/(num_search_steps-1); - dc_q_step = (dc_q_stop - dc_q_start)/(num_search_steps-1); - - for (double dc_i = dc_i_start; dc_i <= dc_i_stop + dc_i_step/2; dc_i += dc_i_step){ - for (double dc_q = dc_q_start; dc_q <= dc_q_stop + dc_q_step/2; dc_q += dc_q_step){ - - const std::complex correction(dc_i, dc_q); - usrp->set_tx_dc_offset(correction); - - //receive some samples - capture_samples(usrp, rx_stream, buff); - - const double dc_dbrms = compute_tone_dbrms(buff, bb_dc_freq/actual_rx_rate); - - if (dc_dbrms < lowest_offset){ - lowest_offset = dc_dbrms; - best_dc_i = dc_i; - best_dc_q = dc_q; - } - - }} - - //std::cout << "best_dc_i " << best_dc_i << std::endl; - //std::cout << "best_dc_q " << best_dc_q << std::endl; - //std::cout << "lowest_offset " << lowest_offset << std::endl; - - dc_i_start = best_dc_i - dc_i_step; - dc_i_stop = best_dc_i + dc_i_step; - dc_q_start = best_dc_q - dc_q_step; - dc_q_stop = best_dc_q + dc_q_step; - } - - if (lowest_offset < -90){ //most likely valid, keep result - result_t result; - result.freq = tx_lo; - result.real_corr = best_dc_i; - result.imag_corr = best_dc_q; - result.best = lowest_offset; - 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; - } - else std::cout << "." << std::flush; - } - - } - std::cout << std::endl; - - //stop the transmitter - threads.interrupt_all(); - threads.join_all(); - - store_results(usrp, results, "TX", "tx", "dc"); - - return 0; -} diff --git a/host/utils/usrp_gen_tx_iq_cal_table.cpp b/host/utils/usrp_gen_tx_iq_cal_table.cpp deleted file mode 100644 index a2b98d8e6..000000000 --- a/host/utils/usrp_gen_tx_iq_cal_table.cpp +++ /dev/null @@ -1,267 +0,0 @@ -// -// Copyright 2010 Ettus Research LLC -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -// - -#include "usrp_cal_utils.hpp" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace po = boost::program_options; - -/*********************************************************************** - * Transmit thread - **********************************************************************/ -static void tx_thread(uhd::usrp::multi_usrp::sptr usrp, const double tx_wave_freq, const double tx_wave_ampl){ - uhd::set_thread_priority_safe(); - - //create a transmit streamer - uhd::stream_args_t stream_args("fc32"); //complex floats - uhd::tx_streamer::sptr tx_stream = usrp->get_tx_stream(stream_args); - - //setup variables and allocate buffer - uhd::tx_metadata_t md; - md.has_time_spec = false; - std::vector > buff(tx_stream->get_max_num_samps()*10); - - //values for the wave table lookup - size_t index = 0; - const double tx_rate = usrp->get_tx_rate(); - const size_t step = boost::math::iround(wave_table_len * tx_wave_freq/tx_rate); - - //fill buff and send until interrupted - while (not boost::this_thread::interruption_requested()){ - for (size_t i = 0; i < buff.size(); i++){ - buff[i] = float(tx_wave_ampl) * wave_table_lookup(index += step); - } - tx_stream->send(&buff.front(), buff.size(), md); - } - - //send a mini EOB packet - md.end_of_burst = true; - tx_stream->send("", 0, md); -} - -/*********************************************************************** - * Tune RX and TX routine - **********************************************************************/ -static double tune_rx_and_tx(uhd::usrp::multi_usrp::sptr usrp, const double tx_lo_freq, const double rx_offset){ - //tune the transmitter with no cordic - uhd::tune_request_t tx_tune_req(tx_lo_freq); - tx_tune_req.dsp_freq_policy = uhd::tune_request_t::POLICY_MANUAL; - tx_tune_req.dsp_freq = 0; - usrp->set_tx_freq(tx_tune_req); - - //tune the receiver - usrp->set_rx_freq(usrp->get_tx_freq() - rx_offset); - - //wait for the LOs to become locked - boost::this_thread::sleep(boost::posix_time::milliseconds(50)); - boost::system_time start = boost::get_system_time(); - while (not usrp->get_tx_sensor("lo_locked").to_bool() or not usrp->get_rx_sensor("lo_locked").to_bool()){ - if (boost::get_system_time() > start + boost::posix_time::milliseconds(100)){ - throw std::runtime_error("timed out waiting for TX and/or RX LO to lock"); - } - } - - return usrp->get_tx_freq(); -} - -/*********************************************************************** - * Data capture routine - **********************************************************************/ -static void capture_samples(uhd::usrp::multi_usrp::sptr usrp, uhd::rx_streamer::sptr rx_stream, std::vector > &buff){ - uhd::stream_cmd_t stream_cmd(uhd::stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_DONE); - stream_cmd.num_samps = buff.size(); - stream_cmd.stream_now = true; - usrp->issue_stream_cmd(stream_cmd); - uhd::rx_metadata_t md; - const size_t num_rx_samps = rx_stream->recv(&buff.front(), buff.size(), md); - - //validate the received data - if (md.error_code != uhd::rx_metadata_t::ERROR_CODE_NONE){ - throw std::runtime_error(str(boost::format( - "Unexpected error code 0x%x" - ) % md.error_code)); - } - if (num_rx_samps != buff.size()){ - throw std::runtime_error("did not get all the samples requested"); - } -} - -/*********************************************************************** - * Main - **********************************************************************/ -int UHD_SAFE_MAIN(int argc, char *argv[]){ - std::string args; - double rate, tx_wave_freq, tx_wave_ampl, rx_offset, freq_step, tx_gain, rx_gain; - size_t nsamps; - - po::options_description desc("Allowed options"); - desc.add_options() - ("help", "help message") - ("verbose", "enable some verbose") - ("args", po::value(&args)->default_value(""), "device address args [default = \"\"]") - ("rate", po::value(&rate)->default_value(12.5e6), "RX and TX sample rate in Hz") - ("tx_wave_freq", po::value(&tx_wave_freq)->default_value(507.123e3), "Transmit wave frequency in Hz") - ("tx_wave_ampl", po::value(&tx_wave_ampl)->default_value(0.7), "Transmit wave amplitude in counts") - ("rx_offset", po::value(&rx_offset)->default_value(.9344e6), "RX LO offset from the TX LO in Hz") - ("tx_gain", po::value(&tx_gain)->default_value(0), "TX gain in dB") - ("rx_gain", po::value(&rx_gain)->default_value(0), "RX gain in dB") - ("freq_step", po::value(&freq_step)->default_value(default_freq_step), "Step size for LO sweep in Hz") - ("nsamps", po::value(&nsamps)->default_value(default_num_samps), "Samples per data capture") - ; - - po::variables_map vm; - po::store(po::parse_command_line(argc, argv, desc), vm); - po::notify(vm); - - //print the help message - if (vm.count("help")){ - std::cout << boost::format("USRP Generate TX Frontend Calibration Table %s") % desc << std::endl; - std::cout << - "This application measures leakage between RX and TX on an XCVR daughterboard to self-calibrate.\n" - << std::endl; - return ~0; - } - - //create a usrp device - std::cout << std::endl; - std::cout << boost::format("Creating the usrp device with: %s...") % args << std::endl; - uhd::usrp::multi_usrp::sptr usrp = uhd::usrp::multi_usrp::make(args); - - //set the antennas to cal - if (not uhd::has(usrp->get_rx_antennas(), "CAL") or not uhd::has(usrp->get_tx_antennas(), "CAL")){ - throw std::runtime_error("This board does not have the CAL antenna option, cannot self-calibrate."); - } - usrp->set_rx_antenna("CAL"); - usrp->set_tx_antenna("CAL"); - - //set the sample rates - usrp->set_rx_rate(rate); - usrp->set_tx_rate(rate); - - //set midrange rx gain, default 0 tx gain - usrp->set_tx_gain(tx_gain); - usrp->set_rx_gain(rx_gain); - - //create a receive streamer - uhd::stream_args_t stream_args("fc32"); //complex floats - uhd::rx_streamer::sptr rx_stream = usrp->get_rx_stream(stream_args); - - //create a transmitter thread - boost::thread_group threads; - threads.create_thread(boost::bind(&tx_thread, usrp, tx_wave_freq, tx_wave_ampl)); - - //re-usable buffer for samples - std::vector > buff(nsamps); - - //store the results here - std::vector results; - - const uhd::meta_range_t freq_range = usrp->get_tx_freq_range(); - for (double tx_lo_i = freq_range.start()+50e6; tx_lo_i < freq_range.stop()-50e6; tx_lo_i += freq_step){ - const double tx_lo = tune_rx_and_tx(usrp, tx_lo_i, rx_offset); - - //frequency constants for this tune event - const double actual_rx_rate = usrp->get_rx_rate(); - const double actual_tx_freq = usrp->get_tx_freq(); - const double actual_rx_freq = usrp->get_rx_freq(); - const double bb_tone_freq = actual_tx_freq + tx_wave_freq - actual_rx_freq; - const double bb_imag_freq = actual_tx_freq - tx_wave_freq - actual_rx_freq; - - //capture initial uncorrected value - usrp->set_tx_iq_balance(std::polar(1.0, 0.0)); - capture_samples(usrp, rx_stream, buff); - const double initial_suppression = compute_tone_dbrms(buff, bb_tone_freq/actual_rx_rate) - compute_tone_dbrms(buff, bb_imag_freq/actual_rx_rate); - - //bounds and results from searching - std::complex best_correction; - double phase_corr_start = -.3, phase_corr_stop = .3, phase_corr_step; - double ampl_corr_start = -.3, ampl_corr_stop = .3, ampl_corr_step; - double best_suppression = 0, best_phase_corr = 0, best_ampl_corr = 0; - - for (size_t i = 0; i < num_search_iters; i++){ - - phase_corr_step = (phase_corr_stop - phase_corr_start)/(num_search_steps-1); - ampl_corr_step = (ampl_corr_stop - ampl_corr_start)/(num_search_steps-1); - - for (double phase_corr = phase_corr_start; phase_corr <= phase_corr_stop + phase_corr_step/2; phase_corr += phase_corr_step){ - for (double ampl_corr = ampl_corr_start; ampl_corr <= ampl_corr_stop + ampl_corr_step/2; ampl_corr += ampl_corr_step){ - - const std::complex correction = std::polar(ampl_corr+1, phase_corr*tau); - usrp->set_tx_iq_balance(correction); - - //receive some samples - capture_samples(usrp, rx_stream, buff); - - const double tone_dbrms = compute_tone_dbrms(buff, bb_tone_freq/actual_rx_rate); - const double imag_dbrms = compute_tone_dbrms(buff, bb_imag_freq/actual_rx_rate); - const double suppression = tone_dbrms - imag_dbrms; - - if (suppression > best_suppression){ - best_correction = correction; - best_suppression = suppression; - best_phase_corr = phase_corr; - best_ampl_corr = ampl_corr; - } - - }} - - //std::cout << "best_phase_corr " << best_phase_corr << std::endl; - //std::cout << "best_ampl_corr " << best_ampl_corr << std::endl; - //std::cout << "best_suppression " << best_suppression << std::endl; - - phase_corr_start = best_phase_corr - phase_corr_step; - phase_corr_stop = best_phase_corr + phase_corr_step; - ampl_corr_start = best_ampl_corr - ampl_corr_step; - ampl_corr_stop = best_ampl_corr + ampl_corr_step; - } - - if (best_suppression > 30){ //most likely valid, keep result - result_t result; - result.freq = tx_lo; - result.real_corr = best_correction.real(); - result.imag_corr = best_correction.imag(); - result.best = best_suppression; - 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; - } - else std::cout << "." << std::flush; - } - - } - std::cout << std::endl; - - //stop the transmitter - threads.interrupt_all(); - threads.join_all(); - - store_results(usrp, results, "TX", "tx", "iq"); - - return 0; -} -- cgit v1.2.3 From 317bff29a5358c7bfc576359ab5a3b3fcf30ad10 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Tue, 15 Nov 2011 14:54:18 -0800 Subject: uhd: added freq options and common gain setter --- host/lib/usrp/common/apply_corrections.cpp | 6 ++++-- host/utils/usrp_cal_rx_iq_balance.cpp | 20 +++++++++++--------- host/utils/usrp_cal_tx_dc_offset.cpp | 22 ++++++++++++---------- host/utils/usrp_cal_tx_iq_balance.cpp | 20 +++++++++++--------- host/utils/usrp_cal_utils.hpp | 27 ++++++++++++++++++++++++++- 5 files changed, 64 insertions(+), 31 deletions(-) (limited to 'host/utils/usrp_cal_utils.hpp') diff --git a/host/lib/usrp/common/apply_corrections.cpp b/host/lib/usrp/common/apply_corrections.cpp index e3ec9baab..6aee00753 100644 --- a/host/lib/usrp/common/apply_corrections.cpp +++ b/host/lib/usrp/common/apply_corrections.cpp @@ -58,6 +58,7 @@ static std::complex get_fe_dc_correction( const std::string &key, const double lo_freq ){ const std::vector &datas = fe_cal_cache[key]; + if (datas.empty()) throw uhd::runtime_error("empty calibration table " + key); //search for lo freq size_t lo_index = 0; @@ -84,6 +85,7 @@ static std::complex get_fe_iq_correction( const std::string &key, const double lo_freq ){ const std::vector &datas = fe_cal_cache[key]; + if (datas.empty()) throw uhd::runtime_error("empty calibration table " + key); //search for lo freq size_t lo_index = 0; @@ -153,11 +155,11 @@ static void apply_fe_corrections( } - if (file_prefix.find("dc") != std::string::npos){ + if (file_prefix.find("dc_cal") != std::string::npos){ sub_tree->access >(fe_path) .set(get_fe_dc_correction(cal_data_path.string(), lo_freq)); } - else if (file_prefix.find("iq") != std::string::npos){ + else if (file_prefix.find("iq_cal") != std::string::npos){ sub_tree->access >(fe_path) .set(get_fe_iq_correction(cal_data_path.string(), lo_freq)); } diff --git a/host/utils/usrp_cal_rx_iq_balance.cpp b/host/utils/usrp_cal_rx_iq_balance.cpp index 7b7fdaec9..7924323a5 100644 --- a/host/utils/usrp_cal_rx_iq_balance.cpp +++ b/host/utils/usrp_cal_rx_iq_balance.cpp @@ -115,7 +115,8 @@ static void capture_samples(uhd::usrp::multi_usrp::sptr usrp, uhd::rx_streamer:: **********************************************************************/ int UHD_SAFE_MAIN(int argc, char *argv[]){ std::string args; - double rate, tx_wave_ampl, tx_offset, freq_step, tx_gain, rx_gain; + double rate, tx_wave_ampl, tx_offset; + double freq_start, freq_stop, freq_step; size_t nsamps; po::options_description desc("Allowed options"); @@ -126,8 +127,8 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ ("rate", po::value(&rate)->default_value(12.5e6), "RX and TX sample rate in Hz") ("tx_wave_ampl", po::value(&tx_wave_ampl)->default_value(0.7), "Transmit wave amplitude in counts") ("tx_offset", po::value(&tx_offset)->default_value(.9344e6), "TX LO offset from the RX LO in Hz") - ("tx_gain", po::value(&tx_gain)->default_value(0), "TX gain in dB") - ("rx_gain", po::value(&rx_gain)->default_value(0), "RX gain in dB") + ("freq_start", po::value(&freq_start), "Frequency start in Hz (do not specify for default)") + ("freq_stop", po::value(&freq_stop), "Frequency stop in Hz (do not specify for default)") ("freq_step", po::value(&freq_step)->default_value(default_freq_step), "Step size for LO sweep in Hz") ("nsamps", po::value(&nsamps)->default_value(default_num_samps), "Samples per data capture") ; @@ -157,14 +158,13 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ usrp->set_rx_antenna("CAL"); usrp->set_tx_antenna("CAL"); + //set optimum gain settings + set_optimum_gain(usrp); + //set the sample rates usrp->set_rx_rate(rate); usrp->set_tx_rate(rate); - //set midrange rx gain, default 0 tx gain - usrp->set_tx_gain(tx_gain); - usrp->set_rx_gain(rx_gain); - //create a receive streamer uhd::stream_args_t stream_args("fc32"); //complex floats uhd::rx_streamer::sptr rx_stream = usrp->get_rx_stream(stream_args); @@ -179,8 +179,10 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ //store the results here std::vector results; - const uhd::meta_range_t freq_range = usrp->get_rx_freq_range(); - for (double rx_lo_i = freq_range.start()+50e6; rx_lo_i < freq_range.stop()-50e6; rx_lo_i += freq_step){ + if (not vm.count("freq_start")) freq_start = usrp->get_rx_freq_range().start() + 50e6; + if (not vm.count("freq_stop")) freq_stop = usrp->get_rx_freq_range().stop() - 50e6; + + for (double rx_lo_i = freq_start; rx_lo_i <= freq_stop; rx_lo_i += freq_step){ const double rx_lo = tune_rx_and_tx(usrp, rx_lo_i, tx_offset); //frequency constants for this tune event diff --git a/host/utils/usrp_cal_tx_dc_offset.cpp b/host/utils/usrp_cal_tx_dc_offset.cpp index 2c75242c7..8615e231c 100644 --- a/host/utils/usrp_cal_tx_dc_offset.cpp +++ b/host/utils/usrp_cal_tx_dc_offset.cpp @@ -116,7 +116,8 @@ static void capture_samples(uhd::usrp::multi_usrp::sptr usrp, uhd::rx_streamer:: **********************************************************************/ int UHD_SAFE_MAIN(int argc, char *argv[]){ std::string args; - double rate, tx_wave_freq, tx_wave_ampl, rx_offset, freq_step, tx_gain, rx_gain; + double rate, tx_wave_freq, tx_wave_ampl, rx_offset; + double freq_start, freq_stop, freq_step; size_t nsamps; po::options_description desc("Allowed options"); @@ -128,8 +129,8 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ ("tx_wave_freq", po::value(&tx_wave_freq)->default_value(507.123e3), "Transmit wave frequency in Hz") ("tx_wave_ampl", po::value(&tx_wave_ampl)->default_value(0.7), "Transmit wave amplitude in counts") ("rx_offset", po::value(&rx_offset)->default_value(.9344e6), "RX LO offset from the TX LO in Hz") - ("tx_gain", po::value(&tx_gain)->default_value(0), "TX gain in dB") - ("rx_gain", po::value(&rx_gain)->default_value(0), "RX gain in dB") + ("freq_start", po::value(&freq_start), "Frequency start in Hz (do not specify for default)") + ("freq_stop", po::value(&freq_stop), "Frequency stop in Hz (do not specify for default)") ("freq_step", po::value(&freq_step)->default_value(default_freq_step), "Step size for LO sweep in Hz") ("nsamps", po::value(&nsamps)->default_value(default_num_samps), "Samples per data capture") ; @@ -159,14 +160,13 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ usrp->set_rx_antenna("CAL"); usrp->set_tx_antenna("CAL"); + //set optimum gain settings + set_optimum_gain(usrp); + //set the sample rates usrp->set_rx_rate(rate); usrp->set_tx_rate(rate); - //set midrange rx gain, default 0 tx gain - usrp->set_tx_gain(tx_gain); - usrp->set_rx_gain(rx_gain); - //create a receive streamer uhd::stream_args_t stream_args("fc32"); //complex floats uhd::rx_streamer::sptr rx_stream = usrp->get_rx_stream(stream_args); @@ -181,8 +181,10 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ //store the results here std::vector results; - const uhd::meta_range_t freq_range = usrp->get_tx_freq_range(); - for (double tx_lo_i = freq_range.start()+50e6; tx_lo_i < freq_range.stop()-50e6; tx_lo_i += freq_step){ + if (not vm.count("freq_start")) freq_start = usrp->get_tx_freq_range().start() + 50e6; + if (not vm.count("freq_stop")) freq_stop = usrp->get_tx_freq_range().stop() - 50e6; + + for (double tx_lo_i = freq_start; tx_lo_i <= freq_stop; tx_lo_i += freq_step){ const double tx_lo = tune_rx_and_tx(usrp, tx_lo_i, rx_offset); //frequency constants for this tune event @@ -235,7 +237,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ dc_q_stop = best_dc_q + dc_q_step; } - if (lowest_offset < -90){ //most likely valid, keep result + if (lowest_offset < initial_dc_dbrms){ //most likely valid, keep result result_t result; result.freq = tx_lo; result.real_corr = best_dc_i; diff --git a/host/utils/usrp_cal_tx_iq_balance.cpp b/host/utils/usrp_cal_tx_iq_balance.cpp index c7cda49c7..29b6f5ede 100644 --- a/host/utils/usrp_cal_tx_iq_balance.cpp +++ b/host/utils/usrp_cal_tx_iq_balance.cpp @@ -116,7 +116,8 @@ static void capture_samples(uhd::usrp::multi_usrp::sptr usrp, uhd::rx_streamer:: **********************************************************************/ int UHD_SAFE_MAIN(int argc, char *argv[]){ std::string args; - double rate, tx_wave_freq, tx_wave_ampl, rx_offset, freq_step, tx_gain, rx_gain; + double rate, tx_wave_freq, tx_wave_ampl, rx_offset; + double freq_start, freq_stop, freq_step; size_t nsamps; po::options_description desc("Allowed options"); @@ -128,8 +129,8 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ ("tx_wave_freq", po::value(&tx_wave_freq)->default_value(507.123e3), "Transmit wave frequency in Hz") ("tx_wave_ampl", po::value(&tx_wave_ampl)->default_value(0.7), "Transmit wave amplitude in counts") ("rx_offset", po::value(&rx_offset)->default_value(.9344e6), "RX LO offset from the TX LO in Hz") - ("tx_gain", po::value(&tx_gain)->default_value(0), "TX gain in dB") - ("rx_gain", po::value(&rx_gain)->default_value(0), "RX gain in dB") + ("freq_start", po::value(&freq_start), "Frequency start in Hz (do not specify for default)") + ("freq_stop", po::value(&freq_stop), "Frequency stop in Hz (do not specify for default)") ("freq_step", po::value(&freq_step)->default_value(default_freq_step), "Step size for LO sweep in Hz") ("nsamps", po::value(&nsamps)->default_value(default_num_samps), "Samples per data capture") ; @@ -159,14 +160,13 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ usrp->set_rx_antenna("CAL"); usrp->set_tx_antenna("CAL"); + //set optimum gain settings + set_optimum_gain(usrp); + //set the sample rates usrp->set_rx_rate(rate); usrp->set_tx_rate(rate); - //set midrange rx gain, default 0 tx gain - usrp->set_tx_gain(tx_gain); - usrp->set_rx_gain(rx_gain); - //create a receive streamer uhd::stream_args_t stream_args("fc32"); //complex floats uhd::rx_streamer::sptr rx_stream = usrp->get_rx_stream(stream_args); @@ -181,8 +181,10 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ //store the results here std::vector results; - const uhd::meta_range_t freq_range = usrp->get_tx_freq_range(); - for (double tx_lo_i = freq_range.start()+50e6; tx_lo_i < freq_range.stop()-50e6; tx_lo_i += freq_step){ + if (not vm.count("freq_start")) freq_start = usrp->get_tx_freq_range().start() + 50e6; + if (not vm.count("freq_stop")) freq_stop = usrp->get_tx_freq_range().stop() - 50e6; + + for (double tx_lo_i = freq_start; tx_lo_i <= freq_stop; tx_lo_i += freq_step){ const double tx_lo = tune_rx_and_tx(usrp, tx_lo_i, rx_offset); //frequency constants for this tune event diff --git a/host/utils/usrp_cal_utils.hpp b/host/utils/usrp_cal_utils.hpp index c08d869ed..5378b0d69 100644 --- a/host/utils/usrp_cal_utils.hpp +++ b/host/utils/usrp_cal_utils.hpp @@ -39,9 +39,34 @@ static const size_t wave_table_len = 8192; static const size_t num_search_steps = 5; static const size_t num_search_iters = 7; static const size_t skip_initial_samps = 20; -static const double default_freq_step = 13.7e6; +static const double default_freq_step = 7.3e6; static const size_t default_num_samps = 10000; +/*********************************************************************** + * Determine gain settings + **********************************************************************/ +static inline void set_optimum_gain(uhd::usrp::multi_usrp::sptr usrp){ + uhd::property_tree::sptr tree = usrp->get_device()->get_tree(); + const uhd::fs_path tx_fe_path = "/mboards/0/dboards/A/tx_frontends/0"; + const std::string tx_name = tree->access(tx_fe_path / "name").get(); + if (tx_name.find("WBX") != std::string::npos or tx_name.find("SBX") != std::string::npos){ + usrp->set_tx_gain(0); + } + else{ + throw std::runtime_error("self-calibration is not supported for this hardware"); + } + + const uhd::fs_path rx_fe_path = "/mboards/0/dboards/A/tx_frontends/0"; + const std::string rx_name = tree->access(rx_fe_path / "name").get(); + if (rx_name.find("WBX") != std::string::npos or rx_name.find("SBX") != std::string::npos){ + usrp->set_rx_gain(25); + } + else{ + throw std::runtime_error("self-calibration is not supported for this hardware"); + } + +} + /*********************************************************************** * Sinusoid wave table **********************************************************************/ -- cgit v1.2.3 From 18abd4dbbf29ec9372bdd2ee83288fc94c20534c Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Tue, 15 Nov 2011 16:22:18 -0800 Subject: uhd: support for applying cal corrections B100 --- host/docs/calibration.rst | 13 +++++++------ host/lib/usrp/b100/b100_impl.cpp | 21 +++++++++++++++++++++ host/lib/usrp/b100/b100_impl.hpp | 2 ++ host/utils/uhd_cal_rx_iq_balance.cpp | 2 +- host/utils/uhd_cal_tx_dc_offset.cpp | 2 +- host/utils/uhd_cal_tx_iq_balance.cpp | 2 +- host/utils/usrp_cal_utils.hpp | 2 +- 7 files changed, 34 insertions(+), 10 deletions(-) (limited to 'host/utils/usrp_cal_utils.hpp') diff --git a/host/docs/calibration.rst b/host/docs/calibration.rst index 26a1064c9..0aaace8f4 100644 --- a/host/docs/calibration.rst +++ b/host/docs/calibration.rst @@ -28,11 +28,12 @@ The following RF frontends are supported by the self-calibration utilities: * more to come... ******************************************** -Basic tool usage +Calibration utilities ******************************************** - UHD installs the calibration utilities into /bin. -Run the following from the command line: +**Disconnect** any extrernal hardware from the RF antenna ports, +and run the following from the command line. +Each utility will take several minutes to complete. :: uhd_cal_rx_iq_balance --verbose --args= @@ -43,13 +44,13 @@ See the output given by --help for more advanced options, such as: manually choosing the frequency range and step size for the sweeps. ******************************************** -Calibration files +Calibration data ******************************************** Calibration files are stored in the user's home/application directory. They can easily be moved from machine to another by copying the "cal" directory. Re-running a calibration utility will replace the existing calibration file. The old calibration file will be renamed so it may be recovered by the user. - * **Unix:** ${HOME}/.uhd/cal - * **Windows:** %APPDATA%\.uhd\cal + * **Unix:** ${HOME}/.uhd/cal/ + * **Windows:** %APPDATA%\\.uhd\\cal\\ diff --git a/host/lib/usrp/b100/b100_impl.cpp b/host/lib/usrp/b100/b100_impl.cpp index 067fe8d47..7674a0fcf 100644 --- a/host/lib/usrp/b100/b100_impl.cpp +++ b/host/lib/usrp/b100/b100_impl.cpp @@ -15,6 +15,7 @@ // along with this program. If not, see . // +#include "apply_corrections.hpp" #include "b100_impl.hpp" #include "b100_ctrl.hpp" #include "fpga_regs_standard.h" @@ -408,6 +409,18 @@ b100_impl::b100_impl(const device_addr_t &device_addr){ _dboard_iface, _tree->subtree(mb_path / "dboards/A") ); + //bind frontend corrections to the dboard freq props + const fs_path db_tx_fe_path = mb_path / "dboards" / "A" / "tx_frontends"; + BOOST_FOREACH(const std::string &name, _tree->list(db_tx_fe_path)){ + _tree->access(db_tx_fe_path / name / "freq" / "value") + .subscribe(boost::bind(&b100_impl::set_tx_fe_corrections, this, _1)); + } + const fs_path db_rx_fe_path = mb_path / "dboards" / "A" / "rx_frontends"; + BOOST_FOREACH(const std::string &name, _tree->list(db_rx_fe_path)){ + _tree->access(db_rx_fe_path / name / "freq" / "value") + .subscribe(boost::bind(&b100_impl::set_rx_fe_corrections, this, _1)); + } + //initialize io handling this->io_init(); @@ -501,3 +514,11 @@ sensor_value_t b100_impl::get_ref_locked(void){ const bool lock = _clock_ctrl->get_locked(); return sensor_value_t("Ref", lock, "locked", "unlocked"); } + +void b100_impl::set_rx_fe_corrections(const double lo_freq){ + apply_rx_fe_corrections(this->get_tree()->subtree("/mboards/0"), "A", lo_freq); +} + +void b100_impl::set_tx_fe_corrections(const double lo_freq){ + apply_tx_fe_corrections(this->get_tree()->subtree("/mboards/0"), "A", lo_freq); +} diff --git a/host/lib/usrp/b100/b100_impl.hpp b/host/lib/usrp/b100/b100_impl.hpp index 0984260be..96d90b14c 100644 --- a/host/lib/usrp/b100/b100_impl.hpp +++ b/host/lib/usrp/b100/b100_impl.hpp @@ -125,6 +125,8 @@ private: void clear_fpga_fifo(void); void handle_async_message(uhd::transport::managed_recv_buffer::sptr); uhd::sensor_value_t get_ref_locked(void); + void set_rx_fe_corrections(const double); + void set_tx_fe_corrections(const double); }; #endif /* INCLUDED_b100_IMPL_HPP */ 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 > gen_table(void){ std::vector > wave_table(wave_table_len); for (size_t i = 0; i < wave_table_len; i++){ - wave_table[i] = std::polar(1.0, (tau*i)/wave_table_len); + wave_table[i] = std::complex(std::polar(1.0, (tau*i)/wave_table_len)); } return wave_table; } -- cgit v1.2.3 From 075e6a9788856d6951df42349afef7816852ca68 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Tue, 15 Nov 2011 17:16:31 -0800 Subject: uhd: more common code in cal utils --- host/utils/uhd_cal_rx_iq_balance.cpp | 39 ++++---------------------- host/utils/uhd_cal_tx_dc_offset.cpp | 39 ++++---------------------- host/utils/uhd_cal_tx_iq_balance.cpp | 39 ++++---------------------- host/utils/usrp_cal_utils.hpp | 53 ++++++++++++++++++++++++++++++++++-- 4 files changed, 69 insertions(+), 101 deletions(-) (limited to 'host/utils/usrp_cal_utils.hpp') diff --git a/host/utils/uhd_cal_rx_iq_balance.cpp b/host/utils/uhd_cal_rx_iq_balance.cpp index a05df60b2..ee6b28abc 100644 --- a/host/utils/uhd_cal_rx_iq_balance.cpp +++ b/host/utils/uhd_cal_rx_iq_balance.cpp @@ -88,34 +88,12 @@ static double tune_rx_and_tx(uhd::usrp::multi_usrp::sptr usrp, const double rx_l return usrp->get_rx_freq(); } -/*********************************************************************** - * Data capture routine - **********************************************************************/ -static void capture_samples(uhd::usrp::multi_usrp::sptr usrp, uhd::rx_streamer::sptr rx_stream, std::vector > &buff){ - uhd::stream_cmd_t stream_cmd(uhd::stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_DONE); - stream_cmd.num_samps = buff.size(); - stream_cmd.stream_now = true; - usrp->issue_stream_cmd(stream_cmd); - uhd::rx_metadata_t md; - const size_t num_rx_samps = rx_stream->recv(&buff.front(), buff.size(), md); - - //validate the received data - if (md.error_code != uhd::rx_metadata_t::ERROR_CODE_NONE){ - throw std::runtime_error(str(boost::format( - "Unexpected error code 0x%x" - ) % md.error_code)); - } - if (num_rx_samps != buff.size()){ - throw std::runtime_error("did not get all the samples requested"); - } -} - /*********************************************************************** * Main **********************************************************************/ int UHD_SAFE_MAIN(int argc, char *argv[]){ std::string args; - double rate, tx_wave_ampl, tx_offset; + double tx_wave_ampl, tx_offset; double freq_start, freq_stop, freq_step; size_t nsamps; @@ -124,7 +102,6 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ ("help", "help message") ("verbose", "enable some verbose") ("args", po::value(&args)->default_value(""), "device address args [default = \"\"]") - ("rate", po::value(&rate)->default_value(12.5e6), "RX and TX sample rate in Hz") ("tx_wave_ampl", po::value(&tx_wave_ampl)->default_value(0.7), "Transmit wave amplitude in counts") ("tx_offset", po::value(&tx_offset)->default_value(.9344e6), "TX LO offset from the RX LO in Hz") ("freq_start", po::value(&freq_start), "Frequency start in Hz (do not specify for default)") @@ -158,12 +135,8 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ usrp->set_rx_antenna("CAL"); usrp->set_tx_antenna("CAL"); - //set optimum gain settings - set_optimum_gain(usrp); - - //set the sample rates - usrp->set_rx_rate(rate); - usrp->set_tx_rate(rate); + //set optimum defaults + set_optimum_defaults(usrp); //create a receive streamer uhd::stream_args_t stream_args("fc32"); //complex floats @@ -174,7 +147,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ threads.create_thread(boost::bind(&tx_thread, usrp, tx_wave_ampl)); //re-usable buffer for samples - std::vector > buff(nsamps); + std::vector > buff; //store the results here std::vector results; @@ -194,7 +167,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ //capture initial uncorrected value usrp->set_rx_iq_balance(std::polar(1.0, 0.0)); - capture_samples(usrp, rx_stream, buff); + capture_samples(usrp, rx_stream, buff, nsamps); const double initial_suppression = compute_tone_dbrms(buff, bb_tone_freq/actual_rx_rate) - compute_tone_dbrms(buff, bb_imag_freq/actual_rx_rate); //bounds and results from searching @@ -215,7 +188,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ usrp->set_rx_iq_balance(correction); //receive some samples - capture_samples(usrp, rx_stream, buff); + capture_samples(usrp, rx_stream, buff, nsamps); const double tone_dbrms = compute_tone_dbrms(buff, bb_tone_freq/actual_rx_rate); const double imag_dbrms = compute_tone_dbrms(buff, bb_imag_freq/actual_rx_rate); diff --git a/host/utils/uhd_cal_tx_dc_offset.cpp b/host/utils/uhd_cal_tx_dc_offset.cpp index ed1b85bb3..5ef9f823c 100644 --- a/host/utils/uhd_cal_tx_dc_offset.cpp +++ b/host/utils/uhd_cal_tx_dc_offset.cpp @@ -89,34 +89,12 @@ static double tune_rx_and_tx(uhd::usrp::multi_usrp::sptr usrp, const double tx_l return usrp->get_tx_freq(); } -/*********************************************************************** - * Data capture routine - **********************************************************************/ -static void capture_samples(uhd::usrp::multi_usrp::sptr usrp, uhd::rx_streamer::sptr rx_stream, std::vector > &buff){ - uhd::stream_cmd_t stream_cmd(uhd::stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_DONE); - stream_cmd.num_samps = buff.size(); - stream_cmd.stream_now = true; - usrp->issue_stream_cmd(stream_cmd); - uhd::rx_metadata_t md; - const size_t num_rx_samps = rx_stream->recv(&buff.front(), buff.size(), md); - - //validate the received data - if (md.error_code != uhd::rx_metadata_t::ERROR_CODE_NONE){ - throw std::runtime_error(str(boost::format( - "Unexpected error code 0x%x" - ) % md.error_code)); - } - if (num_rx_samps != buff.size()){ - throw std::runtime_error("did not get all the samples requested"); - } -} - /*********************************************************************** * Main **********************************************************************/ int UHD_SAFE_MAIN(int argc, char *argv[]){ std::string args; - double rate, tx_wave_freq, tx_wave_ampl, rx_offset; + double tx_wave_freq, tx_wave_ampl, rx_offset; double freq_start, freq_stop, freq_step; size_t nsamps; @@ -125,7 +103,6 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ ("help", "help message") ("verbose", "enable some verbose") ("args", po::value(&args)->default_value(""), "device address args [default = \"\"]") - ("rate", po::value(&rate)->default_value(12.5e6), "RX and TX sample rate in Hz") ("tx_wave_freq", po::value(&tx_wave_freq)->default_value(507.123e3), "Transmit wave frequency in Hz") ("tx_wave_ampl", po::value(&tx_wave_ampl)->default_value(0.7), "Transmit wave amplitude in counts") ("rx_offset", po::value(&rx_offset)->default_value(.9344e6), "RX LO offset from the TX LO in Hz") @@ -160,12 +137,8 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ usrp->set_rx_antenna("CAL"); usrp->set_tx_antenna("CAL"); - //set optimum gain settings - set_optimum_gain(usrp); - - //set the sample rates - usrp->set_rx_rate(rate); - usrp->set_tx_rate(rate); + //set optimum defaults + set_optimum_defaults(usrp); //create a receive streamer uhd::stream_args_t stream_args("fc32"); //complex floats @@ -176,7 +149,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ threads.create_thread(boost::bind(&tx_thread, usrp, tx_wave_freq, tx_wave_ampl)); //re-usable buffer for samples - std::vector > buff(nsamps); + std::vector > buff; //store the results here std::vector results; @@ -195,7 +168,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ //capture initial uncorrected value usrp->set_tx_dc_offset(std::complex(0, 0)); - capture_samples(usrp, rx_stream, buff); + capture_samples(usrp, rx_stream, buff, nsamps); const double initial_dc_dbrms = compute_tone_dbrms(buff, bb_dc_freq/actual_rx_rate); //bounds and results from searching @@ -215,7 +188,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ usrp->set_tx_dc_offset(correction); //receive some samples - capture_samples(usrp, rx_stream, buff); + capture_samples(usrp, rx_stream, buff, nsamps); const double dc_dbrms = compute_tone_dbrms(buff, bb_dc_freq/actual_rx_rate); diff --git a/host/utils/uhd_cal_tx_iq_balance.cpp b/host/utils/uhd_cal_tx_iq_balance.cpp index 8b49ef170..d7851424a 100644 --- a/host/utils/uhd_cal_tx_iq_balance.cpp +++ b/host/utils/uhd_cal_tx_iq_balance.cpp @@ -89,34 +89,12 @@ static double tune_rx_and_tx(uhd::usrp::multi_usrp::sptr usrp, const double tx_l return usrp->get_tx_freq(); } -/*********************************************************************** - * Data capture routine - **********************************************************************/ -static void capture_samples(uhd::usrp::multi_usrp::sptr usrp, uhd::rx_streamer::sptr rx_stream, std::vector > &buff){ - uhd::stream_cmd_t stream_cmd(uhd::stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_DONE); - stream_cmd.num_samps = buff.size(); - stream_cmd.stream_now = true; - usrp->issue_stream_cmd(stream_cmd); - uhd::rx_metadata_t md; - const size_t num_rx_samps = rx_stream->recv(&buff.front(), buff.size(), md); - - //validate the received data - if (md.error_code != uhd::rx_metadata_t::ERROR_CODE_NONE){ - throw std::runtime_error(str(boost::format( - "Unexpected error code 0x%x" - ) % md.error_code)); - } - if (num_rx_samps != buff.size()){ - throw std::runtime_error("did not get all the samples requested"); - } -} - /*********************************************************************** * Main **********************************************************************/ int UHD_SAFE_MAIN(int argc, char *argv[]){ std::string args; - double rate, tx_wave_freq, tx_wave_ampl, rx_offset; + double tx_wave_freq, tx_wave_ampl, rx_offset; double freq_start, freq_stop, freq_step; size_t nsamps; @@ -125,7 +103,6 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ ("help", "help message") ("verbose", "enable some verbose") ("args", po::value(&args)->default_value(""), "device address args [default = \"\"]") - ("rate", po::value(&rate)->default_value(12.5e6), "RX and TX sample rate in Hz") ("tx_wave_freq", po::value(&tx_wave_freq)->default_value(507.123e3), "Transmit wave frequency in Hz") ("tx_wave_ampl", po::value(&tx_wave_ampl)->default_value(0.7), "Transmit wave amplitude in counts") ("rx_offset", po::value(&rx_offset)->default_value(.9344e6), "RX LO offset from the TX LO in Hz") @@ -160,12 +137,8 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ usrp->set_rx_antenna("CAL"); usrp->set_tx_antenna("CAL"); - //set optimum gain settings - set_optimum_gain(usrp); - - //set the sample rates - usrp->set_rx_rate(rate); - usrp->set_tx_rate(rate); + //set optimum defaults + set_optimum_defaults(usrp); //create a receive streamer uhd::stream_args_t stream_args("fc32"); //complex floats @@ -176,7 +149,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ threads.create_thread(boost::bind(&tx_thread, usrp, tx_wave_freq, tx_wave_ampl)); //re-usable buffer for samples - std::vector > buff(nsamps); + std::vector > buff; //store the results here std::vector results; @@ -196,7 +169,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ //capture initial uncorrected value usrp->set_tx_iq_balance(std::polar(1.0, 0.0)); - capture_samples(usrp, rx_stream, buff); + capture_samples(usrp, rx_stream, buff, nsamps); const double initial_suppression = compute_tone_dbrms(buff, bb_tone_freq/actual_rx_rate) - compute_tone_dbrms(buff, bb_imag_freq/actual_rx_rate); //bounds and results from searching @@ -217,7 +190,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ usrp->set_tx_iq_balance(correction); //receive some samples - capture_samples(usrp, rx_stream, buff); + capture_samples(usrp, rx_stream, buff, nsamps); const double tone_dbrms = compute_tone_dbrms(buff, bb_tone_freq/actual_rx_rate); const double imag_dbrms = compute_tone_dbrms(buff, bb_imag_freq/actual_rx_rate); diff --git a/host/utils/usrp_cal_utils.hpp b/host/utils/usrp_cal_utils.hpp index 3058cd928..6417b5d8b 100644 --- a/host/utils/usrp_cal_utils.hpp +++ b/host/utils/usrp_cal_utils.hpp @@ -43,10 +43,25 @@ static const double default_freq_step = 7.3e6; static const size_t default_num_samps = 10000; /*********************************************************************** - * Determine gain settings + * Set standard defaults for devices **********************************************************************/ -static inline void set_optimum_gain(uhd::usrp::multi_usrp::sptr usrp){ +static inline void set_optimum_defaults(uhd::usrp::multi_usrp::sptr usrp){ uhd::property_tree::sptr tree = usrp->get_device()->get_tree(); + + const uhd::fs_path mb_path = "/mboards/0"; + const std::string mb_name = tree->access(mb_path / "name").get(); + if (mb_name.find("USRP2") != std::string::npos){ + usrp->set_tx_rate(12.5e6); + usrp->set_rx_rate(12.5e6); + } + else if (mb_name.find("B100") != std::string::npos){ + usrp->set_tx_rate(4e6); + usrp->set_rx_rate(4e6); + } + else{ + throw std::runtime_error("self-calibration is not supported for this hardware"); + } + const uhd::fs_path tx_fe_path = "/mboards/0/dboards/A/tx_frontends/0"; const std::string tx_name = tree->access(tx_fe_path / "name").get(); if (tx_name.find("WBX") != std::string::npos or tx_name.find("SBX") != std::string::npos){ @@ -166,3 +181,37 @@ static void store_results( std::cout << "wrote cal data to " << cal_data_path << std::endl; } + +/*********************************************************************** + * Data capture routine + **********************************************************************/ +static void capture_samples( + uhd::usrp::multi_usrp::sptr usrp, + uhd::rx_streamer::sptr rx_stream, + std::vector > &buff, + const size_t nsamps_requested +){ + buff.resize(nsamps_requested); + uhd::rx_metadata_t md; + + uhd::stream_cmd_t stream_cmd(uhd::stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_DONE); + stream_cmd.num_samps = buff.size(); + stream_cmd.stream_now = true; + usrp->issue_stream_cmd(stream_cmd); + const size_t num_rx_samps = rx_stream->recv(&buff.front(), buff.size(), md); + + //validate the received data + if (md.error_code != uhd::rx_metadata_t::ERROR_CODE_NONE){ + throw std::runtime_error(str(boost::format( + "Unexpected error code 0x%x" + ) % md.error_code)); + } + //we can live if all the data didnt come in + if (num_rx_samps > buff.size()/2){ + buff.resize(num_rx_samps); + return; + } + if (num_rx_samps != buff.size()){ + throw std::runtime_error("did not get all the samples requested"); + } +} -- cgit v1.2.3 From 95568c8b30490f630a72b665b135c46549ee5882 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 16 Nov 2011 06:39:31 +0000 Subject: e100: added self-cal support with minor speedups --- host/lib/usrp/e100/e100_impl.cpp | 21 +++++++++++++++++++++ host/lib/usrp/e100/e100_impl.hpp | 2 ++ host/utils/uhd_cal_rx_iq_balance.cpp | 2 +- host/utils/uhd_cal_tx_dc_offset.cpp | 5 +++-- host/utils/uhd_cal_tx_iq_balance.cpp | 5 +++-- host/utils/usrp_cal_utils.hpp | 36 ++++++++++++++++++++++-------------- 6 files changed, 52 insertions(+), 19 deletions(-) (limited to 'host/utils/usrp_cal_utils.hpp') diff --git a/host/lib/usrp/e100/e100_impl.cpp b/host/lib/usrp/e100/e100_impl.cpp index 7804f7fd8..8b7756461 100644 --- a/host/lib/usrp/e100/e100_impl.cpp +++ b/host/lib/usrp/e100/e100_impl.cpp @@ -15,6 +15,7 @@ // along with this program. If not, see . // +#include "apply_corrections.hpp" #include "e100_impl.hpp" #include "e100_regs.hpp" #include @@ -374,6 +375,18 @@ e100_impl::e100_impl(const uhd::device_addr_t &device_addr){ _dboard_iface, _tree->subtree(mb_path / "dboards/A") ); + //bind frontend corrections to the dboard freq props + const fs_path db_tx_fe_path = mb_path / "dboards" / "A" / "tx_frontends"; + BOOST_FOREACH(const std::string &name, _tree->list(db_tx_fe_path)){ + _tree->access(db_tx_fe_path / name / "freq" / "value") + .subscribe(boost::bind(&e100_impl::set_tx_fe_corrections, this, _1)); + } + const fs_path db_rx_fe_path = mb_path / "dboards" / "A" / "rx_frontends"; + BOOST_FOREACH(const std::string &name, _tree->list(db_rx_fe_path)){ + _tree->access(db_rx_fe_path / name / "freq" / "value") + .subscribe(boost::bind(&e100_impl::set_rx_fe_corrections, this, _1)); + } + //initialize io handling this->io_init(); @@ -450,3 +463,11 @@ void e100_impl::check_fpga_compat(void){ } _tree->create("/mboards/0/fpga_version").set(str(boost::format("%u.%u") % fpga_major % fpga_minor)); } + +void e100_impl::set_rx_fe_corrections(const double lo_freq){ + apply_rx_fe_corrections(this->get_tree()->subtree("/mboards/0"), "A", lo_freq); +} + +void e100_impl::set_tx_fe_corrections(const double lo_freq){ + apply_tx_fe_corrections(this->get_tree()->subtree("/mboards/0"), "A", lo_freq); +} diff --git a/host/lib/usrp/e100/e100_impl.hpp b/host/lib/usrp/e100/e100_impl.hpp index f3e481b93..2ea890375 100644 --- a/host/lib/usrp/e100/e100_impl.hpp +++ b/host/lib/usrp/e100/e100_impl.hpp @@ -130,6 +130,8 @@ private: void update_clock_source(const std::string &); uhd::sensor_value_t get_ref_locked(void); void check_fpga_compat(void); + void set_rx_fe_corrections(const double); + void set_tx_fe_corrections(const double); }; diff --git a/host/utils/uhd_cal_rx_iq_balance.cpp b/host/utils/uhd_cal_rx_iq_balance.cpp index ee6b28abc..da9ccbdb3 100644 --- a/host/utils/uhd_cal_rx_iq_balance.cpp +++ b/host/utils/uhd_cal_rx_iq_balance.cpp @@ -222,7 +222,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 %f dB, corrected %f dB") % (rx_lo/1e6) % result.best % result.delta << std::endl; + std::cout << boost::format("RX IQ: %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 5ef9f823c..af5b60d14 100644 --- a/host/utils/uhd_cal_tx_dc_offset.cpp +++ b/host/utils/uhd_cal_tx_dc_offset.cpp @@ -50,11 +50,12 @@ static void tx_thread(uhd::usrp::multi_usrp::sptr usrp, const double tx_wave_fre size_t index = 0; const double tx_rate = usrp->get_tx_rate(); const size_t step = boost::math::iround(wave_table_len * tx_wave_freq/tx_rate); + wave_table table(tx_wave_ampl); //fill buff and send until interrupted while (not boost::this_thread::interruption_requested()){ for (size_t i = 0; i < buff.size(); i++){ - buff[i] = float(tx_wave_ampl) * wave_table_lookup(index += step); + buff[i] = table(index += step); } tx_stream->send(&buff.front(), buff.size(), md); } @@ -219,7 +220,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 %f dB, corrected %f dB") % (tx_lo/1e6) % result.best % result.delta << std::endl; + std::cout << boost::format("TX DC: %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 d7851424a..ff965e040 100644 --- a/host/utils/uhd_cal_tx_iq_balance.cpp +++ b/host/utils/uhd_cal_tx_iq_balance.cpp @@ -50,11 +50,12 @@ static void tx_thread(uhd::usrp::multi_usrp::sptr usrp, const double tx_wave_fre size_t index = 0; const double tx_rate = usrp->get_tx_rate(); const size_t step = boost::math::iround(wave_table_len * tx_wave_freq/tx_rate); + wave_table table(tx_wave_ampl); //fill buff and send until interrupted while (not boost::this_thread::interruption_requested()){ for (size_t i = 0; i < buff.size(); i++){ - buff[i] = float(tx_wave_ampl) * wave_table_lookup(index += step); + buff[i] = table(index += step); } tx_stream->send(&buff.front(), buff.size(), md); } @@ -224,7 +225,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 %f dB, corrected %f dB") % (tx_lo/1e6) % result.best % result.delta << std::endl; + std::cout << boost::format("TX IQ: %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 6417b5d8b..0faaf9a84 100644 --- a/host/utils/usrp_cal_utils.hpp +++ b/host/utils/usrp_cal_utils.hpp @@ -58,6 +58,10 @@ static inline void set_optimum_defaults(uhd::usrp::multi_usrp::sptr usrp){ usrp->set_tx_rate(4e6); usrp->set_rx_rate(4e6); } + else if (mb_name.find("E10") != std::string::npos){ + usrp->set_tx_rate(4e6); + usrp->set_rx_rate(8e6); + } else{ throw std::runtime_error("self-calibration is not supported for this hardware"); } @@ -85,18 +89,22 @@ static inline void set_optimum_defaults(uhd::usrp::multi_usrp::sptr usrp){ /*********************************************************************** * Sinusoid wave table **********************************************************************/ -static inline std::vector > gen_table(void){ - std::vector > wave_table(wave_table_len); - for (size_t i = 0; i < wave_table_len; i++){ - wave_table[i] = std::complex(std::polar(1.0, (tau*i)/wave_table_len)); +class wave_table{ +public: + wave_table(const double ampl){ + _table.resize(wave_table_len); + for (size_t i = 0; i < wave_table_len; i++){ + _table[i] = std::complex(std::polar(ampl, (tau*i)/wave_table_len)); + } } - return wave_table; -} -static inline std::complex wave_table_lookup(const size_t index){ - static const std::vector > wave_table = gen_table(); - return wave_table[index % wave_table_len]; -} + inline std::complex operator()(const size_t index) const{ + return _table[index % wave_table_len]; + } + +private: + std::vector > _table; +}; /*********************************************************************** * Compute power of a tone @@ -106,16 +114,16 @@ static inline double compute_tone_dbrms( const double freq //freq is fractional ){ //shift the samples so the tone at freq is down at DC - std::vector > shifted(samples.size() - skip_initial_samps); + std::vector > shifted(samples.size() - skip_initial_samps); for (size_t i = 0; i < shifted.size(); i++){ - shifted[i] = std::complex(samples[i+skip_initial_samps]) * std::polar(1.0, -freq*tau*i); + shifted[i] = samples[i+skip_initial_samps] * std::complex(std::polar(1.0, -freq*tau*i)); } //filter the samples with a narrow low pass - std::complex iir_output = 0, iir_last = 0; + std::complex iir_output = 0, iir_last = 0; double output = 0; for (size_t i = 0; i < shifted.size(); i++){ - iir_output = alpha * shifted[i] + (1-alpha)*iir_last; + iir_output = float(alpha) * shifted[i] + float(1-alpha)*iir_last; iir_last = iir_output; output += std::abs(iir_output); } -- cgit v1.2.3