aboutsummaryrefslogtreecommitdiffstats
path: root/host/utils/usrp_cal_utils.hpp
diff options
context:
space:
mode:
authorBrent Stapleton <brent.stapleton@ettus.com>2019-01-14 10:35:25 -0800
committerBrent Stapleton <brent.stapleton@ettus.com>2019-01-16 11:40:23 -0800
commit967be2a4e82b1a125b26bb72a60318a4fb2b50c4 (patch)
tree8a24954b54d1546dc8049a17e485adb0a605f74f /host/utils/usrp_cal_utils.hpp
parentaafe4e8b742a0e21d3818f21f34e3c8613132530 (diff)
downloaduhd-967be2a4e82b1a125b26bb72a60318a4fb2b50c4.tar.gz
uhd-967be2a4e82b1a125b26bb72a60318a4fb2b50c4.tar.bz2
uhd-967be2a4e82b1a125b26bb72a60318a4fb2b50c4.zip
uhd: mpm: apply clang-format to all files
Applying formatting changes to all .cpp and .hpp files in the following directories: ``` find host/examples/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find host/tests/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find host/lib/usrp/dboard/neon/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find host/lib/usrp/dboard/magnesium/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find host/lib/usrp/device3/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find host/lib/usrp/mpmd/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find host/lib/usrp/x300/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find host/utils/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find mpm/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file ``` Also formatted host/include/, except Cpp03 was used as a the language standard instead of Cpp11. ``` sed -i 's/ Cpp11/ Cpp03/g' .clang-format find host/include/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file ``` Formatting style was designated by the .clang-format file.
Diffstat (limited to 'host/utils/usrp_cal_utils.hpp')
-rw-r--r--host/utils/usrp_cal_utils.hpp267
1 files changed, 127 insertions, 140 deletions
diff --git a/host/utils/usrp_cal_utils.hpp b/host/utils/usrp_cal_utils.hpp
index ebd1400b7..fe567c7de 100644
--- a/host/utils/usrp_cal_utils.hpp
+++ b/host/utils/usrp_cal_utils.hpp
@@ -5,38 +5,40 @@
// SPDX-License-Identifier: GPL-3.0-or-later
//
-#include <uhd/utils/paths.hpp>
#include <uhd/property_tree.hpp>
-#include <uhd/usrp/multi_usrp.hpp>
#include <uhd/usrp/dboard_eeprom.hpp>
-#include <uhd/utils/paths.hpp>
+#include <uhd/usrp/multi_usrp.hpp>
#include <uhd/utils/algorithm.hpp>
+#include <uhd/utils/paths.hpp>
#include <boost/filesystem.hpp>
#include <boost/format.hpp>
-#include <iostream>
-#include <vector>
-#include <complex>
+#include <chrono>
#include <cmath>
+#include <complex>
#include <cstdlib>
#include <fstream>
-#include <chrono>
+#include <iostream>
#include <thread>
+#include <vector>
namespace fs = boost::filesystem;
-struct result_t{double freq, real_corr, imag_corr, best, delta;};
+struct result_t
+{
+ double freq, real_corr, imag_corr, best, delta;
+};
typedef std::complex<float> samp_type;
/***********************************************************************
* Constants
**********************************************************************/
-static const double tau = 6.28318531;
-static const size_t wave_table_len = 65536;
-static const size_t num_search_steps = 5;
-static const double default_precision = 0.0001;
-static const double default_freq_step = 7.3e6;
-static const size_t default_fft_bin_size = 1000;
+static const double tau = 6.28318531;
+static const size_t wave_table_len = 65536;
+static const size_t num_search_steps = 5;
+static const double default_precision = 0.0001;
+static const double default_freq_step = 7.3e6;
+static const size_t default_fft_bin_size = 1000;
static constexpr size_t MAX_NUM_TX_ERRORS = 10;
/***********************************************************************
@@ -49,51 +51,44 @@ static inline void set_optimum_defaults(uhd::usrp::multi_usrp::sptr usrp)
uhd::usrp::subdev_spec_t subdev_spec = usrp->get_rx_subdev_spec();
const uhd::fs_path mb_path = "/mboards/0";
- const std::string mb_name = tree->access<std::string>(mb_path / "name").get();
- if (mb_name.find("USRP2") != std::string::npos or
- mb_name.find("N200") != std::string::npos or
- mb_name.find("N210") != std::string::npos or
- mb_name.find("X300") != std::string::npos or
- mb_name.find("X310") != std::string::npos or
- mb_name.find("n3xx") != std::string::npos)
- {
+ const std::string mb_name = tree->access<std::string>(mb_path / "name").get();
+ if (mb_name.find("USRP2") != std::string::npos
+ or mb_name.find("N200") != std::string::npos
+ or mb_name.find("N210") != std::string::npos
+ or mb_name.find("X300") != std::string::npos
+ or mb_name.find("X310") != std::string::npos
+ or mb_name.find("n3xx") != std::string::npos) {
usrp->set_tx_rate(12.5e6);
usrp->set_rx_rate(12.5e6);
- }
- else if (mb_name.find("B100") != std::string::npos)
- {
+ } else if (mb_name.find("B100") != std::string::npos) {
usrp->set_tx_rate(4e6);
usrp->set_rx_rate(4e6);
- }
- else
- {
+ } else {
throw std::runtime_error("self-calibration is not supported for this device");
}
- const uhd::fs_path tx_fe_path = "/mboards/0/dboards/" + subdev_spec[0].db_name + "/tx_frontends/0";
+ const uhd::fs_path tx_fe_path =
+ "/mboards/0/dboards/" + subdev_spec[0].db_name + "/tx_frontends/0";
const std::string tx_name = tree->access<std::string>(tx_fe_path / "name").get();
- if (tx_name.find("WBX") == std::string::npos and
- tx_name.find("SBX") == std::string::npos and
- tx_name.find("CBX") == std::string::npos and
- tx_name.find("RFX") == std::string::npos and
- tx_name.find("UBX") == std::string::npos and
- tx_name.find("Rhodium") == std::string::npos
- )
- {
+ if (tx_name.find("WBX") == std::string::npos
+ and tx_name.find("SBX") == std::string::npos
+ and tx_name.find("CBX") == std::string::npos
+ and tx_name.find("RFX") == std::string::npos
+ and tx_name.find("UBX") == std::string::npos
+ and tx_name.find("Rhodium") == std::string::npos) {
throw std::runtime_error("self-calibration is not supported for this TX dboard");
}
usrp->set_tx_gain(0);
- const uhd::fs_path rx_fe_path = "/mboards/0/dboards/" + subdev_spec[0].db_name + "/rx_frontends/0";
+ const uhd::fs_path rx_fe_path =
+ "/mboards/0/dboards/" + subdev_spec[0].db_name + "/rx_frontends/0";
const std::string rx_name = tree->access<std::string>(rx_fe_path / "name").get();
- if (rx_name.find("WBX") == std::string::npos and
- rx_name.find("SBX") == std::string::npos and
- rx_name.find("CBX") == std::string::npos and
- rx_name.find("RFX") == std::string::npos and
- rx_name.find("UBX") == std::string::npos and
- rx_name.find("Rhodium") == std::string::npos
- )
- {
+ if (rx_name.find("WBX") == std::string::npos
+ and rx_name.find("SBX") == std::string::npos
+ and rx_name.find("CBX") == std::string::npos
+ and rx_name.find("RFX") == std::string::npos
+ and rx_name.find("UBX") == std::string::npos
+ and rx_name.find("Rhodium") == std::string::npos) {
throw std::runtime_error("self-calibration is not supported for this RX dboard");
}
usrp->set_rx_gain(0);
@@ -107,13 +102,16 @@ void check_for_empty_serial(uhd::usrp::multi_usrp::sptr usrp)
// Will work on 1st subdev, top-level must make sure it's the right one
uhd::usrp::subdev_spec_t subdev_spec = usrp->get_rx_subdev_spec();
- //extract eeprom
+ // extract eeprom
uhd::property_tree::sptr tree = usrp->get_device()->get_tree();
// This only works with transceiver boards, so we can always check rx side
- const uhd::fs_path db_path = "/mboards/0/dboards/" + subdev_spec[0].db_name + "/rx_eeprom";
- const uhd::usrp::dboard_eeprom_t db_eeprom = tree->access<uhd::usrp::dboard_eeprom_t>(db_path).get();
+ const uhd::fs_path db_path =
+ "/mboards/0/dboards/" + subdev_spec[0].db_name + "/rx_eeprom";
+ const uhd::usrp::dboard_eeprom_t db_eeprom =
+ tree->access<uhd::usrp::dboard_eeprom_t>(db_path).get();
- std::string error_string = "This dboard has no serial!\n\nPlease see the Calibration documentation for details on how to fix this.";
+ std::string error_string = "This dboard has no serial!\n\nPlease see the Calibration "
+ "documentation for details on how to fix this.";
if (db_eeprom.serial.empty())
throw std::runtime_error(error_string);
}
@@ -128,7 +126,7 @@ public:
{
_table.resize(wave_table_len);
for (size_t i = 0; i < wave_table_len; i++)
- _table[i] = samp_type(std::polar(ampl, (tau*i)/wave_table_len));
+ _table[i] = samp_type(std::polar(ampl, (tau * i) / wave_table_len));
}
inline samp_type operator()(const size_t index) const
@@ -137,33 +135,32 @@ public:
}
private:
- std::vector<samp_type > _table;
+ std::vector<samp_type> _table;
};
/***********************************************************************
* Compute power of a tone
**********************************************************************/
-static inline double compute_tone_dbrms(
- const std::vector<samp_type> &samples,
- const double freq) //freq is fractional
+static inline double compute_tone_dbrms(const std::vector<samp_type>& samples,
+ const double freq) // freq is fractional
{
- //shift the samples so the tone at freq is down at DC
- //and average the samples to measure the DC component
+ // shift the samples so the tone at freq is down at DC
+ // and average the samples to measure the DC component
samp_type average = 0;
for (size_t i = 0; i < samples.size(); i++)
- average += samp_type(std::polar(1.0, -freq*tau*i)) * samples[i];
+ average += samp_type(std::polar(1.0, -freq * tau * i)) * samples[i];
- return 20*std::log10(std::abs(average/float(samples.size())));
+ return 20 * std::log10(std::abs(average / float(samples.size())));
}
/***********************************************************************
* Write a dat file
**********************************************************************/
static inline void write_samples_to_file(
- const std::vector<samp_type > &samples, const std::string &file)
+ const std::vector<samp_type>& samples, const std::string& file)
{
std::ofstream outfile(file.c_str(), std::ofstream::binary);
- outfile.write((const char*)&samples.front(), samples.size()*sizeof(samp_type));
+ outfile.write((const char*)&samples.front(), samples.size() * sizeof(samp_type));
outfile.close();
}
@@ -171,38 +168,39 @@ static inline void write_samples_to_file(
/***********************************************************************
* Retrieve d'board serial
**********************************************************************/
-static std::string get_serial(
- uhd::usrp::multi_usrp::sptr usrp,
- const std::string &tx_rx)
+static std::string get_serial(uhd::usrp::multi_usrp::sptr usrp, const std::string& tx_rx)
{
uhd::property_tree::sptr tree = usrp->get_device()->get_tree();
// Will work on 1st subdev, top-level must make sure it's the right one
uhd::usrp::subdev_spec_t subdev_spec = usrp->get_rx_subdev_spec();
- const uhd::fs_path db_path = "/mboards/0/dboards/" + subdev_spec[0].db_name + "/" + tx_rx + "_eeprom";
- const uhd::usrp::dboard_eeprom_t db_eeprom = tree->access<uhd::usrp::dboard_eeprom_t>(db_path).get();
+ const uhd::fs_path db_path =
+ "/mboards/0/dboards/" + subdev_spec[0].db_name + "/" + tx_rx + "_eeprom";
+ const uhd::usrp::dboard_eeprom_t db_eeprom =
+ tree->access<uhd::usrp::dboard_eeprom_t>(db_path).get();
return db_eeprom.serial;
}
/***********************************************************************
* Store data to file
**********************************************************************/
-static void store_results(
- const std::vector<result_t> &results,
- const std::string &XX, // "TX" or "RX"
- const std::string &xx, // "tx" or "rx"
- const std::string &what, // Type of test, e.g. "iq",
- const std::string &serial)
+static void store_results(const std::vector<result_t>& results,
+ const std::string& XX, // "TX" or "RX"
+ const std::string& xx, // "tx" or "rx"
+ const std::string& what, // Type of test, e.g. "iq",
+ const std::string& serial)
{
- //make the calibration file path
+ // 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 / str(boost::format("%s_%s_cal_v0.2_%s.csv") % xx % what % serial);
+ cal_data_path =
+ cal_data_path / str(boost::format("%s_%s_cal_v0.2_%s.csv") % xx % what % serial);
if (fs::exists(cal_data_path))
- fs::rename(cal_data_path, cal_data_path.string() + str(boost::format(".%d") % time(NULL)));
+ fs::rename(cal_data_path,
+ cal_data_path.string() + str(boost::format(".%d") % time(NULL)));
- //fill the calibration file
+ // 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") % serial;
@@ -211,15 +209,10 @@ static void store_results(
cal_data << boost::format("DATA STARTS HERE\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].best << ", "
- << results[i].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].best << ", "
+ << results[i].delta << "\n";
}
std::cout << "wrote cal data to " << cal_data_path << std::endl;
@@ -228,10 +221,9 @@ static void store_results(
/***********************************************************************
* Data capture routine
**********************************************************************/
-static void capture_samples(
- uhd::usrp::multi_usrp::sptr usrp,
+static void capture_samples(uhd::usrp::multi_usrp::sptr usrp,
uhd::rx_streamer::sptr rx_stream,
- std::vector<samp_type > &buff,
+ std::vector<samp_type>& buff,
const size_t nsamps_requested)
{
buff.resize(nsamps_requested);
@@ -243,34 +235,29 @@ static void capture_samples(
std::vector<samp_type> discard_buff(nsamps_to_discard);
uhd::stream_cmd_t stream_cmd(uhd::stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_DONE);
- stream_cmd.num_samps = buff.size() + nsamps_to_discard;
+ stream_cmd.num_samps = buff.size() + nsamps_to_discard;
stream_cmd.stream_now = true;
usrp->issue_stream_cmd(stream_cmd);
size_t num_rx_samps = 0;
// Discard the transient samples.
rx_stream->recv(&discard_buff.front(), discard_buff.size(), md);
- if (md.error_code != uhd::rx_metadata_t::ERROR_CODE_NONE)
- {
- throw std::runtime_error(str(boost::format(
- "Receiver error: %s"
- ) % md.strerror()));
+ if (md.error_code != uhd::rx_metadata_t::ERROR_CODE_NONE) {
+ throw std::runtime_error(
+ str(boost::format("Receiver error: %s") % md.strerror()));
}
// Now capture the data we want
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(
- "Receiver error: %s"
- ) % md.strerror()));
+ // validate the received data
+ if (md.error_code != uhd::rx_metadata_t::ERROR_CODE_NONE) {
+ throw std::runtime_error(
+ str(boost::format("Receiver error: %s") % md.strerror()));
}
- //we can live if all the data didnt come in
- if (num_rx_samps > buff.size()/2)
- {
+ // we can live if all the data didnt come in
+ if (num_rx_samps > buff.size() / 2) {
buff.resize(num_rx_samps);
return;
}
@@ -281,15 +268,16 @@ static void capture_samples(
/***********************************************************************
* Setup function
**********************************************************************/
-static uhd::usrp::multi_usrp::sptr setup_usrp_for_cal(std::string &args, std::string &subdev, std::string &serial)
+static uhd::usrp::multi_usrp::sptr setup_usrp_for_cal(
+ std::string& args, std::string& subdev, std::string& serial)
{
std::cout << std::endl;
- std::cout << boost::format("Creating the usrp device with: %s...") % args << 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);
// Configure subdev
- if (!subdev.empty())
- {
+ if (!subdev.empty()) {
usrp->set_tx_subdev_spec(subdev);
usrp->set_rx_subdev_spec(subdev);
}
@@ -297,16 +285,18 @@ static uhd::usrp::multi_usrp::sptr setup_usrp_for_cal(std::string &args, std::st
serial = get_serial(usrp, "tx");
std::cout << "Daughterboard serial: " << serial;
- //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.");
+ // 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");
- //fail if daughterboard has no serial
+ // fail if daughterboard has no serial
check_for_empty_serial(usrp);
- //set optimum defaults
+ // set optimum defaults
set_optimum_defaults(usrp);
return usrp;
@@ -315,25 +305,24 @@ static uhd::usrp::multi_usrp::sptr setup_usrp_for_cal(std::string &args, std::st
/***********************************************************************
* Function to find optimal RX gain setting (for the current frequency)
**********************************************************************/
-UHD_INLINE void set_optimal_rx_gain(
- uhd::usrp::multi_usrp::sptr usrp,
+UHD_INLINE void set_optimal_rx_gain(uhd::usrp::multi_usrp::sptr usrp,
uhd::rx_streamer::sptr rx_stream,
double wave_freq = 0.0)
{
- const double gain_step = 3.0;
+ const double gain_step = 3.0;
const double gain_compression_threshold = gain_step * 0.5;
- 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 + wave_freq;
+ 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 + wave_freq;
const size_t nsamps = size_t(actual_rx_rate / default_fft_bin_size);
std::vector<samp_type> buff(nsamps);
uhd::gain_range_t rx_gain_range = usrp->get_rx_gain_range();
- double rx_gain = rx_gain_range.start() + gain_step;
- double curr_dbrms = 0.0;
- double prev_dbrms = 0.0;
- double delta = 0.0;
+ double rx_gain = rx_gain_range.start() + gain_step;
+ double curr_dbrms = 0.0;
+ double prev_dbrms = 0.0;
+ double delta = 0.0;
// No sense in setting the gain where this is no gain range
if (rx_gain_range.stop() - rx_gain_range.start() < gain_step)
@@ -349,20 +338,19 @@ UHD_INLINE void set_optimal_rx_gain(
// Initialize prev_dbrms value
usrp->set_rx_gain(rx_gain);
capture_samples(usrp, rx_stream, buff, nsamps);
- prev_dbrms = compute_tone_dbrms(buff, bb_tone_freq/actual_rx_rate);
+ prev_dbrms = compute_tone_dbrms(buff, bb_tone_freq / actual_rx_rate);
rx_gain += gain_step;
// Find RX gain where signal begins to clip
- while (rx_gain <= rx_gain_range.stop())
- {
+ while (rx_gain <= rx_gain_range.stop()) {
usrp->set_rx_gain(rx_gain);
capture_samples(usrp, rx_stream, buff, nsamps);
- curr_dbrms = compute_tone_dbrms(buff, bb_tone_freq/actual_rx_rate);
- delta = curr_dbrms - prev_dbrms;
+ curr_dbrms = compute_tone_dbrms(buff, bb_tone_freq / actual_rx_rate);
+ delta = curr_dbrms - prev_dbrms;
// check if the gain is compressed beyone the threshold
if (delta < gain_step - gain_compression_threshold)
- break; // if so, we are done
+ break; // if so, we are done
prev_dbrms = curr_dbrms;
rx_gain += gain_step;
@@ -391,14 +379,14 @@ bool has_tx_error(uhd::tx_streamer::sptr tx_stream)
return false;
}
- return async_md.event_code & (0
- // Any of these errors are considered a problematic TX error:
- | uhd::async_metadata_t::EVENT_CODE_UNDERFLOW
- | uhd::async_metadata_t::EVENT_CODE_SEQ_ERROR
- | uhd::async_metadata_t::EVENT_CODE_TIME_ERROR
- | uhd::async_metadata_t::EVENT_CODE_UNDERFLOW_IN_PACKET
- | uhd::async_metadata_t::EVENT_CODE_SEQ_ERROR_IN_BURST
- );
+ return async_md.event_code
+ & (0
+ // Any of these errors are considered a problematic TX error:
+ | uhd::async_metadata_t::EVENT_CODE_UNDERFLOW
+ | uhd::async_metadata_t::EVENT_CODE_SEQ_ERROR
+ | uhd::async_metadata_t::EVENT_CODE_TIME_ERROR
+ | uhd::async_metadata_t::EVENT_CODE_UNDERFLOW_IN_PACKET
+ | uhd::async_metadata_t::EVENT_CODE_SEQ_ERROR_IN_BURST);
}
void wait_for_lo_lock(uhd::usrp::multi_usrp::sptr usrp)
@@ -407,10 +395,9 @@ void wait_for_lo_lock(uhd::usrp::multi_usrp::sptr usrp)
const auto timeout =
std::chrono::steady_clock::now() + std::chrono::milliseconds(100);
while (not usrp->get_tx_sensor("lo_locked").to_bool()
- or not usrp->get_rx_sensor("lo_locked").to_bool()) {
+ or not usrp->get_rx_sensor("lo_locked").to_bool()) {
if (std::chrono::steady_clock::now() > timeout) {
- throw std::runtime_error(
- "timed out waiting for TX and/or RX LO to lock");
+ throw std::runtime_error("timed out waiting for TX and/or RX LO to lock");
}
}
}