mirror of
https://github.com/naruxde/revpimodio2.git
synced 2025-11-09 06:13:53 +01:00
netio.disconnect() eingefügt (gleich mit modio.cleanup())
Prüfung des Parameters address in RevPiNetIO()
This commit is contained in:
@@ -332,6 +332,9 @@ Methods</h3>
|
|||||||
<td><a style="color:#0000FF" href="#RevPiNetIO._create_myfh">_create_myfh</a></td>
|
<td><a style="color:#0000FF" href="#RevPiNetIO._create_myfh">_create_myfh</a></td>
|
||||||
<td>Erstellt NetworkFileObject.</td>
|
<td>Erstellt NetworkFileObject.</td>
|
||||||
</tr><tr>
|
</tr><tr>
|
||||||
|
<td><a style="color:#0000FF" href="#RevPiNetIO.disconnect">disconnect</a></td>
|
||||||
|
<td>Trennt Verbindungen und beendet autorefresh inkl.</td>
|
||||||
|
</tr><tr>
|
||||||
<td><a style="color:#0000FF" href="#RevPiNetIO.get_jconfigrsc">get_jconfigrsc</a></td>
|
<td><a style="color:#0000FF" href="#RevPiNetIO.get_jconfigrsc">get_jconfigrsc</a></td>
|
||||||
<td>Laed die piCotry Konfiguration und erstellt ein <class 'dict'>.</td>
|
<td>Laed die piCotry Konfiguration und erstellt ein <class 'dict'>.</td>
|
||||||
</tr><tr>
|
</tr><tr>
|
||||||
@@ -377,6 +380,12 @@ RevPiNetIO._create_myfh</h3>
|
|||||||
<p>
|
<p>
|
||||||
Erstellt NetworkFileObject.
|
Erstellt NetworkFileObject.
|
||||||
return FileObject
|
return FileObject
|
||||||
|
</p><a NAME="RevPiNetIO.disconnect" ID="RevPiNetIO.disconnect"></a>
|
||||||
|
<h3 style="background-color:#FFFFFF;color:#FF0000">
|
||||||
|
RevPiNetIO.disconnect</h3>
|
||||||
|
<b>disconnect</b>(<i></i>)
|
||||||
|
<p>
|
||||||
|
Trennt Verbindungen und beendet autorefresh inkl. alle Threads.
|
||||||
</p><a NAME="RevPiNetIO.get_jconfigrsc" ID="RevPiNetIO.get_jconfigrsc"></a>
|
</p><a NAME="RevPiNetIO.get_jconfigrsc" ID="RevPiNetIO.get_jconfigrsc"></a>
|
||||||
<h3 style="background-color:#FFFFFF;color:#FF0000">
|
<h3 style="background-color:#FFFFFF;color:#FF0000">
|
||||||
RevPiNetIO.get_jconfigrsc</h3>
|
RevPiNetIO.get_jconfigrsc</h3>
|
||||||
|
|||||||
@@ -182,6 +182,7 @@ revpimodio2.netio.NetFH.timeout?7
|
|||||||
revpimodio2.netio.NetFH.write?4(bytebuff)
|
revpimodio2.netio.NetFH.write?4(bytebuff)
|
||||||
revpimodio2.netio.NetFH?1(address, timeout=500)
|
revpimodio2.netio.NetFH?1(address, timeout=500)
|
||||||
revpimodio2.netio.RevPiNetIO._create_myfh?5()
|
revpimodio2.netio.RevPiNetIO._create_myfh?5()
|
||||||
|
revpimodio2.netio.RevPiNetIO.disconnect?4()
|
||||||
revpimodio2.netio.RevPiNetIO.get_jconfigrsc?4()
|
revpimodio2.netio.RevPiNetIO.get_jconfigrsc?4()
|
||||||
revpimodio2.netio.RevPiNetIO.net_cleardefaultvalues?4(device=None)
|
revpimodio2.netio.RevPiNetIO.net_cleardefaultvalues?4(device=None)
|
||||||
revpimodio2.netio.RevPiNetIO.net_setdefaultvalues?4(device=None)
|
revpimodio2.netio.RevPiNetIO.net_setdefaultvalues?4(device=None)
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE Project SYSTEM "Project-5.1.dtd">
|
<!DOCTYPE Project SYSTEM "Project-5.1.dtd">
|
||||||
<!-- eric project file for project revpimodio2 -->
|
<!-- eric project file for project revpimodio2 -->
|
||||||
<!-- Saved: 2017-11-06, 13:58:17 -->
|
<!-- Saved: 2017-11-11, 16:19:49 -->
|
||||||
<!-- Copyright (C) 2017 Sven Sager, akira@narux.de -->
|
<!-- Copyright (C) 2017 Sven Sager, akira@narux.de -->
|
||||||
<Project version="5.1">
|
<Project version="5.1">
|
||||||
<Language>en_US</Language>
|
<Language>en_US</Language>
|
||||||
@@ -34,6 +34,7 @@
|
|||||||
<Source>test/web_benniesrunxxl.py</Source>
|
<Source>test/web_benniesrunxxl.py</Source>
|
||||||
<Source>test/test_unit.py</Source>
|
<Source>test/test_unit.py</Source>
|
||||||
<Source>test/test_unitnet.py</Source>
|
<Source>test/test_unitnet.py</Source>
|
||||||
|
<Source>test/test_netio_brett.py</Source>
|
||||||
</Sources>
|
</Sources>
|
||||||
<Forms/>
|
<Forms/>
|
||||||
<Translations/>
|
<Translations/>
|
||||||
|
|||||||
@@ -386,19 +386,10 @@ class RevPiNetIO(_RevPiModIO):
|
|||||||
@param simulator Laed das Modul als Simulator und vertauscht IOs
|
@param simulator Laed das Modul als Simulator und vertauscht IOs
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# Objekte die auch schon bei Fehler benötigt werden
|
|
||||||
self._exit = Event()
|
|
||||||
self._imgwriter = None
|
|
||||||
self._lst_refresh = []
|
|
||||||
self._myfh = None
|
|
||||||
self._waitexit = Event()
|
|
||||||
|
|
||||||
# Adresse verarbeiten
|
# Adresse verarbeiten
|
||||||
if type(address) == str:
|
if type(address) == str:
|
||||||
# TODO: IP-Adresse prüfen
|
# TODO: IP-Adresse prüfen
|
||||||
self._address = (address, 55234)
|
self._address = (address, 55234)
|
||||||
|
|
||||||
elif type(address) == tuple:
|
elif type(address) == tuple:
|
||||||
if len(address) == 2 \
|
if len(address) == 2 \
|
||||||
and type(address[0]) == str \
|
and type(address[0]) == str \
|
||||||
@@ -410,11 +401,15 @@ class RevPiNetIO(_RevPiModIO):
|
|||||||
raise ValueError("port number out of range 1 - 65535")
|
raise ValueError("port number out of range 1 - 65535")
|
||||||
|
|
||||||
self._address = address
|
self._address = address
|
||||||
|
|
||||||
else:
|
else:
|
||||||
raise ValueError(
|
raise ValueError(
|
||||||
"address tuple must be (<class 'str'>, <class 'int'>)"
|
"address tuple must be (<class 'str'>, <class 'int'>)"
|
||||||
)
|
)
|
||||||
|
else:
|
||||||
|
raise ValueError(
|
||||||
|
"parameter address must be <class 'str'> or <class 'tuple'> "
|
||||||
|
"like (<class 'str'>, <class 'int'>)"
|
||||||
|
)
|
||||||
|
|
||||||
# Vererben
|
# Vererben
|
||||||
super().__init__(
|
super().__init__(
|
||||||
@@ -439,6 +434,10 @@ class RevPiNetIO(_RevPiModIO):
|
|||||||
self._buffedwrite = True
|
self._buffedwrite = True
|
||||||
return NetFH(self._address)
|
return NetFH(self._address)
|
||||||
|
|
||||||
|
def disconnect(self):
|
||||||
|
"""Trennt Verbindungen und beendet autorefresh inkl. alle Threads."""
|
||||||
|
self.cleanup()
|
||||||
|
|
||||||
def get_jconfigrsc(self):
|
def get_jconfigrsc(self):
|
||||||
"""Laed die piCotry Konfiguration und erstellt ein <class 'dict'>.
|
"""Laed die piCotry Konfiguration und erstellt ein <class 'dict'>.
|
||||||
@return <class 'dict'> der piCtory Konfiguration"""
|
@return <class 'dict'> der piCtory Konfiguration"""
|
||||||
|
|||||||
Reference in New Issue
Block a user