revpi/revpimodio2
1
0
Fork 0
mirror of https://github.com/naruxde/revpimodio2.git synced 2025-11-09 06:13:53 +01:00
Code Issues Packages Releases Wiki Activity

Mit default zusammenführen

Browse Source
This commit is contained in:
Sven Sager
2018-08-14 11:40:01 +02:00
parent 70a95dcacd 61ad36840d
commit 6ef9a55f93
5 changed files with 44 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
revpimodio2/device.py
View File

@@ -299,9 +299,8 @@ class Device(object):
self._modio.readprocimg(self)
# Datenkopie anlegen
self._filelock.acquire()
self._ba_datacp = self._ba_devdata[:]
self._filelock.release()
with self._filelock:
self._ba_datacp = self._ba_devdata[:]
self._selfupdate = True

26
revpimodio2/helper.py
View File

@@ -400,10 +400,16 @@ class ProcimgWriter(Thread):
def _collect_events(self, value):
"""Aktiviert oder Deaktiviert die Eventueberwachung.
@param value True aktiviert / False deaktiviert"""
@param value True aktiviert / False deaktiviert
@return True, wenn Anforderung erfolgreich war"""
if type(value) != bool:
raise ValueError("value must be <class 'bool'>")
# Nur starten, wenn System läuft
if not self.is_alive():
self.__eventwork = False
return False
if self.__eventwork != value:
with self.lck_refresh:
self.__eventwork = value
@@ -417,6 +423,8 @@ class ProcimgWriter(Thread):
self.__eventth.daemon = True
self.__eventth.start()
return True
def _get_ioerrors(self):
"""Ruft aktuelle Anzahl der Fehler ab.
@return Aktuelle Fehleranzahl"""
@@ -472,13 +480,13 @@ class ProcimgWriter(Thread):
if self._modio._monitoring:
# Inputs und Outputs in Puffer
for dev in self._modio._lst_refresh:
dev._filelock.acquire()
dev._ba_devdata[:] = bytesbuff[dev._slc_devoff]
if self.__eventwork \
and len(dev._dict_events) > 0 \
and dev._ba_datacp != dev._ba_devdata:
self.__check_change(dev)
dev._filelock.release()
with dev._filelock:
dev._ba_devdata[:] = bytesbuff[dev._slc_devoff]
if self.__eventwork \
and len(dev._dict_events) > 0 \
and dev._ba_datacp != dev._ba_devdata:
self.__check_change(dev)
else:
# Inputs in Puffer, Outputs in Prozessabbild
for dev in self._modio._lst_refresh:
@@ -509,7 +517,7 @@ class ProcimgWriter(Thread):
finally:
# Verzögerte Events prüfen
if self.__eventwork:
for tup_fire in list(self.__dict_delay.keys()):
for tup_fire in tuple(self.__dict_delay.keys()):
if tup_fire[0].overwrite and \
getattr(self._modio.io, tup_fire[1]).value != \
tup_fire[2]:

24
revpimodio2/io.py
View File

@@ -385,8 +385,9 @@ class IOBase(object):
)
if self not in self._parentdevice._dict_events:
self._parentdevice._dict_events[self] = \
[IOEvent(func, edge, as_thread, delay, overwrite)]
with self._parentdevice._filelock:
self._parentdevice._dict_events[self] = \
[IOEvent(func, edge, as_thread, delay, overwrite)]
else:
# Prüfen ob Funktion schon registriert ist
for regfunc in self._parentdevice._dict_events[self]:
@@ -418,9 +419,10 @@ class IOBase(object):
)
# Eventfunktion einfügen
self._parentdevice._dict_events[self].append(
IOEvent(func, edge, as_thread, delay, overwrite)
)
with self._parentdevice._filelock:
self._parentdevice._dict_events[self].append(
IOEvent(func, edge, as_thread, delay, overwrite)
)
def _get_address(self):
"""Gibt die absolute Byteadresse im Prozessabbild zurueck.
@@ -627,7 +629,8 @@ class IOBase(object):
"""
if self in self._parentdevice._dict_events:
if func is None:
del self._parentdevice._dict_events[self]
with self._parentdevice._filelock:
del self._parentdevice._dict_events[self]
else:
newlist = []
for regfunc in self._parentdevice._dict_events[self]:
@@ -637,10 +640,11 @@ class IOBase(object):
newlist.append(regfunc)
# Wenn Funktionen übrig bleiben, diese übernehmen
if len(newlist) > 0:
self._parentdevice._dict_events[self] = newlist
else:
del self._parentdevice._dict_events[self]
with self._parentdevice._filelock:
if len(newlist) > 0:
self._parentdevice._dict_events[self] = newlist
else:
del self._parentdevice._dict_events[self]
def wait(self, edge=BOTH, exitevent=None, okvalue=None, timeout=0):
"""Wartet auf Wertaenderung eines IOs.

7
revpimodio2/modio.py
View File

@@ -319,7 +319,7 @@ class RevPiModIO(object):
@param milliseconds <class 'int'> in Millisekunden"""
if self._looprunning:
raise RuntimeError(
"can not change cycletime when cycleloop or mainloop are "
"can not change cycletime when cycleloop or mainloop is "
"running"
)
else:
@@ -587,9 +587,8 @@ class RevPiModIO(object):
# Beim Eintritt in mainloop Bytecopy erstellen
for dev in self._lst_refresh:
dev._filelock.acquire()
dev._ba_datacp = dev._ba_devdata[:]
dev._filelock.release()
with dev._filelock:
dev._ba_datacp = dev._ba_devdata[:]
# ImgWriter mit Eventüberwachung aktivieren
self._imgwriter._collect_events(True)