Merge pull request #699 from slaclab/pre-release

Release Candidate v2.6.4
slaclab · Jun 22, 2020 · 18f1946 · 18f1946
2 parents 59185aa + e3e0414
commit 18f1946
Showing 1 changed file with 11 additions and 35 deletions.
diff --git a/python/surf/devices/ti/_Lmk048Base.py b/python/surf/devices/ti/_Lmk048Base.py
@@ -11,7 +11,6 @@
 import pyrogue as pr
 import re
 import ast
-import time
 
 class Lmk048Base(pr.Device):
     def __init__(self, **kwargs):
@@ -1104,63 +1103,40 @@ def LoadCodeLoaderMacFile(arg):
         @self.command(description='Powerdown the sysref lines',)
         def PwrDwnSysRef():
             self.EnableSysRef.set(0)
-            time.sleep(0.010) # TODO: Optimize this timeout
 
         @self.command(description='Powerup the sysref lines',)
         def PwrUpSysRef():
             self.EnableSysRef.set(self.sysrefMode)
-            self.LmkReg_0x0143.set(0x12)
-            time.sleep(0.010) # TODO: Optimize this timeout
-            self.LmkReg_0x0143.set(0x32)
-            time.sleep(0.010) # TODO: Optimize this timeout
-            self.LmkReg_0x0143.set(0x12)
-            time.sleep(0.010) # TODO: Optimize this timeout
 
         @self.command(description='1: Powerdown',)
         def PwrDwnLmkChip():
             self.POWER_DOWN.set(1)
-            time.sleep(0.010) # TODO: Optimize this timeout
 
         @self.command(description='0: Normal Operation',)
         def PwrUpLmkChip():
             self.POWER_DOWN.set(0)
-            time.sleep(0.010) # TODO: Optimize this timeout
 
         @self.command(description='Synchronize LMK internal counters. Warning this function will power off and power on all the system clocks',)
         def Init():
+            # Cache the current value
             self.sysrefMode = self.EnableSysRef.get()
-            time.sleep(0.010) # TODO: Optimize this timeout
-            self.LmkReg_0x0139.set(0x0)
-            time.sleep(0.010) # TODO: Optimize this timeout
-            self.LmkReg_0x0143.set(0x11)
-            time.sleep(0.010) # TODO: Optimize this timeout
+
+            # Preparing for SYNC
+            self.LmkReg_0x0139.set(self.sysrefMode)
+            self.LmkReg_0x013E.set(0x3)
             self.LmkReg_0x0140.set(0x0)
-            time.sleep(0.010) # TODO: Optimize this timeout
-            self.LmkReg_0x0144.set(0x74)
-            time.sleep(0.010) # TODO: Optimize this timeout
+            self.LmkReg_0x0144.set(0x0)
+
+            # Force a SYNC
             self.LmkReg_0x0143.set(0x11)
-            time.sleep(0.010) # TODO: Optimize this timeout
             self.LmkReg_0x0143.set(0x31)
-            time.sleep(0.010) # TODO: Optimize this timeout
             self.LmkReg_0x0143.set(0x11)
-            time.sleep(0.010) # TODO: Optimize this timeout
+
+            # Disable additional SYNCs
+            self.LmkReg_0x0143.set(0x01)
             self.LmkReg_0x0144.set(0xFF)
-            time.sleep(0.010) # TODO: Optimize this timeout
-            self.LmkReg_0x0139.set(self.sysrefMode)
-            time.sleep(0.010) # TODO: Optimize this timeout
-            self.LmkReg_0x013E.set(0x3)
-            time.sleep(0.010) # TODO: Optimize this timeout
-            self.LmkReg_0x0143.set(0x12)
-            time.sleep(0.010) # TODO: Optimize this timeout
-            self.LmkReg_0x0143.set(0x32)
-            time.sleep(0.010) # TODO: Optimize this timeout
-            self.LmkReg_0x0143.set(0x12)
-            time.sleep(0.010) # TODO: Optimize this timeout
 
             # Fixed Register:
             self.LmkReg_0x0145.set(0x7F) # Always program this register to value 127 (0x7F)
-            time.sleep(0.010) # TODO: Optimize this timeout
             self.LmkReg_0x0171.set(0xAA) # Always program to 170 (0xAA)
-            time.sleep(0.010) # TODO: Optimize this timeout
             self.LmkReg_0x0172.set(0x02) # Always program to 2 (0x02)
-            time.sleep(0.010) # TODO: Optimize this timeout