[#92101] ti_dac38j8x_eyescan: Adapt to eyescan library changes

Author: mars-low

protoplaster/tests/dac/ti_dac38j8x_eyescan/process_eyescan.py

@@ -9,6 +9,7 @@
 TI_DAC38J8X_EYESCAN_LIBRARY = False
 try:
     from eyescan.eyescan import perform_eyescan
+    from eyescan.instructions import TestPattern
     TI_DAC38J8X_EYESCAN_LIBRARY = True
 except OSError:
     print(
@@ -18,15 +19,28 @@
 
 class EyeScan:
 
-    def __init__(self, ftdi_dev: int, bit: int) -> None:
+    def __init__(self, pyftdi_url: str, ftdi_jtag_frequency: float,
+                 ftdi_direction: int, ftdi_initial_value: int,
+                 ftdi_reset_bit: int, daisy_chain_device_number: int,
+                 daisy_chain_device_count: int, bit: int,
+                 test_pattern: TestPattern) -> None:
         self.eyescan_file = tempfile.NamedTemporaryFile()
         self.axis_multiplier = {"x": 1, "y": 10}
         self.bit = bit
 
         # Check if the eyescan library is available
         assert TI_DAC38J8X_EYESCAN_LIBRARY, "TI DAC38J8X eyescan library is not available."
 
-        perform_eyescan(ftdi_dev, self.eyescan_file.name, bit)
+        perform_eyescan(pyftdi_url=pyftdi_url,
+                        ftdi_jtag_frequency=ftdi_jtag_frequency,
+                        ftdi_direction=ftdi_direction,
+                        ftdi_initial_value=ftdi_initial_value,
+                        ftdi_reset_bit=ftdi_reset_bit,
+                        daisy_chain_device_number=daisy_chain_device_number,
+                        daisy_chain_device_count=daisy_chain_device_count,
+                        output_path=self.eyescan_file.name,
+                        bit_number=bit,
+                        test_pattern=test_pattern)
 
     def parse_file(self) -> list[dict]:
         samples_by_lane = defaultdict(lambda: defaultdict(list))

protoplaster/tests/dac/ti_dac38j8x_eyescan/test.py

@@ -3,6 +3,7 @@
 
 from protoplaster.conf.module import ModuleName
 from .process_eyescan import EyeScan
+from eyescan.instructions import TestPattern
 
 
 @ModuleName("ti_dac38j8x_eyescan")
@@ -16,8 +17,6 @@ class TestTiDac38j8xEyescan:
     """
 
     def configure(self):
-        assert hasattr(self,
-                       "ftdi_dev"), "`ftdi_dev` test attribute is required"
         assert hasattr(self, "bit"), "`bit` test attribute is required"
         assert hasattr(
             self,
@@ -26,7 +25,43 @@ def configure(self):
             self,
             "eyescan_diagram"), "`eyescan_diagram` test attribute is required"
 
-        self.eyescan = EyeScan(self.ftdi_dev, self.bit)
+        def parse_test_pattern(pattern):
+            try:
+                return TestPattern[pattern]
+            except KeyError:
+                raise ValueError(
+                    f"{pattern} is not a valid test pattern ({[str(i) for i in TestPattern]})"
+                )
+
+        if not hasattr(self, "ftdi_jtag_frequency"):
+            setattr(self, "ftdi_jtag_frequency", 1E5)
+        if not hasattr(self, "ftdi_direction"):
+            setattr(self, "ftdi_direction", 0x308B)
+        if not hasattr(self, "ftdi_initial_value"):
+            setattr(self, "ftdi_initial_value", 0x2088)
+        if not hasattr(self, "ftdi_reset_bit"):
+            setattr(self, "ftdi_reset_bit", 0x2000)
+        if not hasattr(self, "daisy_chain_count"):
+            setattr(self, "daisy_chain_count", 1)
+        if not hasattr(self, "daisy_chain_number"):
+            setattr(self, "daisy_chain_number", 1)
+        if not hasattr(self, "pyftdi_url"):
+            setattr(self, "pyftdi_url", "ftdi:///1")
+        if not hasattr(self, "test_pattern"):
+            setattr(self, "test_pattern", TestPattern.PRBS_7_BIT)
+        else:
+            self.test_pattern = parse_test_pattern(self.test_pattern)
+
+        self.eyescan = EyeScan(
+            pyftdi_url=self.pyftdi_url,
+            ftdi_jtag_frequency=self.ftdi_jtag_frequency,
+            ftdi_direction=self.ftdi_direction,
+            ftdi_initial_value=self.ftdi_initial_value,
+            ftdi_reset_bit=self.ftdi_reset_bit,
+            daisy_chain_device_number=self.daisy_chain_number,
+            daisy_chain_device_count=self.daisy_chain_count,
+            bit=self.bit,
+            test_pattern=self.test_pattern)
 
     def test_create_diagram(self, record_artifact, artifacts_dir):
         """

requirements.txt

@@ -12,4 +12,4 @@ Flask==3.1.2
 flask-cors==6.0.1
 requests==2.32.5
 waitress==3.0.2
-eyescan @ git+https://github.com/antmicro/dac-eyescan-test.git@3228304
+eyescan @ git+https://github.com/antmicro/dac-eyescan-test.git@9e49c22