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

mpm: mg: Make set_master_clock_rate() an async call

Browse Source 
The ad9371 call set_master_clock_rate() can take a while depending on
the rate change, so make it asynchronous in order not to lock out the
reclaimer loop.
This commit is contained in:
Martin Braun 2019-11-21 16:25:07 -08:00
parent 4607c049fa
commit 1c3c7bddff
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mpm/include/mpm/ad937x/ad937x_ctrl.hpp
View File

@ -86,6 +86,7 @@ public:
std::future<void> handle_finish_initialization;
std::future<void> handle_setup_cal;
std::future<double> handle_set_freq;
std::future<void> handle_set_master_clock_rate;
/*! \brief make a new AD9371 ctrl object using the specified SPI iface
*
@ -283,6 +284,20 @@ void export_mykonos(py::module& top_module)
py::class_<ad937x_ctrl, std::shared_ptr<ad937x_ctrl>>(m, "ad937x_ctrl")
.def("set_master_clock_rate", &ad937x_ctrl::set_master_clock_rate)
.def("async__set_master_clock_rate",
+[](ad937x_ctrl& self, const double rate) {
self.handle_set_master_clock_rate = std::async(std::launch::async,
[&self, rate]() { self.set_master_clock_rate(rate); });
})
.def("await__set_master_clock_rate",
+[](ad937x_ctrl& self) -> bool {
if (self.handle_set_master_clock_rate.wait_for(std::chrono::seconds(0))
== std::future_status::ready) {
self.handle_set_master_clock_rate.get();
return true;
}
return false;
})
.def("begin_initialization", &ad937x_ctrl::begin_initialization)
.def("async__finish_initialization",
+[](ad937x_ctrl& self) {

4
mpm/python/usrp_mpm/dboard_manager/mg_init.py
View File

@ -556,8 +556,8 @@ class MagnesiumInitManager(object):
self.log.debug(
"Sample Clocks and Phase DAC Configured Successfully!")
# Clocks and PPS are now fully active!
if args.get('skip_rfic', None) == None:
self.mykonos.set_master_clock_rate(master_clock_rate)
if args.get('skip_rfic', None) is None:
async_exec(self.mykonos, "set_master_clock_rate", master_clock_rate)
self.init_jesd(jesdcore, master_clock_rate, args)
jesdcore = None # Help with garbage collection
# That's all that requires access to the dboard regs!