mirror of
https://github.com/naruxde/revpimodio2.git
synced 2025-11-09 06:13:53 +01:00
FileHandler nicht bei __init__ Anlegen um Vererbung zu ermöglichen
._configure bekommt JSON als Parameter übergeben RS485 Fehler nicht im Simulatormodus schreiben
This commit is contained in:
@@ -24,7 +24,7 @@ __all__ = ["RevPiModIO", "RevPiModIOSelected", "RevPiModIODriver"]
|
||||
__author__ = "Sven Sager <akira@revpimodio.org>"
|
||||
__name__ = "revpimodio2"
|
||||
__package__ = "revpimodio2"
|
||||
__version__ = "2.0.3"
|
||||
__version__ = "2.0.4"
|
||||
|
||||
# Global package values
|
||||
OFF = 0
|
||||
|
||||
@@ -395,7 +395,7 @@ class Core(Device):
|
||||
self._ioerrorlimit1 = 6
|
||||
self._ioerrorlimit2 = 7
|
||||
|
||||
if not self._modio._monitoring:
|
||||
if not (self._modio._monitoring or self._modio._simulator):
|
||||
# Für RS485 errors defaults laden sollte procimg NULL sein
|
||||
if self._ioerrorlimit1 is not None:
|
||||
self.__lst_io[self._ioerrorlimit1].set_value(
|
||||
|
||||
@@ -67,6 +67,7 @@ class RevPiModIO(object):
|
||||
self._lst_devselect = []
|
||||
self._lst_refresh = []
|
||||
self._maxioerrors = 0
|
||||
self._myfh = None
|
||||
self._th_mainloop = None
|
||||
self._waitexit = Event()
|
||||
|
||||
@@ -79,12 +80,9 @@ class RevPiModIO(object):
|
||||
self.io = None
|
||||
self.summary = None
|
||||
|
||||
# Filehandler öffnen
|
||||
self._myfh = self._create_myfh()
|
||||
|
||||
# Nur Konfigurieren, wenn nicht vererbt
|
||||
if type(self) == RevPiModIO:
|
||||
self._configure()
|
||||
self._configure(self.get_jconfigrsc())
|
||||
|
||||
def __del__(self):
|
||||
"""Zerstoert alle Klassen um aufzuraeumen."""
|
||||
@@ -104,9 +102,12 @@ class RevPiModIO(object):
|
||||
self.__cleanupfunc()
|
||||
self.writeprocimg()
|
||||
|
||||
def _configure(self):
|
||||
def _configure(self, jconfigrsc):
|
||||
"""Verarbeitet die piCtory Konfigurationsdatei."""
|
||||
jconfigrsc = self.get_jconfigrsc()
|
||||
|
||||
# Filehandler konfigurieren, wenn er noch nicht existiert
|
||||
if self._myfh is None:
|
||||
self._myfh = self._create_myfh()
|
||||
|
||||
# App Klasse instantiieren
|
||||
self.app = appmodule.App(jconfigrsc["App"])
|
||||
@@ -857,7 +858,7 @@ class RevPiModIOSelected(RevPiModIO):
|
||||
"<class 'str'>"
|
||||
)
|
||||
|
||||
self._configure()
|
||||
self._configure(self.get_jconfigrsc())
|
||||
|
||||
if len(self.device) == 0:
|
||||
if type(self) == RevPiModIODriver:
|
||||
|
||||
Reference in New Issue
Block a user