Merge pull request #68 from fxzjshm/fix-syntax

Fix syntax in snapadc

Author: jkocz

src/snapadc.py

@@ -685,35 +685,35 @@ def test_patterns(self, chipSel=None, taps=None, mode='std', pattern1=None, patt
         if mode not in MODE:
             raise ValueError("Invalid parameter")
 
-        self.select_adc(chipSel)
+        self.selectADC(chipSel)
         if mode=='ramp':        # ramp mode
-            self.controller.test('en_ramp')
+            self.adc.test('en_ramp')
             taps=None
             pattern1=None
             pattern2=None
         elif pattern1==None and pattern2==None:
             # synchronization mode
-            self.controller.test('pat_sync')
+            self.adc.test('pat_sync')
             # pattern1 = 0b11110000 when self.resolution is 8
             # pattern1 = 0b111111000000 when self.resolution is 12
             pattern1 = ((2 ** (self.resolution // 2)) - 1) << (self.resolution // 2)
             pattern1 = self._signed(pattern1, self.resolution)
         elif isinstance(pattern1,int) and pattern2==None:
             # single pattern mode
 
-            if type(self.controller) is HMCAD1520:
+            if type(self.adc) is HMCAD1520:
                 # test patterns of HMCAD1520 need special cares
                 ofst = 16 - self.resolution
                 reg_p1 = pattern1 << ofst
             else:
                 reg_p1 = pattern1
 
-            self.controller.test('single_custom_pat', reg_p1)
+            self.adc.test('single_custom_pat', reg_p1)
             pattern1 = self._signed(pattern1, self.resolution)
         elif isinstance(pattern1,int) and isinstance(pattern2,int):
             # dual pattern mode
 
-            if type(self.controller) is HMCAD1520:
+            if type(self.adc) is HMCAD1520:
                 # test patterns of HMCAD1520 need special cares
                 ofst = 16 - self.resolution
                 reg_p1 = pattern1 << ofst
@@ -722,7 +722,7 @@ def test_patterns(self, chipSel=None, taps=None, mode='std', pattern1=None, patt
                 reg_p1 = pattern1
                 reg_p2 = pattern2
 
-            self.controller.test('dual_custom_pat', reg_p1, reg_p2)
+            self.adc.test('dual_custom_pat', reg_p1, reg_p2)
             pattern1 = self._signed(pattern1, self.resolution)
             pattern2 = self._signed(pattern2, self.resolution)
         else: 
@@ -754,7 +754,7 @@ def _check(data):
 
         if taps == None:
             self.snapshot()
-            results = [_check(self.read_ram(cs)) for cs in chipSel]
+            results = [_check(self.readRAM(cs)) for cs in chipSel]
             results = np.array(results).reshape(len(chipSel),len(self.laneList)).tolist()
             results = dict(zip(chipSel,results))
             for cs in chipSel:
@@ -763,14 +763,14 @@ def _check(data):
             for tap in taps:
                 self.delay(tap, chipSel)
                 self.snapshot()
-                results += [_check(self.read_ram(cs)) for cs in chipSel]
+                results += [_check(self.readRAM(cs)) for cs in chipSel]
             results = np.array(results).reshape(-1,len(chipSel),len(self.laneList))
             results = np.einsum('ijk->jik',results).tolist()
             results = dict(zip(chipSel,results))
             for cs in chipSel:
                 results[cs] = dict(zip(taps,[np.array(row) for row in results[cs]]))
 
-        self.controller.test('off')
+        self.adc.test('off')
 
         if len(chipSel) == 1:
             return results[chipSel[0]]
@@ -1050,8 +1050,4 @@ def from_device_info(cls, parent, device_name, device_info, initialize=False, **
         :param kwargs:
         :return:
         """
-        host = parent
-        #return cls(parent, device_name, device_info, initialize, **kwargs)
-        # XXX should device_info be passed as kwargs to cls? Would require renaming
-        # some parameters, so am not for now.
-        return cls(host)
+        return cls(parent, device_name, device_info, initialize, **kwargs)