Skip to content

fix to multi-usrp-rfnoc 'set_master_clock_rate' function #914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TalFel wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −4
Open

fix to multi-usrp-rfnoc 'set_master_clock_rate' function #914

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions host/lib/usrp/multi_usrp_rfnoc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,17 +747,33 @@ class multi_usrp_rfnoc : public multi_usrp
void set_master_clock_rate(double rate, size_t mboard) override
{
for (auto& chain : _rx_chans) {
auto radio = chain.second.radio;
auto& rx_chain = chain.second;
auto radio = rx_chain.radio;
if (radio->get_block_id().get_device_no() == mboard
|| mboard == ALL_MBOARDS) {
radio->set_rate(rate);
const double actual_radio_rate = radio->set_rate(rate);
if (rx_chain.ddc) {
rx_chain.ddc->set_input_rate(actual_radio_rate, rx_chain.block_chan);
if (_rx_rates.count(chain.first)) {
_rx_rates[chain.first] = rx_chain.ddc->set_output_rate(
_rx_rates.at(chain.first), rx_chain.block_chan);
}
}
}
}
for (auto& chain : _tx_chans) {
auto radio = chain.second.radio;
auto& tx_chain = chain.second;
auto radio = tx_chain.radio;
if (radio->get_block_id().get_device_no() == mboard
|| mboard == ALL_MBOARDS) {
radio->set_rate(rate);
const double actual_radio_rate = radio->set_rate(rate);
if (tx_chain.duc) {
tx_chain.duc->set_output_rate(actual_radio_rate, tx_chain.block_chan);
if (_tx_rates.count(chain.first)) {
_tx_rates[chain.first] = tx_chain.duc->set_input_rate(
_tx_rates.at(chain.first), tx_chain.block_chan);
}
}
}
}
}
Expand Down
Loading