diff --git a/src/revpi_middleware/ios1/interface_devices.py b/src/revpi_middleware/ios1/interface_devices.py index 569cb1f..c9aa901 100644 --- a/src/revpi_middleware/ios1/interface_devices.py +++ b/src/revpi_middleware/ios1/interface_devices.py @@ -35,7 +35,7 @@ class InterfaceDevice: def __init__(self, dbus: Union[SystemBus, SessionBus], device: Device): self.dbus = dbus self.device = device - self.object_path = get_device_object_path(device.position) + self.object_path = get_device_object_path(device) @property def bmk(self) -> str: diff --git a/src/revpi_middleware/ios1/interface_ios.py b/src/revpi_middleware/ios1/interface_ios.py index 3b1efb1..3594a7f 100644 --- a/src/revpi_middleware/ios1/interface_ios.py +++ b/src/revpi_middleware/ios1/interface_ios.py @@ -62,7 +62,7 @@ class InterfaceInput: self._raw = False self.dbus = dbus self.io = io - self.object_path = get_io_object_path(io.name) + self.object_path = get_io_object_path(io) try: self.variant_type = get_variant_type(self.io) except ValueError: diff --git a/src/revpi_middleware/ios1/ios1_helper.py b/src/revpi_middleware/ios1/ios1_helper.py index 491f5b7..0f03ef6 100644 --- a/src/revpi_middleware/ios1/ios1_helper.py +++ b/src/revpi_middleware/ios1/ios1_helper.py @@ -5,6 +5,7 @@ from logging import getLogger +from revpimodio2.device import Device from revpimodio2.io import IOBase log = getLogger(__name__) @@ -13,12 +14,12 @@ REVPI_DBUS_NAME = "com.revolutionpi.ios1" REVPI_DBUS_BASE_PATH = "/com/revolutionpi/ios1" -def get_io_object_path(io_name: str) -> str: - return f"{REVPI_DBUS_BASE_PATH}/io/{io_name}" +def get_io_object_path(io: IOBase) -> str: + return f"{REVPI_DBUS_BASE_PATH}/io/{io.name}" -def get_device_object_path(device_name: str) -> str: - return f"{REVPI_DBUS_BASE_PATH}/device/{device_name}" +def get_device_object_path(device: Device) -> str: + return f"{REVPI_DBUS_BASE_PATH}/device/{device.position}" def get_variant_type(io: IOBase) -> str: