revpi/revpipyload
1
0
Fork 0
mirror of https://github.com/naruxde/revpipyload.git synced 2025-11-08 23:23:52 +01:00
Code Issues Packages Releases Wiki Activity

Fehler bei MQTT-Werteübergabe der XML-RPC Schnittstelle behoben

Browse Source 
postinst Link angepasst
This commit is contained in:
Sven Sager
2018-09-26 11:08:30 +02:00
parent fd00fa3684
commit 4b3de84b20
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
debian/postinst vendored
View File

@@ -16,7 +16,7 @@ case "$1" in
READ: READ:
DE: https://revpimodio.org/revpipyplc-auf-065/ DE: https://revpimodio.org/revpipyplc-auf-065/
EN: https://revpimodio.org/en/revpipyplc-to-064/ EN: https://revpimodio.org/en/revpipyplc-to-065/
END END
;; ;;

4
revpipyload.e4p
View File

@@ -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 revpipyload --> <!-- eric project file for project revpipyload -->
<!-- Saved: 2018-09-25, 19:20:18 --> <!-- Saved: 2018-09-26, 10:58:41 -->
<!-- Copyright (C) 2018 Sven Sager, akira@narux.de --> <!-- Copyright (C) 2018 Sven Sager, akira@narux.de -->
<Project version="5.1"> <Project version="5.1">
<Language>en_US</Language> <Language>en_US</Language>
@@ -9,7 +9,7 @@
<ProgLanguage mixed="0">Python3</ProgLanguage> <ProgLanguage mixed="0">Python3</ProgLanguage>
<ProjectType>Console</ProjectType> <ProjectType>Console</ProjectType>
<Description>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.</Description> <Description>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.</Description>
<Version>0.7.1</Version> <Version>0.7.2</Version>
<Author>Sven Sager</Author> <Author>Sven Sager</Author>
<Email>akira@narux.de</Email> <Email>akira@narux.de</Email>
<Eol index="1"/> <Eol index="1"/>

12
revpipyload/revpipyload.py
View File

@@ -28,7 +28,7 @@ begrenzt werden!
__author__ = "Sven Sager" __author__ = "Sven Sager"
__copyright__ = "Copyright (C) 2018 Sven Sager" __copyright__ = "Copyright (C) 2018 Sven Sager"
__license__ = "GPLv3" __license__ = "GPLv3"
__version__ = "0.7.1" __version__ = "0.7.2"
import gzip import gzip
import logsystem import logsystem
import picontrolserver import picontrolserver
@@ -119,7 +119,7 @@ class RevPiPyLoad():
self.globalconfig["MQTT"].get("password", "") or self.globalconfig["MQTT"].get("password", "") or
self.mqttclient_id != self.mqttclient_id !=
self.globalconfig["MQTT"].get("client_id", "") or self.globalconfig["MQTT"].get("client_id", "") or
self.mqttsend_events != self.mqttsend_on_event !=
self.globalconfig["MQTT"].getboolean("send_on_event", False) or self.globalconfig["MQTT"].getboolean("send_on_event", False) or
self.mqttwrite_outputs != self.mqttwrite_outputs !=
self.globalconfig["MQTT"].getboolean("write_outputs", False) self.globalconfig["MQTT"].getboolean("write_outputs", False)
@@ -237,7 +237,7 @@ class RevPiPyLoad():
self.globalconfig["MQTT"].get("password", "") self.globalconfig["MQTT"].get("password", "")
self.mqttclient_id = \ self.mqttclient_id = \
self.globalconfig["MQTT"].get("client_id", "") self.globalconfig["MQTT"].get("client_id", "")
self.mqttsend_events = \ self.mqttsend_on_event = \
self.globalconfig["MQTT"].getboolean("send_on_event", False) self.globalconfig["MQTT"].getboolean("send_on_event", False)
self.mqttwrite_outputs = \ self.mqttwrite_outputs = \
self.globalconfig["MQTT"].getboolean("write_outputs", False) self.globalconfig["MQTT"].getboolean("write_outputs", False)
@@ -468,7 +468,7 @@ class RevPiPyLoad():
self.mqttusername, self.mqttusername,
self.mqttpassword, self.mqttpassword,
self.mqttclient_id, self.mqttclient_id,
self.mqttsend_events, self.mqttsend_on_event,
self.mqttwrite_outputs, self.mqttwrite_outputs,
) )
except Exception as e: except Exception as e:
@@ -763,7 +763,7 @@ class RevPiPyLoad():
dc["mqttusername"] = self.mqttusername dc["mqttusername"] = self.mqttusername
dc["mqttpassword"] = self.mqttpassword dc["mqttpassword"] = self.mqttpassword
dc["mqttclient_id"] = self.mqttclient_id dc["mqttclient_id"] = self.mqttclient_id
dc["mqttsend_events"] = int(self.mqttsend_events) dc["mqttsend_on_event"] = int(self.mqttsend_on_event)
dc["mqttwrite_outputs"] = int(self.mqttwrite_outputs) dc["mqttwrite_outputs"] = int(self.mqttwrite_outputs)
# PLCSLAVE Sektion # PLCSLAVE Sektion
@@ -998,7 +998,7 @@ class RevPiPyLoad():
"mqttusername": ".*", "mqttusername": ".*",
"mqttpassword": ".*", "mqttpassword": ".*",
"mqttclient_id": ".*", "mqttclient_id": ".*",
"mqttsend_events": "[01]", "mqttsend_on_event": "[01]",
"mqttwrite_outputs": "[01]", "mqttwrite_outputs": "[01]",
}, },
"PLCSLAVE": { "PLCSLAVE": {

2
setup.py
View File

@@ -27,7 +27,7 @@ setup(
license="LGPLv3", license="LGPLv3",
name="revpipyload", name="revpipyload",
version="0.7.1", version="0.7.2",
scripts=["data/revpipyload"], scripts=["data/revpipyload"],