diff options
author | Trung N Tran <trung.tran@ettus.com> | 2018-04-27 15:27:13 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2018-04-30 14:36:29 -0700 |
commit | 546aa04355ff34924ce1d00fd003cb0ee63c8cf9 (patch) | |
tree | 7922390d41b4dbc90c1bd71f763b42e05ca85b44 /mpm/python/usrp_mpm/dboard_manager | |
parent | 4e2fd551ad48e1ee13d2b7a203f624dd828c2c3b (diff) | |
download | uhd-546aa04355ff34924ce1d00fd003cb0ee63c8cf9.tar.gz uhd-546aa04355ff34924ce1d00fd003cb0ee63c8cf9.tar.bz2 uhd-546aa04355ff34924ce1d00fd003cb0ee63c8cf9.zip |
mpm: replace long execution function with async call
- Replace mykonos finish_initialization with async version
- Replace myknonos setup_cal with async version
- Remove disable_timeout on rpc_server init()
Diffstat (limited to 'mpm/python/usrp_mpm/dboard_manager')
-rw-r--r-- | mpm/python/usrp_mpm/dboard_manager/magnesium.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/mpm/python/usrp_mpm/dboard_manager/magnesium.py b/mpm/python/usrp_mpm/dboard_manager/magnesium.py index 53341c206..2385b05eb 100644 --- a/mpm/python/usrp_mpm/dboard_manager/magnesium.py +++ b/mpm/python/usrp_mpm/dboard_manager/magnesium.py @@ -21,6 +21,7 @@ from usrp_mpm.dboard_manager.mg_periphs import TCA6408, MgCPLD from usrp_mpm.dboard_manager.mg_periphs import DboardClockControl from usrp_mpm.cores import nijesdcore from usrp_mpm.mpmlog import get_logger +from usrp_mpm.mpmutils import async_exec from usrp_mpm.sys_utils.uio import open_uio from usrp_mpm.sys_utils.udev import get_eeprom_paths from usrp_mpm.cores import ClockSynchronizer @@ -63,6 +64,7 @@ TRACKING_CALIBRATION_TABLE = {"TRACK_RX1_QEC" : 0x01, "ALL" : 0xF3, } + def create_spidev_iface_lmk(dev_node): """ Create a regs iface from a spidev node @@ -513,9 +515,13 @@ class Magnesium(DboardManagerBase): .format(self._init_cals_mask)) self.log.debug("args[tracking_cals]=0x{:02X}" .format(self._tracking_cals_mask)) - self.mykonos.setup_cal(self._init_cals_mask, - self._tracking_cals_mask, - self._init_cals_timeout) + async_exec( + self.mykonos, + "setup_cal", + self._init_cals_mask, + self._tracking_cals_mask, + self._init_cals_timeout + ) def init_lo_source(self, args): """Set all LO @@ -561,10 +567,9 @@ class Magnesium(DboardManagerBase): jesdcore.send_sysref_pulse() time.sleep(0.001) # 17us... ish. jesdcore.send_sysref_pulse() - self.mykonos.finish_initialization() + async_exec(self.mykonos, "finish_initialization") # TODO:can we call this after JESD? self.init_rf_cal(args) - self.log.trace("Starting JESD204b Link Initialization...") # Generally, enable the source before the sink. Start with the DAC side. self.log.trace("Starting FPGA framer...") |