From 13d42acd67006e3ebfce319b7ba6405d7f7d0f7a Mon Sep 17 00:00:00 2001
From: Sven Sager <akira@narux.de>
Date: Mon, 13 Apr 2020 10:03:17 +0200
Subject: [PATCH] Use new RevPiModIO features

---
 revpipyload/mqttserver.py    | 4 ++--
 revpipyload/procimgserver.py | 4 ++--
 revpipyload/revpipyload.py   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/revpipyload/mqttserver.py b/revpipyload/mqttserver.py
index 2a0cd12..4aae427 100644
--- a/revpipyload/mqttserver.py
+++ b/revpipyload/mqttserver.py
@@ -139,7 +139,7 @@ class MqttServer(Thread):
                 configrsc=proginit.pargs.configrsc,
                 procimg=proginit.pargs.procimg,
                 replace_io_file=self._replace_ios,
-                direct_output=True,
+                shared_procimg=True,
             )
 
             if self._replace_ios:
@@ -153,7 +153,7 @@ class MqttServer(Thread):
                     monitoring=not self._write_outputs,
                     configrsc=proginit.pargs.configrsc,
                     procimg=proginit.pargs.procimg,
-                    direct_output=True,
+                    shared_procimg=True,
                 )
                 proginit.logger.warning(
                     "replace_ios_file not loadable for MQTT - using "
diff --git a/revpipyload/procimgserver.py b/revpipyload/procimgserver.py
index eccaa7e..7835820 100644
--- a/revpipyload/procimgserver.py
+++ b/revpipyload/procimgserver.py
@@ -107,7 +107,7 @@ class ProcimgServer():
                 configrsc=proginit.pargs.configrsc,
                 procimg=proginit.pargs.procimg,
                 replace_io_file=self.replace_ios,
-                direct_output=True,
+                shared_procimg=True,
             )
 
             if self.replace_ios:
@@ -118,7 +118,7 @@ class ProcimgServer():
                 self.rpi = revpimodio2.RevPiModIO(
                     configrsc=proginit.pargs.configrsc,
                     procimg=proginit.pargs.procimg,
-                    direct_output=True,
+                    shared_procimg=True,
                 )
                 proginit.logger.warning(
                     "replace_ios_file not loadable for ProcimgServer - using "
diff --git a/revpipyload/revpipyload.py b/revpipyload/revpipyload.py
index 23524bb..8c7cc89 100755
--- a/revpipyload/revpipyload.py
+++ b/revpipyload/revpipyload.py
@@ -918,7 +918,7 @@ class RevPiPyLoad():
         dc["plcslaveacl"] = self.plcslaveacl.acl
         dc["plcslavebindip"] = self.plcslavebindip
         dc["plcslaveport"] = self.plcslaveport
-        dc["plcslavewatchdog"] = self.plcwatchdog
+        dc["plcslavewatchdog"] = int(self.plcwatchdog)
 
         # XMLRPC Sektion
         dc["xmlrpc"] = int(self.xmlrpc)