Merge pull request #204 from slaclab/pre-release

v1.7.4 release candidate
slaclab · Apr 4, 2018 · 058604c · 058604c
2 parents 5f80d9f + 933c720
commit 058604c
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 28 deletions.
diff --git a/python/surf/devices/linear/_ltc2270.py b/python/surf/devices/linear/_ltc2270.py
@@ -60,7 +60,7 @@ def __init__(self,
         self.add(pr.RemoteVariable(  
             name        = 'ClkPhase',
             description = 'ClkPhase',
-            offset      = 0x004, 
+            offset      = 0x008, 
             bitSize     = 2, 
             bitOffset   = 1, 
             base        = pr.UInt,
@@ -70,7 +70,7 @@ def __init__(self,
         self.add(pr.RemoteVariable(  
             name        = 'Dcs',
             description = 'Dcs',
-            offset      = 0x004,
+            offset      = 0x008,
             bitSize     = 1, 
             bitOffset   = 0, 
             base        = pr.Bool,
@@ -80,17 +80,17 @@ def __init__(self,
         self.add(pr.RemoteVariable(  
             name        = 'ILvds',
             description = 'ILvds',
-            offset      = 0x008, 
+            offset      = 0x00C, 
             bitSize     = 3, 
-            bitOffset   = 3, 
+            bitOffset   = 4, 
             base        = pr.UInt,
             mode        = 'RW',
         ))                
 
         self.add(pr.RemoteVariable(  
             name        = 'TermOn',
             description = 'TermOn',
-            offset      = 0x008, 
+            offset      = 0x00C, 
             bitSize     = 1, 
             bitOffset   = 3, 
             base        = pr.Bool,
@@ -100,7 +100,7 @@ def __init__(self,
         self.add(pr.RemoteVariable(  
             name        = 'OutOff',
             description = 'OutOff',
-            offset      = 0x008, 
+            offset      = 0x00C, 
             bitSize     = 1, 
             bitOffset   = 2, 
             base        = pr.Bool,
@@ -110,7 +110,7 @@ def __init__(self,
         self.add(pr.RemoteVariable(  
             name        = 'OutMode',
             description = 'OutMode',
-            offset      = 0x008, 
+            offset      = 0x00C, 
             bitSize     = 2, 
             bitOffset   = 0, 
             base        = pr.UInt,
@@ -120,7 +120,7 @@ def __init__(self,
         self.add(pr.RemoteVariable(  
             name        = 'OutTest',
             description = 'OutTest',
-            offset      = 0x00C, 
+            offset      = 0x010, 
             bitSize     = 3, 
             bitOffset   = 3, 
             base        = pr.UInt,
@@ -130,7 +130,7 @@ def __init__(self,
         self.add(pr.RemoteVariable(  
             name        = 'Abp',
             description = 'Abp',
-            offset      = 0x00C, 
+            offset      = 0x010, 
             bitSize     = 1, 
             bitOffset   = 2, 
             base        = pr.Bool,
@@ -140,7 +140,7 @@ def __init__(self,
         self.add(pr.RemoteVariable(  
             name        = 'Rand',
             description = 'Rand',
-            offset      = 0x00C, 
+            offset      = 0x010, 
             bitSize     = 1, 
             bitOffset   = 1, 
             base        = pr.Bool,
@@ -150,7 +150,7 @@ def __init__(self,
         self.add(pr.RemoteVariable(  
             name        = 'TwoComp',
             description = 'TwoComp',
-            offset      = 0x00C, 
+            offset      = 0x010, 
             bitSize     = 1, 
             bitOffset   = 0, 
             base        = pr.Bool,

diff --git a/python/surf/devices/micron/_AxiMicronP30.py b/python/surf/devices/micron/_AxiMicronP30.py
@@ -30,7 +30,7 @@ def __init__(self,
         super().__init__(
             name        = name, 
             description = description, 
-            size        = (0x1 << 11), 
+            size        = (0x1 << 12), 
             **kwargs)
 
         self._mcs = McsReader()        

diff --git a/python/surf/protocols/clink/_ClinkChannel.py b/python/surf/protocols/clink/_ClinkChannel.py
@@ -164,18 +164,18 @@ def __init__(   self,
             self._tx = surf.protocols.clink.ClinkSerialTx()
             pr.streamConnect(self._tx,serial)
 
-    @pr.command(order=1, value='', name='SendString', description='Send a command string')
-    def sendString(self, arg):
-        if self._tx is not None:
-            self._tx.sendString(arg)
-
-    @pr.command(order=2, name='SendEscape', description='Send an escape charactor')
-    def sendEscape(self):
-        if self._tx is not None:
-            self._tx.sendEscape()
-
-    @pr.command(order=3, name='SendGcp', description='Send gcp command')
-    def sendGcp(self):
-        if self._tx is not None:
-            self._tx.sendString("gcp")
+        @self.command(value='', name='SendString', description='Send a command string')
+        def sendString(arg):
+            if self._tx is not None:
+                self._tx.sendString(arg)
+
+        @self.command(name='SendEscape', description='Send an escape charactor')
+        def sendEscape():
+            if self._tx is not None:
+                self._tx.sendEscape()
+
+        @self.command(name='SendGcp', description='Send gcp command')
+        def sendGcp():
+            if self._tx is not None:
+                self._tx.sendString("gcp")
 
diff --git a/python/surf/protocols/clink/_ClinkSerialTx.py b/python/surf/protocols/clink/_ClinkSerialTx.py
@@ -29,7 +29,7 @@ def sendEscape(self):
         ba = bytearray(4)
         ba[0] = 27
 
-        frame = self._reqFrame(len(ba),True,0)
+        frame = self._reqFrame(len(ba),True)
         frame.write(ba,0)
         self._sendFrame(frame)
 
@@ -41,7 +41,7 @@ def sendString(self,st):
             i += 4
         ba[i] = 0x0D
 
-        frame = self._reqFrame(len(ba),True,0)
+        frame = self._reqFrame(len(ba),True)
         frame.write(ba,0)
         self._sendFrame(frame)