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

get_config Datentypen angepasst

Browse Source
This commit is contained in:
Sven Sager
2018-09-06 14:26:51 +02:00
parent c1afa0b33b
commit 22cc824694
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/mqttserver.html
View File

@@ -92,7 +92,7 @@ Static Methods</h3>
<a NAME="MqttServer.__init__" ID="MqttServer.__init__"></a>
<h3 style="background-color:#FFFFFF;color:#FF0000">
MqttServer (Constructor)</h3>
<b>MqttServer</b>(<i>basetopic, sendinterval, host, port=1883, tls_set=False, username="", password=None, client_id="", send_events=False, write_outputs=False</i>)
<b>MqttServer</b>(<i>basetopic, sendinterval, broker_address, port=1883, tls_set=False, username="", password=None, client_id="", send_events=False, write_outputs=False</i>)
<p>
Init MqttServer class.
</p><dl>
@@ -102,7 +102,7 @@ Basis-Topic fuer Datenaustausch
</dd><dt><i>sendinterval</i></dt>
<dd>
Prozessabbild alle n Sekunden senden
</dd><dt><i>host</i></dt>
</dd><dt><i>broker_address</i></dt>
<dd>
Adresse <class 'str'> des MQTT-Servers
</dd><dt><i>port</i></dt>

2
eric-revpipyload.api
View File

@@ -28,7 +28,7 @@ mqttserver.MqttServer.newlogfile?4()
mqttserver.MqttServer.reload_revpimodio?4()
mqttserver.MqttServer.run?4()
mqttserver.MqttServer.stop?4()
mqttserver.MqttServer?1(basetopic, sendinterval, host, port=1883, tls_set=False, username="", password=None, client_id="", send_events=False, write_outputs=False)
mqttserver.MqttServer?1(basetopic, sendinterval, broker_address, port=1883, tls_set=False, username="", password=None, client_id="", send_events=False, write_outputs=False)
mqttserver.__author__?9
mqttserver.__copyright__?9
mqttserver.__license__?9

28
revpipyload/revpipyload.py
View File

@@ -740,40 +740,40 @@ class RevPiPyLoad():
dc = {}
# DEFAULT Sektion
dc["autoreload"] = self.autoreload
dc["autoreload"] = int(self.autoreload)
dc["autoreloaddelay"] = self.autoreloaddelay
dc["autostart"] = self.autostart
dc["autostart"] = int(self.autostart)
dc["plcworkdir"] = self.plcworkdir
dc["plcprogram"] = self.plcprogram
dc["plcarguments"] = self.plcarguments
# dc["plcuid"] = self.plcuid
# dc["plcgid"] = self.plcgid
dc["plcuid"] = self.plcuid
dc["plcgid"] = self.plcgid
dc["pythonversion"] = self.pythonversion
dc["rtlevel"] = self.rtlevel
dc["zeroonerror"] = self.zeroonerror
dc["zeroonexit"] = self.zeroonexit
dc["rtlevel"] = int(self.rtlevel)
dc["zeroonerror"] = int(self.zeroonerror)
dc["zeroonexit"] = int(self.zeroonexit)
# MQTT Sektion
dc["mqtt"] = self.mqtt
dc["mqtt"] = int(self.mqtt)
dc["mqttbasetopic"] = self.mqttbasetopic
dc["mqttsendinterval"] = self.mqttsendinterval
dc["mqttbroker_address"] = self.mqttbroker_address
dc["mqttport"] = self.mqttport
dc["mqtttls_set"] = self.mqtttls_set
dc["mqtttls_set"] = int(self.mqtttls_set)
dc["mqttusername"] = self.mqttusername
dc["mqttpassword"] = self.mqttpassword
dc["mqttclient_id"] = self.mqttclient_id
dc["mqttsend_events"] = self.mqttsend_events
dc["mqttwrite_outputs"] = self.mqttwrite_outputs
dc["mqttsend_events"] = int(self.mqttsend_events)
dc["mqttwrite_outputs"] = int(self.mqttwrite_outputs)
# PLCSLAVE Sektion
dc["plcslave"] = self.plcslave
dc["plcslave"] = int(self.plcslave)
dc["plcslaveacl"] = self.plcslaveacl.acl
dc["plcslavebindip"] = self.plcslavebindip
dc["plcslaveport"] = self.plcslaveport
# XMLRPC Sektion
dc["xmlrpc"] = self.xmlrpc
dc["xmlrpc"] = int(self.xmlrpc)
dc["xmlrpcacl"] = self.xmlrpcacl.acl
dc["xmlrpcbindip"] = self.xmlrpcbindip
@@ -1015,7 +1015,7 @@ class RevPiPyLoad():
}
}
# Werte übernehmen
# Werte übernehmen, die eine Definition in key haben (andere nicht)
for sektion in keys:
suffix = sektion.lower()
for key in keys[sektion]: