diff --git a/.idea/misc.xml b/.idea/misc.xml index 7694c31..d2e59aa 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,7 +3,7 @@ - + diff --git a/.idea/revpimodio2.iml b/.idea/revpimodio2.iml index d7db3b1..3d9fcd9 100644 --- a/.idea/revpimodio2.iml +++ b/.idea/revpimodio2.iml @@ -2,7 +2,7 @@ - + diff --git a/revpimodio2/__init__.py b/revpimodio2/__init__.py index ce43a99..59cf2f0 100644 --- a/revpimodio2/__init__.py +++ b/revpimodio2/__init__.py @@ -22,7 +22,7 @@ __author__ = "Sven Sager " __copyright__ = "Copyright (C) 2020 Sven Sager" __license__ = "LGPLv3" __name__ = "revpimodio2" -__version__ = "2.5.10" +__version__ = "2.6.0rc1" # Global package values OFF = 0 diff --git a/revpimodio2/device.py b/revpimodio2/device.py index 018d0fc..3c35ebe 100644 --- a/revpimodio2/device.py +++ b/revpimodio2/device.py @@ -626,13 +626,11 @@ class Core(Base): exp_a1red = lst_led[1].export exp_a2green = lst_led[2].export exp_a2red = lst_led[3].export - # exp_wd = lst_led[7].export else: exp_a1green = lst_led[0].export exp_a1red = exp_a1green exp_a2green = exp_a1green exp_a2red = exp_a1green - # exp_wd = exp_a1green # Echte IOs erzeugen self.a1green = IOBase(self, [ @@ -931,10 +929,12 @@ class Connect(Core): exp_a3green = lst_led[4].export exp_a3red = lst_led[5].export exp_x2out = lst_led[6].export + exp_wd = lst_led[7].export else: exp_a3green = lst_led[0].export exp_a3red = exp_a3green exp_x2out = exp_a3green + exp_wd = exp_a3green lst_status = lst_myios[self._slc_statusbyte.start] if len(lst_status) == 8: exp_x2in = lst_status[6].export @@ -961,6 +961,9 @@ class Connect(Core): exp_x2out, None, "Connect_X2_OUT", "6" ], OUT, "little", False) + # Export hardware watchdog to use it with other systems + self.wd._export = int(exp_wd) # Do this without mrk for export! + def _get_leda3(self) -> int: """ Gibt den Zustand der LED A3 vom Connect zurueck. diff --git a/setup.py b/setup.py index fb9b96b..6059839 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ setup( license="LGPLv3", name="revpimodio2", - version="2.5.10", + version="2.6.0a0", packages=["revpimodio2"], python_requires="~=3.2",