eiscat/mpm: Moved EISCAT full init sequence to UHD

2 files changed, 5 insertions, 16 deletions

diff --git a/mpm/python/usrp_mpm/dboard_manager/eiscat.py b/mpm/python/usrp_mpm/dboard_manager/eiscat.py
index 14b0acd49..0b76c88ee 100644
--- a/mpm/python/usrp_mpm/dboard_manager/eiscat.py
+++ b/mpm/python/usrp_mpm/dboard_manager/eiscat.py
@@ -60,6 +60,9 @@ def create_spidev_iface_phasedac(dev_node):
 class ADS54J56(object):
     """
     Controls for ADS54J56 ADC
+
+    These commands are very specific to the EISCAT daughterboard, so they stay
+    here.
     """
     def __init__(self, regs, log):
         self.log = log
@@ -533,8 +536,8 @@ class EISCAT(DboardManagerBase):
 
     def send_sysref(self):
         """
-        TODO this is a temp way of sending sysref
-        need to replace with timed command
+        Send a SYSREF from MPM. This is not possible to do in a timed
+        fashion though.
         """
         self.log.trace("Sending SYSREF via MPM...")
         self.radio_regs.poke32(self.SYSREF_CONTROL, 0x0)
diff --git a/mpm/python/usrp_mpm/periph_manager/n310.py b/mpm/python/usrp_mpm/periph_manager/n310.py
index b1c4840d7..a5036121a 100644
--- a/mpm/python/usrp_mpm/periph_manager/n310.py
+++ b/mpm/python/usrp_mpm/periph_manager/n310.py
@@ -148,20 +148,6 @@ class n310(PeriphManagerBase):
         }
         for ifname, table in iteritems(self._eth_dispatchers):
             table.set_ipv4_addr(self._chdr_interfaces[ifname]['ip_addr'])
-        self.log.warning("Running a custom EISCAT-specific sequence to bring " \
-                         "up 2 daughterboards without requiring UHD support. " \
-                         "This effectively disables Magnesium and must be " \
-                         "replaced before merging back into n3xx-master."
-                        )
-        self.dboards[0].send_sysref()
-        for dboard in self.dboards:
-            dboard.init_adcs_and_deframers()
-        self.dboards[0].send_sysref()
-        time.sleep(0.5)
-        for dboard in self.dboards:
-            dboard.check_deframer_status()
-            assert dboard.initialized
-
 
     def _allocate_sid(self, sender_addr, port, sid, xbar_src_addr, xbar_src_port):
         """