feat(io): Simplify IO interface hierarchy and unify property handling
Replaced specific IO interface classes (`InterfaceInpBool`, `InterfaceInpInt`, etc.) with generic `InterfaceInput` and `InterfaceOutput` classes to simplify the hierarchy. Signed-off-by: Sven Sager <s.sager@kunbus.com>
This commit is contained in:
Sven Sager
@@ -2,13 +2,123 @@
|
||||
# SPDX-FileCopyrightText: 2025 KUNBUS GmbH
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
"""D-Bus interfaces for IOs."""
|
||||
from typing import Union
|
||||
|
||||
from dbus import SystemBus, SessionBus
|
||||
from gi.overrides.GLib import Variant
|
||||
from pydbus.generic import signal
|
||||
from revpimodio2 import RevPiModIO, Cycletools
|
||||
from revpimodio2.io import IntIO
|
||||
from revpimodio2.io import IOBase
|
||||
|
||||
from .ios1_helper import DbusInterfaceIo, get_io_object_path
|
||||
from .ios1_helper import get_io_object_path, get_variant_type
|
||||
|
||||
|
||||
class InterfaceInput:
|
||||
"""
|
||||
<node>
|
||||
<interface name="com.revolutionpi.ios1.Input">
|
||||
<property name="address" type="n" access="read"/>
|
||||
<property name="bmk" type="s" access="read"/>
|
||||
<property name="byteorder" type="s" access="readwrite"/>
|
||||
<property name="defaultvalue" type="v" access="read"/>
|
||||
<property name="length" type="q" access="read"/>
|
||||
<property name="name" type="s" access="read"/>
|
||||
<property name="signed" type="b" access="readwrite"/>
|
||||
<property name="value" type="v" access="read"/>
|
||||
</interface>
|
||||
</node>
|
||||
"""
|
||||
|
||||
interface_name = "com.revolutionpi.ios1.Input"
|
||||
PropertiesChanged = signal()
|
||||
|
||||
def __init__(self, dbus: Union[SystemBus, SessionBus], io: IOBase):
|
||||
self.dbus = dbus
|
||||
self.io = io
|
||||
self.variant_type = get_variant_type(self.io)
|
||||
|
||||
def emit_io_change(self):
|
||||
if self.interface_name:
|
||||
self.PropertiesChanged(
|
||||
self.interface_name,
|
||||
{"value": Variant(self.variant_type, self.io.value)},
|
||||
[],
|
||||
)
|
||||
|
||||
@property
|
||||
def address(self) -> int:
|
||||
return self.io.address
|
||||
|
||||
@property
|
||||
def bmk(self) -> str:
|
||||
return self.io.bmk
|
||||
|
||||
@property
|
||||
def byteorder(self) -> str:
|
||||
return self.io.byteorder
|
||||
|
||||
@byteorder.setter
|
||||
def byteorder(self, value: str) -> None:
|
||||
if hasattr(self.io, "_set_byteorder"):
|
||||
self.io._set_byteorder(value)
|
||||
self.variant_type = get_variant_type(self.io)
|
||||
|
||||
@property
|
||||
def defaultvalue(self) -> Variant:
|
||||
return Variant(self.variant_type, self.io.defaultvalue)
|
||||
|
||||
@property
|
||||
def length(self) -> int:
|
||||
# 0 length for boolean
|
||||
return 0 if self.variant_type == "b" else self.io.length
|
||||
|
||||
@property
|
||||
def name(self) -> str:
|
||||
return self.io.name
|
||||
|
||||
@property
|
||||
def signed(self) -> bool:
|
||||
if hasattr(self.io, "signed"):
|
||||
return self.io.signed
|
||||
return False
|
||||
|
||||
@signed.setter
|
||||
def signed(self, value: bool) -> None:
|
||||
if hasattr(self.io, "_set_signed"):
|
||||
self.io._set_signed(value)
|
||||
self.variant_type = get_variant_type(self.io)
|
||||
|
||||
@property
|
||||
def value(self) -> Variant:
|
||||
return Variant(self.variant_type, self.io.value)
|
||||
|
||||
|
||||
class InterfaceOutput(InterfaceInput):
|
||||
"""
|
||||
<node>
|
||||
<interface name="com.revolutionpi.ios1.Output">
|
||||
<property name="address" type="n" access="read"/>
|
||||
<property name="bmk" type="s" access="read"/>
|
||||
<property name="byteorder" type="s" access="readwrite"/>
|
||||
<property name="defaultvalue" type="v" access="read"/>
|
||||
<property name="length" type="q" access="read"/>
|
||||
<property name="name" type="s" access="read"/>
|
||||
<property name="signed" type="b" access="readwrite"/>
|
||||
<property name="value" type="v" access="readwrite"/>
|
||||
</interface>
|
||||
</node>
|
||||
"""
|
||||
|
||||
interface_name = "com.revolutionpi.ios1.Output"
|
||||
|
||||
@property
|
||||
def value(self) -> Variant:
|
||||
return super().value
|
||||
|
||||
@value.setter
|
||||
def value(self, value: Variant) -> None:
|
||||
self.io.value = value
|
||||
self.io._parentdevice._modio.writeprocimg()
|
||||
|
||||
|
||||
class InterfaceIoManager:
|
||||
@@ -40,7 +150,7 @@ class InterfaceIoManager:
|
||||
interface_name = "com.revolutionpi.ios1.IoManager"
|
||||
IoChanged = signal()
|
||||
|
||||
def __init__(self, modio: RevPiModIO, io_interfaces: dict[str, DbusInterfaceIo]):
|
||||
def __init__(self, modio: RevPiModIO, io_interfaces: dict[str, InterfaceInput]):
|
||||
self._dc_io_interfaces = io_interfaces
|
||||
self.modio = modio
|
||||
|
||||
@@ -82,135 +192,3 @@ class InterfaceIoManager:
|
||||
|
||||
def DeactivateIoEvents(self) -> None:
|
||||
self.modio.exit(False)
|
||||
|
||||
|
||||
class InterfaceInpBool(DbusInterfaceIo):
|
||||
"""
|
||||
<node>
|
||||
<interface name="com.revolutionpi.ios1.InpBool">
|
||||
<property name="address" type="i" access="read"/>
|
||||
<property name="bmk" type="s" access="read"/>
|
||||
<property name="defaultvalue" type="b" access="read"/>
|
||||
<property name="length" type="i" access="read"/>
|
||||
<property name="name" type="s" access="read"/>
|
||||
<property name="value" type="b" access="read"/>
|
||||
</interface>
|
||||
</node>
|
||||
"""
|
||||
|
||||
interface_name = "com.revolutionpi.ios1.InpBool"
|
||||
|
||||
@property
|
||||
def value(self) -> bool:
|
||||
return self.io.value
|
||||
|
||||
|
||||
class InterfaceOutBool(InterfaceInpBool):
|
||||
"""
|
||||
<node>
|
||||
<interface name="com.revolutionpi.ios1.OutBool">
|
||||
<property name="address" type="i" access="read"/>
|
||||
<property name="bmk" type="s" access="read"/>
|
||||
<property name="defaultvalue" type="b" access="read"/>
|
||||
<property name="length" type="i" access="read"/>
|
||||
<property name="name" type="s" access="read"/>
|
||||
<property name="value" type="b" access="readwrite"/>
|
||||
</interface>
|
||||
</node>
|
||||
"""
|
||||
|
||||
interface_name = "com.revolutionpi.ios1.OutBool"
|
||||
|
||||
@property
|
||||
def value(self) -> bool:
|
||||
return super().value
|
||||
|
||||
@value.setter
|
||||
def value(self, value: bool) -> None:
|
||||
self.io.value = value
|
||||
self.io._parentdevice._modio.writeprocimg()
|
||||
|
||||
|
||||
class InterfaceInpInt(DbusInterfaceIo):
|
||||
"""
|
||||
<node>
|
||||
<interface name="com.revolutionpi.ios1.InpInt">
|
||||
<property name="address" type="i" access="read"/>
|
||||
<property name="bmk" type="s" access="read"/>
|
||||
<property name="byteorder" type="s" access="readwrite"/>
|
||||
<property name="defaultvalue" type="i" access="read"/>
|
||||
<property name="length" type="i" access="read"/>
|
||||
<property name="min_value" type="i" access="read"/>
|
||||
<property name="max_value" type="i" access="read"/>
|
||||
<property name="name" type="s" access="read"/>
|
||||
<property name="signed" type="b" access="readwrite"/>
|
||||
<property name="value" type="i" access="read"/>
|
||||
</interface>
|
||||
</node>
|
||||
"""
|
||||
|
||||
interface_name = "com.revolutionpi.ios1.InpInt"
|
||||
io = IntIO # type: IntIO
|
||||
|
||||
@property
|
||||
def byteorder(self) -> str:
|
||||
return self.io.byteorder
|
||||
|
||||
@byteorder.setter
|
||||
def byteorder(self, value: str) -> None:
|
||||
self.io.byteorder = value
|
||||
|
||||
@property
|
||||
def min_value(self) -> int:
|
||||
if self.io.signed:
|
||||
return -(1 << (self.io.length * 8 - 1))
|
||||
return 0
|
||||
|
||||
@property
|
||||
def max_value(self) -> int:
|
||||
bit_length = self.io.length * 8
|
||||
if self.io.signed:
|
||||
return (1 << (bit_length - 1)) - 1
|
||||
return (1 << bit_length) - 1
|
||||
|
||||
@property
|
||||
def signed(self) -> bool:
|
||||
return self.io.signed
|
||||
|
||||
@signed.setter
|
||||
def signed(self, value: bool) -> None:
|
||||
self.io.signed = value
|
||||
|
||||
@property
|
||||
def value(self) -> int:
|
||||
return self.io.value
|
||||
|
||||
|
||||
class InterfaceOutInt(InterfaceInpInt):
|
||||
"""
|
||||
<node>
|
||||
<interface name="com.revolutionpi.ios1.OutInt">
|
||||
<property name="address" type="i" access="read"/>
|
||||
<property name="bmk" type="s" access="read"/>
|
||||
<property name="byteorder" type="s" access="readwrite"/>
|
||||
<property name="defaultvalue" type="i" access="read"/>
|
||||
<property name="length" type="i" access="read"/>
|
||||
<property name="min_value" type="i" access="read"/>
|
||||
<property name="max_value" type="i" access="read"/>
|
||||
<property name="name" type="s" access="read"/>
|
||||
<property name="signed" type="b" access="readwrite"/>
|
||||
<property name="value" type="i" access="readwrite"/>
|
||||
</interface>
|
||||
</node>
|
||||
"""
|
||||
|
||||
interface_name = "com.revolutionpi.ios1.OutInt"
|
||||
|
||||
@property
|
||||
def value(self) -> int:
|
||||
return super().value
|
||||
|
||||
@value.setter
|
||||
def value(self, value: int):
|
||||
self.io.value = value
|
||||
self.io._parentdevice._modio.writeprocimg()
|
||||
|
||||
Reference in New Issue
Block a user