ekfsm 0.11.0b1.post3__py3-none-any.whl → 0.13.0a160.post4__py3-none-any.whl

ekfsm/devices/gpio.py

@@ -8,7 +8,7 @@ from gpiod.chip import LineSettings
 from gpiod.line import Direction, Value
 from more_itertools import first_true
 
-from ekfsm.core.components import SystemComponent
+from ekfsm.core.components import SysTree
 from ekfsm.exceptions import GPIOError
 from ekfsm.log import ekfsm_logger
 
@@ -55,7 +55,7 @@ class GPIO(Device):
     def __init__(
         self,
         name: str,
-        parent: SystemComponent | None = None,
+        parent: SysTree | None = None,
         *args,
         **kwargs,
     ):
@@ -83,7 +83,7 @@ class GPIO(Device):
 
     def _find_gpio_dev(
         self,
-        parent: SystemComponent | None = None,
+        parent: SysTree | None = None,
         *args,
         **kwargs,
     ) -> tuple[int, int]:
@@ -186,7 +186,7 @@ class GPIOExpander(GPIO):
     def __init__(
         self,
         name: str,
-        parent: SystemComponent | None,
+        parent: SysTree | None,
         *args,
         **kwargs,
     ):
@@ -203,7 +203,7 @@ class EKFIdentificationIOExpander(GPIOExpander, ProbeableDevice):
     def __init__(
         self,
         name: str,
-        parent: SystemComponent | None,
+        parent: SysTree | None,
         *args,
         **kwargs,
     ):
@@ -212,10 +212,11 @@ class EKFIdentificationIOExpander(GPIOExpander, ProbeableDevice):
     def probe(self, *args, **kwargs) -> bool:
         from ekfsm.core import HwModule
 
-        assert isinstance(self.root, HwModule)
+        assert isinstance(self.hw_module, HwModule)
         id, _ = self.read_board_id_rev()
+        self.logger.debug(f"Probing EKFIdentificationIOExpander: {id}")
 
-        return self.root.id == id
+        return self.hw_module.id == id
 
     def read_board_id_rev(self) -> tuple[int, int]:
         for pin in range(6, 8):

ekfsm/devices/iio_thermal_humidity.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-from ekfsm.core.components import SystemComponent
+from ekfsm.core.components import SysTree
 from ekfsm.log import ekfsm_logger
 
 from ..core.sysfs import SysFSDevice
@@ -18,7 +18,7 @@ class IIOThermalHumidity(Device):
     def __init__(
         self,
         name: str,
-        parent: SystemComponent | None = None,
+        parent: SysTree | None = None,
         children: list[Device] | None = None,
         *args,
         **kwargs,

ekfsm/devices/imu.py

@@ -0,0 +1,14 @@
+class ImuSample:
+    """
+    Class to store IMU data sample
+
+    * accel: list[float] - Accelerometer data in m/s^2, [x, y, z]
+    * gyro: list[float] - Gyroscope data in degrees/s, [x, y, z]
+    * lost: bool - True if data was lost before that sample
+
+    """
+
+    def __init__(self, accel: list[float], gyro: list[float], lost: bool):
+        self.accel = accel
+        self.gyro = gyro
+        self.lost = lost

ekfsm/devices/mux.py

@@ -1,4 +1,4 @@
-from ekfsm.core.components import SystemComponent
+from ekfsm.core.components import SysTree
 
 from ..core.sysfs import SysFSDevice
 from .generic import Device
@@ -9,7 +9,7 @@ class MuxChannel(Device):
         self,
         name: str,
         channel_id: int,
-        parent: 'I2CMux',
+        parent: "I2CMux",
         children: list[Device] | None = None,
         *args,
         **kwargs,
@@ -28,7 +28,7 @@ class I2CMux(Device):
     def __init__(
         self,
         name: str,
-        parent: SystemComponent | None = None,
+        parent: SysTree | None = None,
         children: list[MuxChannel] | None = None,
         *args,
         **kwargs,

ekfsm/devices/pmbus.py

@@ -1,18 +1,100 @@
+from enum import IntFlag
 from pathlib import Path
 
-from ekfsm.core.components import SystemComponent
+from ekfsm.core.components import SysTree
 
-from ..core.sysfs import SysFSDevice
+from ..core.sysfs import SysFSDevice, sysfs_root
 
 from .generic import Device
 from ..core.probe import ProbeableDevice
 
+from time import sleep
+from functools import wraps
+from ekfsm.log import ekfsm_logger
+from threading import Lock
+
+__all__ = ["PsuStatus", "PmBus", "retry"]
+
+logger = ekfsm_logger(__name__)
+
+
+def retry(max_attempts=5, delay=0.5):
+    """
+    Retry decorator.
+
+    Decorator that retries a function a number of times before giving up.
+
+    This is useful for functions that may fail due to transient errors.
+
+    Note
+    ----
+    This is needed for certain PMBus commands that may fail due to transient errors
+    because page switching timing is not effectively handled by older kernel versions.
+
+    Important
+    ---------
+    This decorator is thread-safe, meaning a read attempt is atomic and cannot
+    be interupted by scheduler.
+
+    Parameters
+    ----------
+    max_attempts
+        The maximum number of attempts before giving up.
+    delay
+        The delay in seconds between attempts.
+    """
+
+    lock = Lock()
+
+    def decorator(func):
+        @wraps(func)
+        def wrapper(*args, **kwargs):
+            attempts = 0
+            while attempts < max_attempts:
+                with lock:
+                    try:
+                        return func(*args, **kwargs)
+                    except Exception as e:
+                        attempts += 1
+                        if attempts == max_attempts:
+                            logger.exception(
+                                f"Failed to execute {func.__name__} after {max_attempts} attempts: {e}"
+                            )
+                            raise e
+                        logger.info(
+                            f"Retrying execution of {func.__name__} in {delay}s..."
+                        )
+                sleep(delay)
+
+        return wrapper
+
+    return decorator
+
+
+class PsuStatus(IntFlag):
+    """
+    Represents the status of a PSU according to STATUS_BYTE register.
+
+    See Also
+    --------
+    `PMBus Power System Management Protocol Specification - Part II - Revision 1.4, Fig. 60 <https://pmbus.org/>`_
+    """
+
+    OUTPUT_OVERVOLTAGE = 0x20
+    OUTPUT_OVERCURRENT = 0x10
+    INPUT_UNDERVOLTAGE = 0x08
+    TEMP_ANORMALY = 0x04
+    COMMUNICATION_ERROR = 0x02
+    ERROR = 0x01
+    OK = 0x00
+
 
 class PmBus(Device, ProbeableDevice):
+
     def __init__(
         self,
         name: str,
-        parent: SystemComponent | None = None,
+        parent: SysTree | None = None,
         children: list[Device] | None = None,
         *args,
         **kwargs,
@@ -23,43 +105,143 @@ class PmBus(Device, ProbeableDevice):
 
         files = list(Path(self.sysfs_device.path).rglob("hwmon/*/in1_input"))
         if len(files) == 0:
-            raise FileNotFoundError("No HWMON entries found")
+            raise FileNotFoundError("No HWMON entries found in sysfs")
         self.hwmon_sysfs = SysFSDevice(files[0].parent)
 
+        self.debugfs_root = sysfs_root() / "kernel/debug/pmbus"
+        files = list(self.debugfs_root.rglob("hwmon*/status*_input"))
+        if len(files) == 0:
+            raise FileNotFoundError("No HWMON entries found in debugfs")
+        self.hwmon_debugfs = SysFSDevice(files[0].parent)
+
     def probe(self, *args, **kwargs) -> bool:
         from ekfsm.core import HwModule
 
-        assert isinstance(self.root, HwModule)
-        return self.root.id == self.model()
+        assert isinstance(self.hw_module, HwModule)
+        return self.hw_module.id == self.model()
 
     # Voltage and Current Interfaces
-    def _in_conversion(self, in_file: str) -> float:
-        return float(self.hwmon_sysfs.read_attr_utf8(in_file)) / 1000.0
-
-    def _current_conversion(self, in_file: str) -> float:
+    def _conversion(self, in_file: str) -> float:
         return float(self.hwmon_sysfs.read_attr_utf8(in_file)) / 1000.0
 
+    @retry()
     def in1_input(self) -> float:
-        return self._in_conversion("in1_input")
+        """
+        Get input voltage of PSU page 1.
 
+        Returns
+        -------
+            Input voltage in volts
+        """
+        return self._conversion("in1_input")
+
+    @retry()
     def in2_input(self) -> float:
-        return self._in_conversion("in2_input")
+        """
+        Get input voltage of PSU page 2.
+
+        Returns
+        -------
+            Input voltage in volts
+        """
+        return self._conversion("in2_input")
 
+    @retry()
     def curr1_input(self) -> float:
-        return self._current_conversion("curr1_input")
+        """
+        Get input current of PSU page 1.
 
+        Returns
+        -------
+            Input current in amperes
+        """
+        return self._conversion("curr1_input")
+
+    @retry()
     def curr2_input(self) -> float:
-        return self._current_conversion("curr2_input")
+        """
+        Get input current of PSU page 2.
+
+        Returns
+        -------
+            Input current in amperes
+        """
+        return self._conversion("curr2_input")
+
+    # Status Interface
+    @retry()
+    def status0_input(self) -> PsuStatus:
+        """
+        Get the status of PSU page 1.
+
+        Returns
+        -------
+            PSU status as defined in PsuStatus
+        """
+        status = int(self.hwmon_debugfs.read_attr_utf8("status0_input").strip(), 16)
+        return PsuStatus(status)
+
+    @retry()
+    def status1_input(self) -> PsuStatus:
+        """
+        Get the status of PSU page 2.
+
+        Returns
+        -------
+            PSU status as defined in PsuStatus
+        """
+        status = int(self.hwmon_debugfs.read_attr_utf8("status1_input").strip(), 16)
+        return PsuStatus(status)
+
+    # Temperature Interface
+    @retry()
+    def temp1_input(self) -> float:
+        """
+        Get the PSU temperature.
+
+        Returns
+        -------
+            PSU temperature in degrees celsius
+        """
+        return self._conversion("temp1_input")
 
     # Inventory Interface
     def vendor(self) -> str:
+        """
+        Get the vendor of the PSU.
+
+        Returns
+        -------
+            PSU vendor
+        """
         return self.hwmon_sysfs.read_attr_utf8("vendor").strip()
 
     def model(self) -> str:
+        """
+        Get the model of the PSU.
+
+        Returns
+        -------
+            PSU model
+        """
         return self.hwmon_sysfs.read_attr_utf8("model").strip()
 
     def serial(self) -> str:
+        """
+        Get the serial number of the PSU.
+
+        Returns
+        -------
+            PSU serial number
+        """
         return self.hwmon_sysfs.read_attr_utf8("serial").strip()
 
     def revision(self) -> str:
+        """
+        Get the revision of the PSU.
+
+        Returns
+        -------
+            PSU revision
+        """
         return self.hwmon_sysfs.read_attr_utf8("revision").strip()

ekfsm/devices/smbus.py

@@ -0,0 +1,24 @@
+from abc import ABC, abstractmethod
+from typing import List
+
+
+class SimSmbus(ABC):
+    @abstractmethod
+    def read_word_data(self, cmd: int) -> int:
+        pass
+
+    @abstractmethod
+    def read_block_data(self, cmd: int) -> List[int]:
+        pass
+
+    @abstractmethod
+    def write_block_data(self, cmd: int, data: List[int]):
+        pass
+
+    @abstractmethod
+    def write_byte(self, cmd: int):
+        pass
+
+    @abstractmethod
+    def write_word_data(self, cmd: int, data: int):
+        pass

ekfsm/simctrl.py

@@ -1,42 +1,20 @@
-from abc import ABC, abstractmethod
 import socket
 import struct
 from unittest.mock import patch
 from pathlib import Path
 
+from ekfsm.devices.smbus import SimSmbus
 from ekfsm.devices.gpio import EKFIdSimGpio
 from ekfsm.devices.gpio import SimGpio
 from .core.sysfs import set_sysfs_root
-from .core.components import SystemComponent
+from .core.components import SysTree
 
 from .devices import GPIO
 from typing import List
 from smbus2 import SMBus
 
-GPIO_SIM_MAPPING = {}
-SMBUS_SIM_MAPPING = {}
-
-
-class SimSmbus(ABC):
-    @abstractmethod
-    def read_word_data(self, cmd: int) -> int:
-        pass
-
-    @abstractmethod
-    def read_block_data(self, cmd: int) -> List[int]:
-        pass
-
-    @abstractmethod
-    def write_block_data(self, cmd: int, data: List[int]):
-        pass
-
-    @abstractmethod
-    def write_byte(self, cmd: int):
-        pass
-
-    @abstractmethod
-    def write_word_data(self, cmd: int, data: int):
-        pass
+GPIO_SIM_MAPPING: dict[str, SimGpio] = {}
+SMBUS_SIM_MAPPING: dict[str, SimSmbus] = {}
 
 
 def register_gpio_sim(major: int, minor: int, sim_gpio: SimGpio) -> None:
@@ -72,7 +50,7 @@ class GpioSimulator(GPIO):
     def __init__(
         self,
         name: str,
-        parent: SystemComponent | None = None,
+        parent: SysTree | None = None,
         *args,
         **kwargs,
     ):

ekfsm/system.py

@@ -2,6 +2,7 @@ from typing import Tuple, Any, Generator
 from pathlib import Path
 from munch import Munch, munchify
 
+from ekfsm.core.components import SysTree
 import yaml
 
 from .core.slots import Slot, SlotType
@@ -46,7 +47,7 @@ def all_board_cfg_files() -> Generator[Path, None, None]:
             yield item
 
 
-class System:
+class System(SysTree):
     """
     A System represents a CPCI system.
 
@@ -94,21 +95,26 @@ class System:
     >>>    print(b.name + b.slot.name) # Print the name of the board and the slot it is in
     """
 
-    def __init__(self, config: Path) -> None:
+    def __init__(self, config: Path, abort: bool = False) -> None:
         """
         Parameters
         ----------
         config
             Path to the config that specifies the system and how the slots are filled.
         """
+        self.config_path = config
+        self.config = load_config(str(self.config_path))
+        self.name = self.config.system_config.name
+
+        super().__init__(self.name, abort=abort)
+
         self.logger = ekfsm_logger(__name__)
         self._init_system(config)
         self._init_slot_attrs()
+        self._aggregate_provider_functions()
+        self.children = self.boards
 
     def _init_system(self, config: Path):
-        self.config_path = config
-        self.config = load_config(str(self.config_path))
-        self.name = self.config.system_config.name
         self.slots: Slots = Slots()
         self.boards: list[HwModule] = []
 
@@ -136,6 +142,18 @@ class System:
         for board in self.boards:
             setattr(self, board.instance_name.lower(), board)
 
+    def _aggregate_provider_functions(self):
+        if hasattr(self.config.system_config, "aggregates"):
+            agg = self.config.system_config.aggregates
+            if agg is not None:
+                for key, value in agg.items():
+                    prv = Munch()
+                    for board in self.boards:
+                        if hasattr(board, key):
+                            prv.update({value: getattr(board, key)})
+                    if value in prv.keys():
+                        setattr(self, value, prv[value])
+
     def reload(self):
         """
         Reload the current system configuration.
@@ -144,7 +162,7 @@ class System:
         ---------
         This will rebuild all system objects and reinitialize the system tree.
         """
-        self._init_system(self.config_path)
+        self.__init__(self.config_path)
 
     def _create_master(self) -> Tuple[HwModule | None, int]:
         for i, slot in enumerate(self.config.system_config.slots):
@@ -190,10 +208,16 @@ class System:
                 hwmod = self._create_hwmodule_from_cfg_file(slot, board_name, path)
 
             except Exception as e:
-                self.logger.error(
-                    f"failed to create desired hwmodule {board_type} (as {board_name}): {e}. Leaving slot empty!"
-                )
-                return None, slot
+                if self.abort:
+                    self.logger.error(
+                        f"failed to create desired hwmodule {board_type} (as {board_name}): {e}. Aborting!"
+                    )
+                    raise e
+                else:
+                    self.logger.error(
+                        f"failed to create desired hwmodule {board_type} (as {board_name}): {e}. Leaving slot empty!"
+                    )
+                    return None, slot
 
             # try to probe desired board type
             if hwmod.probe():
@@ -211,6 +235,7 @@ class System:
                 hwmod = self._create_hwmodule_from_cfg_file(slot, board_name, path)
             except ConfigError:
                 # slot type not matching, ignore
+                # ??? should we log this?
                 continue
             except Exception as e:
                 self.logger.debug(
@@ -274,7 +299,15 @@ class System:
                     f"Slot type mismatch for slot {slot.name}: {cfg.slot_type} != {slot.slot_type}"
                 )
 
-            return HwModule(instance_name=board_name, config=yaml_data, slot=slot)
+            hwmod = HwModule(
+                instance_name=board_name,
+                config=yaml_data,
+                slot=slot,
+                abort=self.abort,
+                parent=self,
+            )
+
+            return hwmod
 
     def get_module_in_slot(self, idx: int) -> HwModule | None:
         return next(
@@ -316,11 +349,5 @@ class System:
             f"'{type(self).__name__}' object has no board with name '{name}'"
         )
 
-    def __str__(self) -> str:
-        output = ""
-        for b in self.boards:
-            output += b._render_tree()
-        return output
-
-    def print(self) -> None:
-        print(self)
+    def __repr__(self):
+        return f"System (name={self.name})"