ekfsm 1.3.0a32__py3-none-any.whl → 1.4.0a37__py3-none-any.whl

ekfsm/boards/oem/ekf/sq3-quartet.yaml

@@ -2,40 +2,54 @@ id: 69
 name: "EKF SQ3-QUARTET"
 slot_type: CPCI_S0_PER
 children:
-    - device_type: I2CMux
-      name: "MUX"
-      addr: 0x70
-      slot_coding_mask: 0x07
-      children:
-        - device_type: MuxChannel
-          name: "CH00"
-          channel_id: 0
-          children:
-            - device_type: EKFIdentificationIOExpander
-              name: "GPIO"
-              addr: 0x3D
-              provides:
-                inventory:
-                  - revision
-            - device_type: EKF_EEPROM
-              name: "EEPROM"
-              addr: 0x55
-              provides:
-                inventory:
-                  - vendor
-                  - serial
-                  - model
-                  - repaired_at
-                  - manufactured_at
-        - device_type: MuxChannel
-          name: "CH01"
-          channel_id: 1
-          children:
-        - device_type: MuxChannel
-          name: "CH02"
-          channel_id: 2
-          children:
-        - device_type: MuxChannel
-          name: "CH03"
-          channel_id: 3
-          children:
+  - device_type: IO4Edge
+    name: "BMC"
+    children:
+      - device_type: PixelDisplay
+        name: "display"
+      - device_type: ButtonArray
+        name: "buttons"
+        children:
+          - device_type: Button
+            name: "up"
+            channel_id: 0
+          - device_type: Button
+            name: "down"
+            channel_id: 1
+  - device_type: I2CMux
+    name: "MUX"
+    addr: 0x70
+    slot_coding_mask: 0x07
+    children:
+      - device_type: MuxChannel
+        name: "CH00"
+        channel_id: 0
+        children:
+          - device_type: EKFIdentificationIOExpander
+            name: "GPIO"
+            addr: 0x3D
+            provides:
+              inventory:
+                - revision
+          - device_type: EKF_EEPROM
+            name: "EEPROM"
+            addr: 0x55
+            provides:
+              inventory:
+                - vendor
+                - serial
+                - model
+                - repaired_at
+                - manufactured_at
+      - device_type: MuxChannel
+        name: "CH01"
+        channel_id: 1
+        children:
+      - device_type: MuxChannel
+        name: "CH02"
+        channel_id: 2
+        children:
+      - device_type: MuxChannel
+        name: "CH03"
+        channel_id: 3
+        children:

ekfsm/boards/oem/ekf/z1010.yaml

@@ -0,0 +1,87 @@
+id: 112
+name: "EKF Z1010"
+slot_type: CPCI_S0_UTILITY
+children:
+  - device_type: I2CMux
+    name: "MUX"
+    addr: 0x70
+    slot_coding_mask: 0x0
+    children:
+      - device_type: MuxChannel
+        name: "CH00"
+        channel_id: 0
+        children:
+          - device_type: EKFIdentificationIOExpander
+            name: "GPIO"
+            addr: 0x3D
+            provides:
+              inventory:
+                - revision
+          - device_type: EKF_EEPROM
+            name: "EEPROM"
+            addr: 0x55
+            provides:
+              inventory:
+                - vendor
+                - serial
+                - model
+                - repaired_at
+                - manufactured_at
+              # chassis_inventory:
+              #   - revision: crevision
+              #   - write_revision: write_crevision
+              #   - vendor: cvendor
+              #   - write_vendor: write_cvendor
+              #   - serial: cserial
+              #   - write_serial: write_cserial
+              #   - model: cmodel
+              #   - write_model: write_cmodel
+              #   - unit
+              #   - write_unit
+              # custom_eeprom:
+              #   - write: write_customer_area
+              #   - read: customer_area
+  - device_type: IO4Edge
+    name: "SMC"
+    provides:
+      management:
+        - identify_firmware
+        - load_firmware
+        - load_parameter
+        - get_parameter
+        - restart
+    children:
+      - device_type: LEDArray
+        name: "leds"
+        children:
+          - device_type: ColorLED
+            name: "led0"
+            channel_id: 0
+          - device_type: ColorLED
+            name: "led1"
+            channel_id: 1
+          - device_type: ColorLED
+            name: "led2"
+            channel_id: 2
+          - device_type: ColorLED
+            name: "led3"
+            channel_id: 3
+          - device_type: ColorLED
+            name: "led4"
+            channel_id: 4
+          - device_type: ColorLED
+            name: "led5"
+            channel_id: 5
+          - device_type: ColorLED
+            name: "led6"
+            channel_id: 6
+          - device_type: ColorLED
+            name: "led7"
+            channel_id: 7
+      - device_type: Watchdog
+        name: "watchdog"
+        provides:
+          sysstate:
+            - kick
+      - device_type: ThermalHumidity
+        name: "th"

ekfsm/core/components.py

@@ -51,7 +51,7 @@ class HWModule(SysTree):
         *args,
         **kwargs,
     ) -> None:
-        from ekfsm.core.utils import deserialize_hardware_tree
+        from ekfsm.core.utils import deserialize_hardware_tree, deserialize_module
 
         from .slots import SlotType
 
@@ -59,9 +59,8 @@ class HWModule(SysTree):
         self._slot: Slot = slot
         self.config = config
 
-        self.id, self.board_type, slot_type, self.children = deserialize_hardware_tree(
-            self.logger, self.config, parent=self
-        )
+        self.id, self.board_type, slot_type = deserialize_module(self.logger, config)
+        self.children = deserialize_hardware_tree(self.logger, self.config, parent=self)
 
         self.slot_type = SlotType.from_string(slot_type)
 

ekfsm/core/slots.py

@@ -102,7 +102,9 @@ class Slot:
         }
 
     def __repr__(self) -> str:
-        return f"{self.__class__.__name__}(name={self._name}, slot_type={self.slot_type})"
+        return (
+            f"{self.__class__.__name__}(name={self._name}, slot_type={self.slot_type})"
+        )
 
     @property
     def name(self) -> str:
@@ -123,7 +125,10 @@ class Slot:
         """
         Return True if the slot is populated with the desired hardware module type, False otherwise.
         """
-        return self.hwmodule is not None and self.hwmodule.board_type.lower() == self._desired_hwmodule_type.lower()
+        return (
+            self.hwmodule is not None
+            and self.hwmodule.board_type.lower() == self._desired_hwmodule_type.lower()
+        )
 
 
 class Slots(Munch):

ekfsm/core/utils.py

@@ -55,10 +55,14 @@ def import_board(logger: logging.Logger, data, parent=None, abort: bool = False)
                 import_board(logger, data=child, parent=node, abort=abort)
             except Exception as e:
                 if abort:
-                    logger.error(f"Failed to import sub device {pformat(child)}: {e}. Aborting.")
+                    logger.error(
+                        f"Failed to import sub device {pformat(child)}: {e}. Aborting."
+                    )
                     raise e
                 else:
-                    logger.error(f"Failed to import sub device {pformat(child)}: {e}. Continuing anyway.")
+                    logger.error(
+                        f"Failed to import sub device {pformat(child)}: {e}. Continuing anyway."
+                    )
     return node
 
 
@@ -69,7 +73,9 @@ def provides_validator(x: Any) -> Any:
         key, value = next(iter(x.items()))
         if isinstance(key, str) and isinstance(value, str):
             return x
-    raise SchemaError("Each provides item must be either a string or a dictionary with one string key/value pair")
+    raise SchemaError(
+        "Each provides item must be either a string or a dictionary with one string key/value pair"
+    )
 
 
 device_schema = Schema({})
@@ -81,6 +87,7 @@ _device_structure = Schema(
         Optional("addr"): int,
         Optional("slot_coding_mask"): int,
         Optional("channel_id"): int,
+        Optional("service_suffix"): str,
         Optional("provides"): {
             Optional(str): [Use(provides_validator)],
         },
@@ -103,30 +110,46 @@ module_schema = Schema(
 )
 
 
+def deserialize_module(logger: logging.Logger, data: dict) -> tuple[str, str, str]:
+    """
+    docstring
+    """
+    module_schema.validate(data)
+
+    id, name, slot_type = (data[key] for key in ["id", "name", "slot_type"])
+    logger.debug(colored(f"Importing top level module {pformat(name)}", "green"))
+
+    return id, name, slot_type
+
+
 def deserialize_hardware_tree(
     logger: logging.Logger, data: dict, parent: "HWModule"
-) -> tuple[str, str, str, list["Device"]]:
+) -> list["Device"]:
     abort = parent.abort
 
     module_schema.validate(data)
 
-    id, name, slot_type = (data.pop(key) for key in ["id", "name", "slot_type"])
-
     children = data.pop("children", None)
     if not children:
-        return id, name, slot_type, []
+        return []
 
     devices = []
     for child in children:
         try:
-            logger.debug(colored(f"Importing top level device {pformat(child)}", "green"))
+            logger.debug(
+                colored(f"Importing top level device {pformat(child)}", "green")
+            )
 
             node = import_board(logger, child, parent=parent, abort=abort)
             devices.append(node)
         except Exception as e:
-            logger.error(colored(f"Failed to import top-level device {pformat(child)}: {e}", "red"))
+            logger.error(
+                colored(
+                    f"Failed to import top-level device {pformat(child)}: {e}", "red"
+                )
+            )
             logger.error(colored("Aborting." if abort else "Continuing anyway", "red"))
             if abort:
                 raise
 
-    return id, name, slot_type, devices
+    return devices

ekfsm/devices/__init__.py

@@ -1,6 +1,7 @@
 from ekfsm.devices.coretemp import CoreTemp
 from ekfsm.devices.generic import Device
 from ekfsm.devices.smbios import SMBIOS
+from ekfsm.devices.thermal_humidity import ThermalHumidity
 
 from .eeprom import EEPROM, EKF_CCU_EEPROM, EKF_EEPROM
 from .ekf_ccu_uc import EKFCcuUc
@@ -9,6 +10,13 @@ from .gpio import GPIO, EKFIdentificationIOExpander, GPIOExpander
 from .iio_thermal_humidity import IIOThermalHumidity
 from .mux import I2CMux, MuxChannel
 from .pmbus import PMBus, PSUStatus
+from .io4edge import IO4Edge
+from .pixelDisplay import PixelDisplay
+from .buttonArray import ButtonArray
+from .button import Button
+from .colorLed import ColorLED
+from .ledArray import LEDArray
+from .watchdog import Watchdog
 
 CLASS_MAP = {
     "GenericDevice": Device,
@@ -27,4 +35,12 @@ CLASS_MAP = {
     "HWMON": CoreTemp,
     "EKFSurLed": EKFSurLed,
     "IIOThermalHumidity": IIOThermalHumidity,
+    "ThermalHumidity": ThermalHumidity,
+    "IO4Edge": IO4Edge,
+    "PixelDisplay": PixelDisplay,
+    "ButtonArray": ButtonArray,
+    "Button": Button,
+    "ColorLED": ColorLED,
+    "LEDArray": LEDArray,
+    "Watchdog": Watchdog,
 }

ekfsm/devices/button.py

@@ -0,0 +1,45 @@
+from typing import Callable
+from ekfsm.devices.generic import Device
+
+
+class Button(Device):
+    """
+    Device class for handling a button array.
+    """
+
+    def __init__(
+        self,
+        name: str,
+        parent: Device,
+        children: list[Device] | None = None,
+        abort: bool = False,
+        channel_id: int = 0,
+        *args,
+        **kwargs,
+    ):
+
+        super().__init__(name, parent, children, abort, *args, **kwargs)
+
+        self.channel_id = channel_id
+
+        self._handler: Callable | None = None
+
+    @property
+    def handler(self):
+        """
+        Handle button events with a callback function.
+        """
+        return self._handler
+
+    @handler.setter
+    def handler(self, func: Callable | None, *args, **kwargs):
+        """
+        Handle button events with a callback function.
+        """
+        if callable(func):
+            self._handler = func
+        else:
+            self._handler = None
+
+    def __repr__(self):
+        return f"{self.name}; Channel ID: {self.channel_id}"

ekfsm/devices/buttonArray.py

@@ -0,0 +1,84 @@
+import threading
+from ekfsm.devices.button import Button
+from ekfsm.devices.generic import Device
+from ekfsm.devices.io4edge import IO4Edge
+import io4edge_client.binaryiotypeb as binio
+import io4edge_client.functionblock as fb
+
+
+class ButtonArray(Device):
+    """
+    Device class for handling a button array.
+    """
+
+    def __init__(
+        self,
+        name: str,
+        parent: IO4Edge,
+        children: list[Device] | None = None,
+        abort: bool = False,
+        service_suffix: str | None = None,
+        *args,
+        **kwargs,
+    ):
+
+        super().__init__(name, parent, children, abort, *args, **kwargs)
+
+        self.name = name
+
+        if service_suffix is not None:
+            self.service_suffix = service_suffix
+        else:
+            self.service_suffix = name
+
+        self.service_addr = f"{parent.deviceId}-{self.service_suffix}"
+
+        self.client = binio.Client(self.service_addr)
+
+        self.subscriptionType = binio.Pb.SubscriptionType.BINARYIOTYPEB_ON_RISING_EDGE
+        self.stream_cfg = fb.Pb.StreamControlStart(
+            bucketSamples=1,  # 1 sample per bucket, also ein event pro bucket
+            keepaliveInterval=10000,  # rueckmeldung auch ohne events alle 10 Sekunden
+            bufferedSamples=2,  # 2 samples werden gepuffert
+            low_latency_mode=True,  # schickt soweit moeglich sofort die Events
+        )
+
+    def read(self, stop_event: threading.Event | None = None, timeout: float = 0.1):
+        """
+        Read all button events and dispatch to handlers.
+        """
+        self.client.start_stream(
+            binio.Pb.StreamControlStart(
+                subscribeChannel=tuple(
+                    binio.Pb.SubscribeChannel(
+                        channel=button.channel_id,
+                        subscriptionType=self.subscriptionType,
+                    )
+                    for button in self.children
+                    if isinstance(button, Button)
+                )
+            ),
+            self.stream_cfg,
+        )
+        try:
+            while not (stop_event and stop_event.is_set()):
+                try:
+                    _, samples = self.client.read_stream(timeout=timeout)
+                    for sample in samples.samples:
+                        for button in self.children:
+                            if isinstance(button, Button):
+                                pressed = bool(sample.inputs & (1 << button.channel_id))
+                                if pressed and button.handler:
+                                    button.handler()
+                except TimeoutError:
+                    continue
+        finally:
+            try:
+                if stop_event:
+                    stop_event.clear()
+                self.client.stop_stream()
+            except TimeoutError:
+                pass
+
+    def __repr__(self):
+        return f"{self.name}; Service Address: {self.service_addr}"

ekfsm/devices/colorLed.py

@@ -0,0 +1,51 @@
+from ekfsm.devices.generic import Device
+from ekfsm.devices.ledArray import LEDArray
+from io4edge_client.api.colorLED.python.colorLED.v1alpha1.colorLED_pb2 import Color
+
+
+class ColorLED(Device):
+    """
+    Device class for handling a color LED.
+    """
+
+    def __init__(
+        self,
+        name: str,
+        parent: LEDArray,
+        children: list[Device] | None = None,
+        abort: bool = False,
+        channel_id: int = 0,
+        *args,
+        **kwargs,
+    ):
+
+        super().__init__(name, parent, children, abort, *args, **kwargs)
+
+        self.name = name
+        self.channel_id = channel_id
+
+        self.client = parent.client
+
+    def describe(self):
+        pass
+
+    def get(self) -> tuple[Color, bool]:
+        """
+        Get color LED state.
+        @raises RuntimeError: if the command fails
+        @raises TimeoutError: if the command times out
+        """
+        return self.client.get(self.channel_id)
+
+    def set(self, color: Color, blink: bool) -> None:
+        """
+        Set the color of the color LED.
+        @param Color: The color to set the LED to.
+        @param blink: Whether to blink the LED.
+        @raises RuntimeError: if the command fails
+        @raises TimeoutError: if the command times out
+        """
+        self.client.set(self.channel_id, color, blink)
+
+        def __repr__(self):
+            return f"{self.name}; Channel ID: {self.channel_id}"

ekfsm/devices/io4edge.py

@@ -0,0 +1,94 @@
+from typing import Callable, Optional
+from ekfsm.core.components import HWModule
+from ekfsm.devices.generic import Device
+import io4edge_client.core.coreclient as Client
+
+from re import sub
+
+
+class IO4Edge(Device):
+    """
+    Device class for handling IO4Edge devices.
+    """
+
+    def __init__(
+        self,
+        name: str,
+        parent: HWModule | None = None,
+        children: list[Device] | None = None,
+        abort: bool = False,
+        *args,
+        **kwargs,
+    ):
+
+        super().__init__(name, parent, children, abort, *args, **kwargs)
+
+        attr = self.hw_module.slot.attributes
+        if (
+            attr is None
+            or not hasattr(attr, "slot_coding")
+            or getattr(attr, "slot_coding") is None
+        ):
+            raise ValueError(
+                f"Slot attributes for {self.hw_module.slot.name} are not set or do not contain 'slot_coding'."
+            )
+        else:
+            geoaddr = int(attr.slot_coding)
+            self._geoaddr = geoaddr
+
+        _, module_name = sub(r"-.*$", "", self.hw_module.board_type).split(maxsplit=1)
+        self._module_name = module_name
+        self.client = Client.new_core_client(self.deviceId)
+
+    @property
+    def deviceId(self) -> str:
+        """
+        Returns the device ID for the IO4Edge device.
+        The device ID is a combination of the module name and the geo address.
+        """
+        return f"{self._module_name}-geo_addr{self._geoaddr:02d}"
+
+    def identify_firmware(self) -> tuple[str, str]:
+        return (
+            self.client.identify_firmware().title,
+            self.client.identify_firmware().version,
+        )
+
+    def load_firmware(
+        self, cfg: bytes, progress_callback: Optional[Callable[[float], None]] = None
+    ) -> None:
+        """
+        Load firmware onto the IO4Edge device.
+
+        cfg
+            Firmware configuration bytes.
+        progress_callback
+            Optional callback for progress updates.
+        """
+        self.client.load_firmware(cfg, progress_callback)
+
+    def restart(self) -> None:
+        self.client.restart()
+
+    def load_parameter(self, name: str, value: str) -> None:
+        """
+        Set a parameter onto the IO4Edge device.
+
+        cfg
+            The name of the parameter to load.
+        value
+            The value to set for the parameter.
+        """
+        self.client.set_persistent_parameter(name, value)
+
+    def get_parameter(self, name: str) -> str:
+        """
+        Get a parameter value from the IO4Edge device.
+
+        Returns
+            The value of the requested parameter.
+        """
+        return self.client.get_persistent_parameter(name)
+
+    def __repr__(self):
+        return f"{self.name}; DeviceId: {self.deviceId}"

ekfsm/devices/ledArray.py

@@ -0,0 +1,36 @@
+from ekfsm.devices.generic import Device
+from ekfsm.devices.io4edge import IO4Edge
+from io4edge_client.colorLED import Client
+
+
+class LEDArray(Device):
+    """
+    Device class for handling a LED array.
+    """
+
+    def __init__(
+        self,
+        name: str,
+        parent: IO4Edge,
+        children: list[Device] | None = None,
+        abort: bool = False,
+        service_suffix: str | None = None,
+        *args,
+        **kwargs,
+    ):
+
+        super().__init__(name, parent, children, abort, *args, **kwargs)
+
+        self.name = name
+
+        if service_suffix is not None:
+            self.service_suffix = service_suffix
+        else:
+            self.service_suffix = name
+
+        self.service_addr = f"{parent.deviceId}-{self.service_suffix}"
+
+        self.client = Client(self.service_addr)
+
+    def __repr__(self):
+        return f"{self.name}; Service Address: {self.service_addr}"

ekfsm/devices/pixelDisplay.py

@@ -0,0 +1,88 @@
+from ekfsm.devices.generic import Device
+from ekfsm.devices.io4edge import IO4Edge
+from io4edge_client.pixelDisplay import Client
+from PIL import Image
+
+
+class PixelDisplay(Device):
+    """
+    Device class for handling a pixel display.
+    """
+
+    def __init__(
+        self,
+        name: str,
+        parent: IO4Edge,
+        children: list[Device] | None = None,
+        abort: bool = False,
+        service_suffix: str | None = None,
+        *args,
+        **kwargs,
+    ):
+
+        super().__init__(name, parent, children, abort, *args, **kwargs)
+
+        self.name = name
+
+        if service_suffix is not None:
+            self.service_suffix = service_suffix
+        else:
+            self.service_suffix = name
+
+        self.service_addr = f"{parent.deviceId}-{self.service_suffix}"
+
+        self.client = Client(self.service_addr)
+
+    def describe(self) -> dict:
+        """
+        Returns a description of the pixel display.
+        """
+        describe = self.client.describe()
+        desc = {
+            "height": describe.height_pixel,
+            "width": describe.width_pixel,
+            "max_num_of_pixel": describe.max_num_of_pixel,
+        }
+        return desc
+
+    @property
+    def height(self) -> int:
+        """
+        Returns the height of the pixel display in pixels.
+        """
+        return self.describe()["height"]
+
+    @property
+    def width(self) -> int:
+        """
+        Returns the width of the pixel display in pixels.
+        """
+        return self.describe()["width"]
+
+    def off(self) -> None:
+        """
+        Turn off the pixel display.
+        @raises RuntimeError: if the command fails
+        @raises TimeoutError: if the command times out
+        """
+        self.client.set_display_off()
+
+    def display_image(self, path: str) -> None:
+        """
+        Display an image on the pixel display.
+        @raises RuntimeError: if the command fails
+        @raises TimeoutError: if the command times out
+        """
+        with Image.open(path) as img:
+            img = img.convert("RGB")
+            pix = img.load()
+
+        for i in range(0, 320, 16):
+            pix_area = []
+            for k in range(0, 16):
+                for j in range(0, 240):
+                    pix_area.append(pix[j, i + k])
+            self.client.set_pixel_area(0, i, 239, pix_area)
+
+    def __repr__(self):
+        return f"{self.name}; Service Address: {self.service_addr}"

ekfsm/devices/thermal_humidity.py

@@ -0,0 +1,44 @@
+from ekfsm.devices.generic import Device
+from ekfsm.devices.io4edge import IO4Edge
+from io4edge_client.analogintypea import Client
+
+
+class ThermalHumidity(Device):
+    """
+    Device class for handling a thermal humidity sensor.
+    """
+
+    def __init__(
+        self,
+        name: str,
+        parent: IO4Edge,
+        children: list[Device] | None = None,
+        abort: bool = False,
+        service_suffix: str | None = None,
+        *args,
+        **kwargs,
+    ):
+
+        super().__init__(name, parent, children, abort, *args, **kwargs)
+
+        self.name = name
+
+        if service_suffix is not None:
+            self.service_suffix = service_suffix
+        else:
+            self.service_suffix = name
+
+        self.service_addr = f"{parent.deviceId}-{self.service_suffix}"
+
+        self.client = Client(self.service_addr)
+
+    def __repr__(self):
+        return f"{self.name}; Service Address: {self.service_addr}"
+
+    def temperature(self) -> float:
+        """
+        Get the temperature in Celsius.
+        @raises RuntimeError: if the command fails
+        @raises TimeoutError: if the command times out
+        """
+        return self.client.value()

ekfsm/devices/watchdog.py

@@ -0,0 +1,44 @@
+from ekfsm.devices.generic import Device
+from ekfsm.devices.io4edge import IO4Edge
+from io4edge_client.watchdog import Client
+
+
+class Watchdog(Device):
+    """
+    Device class for handling a color LED.
+    """
+
+    def __init__(
+        self,
+        name: str,
+        parent: IO4Edge,
+        children: list[Device] | None = None,
+        abort: bool = False,
+        service_suffix: str | None = None,
+        *args,
+        **kwargs,
+    ):
+
+        super().__init__(name, parent, children, abort, *args, **kwargs)
+
+        self.name = name
+
+        if service_suffix is not None:
+            self.service_suffix = service_suffix
+        else:
+            self.service_suffix = name
+
+        self.service_addr = f"{parent.deviceId}-{self.service_suffix}"
+
+        self.client = Client(self.service_addr)
+
+    def describe(self):
+        pass
+
+    def kick(self) -> None:
+        """
+        Kick the watchdog.
+        @raises RuntimeError: if the command fails
+        @raises TimeoutError: if the command times out
+        """
+        self.client.kick()

ekfsm/system.py

@@ -173,13 +173,17 @@ class System(SysTree):
         board_type = slot_entry.desired_hwmodule_type
         board_name = slot_entry.desired_hwmodule_name
 
-        self.logger.debug(f"Creating HWModule {board_type} (desired name: {board_name}) in slot {slot.name}")
+        self.logger.debug(
+            f"Creating HWModule {board_type} (desired name: {board_name}) in slot {slot.name}"
+        )
 
         if board_type != "":
             # try to create first the desired board
             path = find_board_config(board_type)
             if path is None:
-                self.logger.error(f"No board config found for {board_type} (desired name: {board_name})")
+                self.logger.error(
+                    f"No board config found for {board_type} (desired name: {board_name})"
+                )
                 return None, slot
 
             try:
@@ -199,11 +203,15 @@ class System(SysTree):
 
             # try to probe desired board type
             if hwmod.probe():
-                self.logger.info(f"Found desired board type {hwmod.board_type} for slot {slot.name}")
+                self.logger.info(
+                    f"Found desired board type {hwmod.board_type} for slot {slot.name}"
+                )
                 return hwmod, slot
 
         # try all other boards types. Maybe someone inserted the wrong board
-        self.logger.info(f"Probing failed. Trying all other board types for slot {slot.name}")
+        self.logger.info(
+            f"Probing failed. Trying all other board types for slot {slot.name}"
+        )
         for path in all_board_cfg_files():
             try:
                 hwmod = self._create_hwmodule_from_cfg_file(slot, board_name, path)
@@ -212,16 +220,22 @@ class System(SysTree):
                 # ??? should we log this?
                 continue
             except Exception as e:
-                self.logger.debug(f"failed to create HWmodule {path} for slot {slot.name}: {e}")
+                self.logger.debug(
+                    f"failed to create HWmodule {path} for slot {slot.name}: {e}"
+                )
                 continue
 
             if hwmod.probe():
-                self.logger.info(f"Found other board type {hwmod.board_type} for slot {slot.name}")
+                self.logger.info(
+                    f"Found other board type {hwmod.board_type} for slot {slot.name}"
+                )
                 return hwmod, slot
 
         return None, slot
 
-    def _create_slot(self, slot_entry: Munch, slot_number: int, master: HWModule | None) -> Slot:
+    def _create_slot(
+        self, slot_entry: Munch, slot_number: int, master: HWModule | None
+    ) -> Slot:
         attributes = None
         if "attributes" in slot_entry:
             attributes = slot_entry.attributes
@@ -237,7 +251,9 @@ class System(SysTree):
             attributes,
         )
 
-    def _create_hwmodule_from_cfg_file(self, slot: Slot, board_name: str, path: Path) -> HWModule:
+    def _create_hwmodule_from_cfg_file(
+        self, slot: Slot, board_name: str, path: Path
+    ) -> HWModule:
         """
         Try to create a HWModule object from a board config file.
         It does not probe the hardware.
@@ -261,7 +277,9 @@ class System(SysTree):
             cfg = munchify(yaml_data)
             # only instantiate if slot type matches
             if cfg.slot_type != slot.slot_type.to_string():
-                raise ConfigError(f"Slot type mismatch for slot {slot.name}: {cfg.slot_type} != {slot.slot_type}")
+                raise ConfigError(
+                    f"Slot type mismatch for slot {slot.name}: {cfg.slot_type} != {slot.slot_type}"
+                )
 
             hwmod = HWModule(
                 instance_name=board_name,
@@ -289,7 +307,11 @@ class System(SysTree):
                 If no HWModule is present in the given slot.
         """
         return next(
-            (v.hwmodule for k, v in self.slots.items() if getattr(v, "number", None) == idx),
+            (
+                v.hwmodule
+                for k, v in self.slots.items()
+                if getattr(v, "number", None) == idx
+            ),
             None,
         )
 
@@ -310,7 +332,12 @@ class System(SysTree):
                 If no HWModule is present with the given name.
         """
         return next(
-            (b for b in self.boards if getattr(b, "instance_name", None) == name),
+            (
+                b
+                for b in self.boards
+                if getattr(b, "instance_name", None) is not None
+                and getattr(b, "instance_name").lower() == name.lower()
+            ),
             None,
         )
 
@@ -334,7 +361,9 @@ class System(SysTree):
         if (hw_module := self.get_module_by_name(name)) is not None:
             return hw_module
 
-        raise AttributeError(f"'{type(self).__name__}' object has no board with name '{name}'")
+        raise AttributeError(
+            f"'{type(self).__name__}' object has no board with name '{name}'"
+        )
 
     def __repr__(self):
         return f"System (name={self.name})"

{ekfsm-1.3.0a32.dist-info → ekfsm-1.4.0a37.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ekfsm
-Version: 1.3.0a32
+Version: 1.4.0a37
 Summary: The EKF System Management Library (ekfsm) is a sensor monitoring suite for Compact PCI Serial devices.
 Author-email: Jan Jansen <jan@ekf.de>, Klaus Popp <klaus.popp@ci4rail.com>, Felix Päßler <fp@ekf.de>
 Requires-Python: >=3.10
@@ -9,9 +9,12 @@ Requires-Dist: click>=8.0.1
 Requires-Dist: crcmod
 Requires-Dist: gpiod>=2.1.0
 Requires-Dist: hexdump
+Requires-Dist: io4edge-client>=1.6.2
 Requires-Dist: ipdb>=0.13.13
 Requires-Dist: more-itertools
 Requires-Dist: munch
+Requires-Dist: pillow
+Requires-Dist: protobuf
 Requires-Dist: schema>=0.7.7
 Requires-Dist: smbus2
 Requires-Dist: termcolor>=3.0.1

{ekfsm-1.3.0a32.dist-info → ekfsm-1.4.0a37.dist-info}/RECORD

@@ -6,7 +6,7 @@ ekfsm/lock.py,sha256=dnPjLXWfWIRnLcGec8g-imuqbmqqXWza8OGhS9Aqydk,3236
 ekfsm/log.py,sha256=_GC8Y7a4fFV4_DNicbwQ-5rRzNQU6WSotXd2etXSrZk,866
 ekfsm/py.typed,sha256=1gNRtmxvYcVqDDEyAzBLnD8dAOweUfYxW2ZPdJzN1fg,102
 ekfsm/simctrl.py,sha256=WXPpWIju6b8Ch7FZW1PaPrWn7D7fP6gw37-ri-OJERE,5382
-ekfsm/system.py,sha256=mReq8vRD6YGHlw37RzRlvwzsEM3OPjogneCVJ_XmOFU,11646
+ekfsm/system.py,sha256=c3jbQa_DxZVur8MsD8gYgK6jkAV55U19MipiDqemzRg,12130
 ekfsm/utils.py,sha256=eOgr4da-dxoMQ6ymjgx_nyBbea8Ck_LAQ8uLM4JgH3c,1179
 ekfsm/boards/oem/ekf/ccu.yaml,sha256=qgr7YZO0kEddD9K6tv6222NyozkRNuF7NFw6hyX0XgE,2094
 ekfsm/boards/oem/ekf/sc5-festival.yaml,sha256=_0kS5GegfyOt5CTJc9kY6HJbr9yZo4i18sVo6F4KE9c,772
@@ -15,17 +15,21 @@ ekfsm/boards/oem/ekf/se5-club.yaml,sha256=j3u6sDwXMUBM0LNKwVm920w3T3tzjia2BRTQb2
 ekfsm/boards/oem/ekf/sn4-djembe.yaml,sha256=ddLDdw7JpPpvR3TmlcTxNVNTOueTl6_A9LSveFrtz3E,1051
 ekfsm/boards/oem/ekf/spv-mystic.yaml,sha256=zcLiNE7wVdXIT4vkwEYSqQ8ff-KEjCHfHnQzzPXJQ4E,1804
 ekfsm/boards/oem/ekf/sq1-track.yaml,sha256=YU83BQjGu-4ejirwnGxd38sJme859kdRovkZyiOJciU,1050
-ekfsm/boards/oem/ekf/sq3-quartet.yaml,sha256=pBB7Tv0IWLkFUYBs3tFvZriA-uqPuPIgzjaN0aHT4e4,1052
+ekfsm/boards/oem/ekf/sq3-quartet.yaml,sha256=JaHJn_lph2iwLz6cwXu0bjRMgj33OXt1-VBNGFu0U3s,1330
 ekfsm/boards/oem/ekf/srf-fan.yaml,sha256=Mcu1Q8B1Ih10hoc_hbkGlppBmbOFcufsVUR42iW4Rwc,1368
 ekfsm/boards/oem/ekf/sur-uart.yaml,sha256=VaNP2BSlNTi1lDco16Ma9smPEAMaVKvx-ZNDcm3QptM,1890
+ekfsm/boards/oem/ekf/z1010.yaml,sha256=Z0m0AaRnBFL3QYvSnzHVauXm3laN4lrVv6ewccyY6Hk,2369
 ekfsm/boards/oem/hitron/hdrc-300s.yaml,sha256=SwBHTWVqENBun_iZattPbvA9koc-LOI_MIXjLahKyyI,548
 ekfsm/core/__init__.py,sha256=xfuU072JY_--561hfSS8ToBM-wgswY4Z-YwDMZkVA6c,348
-ekfsm/core/components.py,sha256=gEChRquC2fEi3Y4BUa_EzvFkO45u95FT1rDg1lEdfHE,3836
+ekfsm/core/components.py,sha256=iTetqtzNjEEj6FDJNfvXxW_cNNRlLX5_WgB5z3g3zqg,3883
 ekfsm/core/probe.py,sha256=DgJvkvMjVk09n0Rzn13ybRvidrmFn_D2PD56XS-KgxU,262
-ekfsm/core/slots.py,sha256=R26kfUnRzuspIPEMHFMBTkhgALu0Tuq7uGgvtfpafGs,6520
+ekfsm/core/slots.py,sha256=qmxfssVitsMFZYbJRCpOOsvEGqh8JVYdRS-_5BliOF4,6580
 ekfsm/core/sysfs.py,sha256=CWH1BXlanHAFzK6KY23qLuFvBZ7Q9td3X6JLRwb3vu0,7309
-ekfsm/core/utils.py,sha256=D5AcGp7xCsf1qA2hHHWe1bOnrpZlTOaq2srITn6bRkk,4194
-ekfsm/devices/__init__.py,sha256=BYq4a7e3eF0GGpoKeBpoNISLIbAjAVMNqnGM_Taw8dE,937
+ekfsm/core/utils.py,sha256=slSgFNmSvwWL5qlDQE9WXGv9u9skojlGtUM_B-WumsY,4634
+ekfsm/devices/__init__.py,sha256=EDFzBuUHt_3_6JD4cageHWZfoMn3WUIIDZk4yEOWgfg,1451
+ekfsm/devices/button.py,sha256=tPGBWi2ZxZDQX_WojQG3lKdsKcCTXRYQjRwRjcIv460,1036
+ekfsm/devices/buttonArray.py,sha256=bKNstHsmc6SM09BaQiQV09wRbgnb5I6KK7JTgCk6PnU,2910
+ekfsm/devices/colorLed.py,sha256=PrA3WsuMs-vi2DxxsW4hRIJh_ZWqs_hW2QmFeijsCxA,1410
 ekfsm/devices/coretemp.py,sha256=UEsPTMYm05qNCnqnPtbAoYdIfvVGkDl9rJg3tkAP748,1992
 ekfsm/devices/eeprom.py,sha256=cwcaM2YCKrw6du8d4zT_M3e4oFJh3XNQc5cQM2vqERE,33090
 ekfsm/devices/ekf_ccu_uc.py,sha256=hjs5r7TKsrFhyyGKClgSFBpchQpFcE7fTZeuLrYiflY,15905
@@ -35,12 +39,17 @@ ekfsm/devices/gpio.py,sha256=37P7uu-ncg0TWf0Xs1iZM-PrX7F_09asd4IhWj6z21Y,10058
 ekfsm/devices/iio.py,sha256=1Jyh5wJ53DxvpWNBqYW07kkaAN9446ebWGCMk2UIuWM,1265
 ekfsm/devices/iio_thermal_humidity.py,sha256=KCeEqBlczroxp-hjsiRlXQdmmnJR9Ck3d3ztths5Vvc,1547
 ekfsm/devices/imu.py,sha256=GwJrnC-WztpE5oGnkIp-laFkSp3_gbSp9YpJ8jBsUOs,423
+ekfsm/devices/io4edge.py,sha256=hk_EzcXVR0-sD2zn6pMuO2txYNnTDKmMaaXS2N__8E4,2743
+ekfsm/devices/ledArray.py,sha256=6DCHs1nJz12aHQNPytaM_KIasQYdB29ZN7GzPb_EcJ4,902
 ekfsm/devices/mux.py,sha256=QpVWsD43Mx1mtCDG_nOxtHeIeU2Cigc62UljJ_utSXQ,1974
+ekfsm/devices/pixelDisplay.py,sha256=68SANN4S15_NncuDvu0hyjjdqhpxYn14cmxjXwfGqgU,2425
 ekfsm/devices/pmbus.py,sha256=fi_kR7TlkcqYhHuB7PA2PjANCYmo3MSPeV-B5ZI_WrQ,7004
 ekfsm/devices/smbios.py,sha256=4P-sxOW27pkzIfVlvFNyVJOcZlYgk2KCTCEUvKf5D94,1067
 ekfsm/devices/smbus.py,sha256=kbtjEnfrVI6lbfqAbojVqO5nnnpa6HanLf0X2iZjgCg,500
+ekfsm/devices/thermal_humidity.py,sha256=OVr1zaCGGutfk1WYZ3509wx6qHqjjF2nFE9QYM_bWtE,1170
 ekfsm/devices/utils.py,sha256=qeDNpTpQ3bLGYERAH5lMsifmOaEcQ32FOwEt8tvmjWU,174
-ekfsm-1.3.0a32.dist-info/METADATA,sha256=bFvKuhXnQh1_Bl-VYr6uWsUOuCXdNx_sZ7W8fXQUSWA,6634
-ekfsm-1.3.0a32.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ekfsm-1.3.0a32.dist-info/entry_points.txt,sha256=WhUR4FzuxPoGrbTOKLsNJO7NAnk2qd4T30fqzN1yLw8,45
-ekfsm-1.3.0a32.dist-info/RECORD,,
+ekfsm/devices/watchdog.py,sha256=-us3IMKsvTR7LzRCszHR19q0jsCGPZUIN_FWN-h8844,1060
+ekfsm-1.4.0a37.dist-info/METADATA,sha256=fz_N76MjDbeGbpB1dHKlmzLEwLb_qLPC6ov2pKLFPQ4,6717
+ekfsm-1.4.0a37.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ekfsm-1.4.0a37.dist-info/entry_points.txt,sha256=WhUR4FzuxPoGrbTOKLsNJO7NAnk2qd4T30fqzN1yLw8,45
+ekfsm-1.4.0a37.dist-info/RECORD,,