From d414b57ba17d9629ac8976fae93a919f19c866a9 Mon Sep 17 00:00:00 2001 From: NaruX Date: Tue, 19 Sep 2017 14:45:45 +0200 Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20aus=20default=20=C3=BCbernomm?= =?UTF-8?q?en=20und=20Version=20hochgezogen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/revpipyload.html | 16 +++++++++++++++- eric-revpipyload.api | 1 + revpipyload.e4p | 4 ++-- revpipyload/revpipyload.py | 2 +- setup.py | 2 +- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/doc/revpipyload.html b/doc/revpipyload.html index 23d8a8d..a5c7587 100644 --- a/doc/revpipyload.html +++ b/doc/revpipyload.html @@ -87,6 +87,9 @@ Methods _loadconfig Load configuration file and setup modul. +_plcslave +Erstellt den PlcSlave-Server Thread. + _plcthread Konfiguriert den PLC-Thread fuer die Ausfuehrung. @@ -180,7 +183,18 @@ RevPiPyLoad._loadconfig _loadconfig()

Load configuration file and setup modul. -

+

+

+RevPiPyLoad._plcslave

+_plcslave() +

+Erstellt den PlcSlave-Server Thread. +

+
Returns:
+
+PLC-Server-Thread Object or None +
+

RevPiPyLoad._plcthread

_plcthread() diff --git a/eric-revpipyload.api b/eric-revpipyload.api index a51d510..864e13a 100644 --- a/eric-revpipyload.api +++ b/eric-revpipyload.api @@ -44,6 +44,7 @@ proginit.picontrolreset?7 proginit.rapcatalog?7 proginit.startdir?7 revpipyload.RevPiPyLoad._loadconfig?5() +revpipyload.RevPiPyLoad._plcslave?5() revpipyload.RevPiPyLoad._plcthread?5() revpipyload.RevPiPyLoad._sigexit?5(signum, frame) revpipyload.RevPiPyLoad._sigloadconfig?5(signum, frame) diff --git a/revpipyload.e4p b/revpipyload.e4p index 188d36f..c895726 100644 --- a/revpipyload.e4p +++ b/revpipyload.e4p @@ -1,7 +1,7 @@ - + en_US @@ -9,7 +9,7 @@ Python3 Console Dieser Loader wird über das Init-System geladen und führt das angegebene Pythonprogramm aus. Es ist für den RevolutionPi gedacht um automatisch das SPS-Programm zu starten. - 0.5.1 + 0.5.2 Sven Sager akira@narux.de diff --git a/revpipyload/revpipyload.py b/revpipyload/revpipyload.py index 0932ff4..04e6fc8 100755 --- a/revpipyload/revpipyload.py +++ b/revpipyload/revpipyload.py @@ -50,7 +50,7 @@ from time import asctime from xmlrpc.client import Binary from xmlrpc.server import SimpleXMLRPCServer -pyloadversion = "0.5.1" +pyloadversion = "0.5.2" re_ipacl = "(([\\d\\*]{1,3}\\.){3}[\\d\\*]{1,3},[0-1] ?)*" diff --git a/setup.py b/setup.py index cbc51d3..8adda1d 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ setup( license="LGPLv3", name="revpipyload", - version="0.5.1", + version="0.5.2", scripts=["data/revpipyload"],