diff --git a/src/revpi_middleware/ios1/interface_ios.py b/src/revpi_middleware/ios1/interface_ios.py index 2d0f5a7..da7fcdc 100644 --- a/src/revpi_middleware/ios1/interface_ios.py +++ b/src/revpi_middleware/ios1/interface_ios.py @@ -5,6 +5,7 @@ from gi.overrides.GLib import Variant from pydbus.generic import signal from revpimodio2 import RevPiModIO, Cycletools +from revpimodio2.io import IntIO from .ios1_helper import REVPI_DBUS_BASE_PATH, DbusInterfaceIo @@ -87,7 +88,10 @@ class InterfaceInpBool(DbusInterfaceIo): """ + + + @@ -96,14 +100,6 @@ class InterfaceInpBool(DbusInterfaceIo): interface_name = "com.revolutionpi.ios1.InpBool" - @property - def bmk(self) -> str: - return self.io.bmk - - @property - def name(self) -> str: - return self.io.name - @property def value(self) -> bool: return self.io.value @@ -113,7 +109,10 @@ class InterfaceOutBool(InterfaceInpBool): """ + + + @@ -127,7 +126,7 @@ class InterfaceOutBool(InterfaceInpBool): return super().value @value.setter - def value(self, value: bool): + def value(self, value: bool) -> None: self.io.value = value self.io._parentdevice._modio.writeprocimg() @@ -136,25 +135,39 @@ class InterfaceInpInt(DbusInterfaceIo): """ + + + + + """ interface_name = "com.revolutionpi.ios1.InpInt" + io = IntIO # type: IntIO @property - def bmk(self) -> str: - return self.io.bmk + def byteorder(self) -> str: + return self.io.byteorder + + @byteorder.setter + def byteorder(self, value: str) -> None: + self.io.byteorder = value @property - def name(self) -> str: - return self.io.name + def signed(self) -> bool: + return self.io.signed + + @signed.setter + def signed(self, value: bool) -> None: + self.io.signed = value @property - def value(self) -> bool: + def value(self) -> int: return self.io.value @@ -162,8 +175,13 @@ class InterfaceOutInt(InterfaceInpInt): """ + + + + + @@ -172,10 +190,10 @@ class InterfaceOutInt(InterfaceInpInt): interface_name = "com.revolutionpi.ios1.OutInt" @property - def value(self) -> bool: + def value(self) -> int: return super().value @value.setter - def value(self, value: bool): + def value(self, value: int): self.io.value = value self.io._parentdevice._modio.writeprocimg() diff --git a/src/revpi_middleware/ios1/ios1_helper.py b/src/revpi_middleware/ios1/ios1_helper.py index 9c7a0d4..3a432de 100644 --- a/src/revpi_middleware/ios1/ios1_helper.py +++ b/src/revpi_middleware/ios1/ios1_helper.py @@ -35,3 +35,23 @@ class DbusInterfaceIo: {"value": int(self.io.value)}, [], ) + + @property + def address(self): + return self.io.address + + @property + def bmk(self) -> str: + return self.io.bmk + + @property + def defaultvalue(self): + return self.io.defaultvalue + + @property + def length(self): + return self.io.length + + @property + def name(self) -> str: + return self.io.name