Add I2CPrimitive._scan

nkpro2000sr · bessman · commit 1b272335626a · 2021-06-17T09:36:10.000+02:00
diff --git a/pslab/bus/busio.py b/pslab/bus/busio.py
@@ -29,7 +29,7 @@
 """
 from typing import List, Union
 
-from pslab.bus.i2c import I2CPrimitive, I2CSlave
+from pslab.bus.i2c import I2CPrimitive
 from pslab.serial_handler import SerialHandler
 
 __all__ = "I2C"
@@ -75,15 +75,7 @@ def scan(self) -> List[int]:
         addrs : list of int
             List of 7-bit addresses on which slave devices replied.
         """
-        addrs = []
-
-        for address in range(0x08, 0x77):
-            slave = I2CSlave(address, self._device)
-
-            if slave.ping():
-                addrs.append(address)
-
-        return addrs
+        return self._scan(0x08, 0x77)
 
     def try_lock(self) -> bool:  # pylint: disable=no-self-use
         """Just a dummy method."""
diff --git a/pslab/bus/i2c.py b/pslab/bus/i2c.py
@@ -97,6 +97,31 @@ def _get_i2c_brgval(cls, frequency: float) -> int:
     def _get_i2c_frequency(cls, brgval: int) -> float:
         return 1 / ((brgval + 2) / CP.CLOCK_RATE + cls._SCL_DELAY)
 
+    def _scan(self, start: int = 1, end: int = 128) -> List[int]:
+        """Scan I2C port for connected devices.
+
+        Parameters
+        ----------
+        start : int
+            Address to start scaning at. Defaults to 1(0 is the general call address).
+        end : int
+            Address to scan up to. Defaults to 128.
+
+        Returns
+        -------
+        addrs : list of int
+            List of 7-bit addresses on which slave devices replied.
+        """
+        addrs = []
+
+        for address in range(start, end):
+            slave = I2CSlave(address, self._device)
+
+            if slave.ping():
+                addrs.append(address)
+
+        return addrs
+
     def _start(self, address: int, mode: int) -> int:
         """Initiate I2C transfer.
 
@@ -442,17 +467,13 @@ def scan(self) -> List[int]:
         addrs : list of int
             List of 7-bit addresses on which slave devices replied.
         """
-        addrs = []
-
-        for address in range(1, 128):  # 0 is the general call address.
-            slave = I2CSlave(address, self._device)
+        addrs = self._scan(1, 128)
 
-            if slave.ping():
-                addrs.append(address)
-                logger.info(
-                    f"Response from slave on {hex(address)} "
-                    + f"({sensors.get(address, 'None')})."
-                )
+        for address in addrs:
+            logger.info(
+                f"Response from slave on {hex(address)} "
+                + f"({sensors.get(address, 'None')})."
+            )
 
         return addrs
 
