hero123457/uhd
1
0
Fork 0
mirror of https://github.com/EttusResearch/uhd.git synced 2026-10-25 17:36:10 +00:00
Code Issues Projects Releases Wiki Activity

n310: Improve LO source control options for ALL and LO2 cases

Browse Source 
If ALL option is specified, set lo source for both lo's. Do not report
an error if user sets LO2 to internal. Enforce single lo target for
queries about lo state.

Signed-off-by: mattprost <matt.prost@ni.com>
This commit is contained in:
mattprost 2022-04-14 18:47:12 -05:00 committed by Aaron Rossetto
parent 8132da59ba
commit 8fbff71f3b
1 changed files with 40 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
host/lib/usrp/dboard/magnesium/magnesium_radio_control.cpp
View File

@ -812,18 +812,25 @@ freq_range_t magnesium_radio_control_impl::get_rx_lo_freq_range(
}
void magnesium_radio_control_impl::set_rx_lo_source(
const std::string& src, const std::string& name, const size_t /*chan*/
)
const std::string& src, const std::string& name, const size_t chan)
{
// TODO: checking what options are there
std::lock_guard<std::recursive_mutex> l(_set_lock);
RFNOC_LOG_TRACE("Setting RX LO " << name << " to " << src);
if (name == MAGNESIUM_LO1) {
_ad9371->set_lo_source(src, RX_DIRECTION);
if (name == radio_control::ALL_LOS) {
const auto rx_lo_names = get_rx_lo_names(chan);
for (auto rx_lo_name : rx_lo_names) {
set_rx_lo_source(src, rx_lo_name, chan);
}
} else {
RFNOC_LOG_ERROR(
"RX LO " << name << " does not support setting source to " << src);
std::lock_guard<std::recursive_mutex> l(_set_lock);
if (name == MAGNESIUM_LO1) {
_ad9371->set_lo_source(src, RX_DIRECTION);
} else if (name == MAGNESIUM_LO2 && src == "internal") {
// LO2 only supports internal source on this device
return;
} else {
RFNOC_LOG_ERROR(
"RX LO " << name << " does not support setting source to " << src);
}
}
}
@ -834,8 +841,11 @@ const std::string magnesium_radio_control_impl::get_rx_lo_source(
if (name == MAGNESIUM_LO1) {
// TODO: should we use this from cache?
return _ad9371->get_lo_source(RX_DIRECTION);
} else if (name == MAGNESIUM_LO2) {
return "internal";
} else {
throw uhd::value_error("Could not find LO stage " + name);
}
return "internal";
}
double magnesium_radio_control_impl::_set_rx_lo_freq(const std::string source,
@ -930,17 +940,25 @@ freq_range_t magnesium_radio_control_impl::get_tx_lo_freq_range(
}
void magnesium_radio_control_impl::set_tx_lo_source(
const std::string& src, const std::string& name, const size_t /*chan*/
)
const std::string& src, const std::string& name, const size_t chan)
{
// TODO: checking what options are there
std::lock_guard<std::recursive_mutex> l(_set_lock);
RFNOC_LOG_TRACE("set_tx_lo_source(name=" << name << ", src=" << src << ")");
if (name == MAGNESIUM_LO1) {
_ad9371->set_lo_source(src, TX_DIRECTION);
if (name == radio_control::ALL_LOS) {
const auto tx_lo_names = get_tx_lo_names(chan);
for (auto tx_lo_name : tx_lo_names) {
set_tx_lo_source(src, tx_lo_name, chan);
}
} else {
RFNOC_LOG_ERROR(
"TX LO " << name << " does not support setting source to " << src);
std::lock_guard<std::recursive_mutex> l(_set_lock);
if (name == MAGNESIUM_LO1) {
_ad9371->set_lo_source(src, TX_DIRECTION);
} else if (name == MAGNESIUM_LO2 && src == "internal") {
// LO2 only supports internal source on this device
return;
} else {
RFNOC_LOG_ERROR(
"TX LO " << name << " does not support setting source to " << src);
}
}
}
@ -951,8 +969,11 @@ const std::string magnesium_radio_control_impl::get_tx_lo_source(
if (name == MAGNESIUM_LO1) {
// TODO: should we use this from cache?
return _ad9371->get_lo_source(TX_DIRECTION);
} else if (name == MAGNESIUM_LO2) {
return "internal";
} else {
throw uhd::value_error("Could not find LO stage " + name);
}
return "internal";
}
double magnesium_radio_control_impl::_set_tx_lo_freq(const std::string source,