From df9ca47ed1301eb131fdc0dbdd1e2ab052549aff Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Tue, 2 May 2017 12:54:55 -0700 Subject: mpm: eiscat: magnesium: Removed C++-only SPI ifaces - EISCAT is now Python only with the exception of the definition of the SPI ifaces - Magnesium uses a Python-generated SPI iface - Removed SPI lock from EISCAT dboard --- mpm/python/usrp_mpm/dboard_manager/magnesium.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'mpm/python/usrp_mpm/dboard_manager/magnesium.py') diff --git a/mpm/python/usrp_mpm/dboard_manager/magnesium.py b/mpm/python/usrp_mpm/dboard_manager/magnesium.py index f6db4885c..aa667e1e0 100644 --- a/mpm/python/usrp_mpm/dboard_manager/magnesium.py +++ b/mpm/python/usrp_mpm/dboard_manager/magnesium.py @@ -56,10 +56,21 @@ class Magnesium(DboardManagerBase): """ self.log.debug("Loading C++ drivers...") self._device = lib.dboards.magnesium_manager( - self._spi_nodes['lmk'], self._spi_nodes['mykonos'], ) - self.lmk = self._device.get_clock_ctrl() + SPI_SPEED_HZ = 1000000 + SPI_ADDR_SHIFT = 8 + SPI_DATA_SHIFT = 0 + SPI_READ_FLAG = 1<<23 + SPI_WRIT_FLAG = 0 + self.lmk = lib.spi.make_spidev_regs_iface( + dev_node, + SPI_SPEED_HZ, + SPI_ADDR_SHIFT, + SPI_DATA_SHIFT, + SPI_READ_FLAG, + SPI_WRIT_FLAG + ) self.mykonos = self._device.get_radio_ctrl() self.log.debug("Loaded C++ drivers.") self.log.debug("Getting Mg A uio...") -- cgit v1.2.3