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

export_replaced_ios mit Dateinamen als default versehen (PyLoad name)

Browse Source 
Merge-Fehler beseitigt
This commit is contained in:
Sven Sager
2019-08-17 20:36:43 +02:00
parent 925efc10fe
commit e7c8c5f958
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/revpimodio2.modio.html
View File

@@ -505,7 +505,7 @@ Entfernt auch alle Devices aus autorefresh
</dl><a NAME="RevPiModIO.export_replaced_ios" ID="RevPiModIO.export_replaced_ios"></a> </dl><a NAME="RevPiModIO.export_replaced_ios" ID="RevPiModIO.export_replaced_ios"></a>
<h3 style="background-color:#FFFFFF;color:#FF0000"> <h3 style="background-color:#FFFFFF;color:#FF0000">
RevPiModIO.export_replaced_ios</h3> RevPiModIO.export_replaced_ios</h3>
<b>export_replaced_ios</b>(<i>filename</i>) <b>export_replaced_ios</b>(<i>filename="replace_ios.conf"</i>)
<p> <p>
Exportiert ersetzte IOs dieser Instanz. Exportiert ersetzte IOs dieser Instanz.
</p><p> </p><p>

2
eric-revpimodio2.api
View File

@@ -166,7 +166,7 @@ revpimodio2.modio.RevPiModIO.cycleloop?4(func, cycletime=50)
revpimodio2.modio.RevPiModIO.cycletime?7 revpimodio2.modio.RevPiModIO.cycletime?7
revpimodio2.modio.RevPiModIO.debug?7 revpimodio2.modio.RevPiModIO.debug?7
revpimodio2.modio.RevPiModIO.exit?4(full=True) revpimodio2.modio.RevPiModIO.exit?4(full=True)
revpimodio2.modio.RevPiModIO.export_replaced_ios?4(filename) revpimodio2.modio.RevPiModIO.export_replaced_ios?4(filename="replace_ios.conf")
revpimodio2.modio.RevPiModIO.get_jconfigrsc?4() revpimodio2.modio.RevPiModIO.get_jconfigrsc?4()
revpimodio2.modio.RevPiModIO.handlesignalend?4(cleanupfunc=None) revpimodio2.modio.RevPiModIO.handlesignalend?4(cleanupfunc=None)
revpimodio2.modio.RevPiModIO.ioerrors?7 revpimodio2.modio.RevPiModIO.ioerrors?7

2
revpimodio2/modio.py
View File

@@ -687,7 +687,7 @@ class RevPiModIO(object):
if not self._monitoring: if not self._monitoring:
self.writeprocimg(dev) self.writeprocimg(dev)
def export_replaced_ios(self, filename): def export_replaced_ios(self, filename="replace_ios.conf"):
"""Exportiert ersetzte IOs dieser Instanz. """Exportiert ersetzte IOs dieser Instanz.
Exportiert alle ersetzten IOs, welche mit .replace_io(...) angelegt Exportiert alle ersetzten IOs, welche mit .replace_io(...) angelegt

8
revpimodio2/netio.py
View File

@@ -380,7 +380,7 @@ class NetFH(Thread):
def readreplaceio(self): def readreplaceio(self):
"""Ruft die replace_io Konfiguration ab. """Ruft die replace_io Konfiguration ab.
@return <class 'bytes'> replace_io_file""" @return <class 'bytes'> replace_io_file"""
if self.__sockend: if self.__sockend.is_set():
raise ValueError("read of closed file") raise ValueError("read of closed file")
with self.__socklock: with self.__socklock:
@@ -388,21 +388,21 @@ class NetFH(Thread):
byte_buff = bytearray() byte_buff = bytearray()
zero_byte = 0 zero_byte = 0
while not self.__sockend and zero_byte < 100: while not self.__sockend.is_set() and zero_byte < 100:
data = self._slavesock.recv(128) data = self._slavesock.recv(128)
if data == b'': if data == b'':
zero_byte += 1 zero_byte += 1
byte_buff += data byte_buff += data
if data.find(b'\x04') >= 0: if data.find(b'\x04') >= 0:
self.__trigger = True
# NOTE: Nur suchen oder Ende prüfen? # NOTE: Nur suchen oder Ende prüfen?
return bytes(byte_buff[:-1]) return bytes(byte_buff[:-1])
self.__sockerr.set() self.__sockerr.set()
raise IOError("readreplaceio error on network") raise IOError("readreplaceio error on network")
self.__trigger = True
def run(self): def run(self):
"""Handler fuer Synchronisierung.""" """Handler fuer Synchronisierung."""
while not self.__sockend.is_set(): while not self.__sockend.is_set():