improvements when plc is switched off

- stop continuous logging during reconnect
- include ._init() into lock

cfg/kapillarheizung_cfg.py

@@ -0,0 +1,102 @@
+Node('Gas10kA.psi.ch',
+     'LOGO for 10kBar Gas pressure stick',
+     interface='tcp://5001',
+)
+
+Mod('io',
+    'frappy_psi.logo.IO',
+    '',
+    ip_address = "192.168.1.1",
+    tcap_client = 0x3000,
+    tsap_server = 0x2000
+)
+
+Mod('PT10000',
+    'frappy_psi.logo.TempSensor',
+    'sensor',
+    io = 'io',
+    vm_address ="VW0",
+)
+
+Mod('T_pt10k',
+    'frappy_psi.softcal.Sensor',
+    '?',
+    value=Param(unit='K'),
+    rawsensor='PT10000',
+    calib='pt10000e',
+)
+
+Mod('PT1000_oben',
+    'frappy_psi.logo.TempSensor',
+    'sensor',
+    io = 'io',
+    vm_address ="VW2",
+)
+
+Mod('T_top',
+    'frappy_psi.softcal.Sensor',
+    '?',
+    value=Param(unit='K'),
+    rawsensor='PT1000_oben',
+    calib='pt1000e',
+)
+
+Mod('PT1000_mitte',
+    'frappy_psi.logo.TempSensor',
+    'sensor',
+    io = 'io',
+    vm_address ="VW4",
+)
+
+Mod('T_mid',
+    'frappy_psi.softcal.Sensor',
+    '?',
+    value=Param(unit='K'),
+    rawsensor='PT1000_mitte',
+    calib='pt1000e',
+)
+
+Mod('PT1000_unten',
+    'frappy_psi.logo.TempSensor',
+    'sensor',
+    io = 'io',
+    vm_address ="VW6",
+)
+
+Mod('T_bot',
+    'frappy_psi.softcal.Sensor',
+    '?',
+    value=Param(unit='K'),
+    rawsensor='PT1000_unten',
+    calib='pt1000e',
+)
+
+Mod('Cernox',
+    'frappy_psi.logo.TempSensor',
+    'sensor',
+    io = 'io',
+    vm_address ="VW8",
+)
+
+Mod('T_cx',
+    'frappy_psi.softcal.Sensor',
+    '?',
+    value=Param(unit='K'),
+    rawsensor='Cernox',
+    calib='X174785',
+)
+
+Mod('HeaterLevelHigh',
+    'frappy_psi.logo.HeaterParam',
+    'heater param',
+    io = 'io',
+    vm_address = "VW10", 
+)
+
+# currently unused:
+#Mod('HeaterLevelLow',
+#    'frappy_psi.logo.HeaterParam',
+#    'heater param',
+#    io = 'io',
+#    vm_address = "VW12", 
+#)

cfg/main/ori4_cfg.py

@@ -9,19 +9,12 @@ Mod('sea_main',
     service='main',
 )
 
-Mod('t',
+Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
     sea_object='tt',
 )
 
-Mod('tm',
-    'frappy_psi.sea.SeaDrivable', '',
-    io='sea_main',
-    sea_object='tt',
-    rel_paths=['tm'],
-)
-
 Mod('cc',
     'frappy_psi.sea.SeaReadable', '',
     io='sea_main',

cfg/sea/ccr2.config.json

@@ -54,8 +54,6 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]}, "cc": {"base": "/cc", "params": [{"path": "", "type": "bool", "kids": 96},
 {"path": "send", "type": "text", "readonly": false, "cmd": "cc send", "visibility": 3},
 {"path": "status", "type": "text", "visibility": 3},

cfg/sea/ccr2ht.config.json

@@ -60,8 +60,6 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]}, "cc": {"base": "/cc", "params": [{"path": "", "type": "bool", "kids": 96},
 {"path": "send", "type": "text", "readonly": false, "cmd": "cc send", "visibility": 3},
 {"path": "status", "type": "text", "visibility": 3},

cfg/sea/ccr3.config.json

@@ -56,8 +56,6 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]},
 
 "cc": {"base": "/cc", "params": [

cfg/sea/cti5.config.json

@@ -50,8 +50,6 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]},
 
 "cc": {"base": "/cc", "params": [

cfg/sea/cti7.config.json

@@ -50,6 +50,4 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]}}

cfg/sea/cti7ht.config.json

@@ -56,6 +56,4 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]}}

cfg/sea/fs.config.json

@@ -56,8 +56,6 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]},
 
 "cc": {"base": "/cc", "params": [

cfg/sea/ft.config.json

@@ -68,8 +68,6 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]},
 
 "table": {"base": "/table", "params": [

cfg/sea/fw.config.json

@@ -62,8 +62,6 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]},
 
 "table": {"base": "/table", "params": [

cfg/sea/ill1.config.json

@@ -62,8 +62,6 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]},
 
 "cc": {"base": "/cc", "params": [

cfg/sea/ill2.config.json

@@ -62,8 +62,6 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]},
 
 "cc": {"base": "/cc", "params": [

cfg/sea/ill4.config.json

@@ -62,8 +62,6 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]},
 
 "cc": {"base": "/cc", "params": [

cfg/sea/ma02.config.json

@@ -63,8 +63,6 @@
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "setsamp", "type": "float", "readonly": false, "cmd": "tt setsamp"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]},
 
 "cc": {"base": "/cc", "params": [

cfg/sea/ori3.config.json

@@ -62,8 +62,6 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]},
 
 "cc": {"base": "/cc", "params": [

cfg/sea/ori7.config.json

@@ -62,8 +62,6 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]},
 
 "cc": {"base": "/cc", "params": [

cfg/sea/rt.config.json

@@ -21,8 +21,6 @@
 {"path": "tm/stddev", "type": "float"},
 {"path": "tm/raw", "type": "float"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]},
 
 "cc": {"base": "/cc", "params": [

cfg/sea/sch5.stick.json

@@ -69,8 +69,6 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]}, "cc": {"base": "/cc", "params": [{"path": "", "type": "bool", "kids": 96},
 {"path": "send", "type": "text", "readonly": false, "cmd": "cc send", "visibility": 3},
 {"path": "status", "type": "text", "visibility": 3},

cfg/sea/variox.config.json

@@ -62,8 +62,6 @@
 {"path": "set/integ", "type": "float", "readonly": false, "cmd": "tt set/integ", "description": "bigger means faster"},
 {"path": "set/deriv", "type": "float", "readonly": false, "cmd": "tt set/deriv"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "tt display"},
-{"path": "dout", "type": "int", "readonly": false, "cmd": "tt dout"},
-{"path": "dinp", "type": "int"},
 {"path": "remote", "type": "bool"}]},
 
 "cc": {"base": "/cc", "params": [

frappy_psi/logo.py

@@ -0,0 +1,158 @@
+# *****************************************************************************
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# Module authors:
+#   Andrea Plank <andrea.plank@psi.ch>
+#   Markus Zolliker <markus.zolliker@psi.ch>
+#
+# *****************************************************************************
+import sys
+import time
+from ast import literal_eval
+from threading import RLock
+import snap7
+from frappy.core import Readable, Parameter, FloatRange, HasIO, StringIO, Property, StringType,IDLE, BUSY, WARN, ERROR,Writable,  Drivable, BoolType, IntRange, Communicator
+from frappy.errors import CommunicationFailedError
+
+
+class IO(Communicator):
+    tcap_client = Property('tcap_client', IntRange())
+    tsap_server = Property('tcap_server', IntRange())
+    ip_address = Property('numeric ip address', StringType())
+    _plc = None
+    _last_try = 0
+
+    def initModule(self):
+        self._lock = RLock()
+        super().initModule()
+
+    def _init(self):
+        if not self._plc:
+            if time.time() < self._last_try + 10:
+                raise CommunicationFailedError('logo PLC not reachable')
+            self._plc = snap7.logo.Logo()
+            prev_stderr = sys.stdout
+            sys.stderr = open('/dev/null', 'w')  # suppress output of snap7
+            try:
+                self._plc.connect(self.ip_address, self.tcap_client, self.tsap_server)
+                if self._plc.get_connected():
+                    return
+            except Exception:
+                pass
+            finally:
+                sys.stderr = prev_stderr
+            self._plc = None
+            self._last_try = time.time()
+            raise CommunicationFailedError('logo PLC not reachable')
+
+    def communicate(self, cmd):
+        with self._lock:
+            self._init()
+            cmd = cmd.split(maxsplit=1)
+            if len(cmd) == 2:
+                self._plc.write(cmd[0], literal_eval(cmd[1]))
+            try:
+                return self._plc.read(cmd[0])
+            except Exception as e:
+                if self._plc:
+                    self.log.exception('error in plc read')
+                self._plc = None
+                raise
+
+
+class Snap7Mixin(HasIO):
+    ioclass = IO
+
+    def get_vm_value(self, vm_address):
+        return self.io.communicate(vm_address)
+
+
+    def set_vm_value(self, vm_address, value):
+        return self.io.communicate(f'{vm_address} {value}')
+
+
+class Pressure(Snap7Mixin, Readable):
+    vm_address = Property('VM address', datatype= StringType())
+    value = Parameter('pressure', datatype = FloatRange(unit = 'mbar'))
+
+    pollinterval = 0.5
+
+    def read_value(self):
+        return self.get_vm_value(self.vm_address)
+
+    def read_status(self):
+        return IDLE, ''
+
+
+class Valve(Snap7Mixin, Drivable):
+    vm_address_input = Property('VM address input', datatype= StringType())
+    vm_address_output = Property('VM address output', datatype= StringType())
+
+    target = Parameter('Valve target', datatype = BoolType())
+    value = Parameter('Value state', datatype = BoolType())
+
+
+    def read_value(self):
+        return self.get_vm_value(self.vm_address_input)
+
+    def write_target(self, target):
+        return self.set_vm_value(self.vm_address_output, target)
+
+    def read_status(self):
+        return IDLE, ''
+
+
+class FluidMachines(Snap7Mixin, Drivable):
+    vm_address_output = Property('VM address output', datatype= StringType())
+
+    target = Parameter('Valve target', datatype = BoolType())
+    value = Parameter('Value state', datatype = BoolType())
+
+    def read_value(self):
+        return self.get_vm_value(self.vm_address_output)
+
+    def write_target(self, target):
+        return self.set_vm_value(self.vm_address_output, target)
+
+    def read_status(self):
+        return IDLE, ''
+
+
+class TempSensor(Snap7Mixin, Readable):
+    vm_address = Property('VM address', datatype= StringType())
+    value = Parameter('resistance', datatype = FloatRange(unit = 'Ohm'))
+
+    def read_value(self):
+        return self.get_vm_value(self.vm_address)
+
+    def read_status(self):
+        return IDLE, ''
+
+
+class HeaterParam(Snap7Mixin, Writable):
+    vm_address = Property('VM address output', datatype= StringType())
+
+    target = Parameter('Heater target', datatype = FloatRange(unit='%'))
+    value = Parameter('Heater Param', datatype = FloatRange(unit='%'))
+
+    def read_value(self):
+        return self.get_vm_value(self.vm_address) * 0.1
+
+    def write_target(self, target):
+        return self.set_vm_value(self.vm_address, round(target * 10)) * 0.1
+
+    def read_status(self):
+        return IDLE, ''