From 8c195d72f32ab3da152f836b4303f627b9fda634 Mon Sep 17 00:00:00 2001
From: NaruX <akira@narux.de>
Date: Mon, 13 Nov 2017 11:01:26 +0100
Subject: [PATCH] =?UTF-8?q?netio.disconnect()=20eingef=C3=BCgt=20(gleich?=
 =?UTF-8?q?=20mit=20modio.cleanup())=20Pr=C3=BCfung=20des=20Parameters=20a?=
 =?UTF-8?q?ddress=20in=20RevPiNetIO()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/revpimodio2.netio.html |  9 +++++++++
 eric-revpimodio2.api       |  1 +
 revpimodio2.e4p            |  3 ++-
 revpimodio2/netio.py       | 19 +++++++++----------
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/doc/revpimodio2.netio.html b/doc/revpimodio2.netio.html
index 1dc4a30..047efb6 100644
--- a/doc/revpimodio2.netio.html
+++ b/doc/revpimodio2.netio.html
@@ -332,6 +332,9 @@ Methods</h3>
 <td><a style="color:#0000FF" href="#RevPiNetIO._create_myfh">_create_myfh</a></td>
 <td>Erstellt NetworkFileObject.</td>
 </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>Laed die piCotry Konfiguration und erstellt ein <class 'dict'>.</td>
 </tr><tr>
@@ -377,6 +380,12 @@ RevPiNetIO._create_myfh</h3>
 <p>
 Erstellt NetworkFileObject.
         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>
 <h3 style="background-color:#FFFFFF;color:#FF0000">
 RevPiNetIO.get_jconfigrsc</h3>
diff --git a/eric-revpimodio2.api b/eric-revpimodio2.api
index 302ab90..cfd0286 100644
--- a/eric-revpimodio2.api
+++ b/eric-revpimodio2.api
@@ -182,6 +182,7 @@ revpimodio2.netio.NetFH.timeout?7
 revpimodio2.netio.NetFH.write?4(bytebuff)
 revpimodio2.netio.NetFH?1(address, timeout=500)
 revpimodio2.netio.RevPiNetIO._create_myfh?5()
+revpimodio2.netio.RevPiNetIO.disconnect?4()
 revpimodio2.netio.RevPiNetIO.get_jconfigrsc?4()
 revpimodio2.netio.RevPiNetIO.net_cleardefaultvalues?4(device=None)
 revpimodio2.netio.RevPiNetIO.net_setdefaultvalues?4(device=None)
diff --git a/revpimodio2.e4p b/revpimodio2.e4p
index d414a09..36afae6 100644
--- a/revpimodio2.e4p
+++ b/revpimodio2.e4p
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Project SYSTEM "Project-5.1.dtd">
 <!-- 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 -->
 <Project version="5.1">
   <Language>en_US</Language>
@@ -34,6 +34,7 @@
     <Source>test/web_benniesrunxxl.py</Source>
     <Source>test/test_unit.py</Source>
     <Source>test/test_unitnet.py</Source>
+    <Source>test/test_netio_brett.py</Source>
   </Sources>
   <Forms/>
   <Translations/>
diff --git a/revpimodio2/netio.py b/revpimodio2/netio.py
index 3e84e57..ed3b542 100644
--- a/revpimodio2/netio.py
+++ b/revpimodio2/netio.py
@@ -386,19 +386,10 @@ class RevPiNetIO(_RevPiModIO):
         @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
         if type(address) == str:
             # TODO: IP-Adresse prüfen
             self._address = (address, 55234)
-
         elif type(address) == tuple:
             if len(address) == 2 \
                     and type(address[0]) == str \
@@ -410,11 +401,15 @@ class RevPiNetIO(_RevPiModIO):
                     raise ValueError("port number out of range 1 - 65535")
 
                 self._address = address
-
             else:
                 raise ValueError(
                     "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
         super().__init__(
@@ -439,6 +434,10 @@ class RevPiNetIO(_RevPiModIO):
         self._buffedwrite = True
         return NetFH(self._address)
 
+    def disconnect(self):
+        """Trennt Verbindungen und beendet autorefresh inkl. alle Threads."""
+        self.cleanup()
+
     def get_jconfigrsc(self):
         """Laed die piCotry Konfiguration und erstellt ein <class 'dict'>.
         @return <class 'dict'> der piCtory Konfiguration"""