diff options
| -rw-r--r-- | mpm/python/usrp_mpm/dboard_manager/magnesium.py | 10 | ||||
| -rw-r--r-- | mpm/python/usrp_mpm/nijesdcore.py | 6 |
2 files changed, 7 insertions, 9 deletions
diff --git a/mpm/python/usrp_mpm/dboard_manager/magnesium.py b/mpm/python/usrp_mpm/dboard_manager/magnesium.py index 9d645a354..f6db4885c 100644 --- a/mpm/python/usrp_mpm/dboard_manager/magnesium.py +++ b/mpm/python/usrp_mpm/dboard_manager/magnesium.py @@ -86,7 +86,7 @@ class Magnesium(DboardManagerBase): self.jesdcore.init() self.log.trace("Resetting Mykonos...") - self.reset_mykonos() #not sure who owns the reset + self.jesdcore.reset_mykonos() #not sure who owns the reset self.log.trace("Initializing Mykonos...") self.mykonos.begin_initialization() @@ -112,14 +112,6 @@ class Magnesium(DboardManagerBase): #if (!self.mykonos.get_deframer_status()) # raise Exception('Mykonos Deframer is not synced!') - def reset_mykonos(self): - " Toggle reset line on Mykonos " - # SUPER GHETTO FIXME - import os - os.system('devmem2 0x4001000C w 2') # Active low reset - time.sleep(0.001) - os.system('devmem2 0x4001000C w 10') - def read_eeprom_v1(self, data): """ read eeprom data version 1 diff --git a/mpm/python/usrp_mpm/nijesdcore.py b/mpm/python/usrp_mpm/nijesdcore.py index 60888a5c1..d4c8d40b9 100644 --- a/mpm/python/usrp_mpm/nijesdcore.py +++ b/mpm/python/usrp_mpm/nijesdcore.py @@ -142,3 +142,9 @@ class NIMgJESDCore(object): if rb & 0xF != 0x2: raise Exception("GT PLL failed to lock!") + def reset_mykonos(self): + " Toggle reset line on Mykonos " + self.regs.poke32(0x0008, 0) # Active low reset + time.sleep(0.001) + self.regs.poke32(0x0008, 1) # No longer in reset + |