Merge branch 'glab_merge_request' into 'wip'

frappy_psi.sensirion: fix a typo

See merge request samenv/frappy!1

.pylintrc

@@ -9,7 +9,7 @@
 
 # Add <file or directory> to the black list. It should be a base name, not a
 # path. You may set this option multiple times.
-ignore = .git
+ignore = .git,resources_qt5.py,resources_qt6.py
 
 # Pickle collected data for later comparisons.
 persistent=yes
@@ -38,26 +38,23 @@ confidence=
 # multiple time.
 disable=missing-docstring
         ,locally-disabled
-        ,locally-enabled
         ,fixme
         ,no-member
-        ,bad-whitespace
+        ,not-callable
         ,wrong-import-position
         ,ungrouped-imports
         ,import-self
-        ,bad-continuation
         ,protected-access
         ,unused-argument
         ,duplicate-code
         ,attribute-defined-outside-init
         ,access-member-before-definition
-        ,no-self-use
         ,broad-except
         ,unneeded-not
         ,unidiomatic-typecheck
         ,undefined-loop-variable
-        ,redefined-variable-type
+        ,consider-using-f-string
-        ,deprecated-lambda
+        ,use-dict-literal
 
 [REPORTS]
 
@@ -67,10 +64,6 @@ disable=missing-docstring
 
 msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg}
 
-# Put messages in a separate file for each module / package specified on the
-# command line instead of printing them on stdout. Reports (if any) will be
-# written in a file name "pylint_global.[txt|html]".
-files-output=no
 
 # Tells whether to display a full report or only the messages
 reports=no
@@ -93,14 +86,11 @@ dummy-variables-rgx=_|dummy
 
 # List of additional names supposed to be defined in builtins. Remember that
 # you should avoid to define new builtins when possible.
-additional-builtins=
+additional-builtins=Node,Mod,Param,Command,Group
 
 
 [BASIC]
 
-# List of builtins function names that should not be used, separated by a comma
-#bad-functions=map,filter,apply,input
-bad-functions=apply,input
 
 # Regular expression which should only match correct module names
 module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9_]+))$
@@ -155,12 +145,6 @@ notes=FIXME,XXX,TODO
 # Maximum number of characters on a single line.
 max-line-length=132
 
-# List of optional constructs for which whitespace checking is disabled. `dict-
-# separator` is used to allow tabulation in dicts, etc.: {1  : 1,\n222: 2}.
-# `trailing-comma` allows a space between comma and closing bracket: (a, ).
-# `empty-line` allows space-only lines.
-no-space-check=trailing-comma,dict-separator
-
 # Maximum number of lines in a module
 max-module-lines=1000
 
@@ -220,6 +204,9 @@ max-statements=150
 # Maximum number of parents for a class (see R0901).
 max-parents=20
 
+# Maximum number of positional arguments
+max-positional-arguments=10
+
 # Maximum number of attributes for a class (see R0902).
 max-attributes=50
 

README.md

@@ -60,4 +60,3 @@ changes are done, eventually a sync step should happen:
    cp -r secop /Volumes/PPMSData/zolliker/frappy/secop
 
    it may be that additional folder have to copied ...
-

bin/frappy-cfg-editor

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # pylint: disable=invalid-name
-#  -*- coding: utf-8 -*-
 # *****************************************************************************
+# Copyright (c) 2015-2024 by the authors, see LICENSE
 #
 # 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

bin/frappy-cli

@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
-#  -*- coding: utf-8 -*-
 # *****************************************************************************
-# Copyright (c) 2015-2016 by the authors, see LICENSE
+# Copyright (c) 2015-2024 by the authors, see LICENSE
 #
 # 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
@@ -25,10 +24,10 @@
 
 import sys
 import argparse
-from os import path
+from pathlib import Path
 
 # Add import path for inplace usage
-sys.path.insert(0, path.abspath(path.join(path.dirname(__file__), '..')))
+sys.path.insert(0, str(Path(__file__).absolute().parents[1]))
 
 from frappy.client.interactive import init, run, clientenv, interact
 
@@ -37,7 +36,7 @@ def parseArgv(argv):
     parser = argparse.ArgumentParser()
     parser.add_argument('-i', '--include',
                         help='file to execute after connecting to the clients', metavar='file',
-                        type=str, action='append', default=[])
+                        type=Path, action='append', default=[])
     parser.add_argument('-o', '--only-execute',
                         help='Do not go into interactive mode after executing files. \
                         Has no effect without --include.', action='store_true')

bin/frappy-gui

@@ -1,8 +1,7 @@
 #!/usr/bin/env python3
 # pylint: disable=invalid-name
-#  -*- coding: utf-8 -*-
 # *****************************************************************************
-# Copyright (c) 2015-2016 by the authors, see LICENSE
+# Copyright (c) 2015-2024 by the authors, see LICENSE
 #
 # 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
@@ -27,10 +26,10 @@ from __future__ import print_function
 
 import sys
 import argparse
-from os import path
+from pathlib import Path
 
 # Add import path for inplace usage
-sys.path.insert(0, path.abspath(path.join(path.dirname(__file__), '..')))
+sys.path.insert(0, str(Path(__file__).absolute().parents[1]))
 
 import logging
 from mlzlog import ColoredConsoleHandler
@@ -47,8 +46,11 @@ def parseArgv(argv):
     loggroup.add_argument('-q', '--quiet',
                           help='Supress everything but errors',
                           action='store_true', default=False)
+    parser.add_argument('-D', '--detailed',
+                        help='Start in detailed mode',
+                        action='store_true', default=False)
     parser.add_argument('node',
-                        help='Nodes the Gui should connect to.\n', metavar='host[:port]',
+                        help='Nodes the GUI should connect to.\n', metavar='host[:port]',
                         nargs='*', type=str, default=[])
     return parser.parse_args(argv)
 
@@ -62,13 +64,14 @@ def main(argv=None):
     loglevel = logging.DEBUG if args.debug else (logging.ERROR if args.quiet else logging.INFO)
     logger = logging.getLogger('gui')
     logger.setLevel(logging.DEBUG)
-    console = ColoredConsoleHandler()
+    if sys.stdout is not None:
-    console.setLevel(loglevel)
+        console = ColoredConsoleHandler()
-    logger.addHandler(console)
+        console.setLevel(loglevel)
+        logger.addHandler(console)
 
-    app = QApplication(argv)
+    app = QApplication(argv, organizationName='frappy', applicationName='frappy_gui')
 
-    win = MainWindow(args.node, logger)
+    win = MainWindow(args, logger)
     app.aboutToQuit.connect(win._onQuit)
     win.show()
 

bin/frappy-play

@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
-#  -*- coding: utf-8 -*-
 # *****************************************************************************
-# Copyright (c) 2015-2016 by the authors, see LICENSE
+# Copyright (c) 2015-2024 by the authors, see LICENSE
 #
 # 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
@@ -23,14 +22,18 @@
 # *****************************************************************************
 
 import sys
-from os import path
+from pathlib import Path
+from frappy.lib import generalConfig
+from frappy.logging import logger
 
 # Add import path for inplace usage
-sys.path.insert(0, path.abspath(path.join(path.dirname(__file__), '..')))
+sys.path.insert(0, str(Path(__file__).absolute().parents[1]))
 
 from frappy.client.interactive import Console
 from frappy.playground import play, USAGE
 
+generalConfig.init()
+logger.init()
 if len(sys.argv) > 1:
     play(sys.argv[1])
 else:

bin/frappy-scan

@@ -0,0 +1,139 @@
+#!/usr/bin/env python3
+# *****************************************************************************
+#
+# 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:
+#   Alexander Zaft <a.zaft@fz-juelich.de>
+#
+# *****************************************************************************
+
+"""SEC node autodiscovery tool."""
+
+import argparse
+import json
+import os
+import select
+import socket
+import sys
+from collections import namedtuple
+from time import time as currenttime
+
+UDP_PORT = 10767
+
+Answer = namedtuple('Answer',
+                    'address, port, equipment_id, firmware, description')
+
+
+def decode(msg, addr):
+    msg = msg.decode('utf-8')
+    try:
+        data = json.loads(msg)
+    except Exception:
+        return None
+    if not isinstance(data, dict):
+        return None
+    if data.get('SECoP') != 'node':
+        return None
+    try:
+        eq_id = data['equipment_id']
+        fw = data['firmware']
+        desc = data['description']
+        port = data['port']
+    except KeyError:
+        return None
+    addr, _scanport = addr
+    return Answer(addr, port, eq_id, fw, desc)
+
+
+def print_answer(answer, *, short=False):
+    try:
+        hostname = socket.gethostbyaddr(answer.address)[0]
+        address = hostname
+        numeric = f' ({answer.address})'
+    except Exception:
+        address = answer.address       
+        numeric = ''
+    if short:
+        # NOTE: keep this easily parseable!
+        print(f'{answer.equipment_id} {address}:{answer.port}')
+        return
+    print(f'Found {answer.equipment_id} at {address}{numeric}:')
+    print(f'  Port: {answer.port}')
+    print(f'  Firmware: {answer.firmware}')
+    desc = answer.description.replace('\n', '\n    ')
+    print(f'  Node description: {desc}')
+    print('-' * 80)
+
+
+def scan(max_wait=1.0):
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    s.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
+    # send a general broadcast
+    try:
+        s.sendto(json.dumps(dict(SECoP='discover')).encode('utf-8'),
+                 ('255.255.255.255', UDP_PORT))
+    except OSError as e:
+        print('could not send the broadcast:', e)
+        # we still keep listening for self-announcements
+    start = currenttime()
+    seen = set()
+    while currenttime() < start + max_wait:
+        res = select.select([s], [], [], 0.1)
+        if res[0]:
+            try:
+                msg, addr = s.recvfrom(1024)
+            except socket.error:  # pragma: no cover
+                continue
+            answer = decode(msg, addr)
+            if answer is None:
+                continue
+            if (answer.address, answer.equipment_id, answer.port) in seen:
+                continue
+            seen.add((answer.address, answer.equipment_id, answer.port))
+            yield answer
+
+
+def listen(*, short=False):
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    if os.name == 'nt':
+        s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+    else:
+        s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
+    s.bind(('0.0.0.0', UDP_PORT))
+    while True:
+        try:
+            msg, addr = s.recvfrom(1024)
+        except KeyboardInterrupt:
+            break
+        answer = decode(msg, addr)
+        if answer:
+            print_answer(answer, short=short)
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-l', '--listen', action='store_true',
+                        help='Keep listening after the broadcast.')
+    parser.add_argument('-s', '--short', action='store_true',
+                        help='Print short info (always on when listen).')
+    args = parser.parse_args(sys.argv[1:])
+    short = args.listen or args.short
+    if not short:
+        print('-' * 80)
+    for answer in scan():
+        print_answer(answer, short=short)
+    if args.listen:
+        listen(short=short)

bin/frappy-server

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # pylint: disable=invalid-name
-#  -*- coding: utf-8 -*-
 # *****************************************************************************
 #
 # This program is free software; you can redistribute it and/or modify it under
@@ -23,12 +22,12 @@
 #
 # *****************************************************************************
 
-import sys
 import argparse
-from os import path
+import sys
+from pathlib import Path
 
 # Add import path for inplace usage
-sys.path.insert(0, path.abspath(path.join(path.dirname(__file__), '..')))
+sys.path.insert(0, str(Path(__file__).absolute().parents[1]))
 
 from frappy.lib import generalConfig
 from frappy.logging import logger
@@ -36,7 +35,15 @@ from frappy.server import Server
 
 
 def parseArgv(argv):
-    parser = argparse.ArgumentParser(description="Manage a SECoP server")
+    parser = argparse.ArgumentParser(
+        description="Manage a SECoP server",
+        epilog="""The server needs some configuration, by default from the
+            generalConfig.cfg file. the keys confdir, logdir and piddir have to
+            be set.
+            Alternatively, one can set the environment variables FRAPPY_CONFDIR
+            FRAPPY_LOGDIR and FRAPPY_PIDDIR to set the required values.
+        """
+    )
     loggroup = parser.add_mutually_exclusive_group()
     loggroup.add_argument("-v", "--verbose",
                           help="Output lots of diagnostic information",
@@ -61,8 +68,9 @@ def parseArgv(argv):
                         action='store',
                         help="comma separated list of cfg files,\n"
                         "defaults to <name_of_the_instance>.\n"
-                        "cfgfiles given without '.cfg' extension are searched in the configuration directory, "
+                        "If a config file contains a slash, it is treated as a"
-                        "else they are treated as path names",
+                        "path, otherwise the file is searched for in the "
+                        "configuration directory.",
                         default=None)
     parser.add_argument('-g',
                         '--gencfg',
@@ -96,15 +104,15 @@ def main(argv=None):
     generalConfig.init(args.gencfg)
     logger.init(loglevel)
 
-    srv = Server(args.name, logger.log, cfgfiles=args.cfgfiles, interface=args.port, testonly=args.test)
+    cfgfiles = [s.strip() for s in args.cfgfiles.split(',')] if args.cfgfiles else None
+
+    srv = Server(args.name, logger.log, cfgfiles=cfgfiles,
+                 interface=args.port, testonly=args.test)
 
     if args.daemonize:
         srv.start()
     else:
-        try:
+        srv.run()
-            srv.run()
-        except KeyboardInterrupt:
-            pass
 
 
 if __name__ == '__main__':

bin/make_doc.py

@@ -1,64 +0,0 @@
-#!/usr/bin/env python
-#  -*- coding: utf-8 -*-
-# *****************************************************************************
-#
-# 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:
-#   Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
-#
-# *****************************************************************************
-
-
-import os
-from os import path
-
-import markdown
-
-BASE_PATH = path.abspath(path.join(path.dirname(__file__), '..'))
-DOC_SRC = path.join(BASE_PATH, 'doc')
-DOC_DST = path.join(BASE_PATH, 'html')
-
-conv = markdown.Markdown()
-
-for dirpath, dirnames, filenames in os.walk(DOC_SRC):
-    # re-create the dir-structure of DOC_SRC into DOC_DST
-    dst_path = path.join(DOC_DST, path.relpath(dirpath, DOC_SRC))
-    try:
-        os.mkdir(dst_path)
-    except OSError:
-        pass
-
-    for fn in filenames:
-        full_name = path.join(dirpath, fn)
-        sub_name = path.relpath(full_name, DOC_SRC)
-        final_name = path.join(DOC_DST, sub_name)
-
-        if not fn.endswith('md'):
-            # just copy everything else
-            with open(full_name, 'rb') as fi:
-                with open(final_name, 'wb') as fo:
-                    # WARNING: possible Memory hog!
-                    fo.write(fi.read())
-            continue
-        # treat .md files special
-        final_sub_name = path.splitext(sub_name)[0] + '.html'
-        final_name = path.join(DOC_DST, final_sub_name)
-        print("Converting %s to %s" %(sub_name, final_sub_name))
-        # transform one file
-        conv.reset()
-        conv.convertFile(input=full_name,
-                         output=final_name,
-                         encoding="utf-8")

bin/peus-plot

@@ -0,0 +1,50 @@
+#!/usr/bin/env python3
+import sys
+from pathlib import Path
+# Add import path for inplace usage
+sys.path.insert(0, str(Path(__file__).absolute().parents[1]))
+
+from frappy.client.interactive import Client
+from frappy_psi.iqplot import Plot
+import numpy as np
+import matplotlib.pyplot as plt
+
+
+if len(sys.argv) < 2:
+    print('Usage: peus-plot <maxY>')
+
+
+def get_modules(name):
+    return list(filter(None, (globals().get(name % i) for i in range(10))))
+
+
+secnode = Client('pc13252:5000')
+time_size = {'time', 'size'}
+int_mods = [u] + get_modules('roi%d')
+t_rois = get_modules('roi%d')
+i_rois = get_modules('roi%di')
+q_rois = get_modules('roi%dq')
+
+if len(sys.argv) > 1:
+    maxy = float(sys.argv[1])
+else:
+    maxy = 0.02
+
+
+iqplot = Plot(maxy)
+
+for i in range(99):
+    pass
+
+try:
+    while True:
+        curves = np.array(u.get_curves())
+        iqplot.plot(curves,
+                    rois=[(r.time - r.size * 0.5, r.time + r.size * 0.5) for r in int_mods],
+                    average=([r.time for r in t_rois],
+                             [r.value for r in i_rois],
+                             [r.value for r in q_rois]))
+        if not iqplot.pause(0.5):
+            break
+except KeyboardInterrupt:
+    iqplot.close()

bin/sim-server

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # pylint: disable=invalid-name
-#  -*- coding: utf-8 -*-
 # *****************************************************************************
 # 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
@@ -23,114 +22,42 @@
 
 Usage:
 
-    bin/stringio-server <communciator> <server port>
+    bin/sim-server <communicator class> -p <server port> [-o <option1>=<value> <option2>=<value>]
 
 open a server on <server port> to communicate with the string based <communicator> over TCP/IP.
 
 Use cases, mainly for test purposes:
-- as a T, if the hardware allows only one connection, and more than one is needed
+
-- relay to a communicator not using TCP/IP, if Frappy should run on an other host
 - relay to a hardware simulation written as a communicator
+
+  > bin/sim-server frappy_psi.ls370sim.Ls370Sim
+
+- relay to a communicator not using TCP/IP, if Frappy should run on an other host
+
+  > bin/sim-server frappy.io.StringIO -o uri=serial:///dev/tty...
+
+- as a T, if the hardware allows only one connection, and more than one is needed:
+
+  > bin/sim-server frappy.io.StringIO -o uri=tcp://<host>:<port>
+
+  typically using communicator class frappy.io.StringIO
 """
 
 import sys
 import argparse
-from os import path
+from pathlib import Path
-import asyncore
 import socket
 import time
+import os
+from ast import literal_eval
+from socketserver import BaseRequestHandler, ThreadingTCPServer
 
 # Add import path for inplace usage
-sys.path.insert(0, path.abspath(path.join(path.dirname(__file__), '..')))
+sys.path.insert(0, str(Path(__file__).absolute().parents[1]))
 
 from frappy.lib import get_class, formatException, mkthread
 
 
-class LineHandler(asyncore.dispatcher_with_send):
-
-    def __init__(self, sock):
-        self.buffer = b""
-        asyncore.dispatcher_with_send.__init__(self, sock)
-        self.crlf = 0
-
-    def handle_line(self, line):
-        raise NotImplementedError
-
-    def handle_read(self):
-        data = self.recv(8192)
-        if data:
-            parts = data.split(b"\n")
-            if len(parts) == 1:
-                self.buffer += data
-            else:
-                self.handle_line((self.buffer + parts[0]).decode('latin_1'))
-                for part in parts[1:-1]:
-                    if part[-1] == b"\r":
-                        self.crlf = True
-                        part = part[:-1]
-                    else:
-                        self.crlf = False
-                    self.handle_line(part.decode('latin_1'))
-                self.buffer = parts[-1]
-
-    def send_line(self, line):
-        self.send((line + ("\r\n" if self.crlf else "\n")).encode('latin_1'))
-
-
-class LineServer(asyncore.dispatcher):
-
-    def __init__(self, port, line_handler_cls, handler_args):
-        asyncore.dispatcher.__init__(self)
-        self.create_socket(socket.AF_INET, socket.SOCK_STREAM)
-        self.set_reuse_addr()
-        self.bind(('0.0.0.0', port))
-        self.listen(5)
-        print('accept connections at port', port)
-        self.line_handler_cls = line_handler_cls
-        self.handler_args = handler_args
-
-    def handle_accept(self):
-        pair = self.accept()
-        if pair is not None:
-            sock, addr = pair
-            print("Incoming connection from %s" % repr(addr))
-            self.line_handler_cls(sock, self.handler_args)
-
-    def loop(self):
-        asyncore.loop()
-
-
-class Server(LineServer):
-
-    class Dispatcher:
-        def announce_update(self, *_):
-            pass
-
-        def announce_update_error(self, *_):
-            pass
-
-    def __init__(self, *args, **kwds):
-        super().__init__(*args, **kwds)
-        self.dispatcher = self.Dispatcher()
-
-
-class Handler(LineHandler):
-    def __init__(self, sock, handler_args):
-        super().__init__(sock)
-        self.module = handler_args['module']
-        self.verbose = handler_args['verbose']
-
-    def handle_line(self, line):
-        try:
-            reply = self.module.communicate(line.strip())
-            if self.verbose:
-                print('%-40s | %s' % (line, reply))
-        except Exception:
-            print(formatException(verbose=True))
-            return
-        self.send_line(reply)
-
-
 class Logger:
     def debug(self, *args):
         pass
@@ -144,43 +71,126 @@ class Logger:
     exception = error = warn = info
 
 
+class TcpRequestHandler(BaseRequestHandler):
+    def setup(self):
+        print(f'connection opened from {self.client_address}')
+        self.running = True
+        self.request.settimeout(1)
+        self.data = b''
+
+    def finish(self):
+        """called when handle() terminates, i.e. the socket closed"""
+        # close socket
+        try:
+            self.request.shutdown(socket.SHUT_RDWR)
+        except Exception:
+            pass
+        finally:
+            print(f'connection closed from {self.client_address}')
+            self.request.close()
+
+    def poller(self):
+        while True:
+            time.sleep(1.0)
+            self.module.doPoll()
+
+    def handle(self):
+        """handle a new connection"""
+        # do a copy of the options, as they are consumed
+        self.module = self.server.modulecls(
+            'mod', Logger(), dict(self.server.options), self.server)
+        self.module.earlyInit()
+
+        mkthread(self.poller)
+        while self.running:
+            try:
+                newdata = self.request.recv(1024)
+                if not newdata:
+                    return
+            except socket.timeout:
+                # no new data during read, continue
+                continue
+            self.data += newdata
+            while self.running:
+                message, sep, self.data = self.data.partition(b'\n')
+                if not sep:
+                    break
+                cmd = message.decode('latin-1')
+                try:
+                    reply = self.module.communicate(cmd.strip())
+                    if self.server.verbose:
+                        print('%-40s | %s' % (cmd, reply))
+                except Exception:
+                    print(formatException(verbose=True))
+                    return
+                outdata = reply.encode('latin-1') + b'\n'
+                try:
+                    self.request.sendall(outdata)
+                except Exception as e:
+                    print(repr(e))
+                    self.running = False
+
+
+class Server(ThreadingTCPServer):
+    allow_reuse_address = os.name != 'nt'  # False on Windows systems
+
+    class Dispatcher:
+        def announce_update(self, *_):
+            pass
+
+        def announce_update_error(self, *_):
+            pass
+
+    def __init__(self, port, modulecls, options, verbose=False):
+        super().__init__(('', port), TcpRequestHandler,
+                         bind_and_activate=True)
+        self.secnode = None
+        self.dispatcher = self.Dispatcher()
+        self.verbose = verbose
+        self.modulecls = get_class(modulecls)
+        self.options = options
+        print(f'started sim-server listening on port {port}')
+
+
 def parse_argv(argv):
-    parser = argparse.ArgumentParser(description="Simulate HW with a serial interface")
+    parser = argparse.ArgumentParser(description="Relay to a communicator (simulated HW or other)")
     parser.add_argument("-v", "--verbose",
                         help="output full communication",
                         action='store_true', default=False)
     parser.add_argument("cls",
                         type=str,
-                        help="simulator class.\n",)
+                        help="communicator class.\n",)
     parser.add_argument('-p',
                         '--port',
                         action='store',
                         help='server port or uri',
                         default=2089)
+    parser.add_argument('-o',
+                        '--options',
+                        action='store',
+                        nargs='*',
+                        help='options in the form key=value',
+                        default=None)
     return parser.parse_args(argv)
 
 
-def poller(pollfunc):
-    while True:
-        time.sleep(1.0)
-        pollfunc()
-
-
 def main(argv=None):
     if argv is None:
         argv = sys.argv
 
     args = parse_argv(argv[1:])
-
+    options = {'description': ''}
-    opts = {'description': 'simulator'}
+    for item in args.options or ():
-
+        key, eq, value = item.partition('=')
-    handler_args = {'verbose': args.verbose}
+        if not eq:
-    srv = Server(int(args.port), Handler, handler_args)
+            raise ValueError(f"missing '=' in {item}")
-    module = get_class(args.cls)(args.cls, Logger(), opts, srv)
+        try:
-    handler_args['module'] = module
+            value = literal_eval(value)
-    module.earlyInit()
+        except Exception:
-    mkthread(poller, module.doPoll)
+            pass
-    srv.loop()
+        options[key] = value
+    srv = Server(int(args.port), args.cls, options, args.verbose)
+    srv.serve_forever()
 
 
 if __name__ == '__main__':

bin/us-plot

@@ -0,0 +1,65 @@
+#!/usr/bin/env python3
+import sys
+from pathlib import Path
+# Add import path for inplace usage
+sys.path.insert(0, str(Path(__file__).absolute().parents[1]))
+
+from frappy.client.interactive import Client
+import numpy as np
+import matplotlib.pyplot as plt
+from frappy_psi.iqplot import Pause
+
+
+if len(sys.argv) < 2:
+    print("""
+    Usage:
+
+        us-plot <end> [<start> [<npoints>]]
+
+        end: end of window [ns]
+        start: start of window [n2], default: 0
+        npoints: number fo points (default 1000)
+    """)
+    sys.exit(0)
+
+Client('pc13252:5000')
+
+
+def plot(array, ax, style, xs):
+    xaxis = np.arange(len(array)) * xs
+    return ax.plot(xaxis, array, style)[0]
+
+
+def update(array, line, xs):
+    xaxis = np.arange(len(array)) * xs
+    line.set_data(np.array([xaxis, array]))
+
+def on_close(event):
+    sys.exit(0)
+
+start = 0
+end = float(sys.argv[1])
+npoints = 1000
+if len(sys.argv) > 2:
+    start = float(sys.argv[2])
+    if len(sys.argv) > 3:
+        npoints = float(sys.argv[3])
+
+fig, ax = plt.subplots(figsize=(15,3))
+pause = Pause(fig)
+try:
+    get_signal = iq.get_signal
+    print('plotting RUS signal')
+except NameError:
+    get_signal = u.get_signal
+    print('plotting PE signal')
+
+xs, signal = get_signal(start, end, npoints)
+
+lines = [plot(s, ax, '-', xs) for s in signal]
+
+while pause(0.5):
+    plt.draw()
+    xs, signal = get_signal(start, end, npoints)
+    for line, sig in zip(lines, signal):
+        update(sig, line, xs)

calibtest.py

@@ -0,0 +1,22 @@
+import sys
+import os
+from glob import glob
+from frappy_psi.calcurve import CalCurve
+
+os.chdir('/Users/zolliker/gitpsi/calcurves')
+
+if len(sys.argv) > 1:
+    calib = sys.argv[1]
+    c = CalCurve(calib)
+else:
+    for file in sorted(glob('*.*')):
+        if file.endswith('.md') or file.endswith('.std'):
+            continue
+        try:
+            c = CalCurve(file)
+            xy = c.export()
+            print('%9.4g %12.7g %9.4g %9.4g %s' % (tuple(c.extx) + tuple(c.exty) + (file,)))
+        except Exception as e:
+            print(file, e)
+            calib = file
+

cfg/PEUS_cfg.py

@@ -0,0 +1,87 @@
+Node('PEUS.psi.ch',
+     'ultrasound, pulse_echo configuration',
+     interface='5000',
+)
+
+Mod('u',
+    'frappy_psi.ultrasound.PulseEcho',
+    'ultrasound acquisition loop',
+    freq='f',
+    # pollinterval=0.1,
+    time=900.0,
+    size=5000.0,
+    nr=500,
+    sr=32768,
+    bw=1e7,
+)
+
+Mod('fio',
+    'frappy_psi.ultrasound.FreqStringIO', '',
+    uri='serial:///dev/ttyS1?baudrate=57600',
+)
+
+Mod('f',
+    'frappy_psi.ultrasound.Frequency',
+    'writable for frequency',
+    output='R',  # L for LF (bnc), R for RF (type N)
+    io='fio',
+    amp=0.5, # VPP
+)
+
+Mod('fdif',
+    'frappy_psi.ultrasound.FrequencyDif',
+    'writable for frequency minus base frequency',
+    freq='f',
+    base=41490200.0,
+)
+
+# Mod('curves',
+#     'frappy_psi.ultrasound.Curves',
+#     't, I, Q and pulse arrays for plot',
+# )
+
+def roi(name, time, size, components='iqpa', enable=True, control=False, freq=None, **kwds):
+    description = 'I/Q of region {name}'
+    if freq:
+        kwds.update(cls='frappy_psi.ultrasound.ControlRoi',
+                    description=f'{description} as control loop',
+                    freq=freq, **kwds)
+    else:
+        kwds.update(cls='frappy_psi.ultrasound.Roi',
+                    description=description, **kwds)
+    kwds.update({c: name + c for c in components})
+    Mod(name,
+        main='u',
+        time=time,
+        size=size,
+        enable=enable,
+        **kwds,
+        )
+    for c in components:
+        Mod(name + c,
+            'frappy.modules.Readable',
+            f'{name}{c} component',
+        )
+
+# control loop
+roi('roi0', 2450, 300, freq='f', maxstep=100000, minstep=4000)
+# other rois
+roi('roi1', 5950, 300)
+roi('roi2', 9475, 300)
+roi('roi3', 12900, 300)
+#roi('roi4', 400, 30, False)
+#roi('roi5', 400, 30, False)
+#roi('roi6', 400, 30, False)
+#roi('roi7', 400, 30, False)
+#roi('roi8', 400, 30, False)
+#roi('roi9', 400, 30, False)
+
+Mod('delay',
+    'frappy_psi.dg645.Delay',
+    'delay line with 2 channels',
+    uri='serial:///dev/ttyS2',
+    on1=1e-09,
+    on2=1e-09,
+    off1=4e-07,
+    off2=6e-07,
+)

cfg/QnwTC1_cfg.py

@@ -6,7 +6,7 @@ Node('QnwTC1test.psi.ch',
 Mod('io',
     'frappy_psi.qnw.QnwIO',
     'connection for Quantum northwest',
-    uri='tcp://ldmcc01-ts:3004',
+    uri='tcp://ldm-fi-ts:3001',
     )
 
 Mod('T',

cfg/RUS_cfg.py

@@ -0,0 +1,39 @@
+Node(equipment_id = 'r_ultrasound.psi.ch',
+     description = 'resonant ultra sound setup',
+     interface = 'tcp://5000',
+)
+
+Mod('iq',
+    cls = 'frappy_psi.ultrasound.RUS',
+    description = 'ultrasound iq mesurement',
+    imod = 'i',
+    qmod = 'q',
+    freq='f',
+    input_range=10,  # VPP
+    input_delay = 0,
+    periods = 163,
+    )
+
+Mod('freqio',
+    'frappy_psi.ultrasound.FreqStringIO',
+    ' ',
+    uri = 'serial:///dev/ttyS1?baudrate=57600',
+)
+
+Mod('f',
+    cls = 'frappy_psi.ultrasound.Frequency',
+    description = 'ultrasound frequency',
+    io='freqio',
+    output='L',  # L for LF (bnc), R for RF (type N)
+    target=10000,
+)
+
+Mod('i',
+    cls='frappy.modules.Readable',
+    description='I component',
+)
+
+Mod('q',
+    cls='frappy.modules.Readable',
+    description='Q component',
+)

cfg/TFA10_cfg.py

@@ -6,7 +6,7 @@ Node('TFA10.psi.ch',
 Mod('io',
     'frappy_psi.thermofisher.ThermFishIO',
     'connection for ThermoFisher A10',
-    uri='tcp://ldmse-d910-ts:3001',
+    uri='tcp://ldm-fi-ts:3002',
     )
 
 Mod('T',
@@ -14,10 +14,6 @@ Mod('T',
     'holder temperature',
     io='io',
     target=Param(max=100),
-    )
+    tolerance=0.5,
-
+    settling_time=20,
-Mod('Th',
-    'frappy_psi.thermofisher.SensorA10',
-    'heat exch. temperature',
-    io='io',
     )

cfg/addons/ah2550sea_cfg.py

@@ -0,0 +1,37 @@
+Node('ah2550.addon.sea.psi.ch',
+     'Andeen Hagerlin 2550 Capacitance Bridge using SEA',
+)
+
+Mod('sea_addons',
+    'frappy_psi.sea.SeaClient',
+    'SEA connection to mbe_ah2550',
+    config='ah2550.addon',
+    export=False,
+    service='addons',
+)
+
+Mod('ah',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_addons',
+    sea_object='cap',
+    extra_modules = ['cap', 'loss']
+)
+
+Mod('cap',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_addons',
+    single_module='ah.cap',
+    value=Param(fmtstr='%.12g'),
+)
+
+Mod('loss',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_addons',
+    single_module='ah.loss',
+)
+
+Mod('capslope',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_addons',
+    sea_object='capslope',
+)

cfg/addons/ah2700_cfg.py

@@ -2,8 +2,21 @@ Node('ah2700.frappy.psi.ch',
      'Andeen Hagerlin 2700 Capacitance Bridge',
 )
 
+Mod('cap_io',
+    'frappy_psi.ah2700.Ah2700IO',
+    '',
+    uri='linse-976d-ts:3006',
+)
+
 Mod('cap',
     'frappy_psi.ah2700.Capacitance',
     'capacitance',
-    uri='lollypop-ts:3002',
+    io = 'cap_io',
+)
+
+Mod('loss',
+    'frappy_psi.parmod.Par',
+    'loss parameter',
+    read='cap.loss',
+    unit='deg',
 )

cfg/addons/ah2700sea_cfg.py

@@ -2,6 +2,8 @@ Node('ah2700.addon.sea.psi.ch',
      'Andeen Hagerlin 2700 Capacitance Bridge using SEA',
 )
 
+sea_cfg='ah2700.addon'
+
 Mod('sea_addons',
     'frappy_psi.sea.SeaClient',
     'SEA connection to mbe_ah2700',
@@ -10,10 +12,24 @@ Mod('sea_addons',
     service='addons',
 )
 
-Mod('cap',
+Mod('ah',
     'frappy_psi.sea.SeaReadable', '',
     io='sea_addons',
     sea_object='cap',
+    extra_modules = ['cap', 'loss']
+)
+
+Mod('cap',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_addons',
+    single_module='ah.cap',
+    value=Param(fmtstr='%.12g'),
+)
+
+Mod('loss',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_addons',
+    single_module='ah.loss',
 )
 
 Mod('capslope',

cfg/addons/camea-be-filter_cfg.py

@@ -0,0 +1,49 @@
+Node('cfg/sea/camea-be-filter.cfg',
+     'Camea Be-Filter',
+)
+
+Mod('sea_addons',
+    'frappy_psi.sea.SeaClient',
+    'addons sea connection for camea-be-filter.addon',
+    config='camea-be-filter.addon',
+    service='addons',
+)
+
+Mod('t_be_filter',
+    'frappy_psi.sea.SeaReadable',
+    'Be filter T',
+    io='sea_addons',
+    sea_object='t_be_filter',
+    extra_modules=['a', 'b', 'c', 'd', 'det'],
+)
+
+Mod('t_be_fil_top_m',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_addons',
+    single_module='t_be_filter.a',
+)
+
+Mod('t_be_fil_top_r',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_addons',
+    single_module='t_be_filter.b',
+)
+
+Mod('t_be_fil_bot_l',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_addons',
+    single_module='t_be_filter.c',
+)
+
+Mod('t_be_fil_bot_r',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_addons',
+    single_module='t_be_filter.d',
+)
+
+Mod('t_detector',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_addons',
+    single_module='t_be_filter.det',
+)
+

cfg/addons/flamesample_cfg.py

@@ -0,0 +1,56 @@
+Node('flamesample.psi.ch',
+     'flame sample thermometers and heater',
+     interface = 'tcp://5000',
+)
+
+Mod('lscio',
+    'frappy_psi.ls372.StringIO',
+    'sample channels LS372 io',
+    uri = 'flamedil-ls.psi.ch:7777',
+)
+
+Mod('lsc_channel',
+    'frappy_psi.ls372.Switcher',
+    'channel switcher sample ls372',
+    io='lscio',
+    value = 3,
+)
+
+Mod('ts_low',
+    'frappy_psi.ls372.TemperatureLoop',
+    'sample RuOX',
+    channel = 3,
+    switcher = 'lsc_channel',
+    minrange=13,
+    range=22,
+    tolerance = 0.1,
+    vexc = 3,
+    htrrng=4,
+)
+
+Mod('ts_high',
+    'frappy_psi.ls372.TemperatureLoop',
+    'sample Cernox',
+    channel = 1,
+    switcher = 'lsc_channel',
+    minrange=11,
+    vexc = 5,
+    range=22,
+    tolerance = 0.1,
+    htrrng=5,
+    minheater=5e-4,
+)
+
+Mod('ts',
+    'frappy_psi.parmod.SwitchDriv',
+    'automatically switching between ts_low and ts_high',
+    meaning=['temperature', 40],
+    value=Param(unit='K'),
+    low='ts_low',
+    high='ts_high',
+    #min_high=0.6035,
+    #max_low=1.6965,
+    min_high=0.6,
+    max_low=1.7,
+    tolerance=0.1,
+)

cfg/addons/razorbill_cfg.py

@@ -0,0 +1,34 @@
+Node('cfg/addons/razorbill.cfg',
+     'razorbill forwarder',
+)
+
+Mod('sea_addons',
+    'frappy_psi.sea.SeaClient',
+    'SEA stick connection',
+    config='razorbill.addon',
+    service='addons',
+)
+
+Mod('ts',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_addons',
+    sea_object='tt',
+    json_file='ori6.config.json',
+    rel_paths=['ts'],
+)
+
+
+Mod('T_remote',
+    'frappy.proxy.Proxy',
+    'dummy (remote) T',
+    remote_class = 'frappy_psi.dummy.Temp',
+    uri='razorbill:3000',
+    module='T',
+    # export=False,
+)
+
+Mod('forwarder',
+    'frappy_psi.dummy.Forwarder',
+    'forwarder',
+    src='ts',
+    dst='T_remote')

cfg/addons/stickmotor_cfg.py

@@ -13,4 +13,5 @@ Mod('stickrot',
     'stick rotation, typically not used as omega',
     io='stick_io',
     encoder_mode='CHECK',
+    backlash=-1,
 )

cfg/addons/vsource_cfg.py

@@ -0,0 +1,44 @@
+Node('k2601b.psi.ch',
+     'source meter keithley 2601b',
+     interface='tcp://5000',
+)
+
+
+Mod('vsource_io',
+    'frappy_psi.k2601b.K2601bIO',
+    'source meter',
+#    uri = '129.129.156.90:5025',
+     uri = "sans-sample-ts:3011"
+)
+
+
+Mod('source',
+    'frappy_psi.k2601b.SourceMeter'
+    '',
+    description = "keithley sourcemeter",
+    mode = 1,
+    vlimit = 6.0,
+    ilimit = 2.,
+    io = 'vsource_io',
+)
+
+Mod('volt',
+    'frappy_psi.k2601b.Voltage'
+    '',
+    description = "Voltage Source",
+    active = True,
+    limit = 5.0,
+    target = 0.0,
+    sourcemeter = 'source',
+    io = 'vsource_io',
+)
+Mod('cur',
+    'frappy_psi.k2601b.Current'
+    '',
+    description = "Current Source",
+    active = False,
+    limit = 0.10,
+    target = 0.0,
+    sourcemeter = 'source',
+    io = 'vsource_io',
+)

cfg/amagnet_cfg.py

@@ -74,10 +74,10 @@ Mod('currentsource',
 Mod('mf',
     'frappy_mlz.amagnet.GarfieldMagnet',
     'magnetic field module, handling polarity switching and stuff',
-    subdev_currentsource = 'currentsource',
+    currentsource = 'currentsource',
-    subdev_enable = 'enable',
+    enable = 'enable',
-    subdev_polswitch = 'polarity',
+    polswitch = 'polarity',
-    subdev_symmetry = 'symmetry',
+    symmetry = 'symmetry',
     target = Param(unit='T'),
     value = Param(unit='T'),
     userlimits = (-0.35, 0.35),

cfg/attocube_cfg.py

@@ -0,0 +1,19 @@
+Node('attocube_test.psi.ch',
+    'a single attocube axis',
+    interface='tcp://5000',
+)
+
+Mod('r',
+    'frappy_psi.attocube.Axis',
+    'ANRv220-F3-02882',
+    axis = 1,
+    value = Param(unit='deg'),
+    tolerance = 0.1,
+    target_min = 0,
+    target_max = 360,
+    steps_fwd = 45,
+    steps_bwd = 85,
+    step_mode = True,
+    # gear = 1.2,
+)
+

cfg/demo_cfg.py

@@ -41,6 +41,6 @@ Mod('label',
     'frappy_demo.modules.Label',
     'some label indicating the state of the magnet `mf`.',
     system = 'Cryomagnet MX15',
-    subdev_mf = 'mf',
+    mf = 'mf',
-    subdev_ts = 'ts',
+    ts = 'ts',
 )

cfg/dilsc_cfg.py

@@ -0,0 +1,231 @@
+Node('cfg/dilsc1.cfg',
+     'triton test',
+     interface='5000',
+     name='dilsc1',
+)
+
+Mod('triton',
+    'frappy_psi.mercury.IO',
+    'connection to triton software',
+    uri='tcp://192.168.2.33:33576',
+)
+
+Mod('T_mix',
+    'frappy_psi.triton.TemperatureSensor',
+    'mix. chamber temperature',
+    slot='T8',
+    io='triton',
+)
+
+Mod('T_pt2head',
+    'frappy_psi.triton.TemperatureSensor',
+    'PTR2 head temperature',
+    slot='T1',
+    io='triton',
+)
+
+Mod('T_pt2plate',
+    'frappy_psi.triton.TemperatureSensor',
+    'PTR2 plate temperature',
+    slot='T2',
+    io='triton',
+)
+
+Mod('T_still',
+    'frappy_psi.triton.TemperatureSensor',
+    'still temperature',
+    slot='T3',
+    io='triton',
+)
+
+Mod('htr_still',
+    'frappy_psi.triton.HeaterOutput',
+    'still heater',
+    slot='H2',
+    io='triton',
+)
+
+Mod('T_coldpl',
+    'frappy_psi.triton.TemperatureSensor',
+    'cold plate temperature',
+    slot='T4',
+    io='triton',
+)
+
+Mod('T_mixcx',
+    'frappy_psi.triton.TemperatureSensor',
+    'mix. chamber cernox',
+    slot='T5',
+    io='triton',
+)
+
+Mod('T_pt1head',
+    'frappy_psi.triton.TemperatureSensor',
+    'PTR1 head temperature',
+    slot='T6',
+    io='triton',
+)
+
+Mod('T_pt1plate',
+    'frappy_psi.triton.TemperatureSensor',
+    'PTR1 plate temperature',
+    slot='T7',
+    io='triton',
+)
+
+Mod('T_pucksensor',
+    'frappy_psi.triton.TemperatureLoop',
+    'puck sensor temperature',
+    output_module='htr_pucksensor',
+    slot='TA',
+    io='triton',
+)
+
+Mod('htr_pucksensor',
+    'frappy_psi.triton.HeaterOutputWithRange',
+    'mix. chamber heater',
+    slot='H1,TA',
+    io='triton',
+)
+
+Mod('T_magnet',
+    'frappy_psi.triton.TemperatureSensor',
+    'magnet temperature',
+    slot='T13',
+    io='triton',
+)
+
+Mod('action',
+    'frappy_psi.triton.Action',
+    'higher level scripts',
+    io='triton',
+    slot='DR',
+)
+
+Mod('p_dump',
+    'frappy_psi.mercury.PressureSensor',
+    'dump pressure',
+    slot='P1',
+    io='triton',
+)
+
+Mod('p_cond',
+    'frappy_psi.mercury.PressureSensor',
+    'condenser pressure',
+    slot='P2',
+    io='triton',
+)
+
+Mod('p_still',
+    'frappy_psi.mercury.PressureSensor',
+    'still pressure',
+    slot='P3',
+    io='triton',
+)
+
+Mod('p_fore',
+    'frappy_psi.mercury.PressureSensor',
+    'pressure on the pump side',
+    slot='P5',
+    io='triton',
+)
+
+Mod('p_back',
+    'frappy_psi.mercury.PressureSensor',
+    'pressure on the back side of the pump',
+    slot='P4',
+    io='triton',
+)
+
+Mod('p_ovc',
+    'frappy_psi.mercury.PressureSensor',
+    'outer vacuum pressure',
+    slot='P6',
+    io='triton',
+)
+
+Mod('V1',
+    'frappy_psi.triton.Valve',
+    'valve V1',
+    slot='V1',
+    io='triton',
+)
+
+Mod('V2',
+    'frappy_psi.triton.Valve',
+    'valve V2',
+    slot='V2',
+    io='triton',
+)
+
+Mod('V4',
+    'frappy_psi.triton.Valve',
+    'valve V4',
+    slot='V4',
+    io='triton',
+)
+
+Mod('V5',
+    'frappy_psi.triton.Valve',
+    'valve V5',
+    slot='V5',
+    io='triton',
+)
+
+Mod('V9',
+    'frappy_psi.triton.Valve',
+    'valve V9',
+    slot='V9',
+    io='triton',
+)
+
+Mod('ips',
+    'frappy_psi.mercury.IO',
+    'IPS for magnet',
+    uri='192.168.127.254:3001',
+)
+
+Mod('mf',
+    'frappy_psi.dilsc.VectorField',
+    'vector field',
+    x='mfx',
+    y='mfy',
+    z='mfz',
+    sphere_radius=0.6,
+    cylinders=((0.23, 5.2), (0.45, 0.8)),
+)
+
+Mod('mfx',
+    'frappy_psi.ips_mercury.SimpleField',
+    'magnetic field, x-axis',
+    slot='GRPX',
+    io='ips',
+    tolerance=0.0001,
+    wait_stable_field=0.0,
+    nunits=2,
+    target=Param(max=0.6),
+    ramp=0.225,
+)
+
+Mod('mfy',
+    'frappy_psi.ips_mercury.SimpleField',
+    'magnetic field, y axis',
+    slot='GRPY',
+    io='ips',
+    tolerance=0.0001,
+    wait_stable_field=0.0,
+    nunits=2,
+    target=Param(max=0.6),
+    ramp=0.225,
+)
+
+Mod('mfz',
+    'frappy_psi.ips_mercury.Field',
+    'magnetic field, z-axis',
+    slot='GRPZ',
+    io='ips',
+    tolerance=0.0001,
+    target=Param(max=5.2),
+    mode='DRIVEN',
+    ramp=0.52,
+)

cfg/drums_cfg.py

@@ -0,0 +1,27 @@
+Node('relais.psi.ch',
+     'relais test',
+     'tcp://5000',
+)
+
+Mod('rl',
+    'frappy_psi.ionopimax.DigitalOutput',
+    'left relais',
+    addr = 'o1',
+    value = 0,  # start with relais off
+   )
+
+Mod('rr',
+    'frappy_psi.ionopimax.DigitalOutput',
+    'right relais',
+    addr = 'o2',
+    value = 0,  # start with relais off
+   )
+
+Mod('drummer',
+    'frappy_psi.drums.Drums',
+    'drummer',
+    target = 150,
+    pattern='l2L2rl1R1L2',
+    left='rl',
+    right='rr',
+)

cfg/flowsas_cfg.py

@@ -0,0 +1,52 @@
+Node('flowsas.psi.ch',
+     'flowsas test motors',
+     'tcp://5000',
+)
+
+#Mod('mot_io',
+#    'frappy_psi.phytron.PhytronIO',
+#    'io for motor control',
+#    uri = 'serial:///dev/ttyUSB0',
+#   )
+
+#Mod('hmot',
+#    'frappy_psi.phytron.Motor',
+#    'horizontal axis',
+#    axis = 'X',
+#    io = 'mot_io',
+#    encoder_mode= 'NO',
+#   )
+
+#Mod('vmot',
+#    'frappy_psi.phytron.Motor',
+#    'vertical axis',
+#    axis = 'Y',
+#    io = 'mot_io',
+#    encoder_mode= 'NO',
+#   )
+
+Mod('syr_io',
+   'frappy_psi.cetoni_pump.LabCannBus',
+   'Module for bus',
+    deviceconfig = "/home/l_samenv/frappy/cetoniSDK/CETONI_SDK_Raspi_64bit_v20220627/config/dual_pumps",
+  )
+
+Mod('syr1',
+   'frappy_psi.cetoni_pump.SyringePump',
+   'First syringe pump',
+    io='syr_io',
+    pump_name = "Nemesys_S_1_Pump",
+    valve_name = "Nemesys_S_1_Valve",
+    inner_diameter_set = 10,
+    piston_stroke_set = 60,
+  )
+
+Mod('syr2',
+   'frappy_psi.cetoni_pump.SyringePump',
+   'Second syringe pump',
+    io='syr_io',
+    pump_name = "Nemesys_S_2_Pump",
+    valve_name = "Nemesys_S_2_Valve",
+    inner_diameter_set = 1,
+    piston_stroke_set = 60,
+  )

cfg/generalConfig.cfg

@@ -3,3 +3,5 @@
 logdir = ./log
 piddir = ./pid
 confdir = ./cfg
+comlog = True
+

cfg/lockin70_cfg.py

@@ -0,0 +1,16 @@
+Node('lockin70test.psi.ch',
+     'lockin70 test',
+     'tcp://5000',
+     )
+
+Mod('io',
+    'frappy_psi.SR.SR_IO',
+    'lockin communication',
+    uri='10105266.psi.ch:50000',
+    )
+
+Mod('XY',
+    'frappy_psi.SR.XY70',
+    'XY channels',
+    io='io',
+    )

cfg/lockin830_cfg.py

@@ -0,0 +1,16 @@
+Node('lockin830test.psi.ch',
+     'lockin830 test',
+     'tcp://5000',
+     )
+
+Mod('io',
+    'frappy_psi.SR830.SR830_IO',
+    'lockin communication',
+    uri='tcp://linse-976d-ts:3002',
+    )
+
+Mod('XY',
+    'frappy_psi.SR830.XY',
+    'XY channels',
+    io='io',
+    )

cfg/lockin_cfg.py

@@ -4,7 +4,13 @@ Node('lockintest.psi.ch',
      )
 
 Mod('io',
-    'frappy_psi.SR_7270.SR7270',
+    'frappy_psi.SR.SR_IO',
     'lockin communication',
     uri='10105266.psi.ch:50000',
     )
+
+Mod('XY',
+    'frappy_psi.SR.XY',
+    'XY channels',
+    io='io',
+    )

cfg/ls340_cfg.py

@@ -4,33 +4,22 @@ Node('ls340test.psi.ch',
      )
 
 Mod('io',
-    'frappy_psi.lakeshore.Ls340IO',
+    'frappy_psi.lakeshore.IO340',
     'communication to ls340',
-    uri='tcp://ldmprep56-ts:3002'
+    uri='tcp://localhost:7777'
     )
 
+Mod('dev',
+    'frappy_psi.lakeshore.Device340',
+    'device for calcurve',
+    io='io',
+    curve_handling=True,
+    )
 Mod('T',
-    'frappy_psi.lakeshore.TemperatureLoop340',
-    'sample temperature',
-    output_module='Heater',
-    target=Param(max=470),
-    io='io',
-    channel='B'
-    )
-
-Mod('T_cold_finger',
     'frappy_psi.lakeshore.Sensor340',
-    'cold finger temperature',
+    'sample temperature',
-    io='io',
+    # output_module='Heater',
-    channel='A'
+    device='dev',
-    )
+    channel='A',
-
+    calcurve='x29746',
-Mod('Heater',
-    'frappy_psi.lakeshore.HeaterOutput',
-    'heater output',
-    channel='B',
-    io='io',
-    resistance=25,
-    max_power=50,
-    current=1
     )

cfg/main/ccr2_cfg.py

@@ -11,6 +11,7 @@ Mod('sea_main',
 
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
+    meaning=['temperature', 20],
     io='sea_main',
     sea_object='tt',
 )

cfg/main/ccr2ht_cfg.py

@@ -12,6 +12,7 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature', 20],
     sea_object='tt',
 )
 

cfg/main/ccr3_cfg.py

@@ -12,5 +12,6 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature', 20],
     sea_object='tt',
 )

cfg/main/ccrpe_cfg.py

@@ -1,39 +1,40 @@
-Node('cfg/main/ccrpe.cfg',
+Node('ccrpe.config.sea.psi.ch',
-     '4 K closed cycle cryostat (PE cell)',
+    '''4 K closed cycle cryostat (PE cell)''',
-     interface='5000',
-     name='ccrpe',
 )
-
 Mod('sea_main',
-    'secop_psi.sea.SeaClient',
+    'frappy_psi.sea.SeaClient',
     'main sea connection for ccrpe.config',
-    config='ccrpe.config',
+    config = 'ccrpe.config',
-    service='main',
+    service = 'main',
 )
-
-Mod('tt',
-    'secop_psi.sea.SeaDrivable', '',
-    io='sea_main',
-    sea_object='tt',
-    rel_paths=['.', 'tm'],
-)
-
 Mod('ts',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaDrivable', '',
+    io='sea_main',
+    meaning=['temperature', 20],
+    sea_object='tt',
+    rel_paths=['ts', 'set'],
+)
+Mod('tm',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='tt',
     rel_paths=['ts'],
 )
 
 Mod('te',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='tt',
     rel_paths=['te'],
 )
 
 Mod('warmup',
-    'secop_psi.sea.SeaDrivable', '',
+    'frappy_psi.sea.SeaDrivable', '',
-    io='sea_main',
+    io = 'sea_main',
-    sea_object='warmup',
+    sea_object = 'warmup',
+)
+Mod('p',
+    'frappy_psi.sea.SeaReadable', '',
+    io = 'sea_main',
+    sea_object = 'p',
 )

cfg/main/ccrpe_lowT_cfg.py

@@ -1,39 +1,38 @@
 Node('cfg/main/ccrpe_lowT.cfg',
      '4 K closed cycle cryostat (PE cell)',
-     interface='5000',
-     name='ccrpe_lowT',
 )
 
 Mod('sea_main',
-    'secop_psi.sea.SeaClient',
+    'frappy_psi.sea.SeaClient',
     'main sea connection for ccrpe_lowT.config',
     config='ccrpe_lowT.config',
     service='main',
 )
 
-Mod('tt',
+Mod('ts',
-    'secop_psi.sea.SeaDrivable', '',
+    'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature', 20],
     sea_object='tt',
-    rel_paths=['.', 'tm'],
+    rel_paths=['ts', 'set'],
 )
 
-Mod('ts',
+Mod('tm',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='tt',
-    rel_paths=['ts'],
+    rel_paths=['tm'],
 )
 
 Mod('te',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='tt',
     rel_paths=['te'],
 )
 
 Mod('warmup',
-    'secop_psi.sea.SeaDrivable', '',
+    'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
     sea_object='warmup',
 )

cfg/main/cryosim_cfg.py

@@ -1,6 +1,5 @@
 Node('cyrosim.psi.ch',
      'cryo simulation (similar ppms simulation)',
-     interface='tcp://5000',
 )
 
 Mod('tt',

cfg/main/cti5_cfg.py

@@ -12,5 +12,6 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature', 20],
     sea_object='tt',
 )

cfg/main/cti7_cfg.py

@@ -12,5 +12,6 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature', 20],
     sea_object='tt',
 )

cfg/main/cti7ht_cfg.py

@@ -11,6 +11,14 @@ Mod('sea_main',
 
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
+    meaning=['temperature', 20],
     io='sea_main',
     sea_object='tt',
 )
+
+Mod('th',
+    'frappy_psi.sea.SeaReadable', 'CTI cold finger temperature',
+    io='sea_main',
+    sea_object='tt',
+    rel_paths = ['te'],
+)

cfg/main/eurotherm_cfg.py

@@ -0,0 +1,16 @@
+Node('eurotherm.config.sea.psi.ch',
+     'Eurotherm controller',
+)
+Mod('sea_main',
+    'frappy_psi.sea.SeaClient',
+    'main sea connection for haakeuro.config',
+    config = 'eurotherm.config',
+    service = 'main',
+)
+Mod('te',
+    'frappy_psi.sea.SeaDrivable', '',
+    io = 'sea_main',
+    meaning=['temperature', 20],
+    sea_object = 'te',
+    meaning=('temperature', 11),
+)

cfg/main/fftf_cfg.py

@@ -12,6 +12,7 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature', 20],
     sea_object='tt',
 )
 
@@ -25,7 +26,7 @@ Mod('p',
 Mod('gasflow',
     'frappy_psi.sea.SeaWritable', '',
     io='sea_main',
-    single_module=['p.gasflow'],
+    single_module='p.gasflow',
 )
 
 Mod('vacuumpump',
@@ -36,7 +37,7 @@ Mod('vacuumpump',
 )
 
 Mod('table',
-    'frappy_psi.sea.SeaModule',
+    'frappy_psi.sea.SeaModule', '',
     io='sea_main',
     sea_object='table',
 )

cfg/main/flamemag_cfg.py

@@ -1,7 +1,14 @@
+Node('flamemag.psi.ch',
+     'flame magnet',
+     interface='tcp://5000',
+)
+
+sea_cfg = 'flamemag.config'
+
 Mod('cio',
     'frappy_psi.cryoltd.IO',
     'IO to cryo ltd software',
-    uri='tcp://flamedil:3128',
+    uri='tcp://flamemag:3128',
 )
 
 Mod('main',
@@ -14,6 +21,7 @@ Mod('B',
     'frappy_psi.cryoltd.MainField',
     'magnetic field',
     channel='Main',
+    main='main',
     constraint=80000.0,
     target=Param(
         max=35000.0,
@@ -27,6 +35,8 @@ Mod('B',
     overshoot={'o': 1.0, 't': 180.0},
     degauss={'s': 500.0, 'd': 30.0, 'f': 5.0, 't': 120.0},
     tolerance=5.0,
+    wait_switch_on = 30,
+    wait_switch_off = 30,
     wait_stable_field=180.0,
 )
 
@@ -34,6 +44,7 @@ Mod('Bx',
     'frappy_psi.cryoltd.ComponentField',
     'magnetic field x component',
     channel='VMX',
+    main='main',
     check_against='B',
     target=Param(
         max=200.0,
@@ -50,6 +61,7 @@ Mod('By',
     'frappy_psi.cryoltd.ComponentField',
     'magnetic field y component',
     channel='VMY',
+    main='main',
     check_against='B',
     target=Param(
         max=100.0,
@@ -66,6 +78,7 @@ Mod('Bz',
     'frappy_psi.cryoltd.ComponentField',
     'magnetic field z component',
     channel='VMZ',
+    main='main',
     check_against='B',
     target=Param(
         max=100.0,
@@ -82,130 +95,132 @@ Mod('compressorA',
     'frappy_psi.cryoltd.Compressor',
     'compressor A',
     channel='A',
+    main='main',
 )
 
 Mod('compressorB',
     'frappy_psi.cryoltd.Compressor',
     'compressor B',
     channel='B',
+    main='main',
 )
 
 Mod('T_stage1_A',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
     channel='1st Stage A',
     main='main',
 )
 
 Mod('T_stage2_A',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
     channel='2nd Stage A',
     main='main',
 )
 
 Mod('T_stage1_B',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
     channel='1st Stage B',
     main='main',
 )
 
 Mod('T_stage2_B',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
     channel='2nd Stage B',
     main='main',
 )
 
 Mod('T_top_A',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
     channel='Inner Magnet A (Top)',
     main='main',
 )
 
 Mod('T_bottom_A',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
     channel='Inner Magnet A (Bottom)',
     main='main',
 )
 
 Mod('T_top_B',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
     channel='Inner Magnet B (Top)',
     main='main',
 )
 
 Mod('T_bottom_B',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
     channel='Inner Magnet B (Bottom)',
     main='main',
 )
 
 Mod('T_Z_shim',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
     channel='Z Shim Former',
     main='main',
 )
 
 Mod('T_XY_shim',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
     channel='XY Shim Former',
     main='main',
 )
 
 Mod('T_XY_vector',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
     channel='XY Vector Former',
     main='main',
 )
 
 Mod('T_radiation_shield',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
     channel='Radiation Shield',
     main='main',
 )
 
 Mod('T_persistent_joints',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
     channel='Persistent Joints',
     main='main',
 )
 
 Mod('T_outer_A',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
     channel='Outer Magnet A',
     main='main',
 )
 
 Mod('T_outer_B',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
     channel='Outer Magnet B',
     main='main',
 )
 
 Mod('T_shim_B',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
     channel='Z Shim Former B',
     main='main',
 )
 
 Mod('T_bore_shield',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
     channel='Bore Radiation Shield',
     main='main',
 )
 
 Mod('T_XYZ_shim',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
     channel='XYZ Shim Plate',
     main='main',
 )
 
 Mod('T_Z_shim_switch',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
     channel='Z Shim Switch',
     main='main',
 )
 
 Mod('T_main_switch',
-    'frappy_psi.cryoltd.Temperature',
+    'frappy_psi.cryoltd.Temperature', '',
     channel='Main Coil Switch',
     main='main',
 )

cfg/main/flamp_cfg.py

@@ -33,25 +33,25 @@ Mod('current',
 Mod('i1',
     'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
-    single_module=['current.i1'],
+    single_module='current.i1',
 )
 
 Mod('i2',
     'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
-    single_module=['current.i2'],
+    single_module='current.i2',
 )
 
 Mod('i3',
     'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
-    single_module=['current.i3'],
+    single_module='current.i3',
 )
 
 Mod('i4',
     'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
-    single_module=['current.i4'],
+    single_module='current.i4',
 )
 
 Mod('pv',

cfg/main/fs_cfg.py

@@ -13,7 +13,7 @@ Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
     sea_object='tt',
-    rel_paths=['.', 'tm'],
+    rel_paths=['tm'],
 )
 
 Mod('ts',

cfg/main/ft_cfg.py

@@ -13,7 +13,8 @@ Mod('ts',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
     sea_object='tt',
-    rel_paths=['.', 'ts'],
+    meaning=['temperature', 20],
+    rel_paths=['ts', 'set'],
 )
 
 Mod('t2',

cfg/main/fw_cfg.py

@@ -0,0 +1,25 @@
+Node('ft.config.sea.psi.ch',
+     'FW ILL furnace with W5 thermnocouple (1800 K), old power rack',
+)
+
+Mod('sea_main',
+    'frappy_psi.sea.SeaClient',
+    'main sea connection for fw.config',
+    config='fw.config',
+    service='main',
+)
+
+Mod('ts',
+    'frappy_psi.sea.SeaDrivable', '',
+    io='sea_main',
+    meaning=['temperature', 20],
+    sea_object='tt',
+    rel_paths=['ts', 'set'],
+)
+
+Mod('t2',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    sea_object='tt',
+    rel_paths=['t2'],
+)

cfg/main/haake_cfg.py

@@ -0,0 +1,21 @@
+Node('haakeuro.config.sea.psi.ch',
+     'Haake thermostat + Eurotherm controller',
+)
+Mod('sea_main',
+    'frappy_psi.sea.SeaClient',
+    'main sea connection for haakeuro.config',
+    config = 'haake.config',
+    service = 'main',
+)
+Mod('th',
+    'frappy_psi.sea.SeaDrivable', '',
+    meaning = ('temperature', 10),
+    io = 'sea_main',
+    sea_object = 'th',
+    extra_modules=['t2'],
+)
+Mod('ts',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    single_module='th.t2',
+)

cfg/main/haakeuro_cfg.py

@@ -1,6 +1,5 @@
-Node(
+Node('haakeuro.config.sea.psi.ch',
-    description = '''Haake thermostat + Eurotherm controller''',
+     'Haake thermostat + Eurotherm controller',
-    id = haakeuro.config.sea.psi.ch,
 )
 Mod('sea_main',
     'frappy_psi.sea.SeaClient',

cfg/main/ill1_cfg.py

@@ -12,7 +12,9 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 27],
     sea_object='tt',
+    rel_paths=['tm', '.', 'set', 'dblctrl'],
 )
 
 Mod('cc',
@@ -26,7 +28,7 @@ Mod('cc',
 Mod('lev',
     'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
-    single_module=['cc.h'],
+    single_module='cc.h',
 )
 
 Mod('nv',

cfg/main/ill2_cfg.py

@@ -0,0 +1,68 @@
+Node('ill2.config.sea.psi.ch',
+     'orange cryostat with 70 mm sample space',
+)
+
+Mod('sea_main',
+    'frappy_psi.sea.SeaClient',
+    'main sea connection for ill2.config',
+    config='ill2.config',
+    service='main',
+)
+
+Mod('tt',
+    'frappy_psi.sea.SeaDrivable', '',
+    io='sea_main',
+    meaning=['temperature_regulation', 27],
+    sea_object='tt',
+    rel_paths=['tm', '.', 'set', 'dblctrl'],
+)
+
+Mod('cc',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    sea_object='cc',
+    extra_modules=['h'],
+    visibility=2,
+)
+
+Mod('lev',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    single_module='cc.h',
+)
+
+Mod('nv',
+    'frappy_psi.sea.SeaWritable', '',
+    io='sea_main',
+    sea_object='nv',
+)
+
+Mod('ln2fill',
+    'frappy_psi.sea.SeaWritable', '',
+    io='sea_main',
+    sea_object='ln2fill',
+)
+
+Mod('hefill',
+    'frappy_psi.sea.SeaWritable', '',
+    io='sea_main',
+    sea_object='hefill',
+)
+
+Mod('hepump',
+    'frappy_psi.sea.SeaWritable', '',
+    io='sea_main',
+    sea_object='hepump',
+)
+
+Mod('hemot',
+    'frappy_psi.sea.SeaDrivable', '',
+    io='sea_main',
+    sea_object='hemot',
+)
+
+Mod('table',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    sea_object='table',
+)

cfg/main/ill3_cfg.py

@@ -1,24 +1,24 @@
 Node('cfg/main/ill3.cfg',
      'orange cryofurnace with 70 mm sample space (low T)',
-     interface='5000',
-     name='ill3',
 )
 
 Mod('sea_main',
-    'secop_psi.sea.SeaClient',
+    'frappy_psi.sea.SeaClient',
     'main sea connection for ill3.config',
     config='ill3.config',
     service='main',
 )
 
 Mod('tt',
-    'secop_psi.sea.SeaDrivable', '',
+    'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 27],
     sea_object='tt',
+    rel_paths=['tm', '.', 'set', 'dblctrl'],
 )
 
 Mod('cc',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='cc',
     extra_modules=['h'],
@@ -26,49 +26,49 @@ Mod('cc',
 )
 
 Mod('lev',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
-    single_module=['cc.h'],
+    single_module='cc.h',
 )
 
 Mod('nv',
-    'secop_psi.sea.SeaWritable', '',
+    'frappy_psi.sea.SeaWritable', '',
     io='sea_main',
     sea_object='nv',
 )
 
 Mod('ln2fill',
-    'secop_psi.sea.SeaWritable', '',
+    'frappy_psi.sea.SeaWritable', '',
     io='sea_main',
     sea_object='ln2fill',
 )
 
 Mod('hefill',
-    'secop_psi.sea.SeaWritable', '',
+    'frappy_psi.sea.SeaWritable', '',
     io='sea_main',
     sea_object='hefill',
 )
 
 Mod('hepump',
-    'secop_psi.sea.SeaWritable', '',
+    'frappy_psi.sea.SeaWritable', '',
     io='sea_main',
     sea_object='hepump',
 )
 
 Mod('hemot',
-    'secop_psi.sea.SeaDrivable', '',
+    'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
     sea_object='hemot',
 )
 
 Mod('nvflow',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='nvflow',
 )
 
 Mod('table',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='table',
 )

cfg/main/ill4_cfg.py

@@ -12,7 +12,9 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 27],
     sea_object='tt',
+    rel_paths=['tm', '.', 'set', 'dblctrl'],
 )
 
 Mod('cc',
@@ -26,7 +28,7 @@ Mod('cc',
 Mod('lev',
     'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
-    single_module=['cc.h'],
+    single_module='cc.h',
 )
 
 Mod('nv',

cfg/main/ill5_cfg.py

@@ -12,7 +12,9 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 27],
     sea_object='tt',
+    rel_paths=['tm', '.', 'set', 'dblctrl'],
 )
 
 Mod('cc',
@@ -26,7 +28,7 @@ Mod('cc',
 Mod('lev',
     'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
-    single_module=['cc.h'],
+    single_module='cc.h',
 )
 
 Mod('nv',

cfg/main/ill5pgas5_cfg.py

@@ -12,7 +12,9 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 27],
     sea_object='tt',
+    rel_paths=['tm', '.', 'set', 'dblctrl'],
 )
 
 Mod('pauto',
@@ -38,7 +40,7 @@ Mod('cc',
 Mod('lev',
     'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
-    single_module=['cc.h'],
+    single_module='cc.h',
 )
 
 Mod('nv',

cfg/main/jtccr_cfg.py

@@ -12,8 +12,9 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 27],
     sea_object='tt',
-    rel_paths=['.', 'tt'],
+    rel_paths=['tt', 'set'],
 )
 
 Mod('T_ccr',
@@ -27,73 +28,73 @@ Mod('jtccr',
     'frappy_psi.sea.SeaWritable', '',
     io='sea_main',
     sea_object='jtccr',
-    extra_modules=['v1,v2,v3,v4,v5,v6,v7,v8,v9,v10,vm'],
+    extra_modules=['v1','v2','v3','v4','v5','v6','v7','v8','v9','v10','vm'],
 )
 
 Mod('v1',
     'frappy_psi.sea.SeaWritable', '',
     io='sea_main',
-    single_module=['jtccr.v1'],
+    single_module='jtccr.v1',
 )
 
 Mod('v2',
     'frappy_psi.sea.SeaWritable', '',
     io='sea_main',
-    single_module=['jtccr.v2'],
+    single_module='jtccr.v2',
 )
 
 Mod('v3',
     'frappy_psi.sea.SeaWritable', '',
     io='sea_main',
-    single_module=['jtccr.v3'],
+    single_module='jtccr.v3',
 )
 
 Mod('v4',
     'frappy_psi.sea.SeaWritable', '',
     io='sea_main',
-    single_module=['jtccr.v4'],
+    single_module='jtccr.v4',
 )
 
 Mod('v5',
     'frappy_psi.sea.SeaWritable', '',
     io='sea_main',
-    single_module=['jtccr.v5'],
+    single_module='jtccr.v5',
 )
 
 Mod('v6',
     'frappy_psi.sea.SeaWritable', '',
     io='sea_main',
-    single_module=['jtccr.v6'],
+    single_module='jtccr.v6',
 )
 
 Mod('v7',
     'frappy_psi.sea.SeaWritable', '',
     io='sea_main',
-    single_module=['jtccr.v7'],
+    single_module='jtccr.v7',
 )
 
 Mod('v8',
     'frappy_psi.sea.SeaWritable', '',
     io='sea_main',
-    single_module=['jtccr.v8'],
+    single_module='jtccr.v8',
 )
 
 Mod('v9',
     'frappy_psi.sea.SeaWritable', '',
     io='sea_main',
-    single_module=['jtccr.v9'],
+    single_module='jtccr.v9',
 )
 
 Mod('v10',
     'frappy_psi.sea.SeaWritable', '',
     io='sea_main',
-    single_module=['jtccr.v10'],
+    single_module='jtccr.v10',
 )
 
 Mod('vm',
     'frappy_psi.sea.SeaWritable', '',
     io='sea_main',
-    single_module=['jtccr.vm'],
+    single_module='jtccr.vm',
 )
 
 Mod('p1',

cfg/main/ma02_cfg.py

@@ -12,7 +12,9 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 27],
     sea_object='tt',
+    rel_paths=['tm', '.', 'set', 'dblctrl'],
 )
 
 Mod('cc',

cfg/main/ma10_cfg.py

@@ -12,7 +12,9 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 27],
     sea_object='tt',
+    rel_paths=['tm', '.', 'set', 'dblctrl'],
 )
 
 Mod('cc',
@@ -43,6 +45,7 @@ Mod('mf',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
     sea_object='mf',
+    rel_paths=['.', 'gen', 'ips'],
 )
 
 Mod('lev',
@@ -79,6 +82,8 @@ Mod('om',
     'frappy_psi.phytron.Motor',
     'stick rotation, typically used for omega',
     io='om_io',
-    sign=-1,
+    target_min = -180,
+    target_max = 360,
     encoder_mode='READ',
+    backlash=-1,
 )

cfg/main/ma10heat_cfg.py

@@ -0,0 +1,102 @@
+Node('ma10.config.sea.psi.ch',
+     '10 Tesla vertical cryomagnet',
+)
+
+Mod('sea_main',
+    'frappy_psi.sea.SeaClient',
+    'main sea connection for ma10.config',
+    config='ma10heat.config',
+    service='main',
+)
+
+Mod('ts',
+    'frappy_psi.sea.SeaDrivable', '',
+    io='sea_main',
+    meaning=['temperature_regulation', 27],
+    sea_object='tt',
+    rel_paths=['ts', 'set']
+)
+
+Mod('tm',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    sea_object='tt',
+    rel_paths=['tm', 'setvti']
+)
+
+Mod('ts2',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    sea_object='tt',
+    rel_paths=['ts_2']
+)
+
+Mod('cc',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    sea_object='cc',
+)
+
+Mod('nv',
+    'frappy_psi.sea.SeaWritable', '',
+    io='sea_main',
+    sea_object='nv',
+)
+
+Mod('hepump',
+    'frappy_psi.sea.SeaWritable', '',
+    io='sea_main',
+    sea_object='hepump',
+)
+
+Mod('hemot',
+    'frappy_psi.sea.SeaDrivable', '',
+    io='sea_main',
+    sea_object='hemot',
+)
+
+Mod('mf',
+    'frappy_psi.sea.SeaDrivable', '',
+    io='sea_main',
+    sea_object='mf',
+)
+
+Mod('lev',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    sea_object='lev',
+)
+
+Mod('ln2fill',
+    'frappy_psi.sea.SeaWritable', '',
+    io='sea_main',
+    sea_object='ln2fill',
+)
+
+Mod('hefill',
+    'frappy_psi.sea.SeaWritable', '',
+    io='sea_main',
+    sea_object='hefill',
+)
+
+Mod('table',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    sea_object='table',
+)
+
+Mod('om_io',
+    'frappy_psi.phytron.PhytronIO',
+    'dom motor IO',
+    uri='ma10-ts.psi.ch:3004',
+)
+
+Mod('om',
+    'frappy_psi.phytron.Motor',
+    'stick rotation, typically used for omega',
+    io='om_io',
+    sign=-1,
+    target_min = -180,
+    target_max = 360,
+    encoder_mode='READ',
+)

cfg/main/ma10high_t_cfg.py

@@ -0,0 +1,109 @@
+Node('ma10.config.sea.psi.ch',
+     '10 Tesla vertical cryomagnet',
+)
+
+Mod('sea_main',
+    'frappy_psi.sea.SeaClient',
+    'main sea connection for ma10.config',
+    config='ma10high_t.config',
+    service='main',
+)
+
+Mod('th',
+    'frappy_psi.sea.SeaReadable',
+    'sample heater temperature',
+    io='sea_main',
+    meaning=['temperature_regulation', 27],
+    sea_object='tt',
+    rel_paths=['ts', 'setsamp']
+)
+
+Mod('tm',
+    'frappy_psi.sea.SeaDrivable', '',
+    io='sea_main',
+    sea_object='tt',
+    rel_paths=['tm', '.', 'set']
+)
+
+Mod('ts',
+    'frappy_psi.parmod.Converging',
+    'test for parmod',
+    unit='K',
+    read='th.value',
+    write='th.setsamp',
+    meaning=['temperature', 20],
+    settling_time=20,
+    tolerance=1,
+)
+
+Mod('ts2',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    sea_object='tt',
+    rel_paths=['ts_2']
+)
+
+Mod('cc',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    sea_object='cc',
+)
+
+Mod('nv',
+    'frappy_psi.sea.SeaWritable', '',
+    io='sea_main',
+    sea_object='nv',
+)
+
+Mod('hepump',
+    'frappy_psi.sea.SeaWritable', '',
+    io='sea_main',
+    sea_object='hepump',
+)
+
+Mod('hemot',
+    'frappy_psi.sea.SeaDrivable', '',
+    io='sea_main',
+    sea_object='hemot',
+)
+
+Mod('mf',
+    'frappy_psi.sea.SeaDrivable', '',
+    io='sea_main',
+    sea_object='mf',
+)
+
+Mod('lev',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    sea_object='lev',
+)
+
+Mod('ln2fill',
+    'frappy_psi.sea.SeaWritable', '',
+    io='sea_main',
+    sea_object='ln2fill',
+)
+
+Mod('hefill',
+    'frappy_psi.sea.SeaWritable', '',
+    io='sea_main',
+    sea_object='hefill',
+)
+
+Mod('om_io',
+    'frappy_psi.phytron.PhytronIO',
+    'dom motor IO',
+    uri='ma10-ts.psi.ch:3004',
+)
+
+Mod('om',
+    'frappy_psi.phytron.Motor',
+    'stick rotation, typically used for omega',
+    io='om_io',
+    sign=-1,
+    target_min = -180,
+    target_max = 360,
+    encoder_mode='READ',
+)
+

cfg/main/ma11_cfg.py

@@ -12,8 +12,9 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 27],
     sea_object='tt',
-    rel_paths=['.', 'tm'],
+    rel_paths=['tm', '.', 'set', 'dblctrl'],
 )
 
 Mod('cc',
@@ -110,5 +111,5 @@ Mod('stickrot',
     'frappy_psi.phytron.Motor',
     'stick rotation, typically not used as omega',
     io='stick_io',
-    encoder_mode='CHECK',
+    encoder_mode='NO',
 )

cfg/main/ma15_cfg.py

@@ -0,0 +1,98 @@
+Node('ma15.config.sea.psi.ch',
+    '''14.9 Tesla superconducting cryomagnet''',
+)
+Mod('sea_main',
+    'frappy_psi.sea.SeaClient',
+    'main sea connection for ma15.config',
+    config = 'ma15.config',
+    service = 'main',
+)
+Mod('tt',
+    'frappy_psi.sea.SeaDrivable', '',
+    io = 'sea_main',
+    meaning=['temperature_regulation', 27],
+    sea_object = 'tt',
+    rel_paths=['tm', '.', 'set', 'dblctrl'],
+)
+Mod('cc',
+    'frappy_psi.sea.SeaReadable', '',
+    io = 'sea_main',
+    sea_object = 'cc',
+)
+Mod('nv',
+    'frappy_psi.sea.SeaWritable', '',
+    io = 'sea_main',
+    sea_object = 'nv',
+)
+Mod('hefill',
+    'frappy_psi.sea.SeaWritable', '',
+    io = 'sea_main',
+    sea_object = 'hefill',
+)
+Mod('hepump',
+    'frappy_psi.sea.SeaWritable', '',
+    io = 'sea_main',
+    sea_object = 'hepump',
+)
+Mod('hemot',
+    'frappy_psi.sea.SeaDrivable', '',
+    io = 'sea_main',
+    sea_object = 'hemot',
+)
+Mod('nvflow',
+    'frappy_psi.sea.SeaReadable', '',
+    io = 'sea_main',
+    sea_object = 'nvflow',
+)
+Mod('mf',
+    'frappy_psi.sea.SeaDrivable', '',
+    io = 'sea_main',
+    sea_object = 'mf',
+)
+Mod('lev',
+    'frappy_psi.sea.SeaReadable', '',
+    io = 'sea_main',
+    sea_object = 'lev',
+)
+Mod('ln2fill',
+    'frappy_psi.sea.SeaWritable', '',
+    io = 'sea_main',
+    sea_object = 'ln2fill',
+)
+Mod('tcoil',
+    'frappy_psi.sea.SeaReadable', '',
+    io = 'sea_main',
+    sea_object = 'tcoil',
+)
+Mod('ccu2',
+    'frappy_psi.sea.SeaWritable', '',
+    io = 'sea_main',
+    sea_object = 'ccu2',
+)
+Mod('lnv',
+    'frappy_psi.sea.SeaWritable', '',
+    io = 'sea_main',
+    sea_object = 'lnv',
+)
+Mod('lpr',
+    'frappy_psi.sea.SeaDrivable', '',
+    io = 'sea_main',
+    sea_object = 'lpr',
+)
+Mod('table',
+    'frappy_psi.sea.SeaReadable', '',
+    io = 'sea_main',
+    sea_object = 'table',
+)
+Mod('stick_io',
+    'frappy_psi.phytron.PhytronIO',
+    'om motor IO',
+    uri='ma15-ts.psi.ch:3005',
+)
+Mod('om',
+    'frappy_psi.phytron.Motor',
+    'stick rotation, typically used as omega',
+    io='stick_io',
+    encoder_mode='CHECK',
+)
+

cfg/main/ma6_cfg.py

@@ -12,8 +12,9 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 27],
     sea_object='tt',
-    rel_paths=['.', 'tm'],
+    rel_paths=['tm', '.', 'set', 'dblctrl'],
 )
 
 Mod('cc',
@@ -74,5 +75,8 @@ Mod('om',
     'frappy_psi.phytron.Motor',
     'stick rotation, typically used for omega',
     io='om_io',
-    encoder_mode='NO',
+    encoder_mode='CHECK',
+    target_min=-180,
+    target_max=360,
+    backlash=-1,
 )

cfg/main/ma6_sampleheat_cfg.py

@@ -0,0 +1,109 @@
+Node('ma6_sampleheat.config.sea.psi.ch',
+     'compact 6 Tesla vertical cryomagnet',
+)
+
+Mod('sea_main',
+    'frappy_psi.sea.SeaClient',
+    'main sea connection for ma6_sampleheat.config',
+    config='ma6_sampleheat.config',
+    service='main',
+)
+
+Mod('tt',
+    'frappy_psi.sea.SeaDrivable', '',
+    io='sea_main',
+    meaning=['temperature_regulation', 27],
+    sea_object='tt',
+    rel_paths=['tm', '.', 'set', 'dblctrl'],
+)
+
+Mod('th',
+    'frappy_psi.sea.SeaReadable',
+    'sample heater temperature',
+    io='sea_main',
+    sea_object='tt',
+    rel_paths=['ts', 'setsamp']
+)
+
+Mod('ts0',
+    'frappy_psi.sea.SeaReadable',
+    'sample stick exch. temperature',
+    io='sea_main',
+    sea_object='tt',
+    rel_paths=['ts_2']
+)
+
+Mod('ts',
+    'frappy_psi.parmod.Converging',
+    'test for parmod',
+    unit='K',
+    read='th.value',
+    write='th.setsamp',
+    meaning=['temperature', 20],
+    settling_time=20,
+    tolerance=1,
+)
+
+
+Mod('cc',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    sea_object='cc',
+)
+
+Mod('nv',
+    'frappy_psi.sea.SeaWritable', '',
+    io='sea_main',
+    sea_object='nv',
+)
+
+Mod('hepump',
+    'frappy_psi.sea.SeaWritable', '',
+    io='sea_main',
+    sea_object='hepump',
+)
+
+Mod('hemot',
+    'frappy_psi.sea.SeaDrivable', '',
+    io='sea_main',
+    sea_object='hemot',
+)
+
+Mod('ln2fill',
+    'frappy_psi.sea.SeaWritable', '',
+    io='sea_main',
+    sea_object='ln2fill',
+)
+
+Mod('hefill',
+    'frappy_psi.sea.SeaWritable', '',
+    io='sea_main',
+    sea_object='hefill',
+)
+
+Mod('mf',
+    'frappy_psi.sea.SeaDrivable', '',
+    io='sea_main',
+    sea_object='mf',
+)
+
+Mod('lev',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    sea_object='lev',
+)
+
+Mod('om_io',
+    'frappy_psi.phytron.PhytronIO',
+    'dom motor IO',
+    uri='ma6-ts.psi.ch:3003',
+)
+
+Mod('om',
+    'frappy_psi.phytron.Motor',
+    'stick rotation, typically used for omega',
+    io='om_io',
+    encoder_mode='CHECK',
+    target_min=-180,
+    target_max=360,
+)

cfg/main/ma7_cfg.py

@@ -10,10 +10,12 @@ Mod('sea_main',
 )
 
 Mod('tt',
-    'frappy_psi.sea.SeaDrivable', '',
+    'frappy_psi.sea.LscDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 27],
     sea_object='tt',
-    rel_paths=['.', 'tm'],
+    sensor_path='tm',
+    set_path='set',
 )
 
 Mod('cc',
@@ -56,6 +58,7 @@ Mod('mf',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
     sea_object='mf',
+    value=Param(unit='T'),
 )
 
 Mod('lev',
@@ -67,15 +70,13 @@ Mod('lev',
 Mod('tcoil1',
     'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
-    sea_object='tcoil',
+    sea_path='tcoil/ta',
-    rel_paths=['ta'],
 )
 
 Mod('tcoil2',
     'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
-    sea_object='tcoil',
+    sea_path='tcoil/tb',
-    rel_paths=['tb'],
 )
 
 Mod('table',

cfg/main/ma7_piezo_cfg.py

@@ -0,0 +1,108 @@
+Node('ma7_piezo.config.sea.psi.ch',
+     '6.8 Tesla horizontal cryomagnet',
+)
+
+Mod('sea_main',
+    'frappy_psi.sea.SeaClient',
+    'main sea connection for ma7.config',
+    config='ma7_piezo.config',
+    service='main',
+)
+
+Mod('tt',
+    'frappy_psi.sea.SeaDrivable', '',
+    io='sea_main',
+    meaning=['temperature_regulation', 27],
+    sea_object='tt',
+    rel_paths=['tm', '.', 'set', 'dblctrl', 'voltage'],
+    extra_modules=['manualpower'],
+)
+
+Mod('cc',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    sea_object='cc',
+)
+
+Mod('nv',
+    'frappy_psi.sea.SeaWritable', '',
+    io='sea_main',
+    sea_object='nv',
+)
+
+Mod('hefill',
+    'frappy_psi.sea.SeaWritable', '',
+    io='sea_main',
+    sea_object='hefill',
+)
+
+Mod('hepump',
+    'frappy_psi.sea.SeaWritable', '',
+    io='sea_main',
+    sea_object='hepump',
+)
+
+Mod('hemot',
+    'frappy_psi.sea.SeaDrivable', '',
+    io='sea_main',
+    sea_object='hemot',
+)
+
+Mod('ln2fill',
+    'frappy_psi.sea.SeaWritable', '',
+    io='sea_main',
+    sea_object='ln2fill',
+)
+
+Mod('mf',
+    'frappy_psi.sea.SeaDrivable', '',
+    io='sea_main',
+    sea_object='mf',
+    value=Param(unit='T'),
+)
+
+Mod('lev',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    sea_object='lev',
+)
+
+Mod('tcoil1',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    sea_object='tcoil',
+    rel_paths=['ta'],
+)
+
+Mod('tcoil2',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    sea_object='tcoil',
+    rel_paths=['tb'],
+)
+
+Mod('table',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    sea_object='table',
+)
+
+Mod('stick_io',
+    'frappy_psi.phytron.PhytronIO',
+    'dom motor IO',
+    uri='ma7-ts.psi.ch:3007',
+)
+
+Mod('stickrot',
+    'frappy_psi.phytron.Motor',
+    'stick rotation, typically not used as omega',
+    io='stick_io',
+    encoder_mode='CHECK',
+)
+
+Mod('V',
+    'frappy_psi.sea.SeaWritable',
+    'voltage',
+    io='sea_main',
+    single_module='tt.manualpower',
+)

cfg/main/ma7_sampleheat_cfg.py

@@ -0,0 +1,135 @@
+Node('ma7.config.sea.psi.ch',
+     '6.8 Tesla horizontal cryomagnet',
+)
+
+Mod('sea_main',
+    'frappy_psi.sea.SeaClient',
+    'main sea connection for ma7_sampleheat.config',
+    config='ma7_sampleheat.config',
+    service='main',
+)
+
+Mod('tt',
+    'frappy_psi.sea.SeaDrivable', '',
+    io='sea_main',
+    meaning=['temperature_regulation', 27],
+    sea_object='tt',
+    rel_paths=['tm', '.', 'set', 'dblctrl'],
+    )
+
+Mod('th',
+    'frappy_psi.sea.SeaReadable',
+    'sample heater temperature',
+    io='sea_main',
+    sea_object='tt',
+    rel_paths=['ts_2', 'setsamp']
+)
+
+
+Mod('ts0',
+    'frappy_psi.sea.SeaReadable',
+    'sample stick exch. temperature',
+    io='sea_main',
+    sea_object='tt',
+    rel_paths=['ts']
+)
+
+Mod('ts',
+    'frappy_psi.parmod.Converging',
+    'test for parmod',
+    unit='K',
+    read='th.value',
+    write='th.setsamp',
+    meaning=['temperature', 20],
+    settling_time=20,
+    tolerance=1,
+)
+
+#Mod('sampheat',
+#    'frappy_psi.sea.SeaWritable', '',
+#    io='sea_main',
+#    sea_object='tt',
+#    rel_paths=['ts_2', 'setsamp', 'manualpower']
+#)
+
+
+Mod('cc',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    sea_object='cc',
+)
+
+Mod('nv',
+    'frappy_psi.sea.SeaWritable', '',
+    io='sea_main',
+    sea_object='nv',
+)
+
+Mod('hefill',
+    'frappy_psi.sea.SeaWritable', '',
+    io='sea_main',
+    sea_object='hefill',
+)
+
+Mod('hepump',
+    'frappy_psi.sea.SeaWritable', '',
+    io='sea_main',
+    sea_object='hepump',
+)
+
+Mod('hemot',
+    'frappy_psi.sea.SeaDrivable', '',
+    io='sea_main',
+    sea_object='hemot',
+)
+
+Mod('ln2fill',
+    'frappy_psi.sea.SeaWritable', '',
+    io='sea_main',
+    sea_object='ln2fill',
+)
+
+Mod('mf',
+    'frappy_psi.sea.SeaDrivable', '',
+    io='sea_main',
+    sea_object='mf',
+)
+
+Mod('lev',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    sea_object='lev',
+)
+
+Mod('tcoil1',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    sea_object='tcoil',
+    rel_paths=['ta'],
+)
+
+Mod('tcoil2',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    sea_object='tcoil',
+    rel_paths=['tb'],
+)
+
+Mod('table',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    sea_object='table',
+)
+
+Mod('stick_io',
+    'frappy_psi.phytron.PhytronIO',
+    'dom motor IO',
+    uri='ma7-ts.psi.ch:3007',
+)
+
+Mod('stickrot',
+    'frappy_psi.phytron.Motor',
+    'stick rotation, typically not used as omega',
+    io='stick_io',
+    encoder_mode='CHECK',
+)

cfg/main/ma7_thermalc_cfg.py

@@ -0,0 +1,129 @@
+Node('ma7_thermalc.config.sea.psi.ch',
+    '''6.8 Tesla horizontal cryomagnet for thrermalcond''',
+)
+Mod('sea_main',
+    'frappy_psi.sea.SeaClient',
+    'main sea connection for ma7_thermalc.config',
+    config = 'ma7_thermalc.config',
+    service = 'main',
+)
+#Mod('tt',
+#    'frappy_psi.sea.SeaDrivable', '',
+#    io='sea_main',
+#    sea_object='tt',
+#    rel_paths=['.', 'tm'],
+#)
+
+Mod('tt',
+    'frappy_psi.sea.SeaDrivable', '',
+    meaning=['temperature_regulation', 27],
+    io='sea_main',
+    sea_object='tt',
+    rel_paths=['tm', '.', 'set', 'dblctrl'],
+)
+
+Mod('th',
+    'frappy_psi.sea.SeaReadable',
+    'sample heater temperature',
+    io='sea_main',
+    sea_object='tt',
+    rel_paths=['ts', 'setsamp']
+)
+
+Mod('ts',
+    'frappy_psi.parmod.Converging',
+    'test for parmod',
+    unit='K',
+    value_param='th.value',
+    target_param='th.setsamp',
+    meaning=['temperature', 20],
+    settling_time=20,
+    tolerance=1,
+)
+
+Mod('samph',
+    'frappy_psi.sea.SeaWritable', '',
+    io='sea_main',
+    sea_object='tt',
+    rel_paths=['setsamp','power'],
+)
+
+
+Mod('cc',
+    'frappy_psi.sea.SeaReadable', '',
+    io = 'sea_main',
+    sea_object = 'cc',
+)
+Mod('nv',
+    'frappy_psi.sea.SeaWritable', '',
+    io = 'sea_main',
+    sea_object = 'nv',
+)
+Mod('hefill',
+    'frappy_psi.sea.SeaWritable', '',
+    io = 'sea_main',
+    sea_object = 'hefill',
+)
+Mod('hepump',
+    'frappy_psi.sea.SeaWritable', '',
+    io = 'sea_main',
+    sea_object = 'hepump',
+)
+Mod('hemot',
+    'frappy_psi.sea.SeaDrivable', '',
+    io = 'sea_main',
+    sea_object = 'hemot',
+)
+Mod('nvflow',
+    'frappy_psi.sea.SeaReadable', '',
+    io = 'sea_main',
+    sea_object = 'nvflow',
+)
+Mod('ln2fill',
+    'frappy_psi.sea.SeaWritable', '',
+    io = 'sea_main',
+    sea_object = 'ln2fill',
+)
+Mod('mf',
+    'frappy_psi.sea.SeaDrivable', '',
+    io = 'sea_main',
+    sea_object = 'mf',
+)
+Mod('lev',
+    'frappy_psi.sea.SeaReadable', '',
+    io = 'sea_main',
+    sea_object = 'lev',
+)
+
+Mod('tcoil1',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    sea_object='tcoil',
+    rel_paths=['ta'],
+)
+
+Mod('tcoil2',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    sea_object='tcoil',
+    rel_paths=['tb'],
+)
+
+Mod('table',
+    'frappy_psi.sea.SeaReadable', '',
+    io = 'sea_main',
+    sea_object = 'table',
+)
+
+Mod('stick_io',
+    'frappy_psi.phytron.PhytronIO',
+    'dom motor IO',
+    uri='ma7-ts.psi.ch:3007',
+)
+
+Mod('stickrot',
+    'frappy_psi.phytron.Motor',
+    'stick rotation, typically not used as omega',
+    io='stick_io',
+    encoder_mode='CHECK',
+)

cfg/main/ma7two_cfg.py

@@ -1,104 +1,104 @@
 Node('cfg/main/ma7two.cfg',
      '6.8 Tesla horizontal cryomagnet with two heater loops',
-     interface='5000',
-     name='ma7two',
 )
 
 Mod('sea_main',
-    'secop_psi.sea.SeaClient',
+    'frappy_psi.sea.SeaClient',
     'main sea connection for ma7two.config',
     config='ma7two.config',
     service='main',
 )
 
 Mod('tt',
-    'secop_psi.sea.SeaDrivable', '',
+    'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 27],
     sea_object='tt',
+    rel_paths=['tm', '.', 'set', 'dblctrl'],
 )
 
 Mod('cc',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='cc',
 )
 
 Mod('nv',
-    'secop_psi.sea.SeaWritable', '',
+    'frappy_psi.sea.SeaWritable', '',
     io='sea_main',
     sea_object='nv',
 )
 
 Mod('hefill',
-    'secop_psi.sea.SeaWritable', '',
+    'frappy_psi.sea.SeaWritable', '',
     io='sea_main',
     sea_object='hefill',
 )
 
 Mod('hepump',
-    'secop_psi.sea.SeaWritable', '',
+    'frappy_psi.sea.SeaWritable', '',
     io='sea_main',
     sea_object='hepump',
 )
 
 Mod('hemot',
-    'secop_psi.sea.SeaDrivable', '',
+    'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
     sea_object='hemot',
 )
 
 Mod('nvflow',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='nvflow',
 )
 
 Mod('ln2fill',
-    'secop_psi.sea.SeaWritable', '',
+    'frappy_psi.sea.SeaWritable', '',
     io='sea_main',
     sea_object='ln2fill',
 )
 
 Mod('mf',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='mf',
 )
 
 Mod('lev',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='lev',
 )
 
 Mod('tcoil1',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='tcoil',
     rel_paths=['ta'],
 )
 
 Mod('tcoil2',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='tcoil',
     rel_paths=['tb'],
 )
 
 Mod('table',
-    'secop_psi.sea.SeaReadable', '',
+    'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='table',
 )
 
 Mod('om_io',
-    'secop_psi.phytron.PhytronIO',
+    'frappy_psi.phytron.PhytronIO',
     'dom motor IO',
     uri='ma7-ts.psi.ch:3007',
 )
 
 Mod('om',
-    'secop_psi.phytron.Motor',
+    'frappy_psi.phytron.Motor',
     'stick rotation',
     io='om_io',
     encoder_mode='CHECK',

cfg/main/magsim_cfg.py

@@ -1,6 +1,5 @@
 Node('magsim.psi.ch',
      'cryo magnet simulation (similar to ppms simulation)',
-     interface='tcp://5000',
 )
 
 Mod('tt',

cfg/main/mb11_cfg.py

@@ -1,8 +1,9 @@
 Node('mb11.psi.ch',
      'MB11 11 Tesla - 100 mm cryomagnet',
-     interface='tcp://5000',
 )
 
+sea_cfg = 'mb11.config'
+
 Mod('itc1',
     'frappy_psi.mercury.IO',
     'ITC for heat exchanger and pressures',
@@ -24,11 +25,13 @@ Mod('ips',
 Mod('T_stat',
     'frappy_psi.mercury.TemperatureAutoFlow',
     'static heat exchanger temperature',
+    meaning=['temperature_regulation', 27],
     output_module='htr_stat',
     needle_valve='p_stat',
     slot='DB6.T1',
     io='itc1',
     tolerance=0.1,
+    flowpars=((1,5), (2, 20)),
 )
 
 Mod('htr_stat',
@@ -203,7 +206,8 @@ Mod('om',
     'frappy_psi.phytron.Motor',
     'stick rotation, typically used for omega',
     io='om_io',
-    sign=-1,
+    target_min=-360,
+    target_max=360,
     encoder_mode='NO',
-    target=Param(min=-180, max=360)
+    target=Param(min=-360, max=360),
 )

cfg/main/mb11std_cfg.py

@@ -1,6 +1,5 @@
 Node('mb11.psi.ch',
      'MB11 11 Tesla - 100 mm cryomagnet',
-     interface='tcp://5000',
 )
 
 Mod('itc1',
@@ -24,11 +23,13 @@ Mod('ips',
 Mod('T_stat',
     'frappy_psi.mercury.TemperatureAutoFlow',
     'static heat exchanger temperature',
+    meaning=['temperature_regulation', 27],
     output_module='htr_stat',
     needle_valve='p_stat',
     slot='DB6.T1',
     io='itc1',
     tolerance=0.1,
+    flowpars=((1,5), (2, 20)),
 )
 
 Mod('htr_stat',
@@ -45,6 +46,7 @@ Mod('ts',
     slot='MB1.T1',
     io='itc1',
     tolerance=1.0,
+    visibility='expert',
 )
 
 Mod('htr_sample',
@@ -59,7 +61,7 @@ Mod('p_stat',
     'static needle valve pressure',
     output_module='pos_stat',
     settling_time=60.0,
-    slot='DB5.P1,DB3.G1',
+    slot='DB5.P1',
     io='itc1',
     tolerance=1.0,
     value=Param(
@@ -96,7 +98,7 @@ Mod('p_dyn',
     'dynamic needle valve pressure',
     output_module='pos_dyn',
     settling_time=60.0,
-    slot='DB8.P1,DB4.G1',
+    slot='DB8.P1',
     io='itc1',
     tolerance=1.0,
     value=Param(
@@ -133,7 +135,7 @@ Mod('lev',
 
 Mod('n2lev',
     'frappy_psi.mercury.N2Level',
-    'LHe level',
+    'LN2 level',
     slot='DB1.L1',
     io='ips',
 )
@@ -219,6 +221,8 @@ Mod('om',
     'frappy_psi.phytron.Motor',
     'stick rotation, typically used for omega',
     io='om_io',
-    sign=-1,
+    target_min=-360,
+    target_max=360,
     encoder_mode='NO',
+    target=Param(min=-360, max=360),
 )

cfg/main/ori2_cfg.py

@@ -0,0 +1,73 @@
+Node('ori3.config.sea.psi.ch',
+     'orange cryostat with 50 mm sample space',
+)
+
+Mod('sea_main',
+    'frappy_psi.sea.SeaClient',
+    'main sea connection for ori2.config',
+    config='ori2.config',
+    service='main',
+)
+
+Mod('tt',
+    'frappy_psi.sea.SeaDrivable', '',
+    io='sea_main',
+    meaning=['temperature_regulation', 27],
+    sea_object='tt',
+    rel_paths=['tm', '.', 'set', 'dblctrl'],
+)
+
+Mod('cc',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    sea_object='cc',
+    extra_modules=['h'],
+)
+
+Mod('lev',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    single_module='cc.h',
+)
+
+Mod('nv',
+    'frappy_psi.sea.SeaWritable', '',
+    io='sea_main',
+    sea_object='nv',
+)
+
+Mod('ln2fill',
+    'frappy_psi.sea.SeaWritable', '',
+    io='sea_main',
+    sea_object='ln2fill',
+)
+
+Mod('hefill',
+    'frappy_psi.sea.SeaWritable', '',
+    io='sea_main',
+    sea_object='hefill',
+)
+
+Mod('hepump',
+    'frappy_psi.sea.SeaWritable', '',
+    io='sea_main',
+    sea_object='hepump',
+)
+
+Mod('hemot',
+    'frappy_psi.sea.SeaDrivable', '',
+    io='sea_main',
+    sea_object='hemot',
+)
+
+Mod('nvflow',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    sea_object='nvflow',
+)
+
+Mod('table',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    sea_object='table',
+)

cfg/main/ori3_cfg.py

@@ -12,13 +12,22 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 27],
     sea_object='tt',
+    rel_paths=['tm', '.', 'set', 'dblctrl'],
 )
 
 Mod('cc',
     'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='cc',
+    extra_modules=['h'],
+)
+
+Mod('lev',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    single_module='cc.h',
 )
 
 Mod('nv',
@@ -51,6 +60,12 @@ Mod('hemot',
     sea_object='hemot',
 )
 
+Mod('nvflow',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    sea_object='nvflow',
+)
+
 Mod('table',
     'frappy_psi.sea.SeaReadable', '',
     io='sea_main',

cfg/main/ori4_cfg.py

@@ -9,23 +9,26 @@ Mod('sea_main',
     service='main',
 )
 
-Mod('t',
+Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 27],
     sea_object='tt',
-)
+    rel_paths=['tm', '.', 'set', 'dblctrl'],
-
-Mod('tm',
-    'frappy_psi.sea.SeaDrivable', '',
-    io='sea_main',
-    sea_object='tt',
-    rel_paths=['tm'],
 )
 
 Mod('cc',
     'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='cc',
+    extra_modules=['h'],
+    visibility=2,
+)
+
+Mod('lev',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    single_module='cc.h',
 )
 
 Mod('nv',

cfg/main/ori6_cfg.py

@@ -12,13 +12,23 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 27],
     sea_object='tt',
+    rel_paths=['tm', '.', 'set', 'dblctrl'],
 )
 
 Mod('cc',
     'frappy_psi.sea.SeaReadable', '',
     io='sea_main',
     sea_object='cc',
+    extra_modules=['h'],
+    visibility=2,
+)
+
+Mod('lev',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    single_module='cc.h',
 )
 
 Mod('nv',

cfg/main/ori7_cfg.py

@@ -0,0 +1,70 @@
+Node('ori7.config.sea.psi.ch',
+    '''orange cryostat with 50 mm sample space for ULT''',
+)
+
+Mod('sea_main',
+    'frappy_psi.sea.SeaClient',
+    'main sea connection for ori7.config',
+    config = 'ori7.config',
+    service = 'main',
+)
+
+Mod('tt',
+    'frappy_psi.sea.SeaDrivable', '',
+    io = 'sea_main',
+    meaning=['temperature_regulation', 27],
+    sea_object = 'tt',
+    rel_paths=['tm', '.', 'set', 'dblctrl'],
+)
+
+Mod('cc',
+    'frappy_psi.sea.SeaReadable', '',
+    io = 'sea_main',
+    sea_object = 'cc',
+    extra_modules=['h'],
+    visibility=2,
+)
+
+Mod('lev',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_main',
+    single_module='cc.h',
+)
+
+Mod('nv',
+    'frappy_psi.sea.SeaWritable', '',
+    io = 'sea_main',
+    sea_object = 'nv',
+)
+
+
+Mod('ln2fill',
+    'frappy_psi.sea.SeaWritable', '',
+    io = 'sea_main',
+    sea_object = 'ln2fill',
+)
+Mod('hefill',
+    'frappy_psi.sea.SeaWritable', '',
+    io = 'sea_main',
+    sea_object = 'hefill',
+)
+Mod('hepump',
+    'frappy_psi.sea.SeaWritable', '',
+    io = 'sea_main',
+    sea_object = 'hepump',
+)
+Mod('hemot',
+    'frappy_psi.sea.SeaDrivable', '',
+    io = 'sea_main',
+    sea_object = 'hemot',
+)
+Mod('nvflow',
+    'frappy_psi.sea.SeaReadable', '',
+    io = 'sea_main',
+    sea_object = 'nvflow',
+)
+Mod('table',
+    'frappy_psi.sea.SeaReadable', '',
+    io = 'sea_main',
+    sea_object = 'table',
+)

cfg/main/ori7test_cfg.py

@@ -0,0 +1,17 @@
+from frappy_psi.ccracks import Rack
+
+Node('ori7test.psi.ch',
+     'ORI7 test',
+     'tcp://5000'
+     )
+
+rack = Rack(Mod)
+
+rack.lakeshore()
+rack.sensor('Ts', channel='C', calcurve='x186350')
+rack.loop('T', channel='B', calcurve='x174786', output_module='htr', target=10)
+rack.heater('htr', 1, '100W', 25)
+
+rack.ccu(he=True, n2=True)
+
+rack.hepump()

cfg/main/peltier_cfg.py

@@ -0,0 +1,58 @@
+Node('peltier.psi.ch',
+     'peltier test',
+     'tcp://5000',
+     )
+
+Mod('tio',
+    'frappy_psi.qnw.QnwIO',
+    'connection for Quantum northwest',
+    uri='tcp://ldm-fi-ts:3001',
+    )
+
+Mod('T',
+    'frappy_psi.qnw.TemperatureLoopTC1',
+    'holder temperature',
+    channel='CT',
+    io='tio',
+    )
+
+Mod('Th',
+    'frappy_psi.qnw.SensorTC1',
+    'heat exch. temperature',
+    channel='HT',
+    io='tio',
+    )
+
+Mod('wio',
+    'frappy_psi.thermofisher.ThermFishIO',
+    'connection for water bath',
+    uri='tcp://ldm-fi-ts:3002',
+    )
+
+Mod('Tbath',
+    'frappy_psi.thermofisher.TemperatureLoopA10',
+    'water bath',
+    io='wio',
+    target=Param(max=100),
+    tolerance=0.5,
+    settling_time=20,
+    )
+
+Mod('lio',  # the name of the module
+    'frappy_demo.lakeshore.LakeshoreIO',  # the class used for communication
+    'communication to main controller',  # a description
+    uri="tcp://ldmcc02-ls:7777",  # the serial connection
+    )
+Mod('Ta',
+    'frappy_demo.lakeshore.TemperatureSensor',
+    'Sample Temperature',
+    io='lio',
+    channel='A',  # the channel on the LakeShore for this module
+    )
+Mod('Tb',
+    'frappy_demo.lakeshore.TemperatureSensor',
+    'Sample Temperature',
+    io='lio',
+    channel='B',  # the channel on the LakeShore for this module
+    )
+

cfg/main/rt_cfg.py

@@ -1,18 +1,17 @@
 Node('cfg/main/rt.cfg',
      'room temperature HRPT (pt1000)',
-     interface='5000',
-     name='rt',
 )
 
 Mod('sea_main',
-    'secop_psi.sea.SeaClient',
+    'frappy_psi.sea.SeaClient',
     'main sea connection for rt.config',
     config='rt.config',
     service='main',
 )
 
 Mod('tt',
-    'secop_psi.sea.SeaDrivable', '',
+    'frappy_psi.sea.SeaDrivable', '',
+    meaning=['temperature', 20],
     sea_object='tt',
     io='sea_main',
 )

cfg/main/variox_cfg.py

@@ -12,7 +12,9 @@ Mod('sea_main',
 Mod('tt',
     'frappy_psi.sea.SeaDrivable', '',
     io='sea_main',
+    meaning=['temperature_regulation', 27],
     sea_object='tt',
+    rel_paths=['tm', '.', 'set', 'dblctrl'],
 )
 
 Mod('cc',

cfg/main/varioxb_cfg.py

@@ -0,0 +1,187 @@
+Node('varioxb.psi.ch',
+     'VarioxB - 100 mm cryostat',
+     interface='tcp://5000',
+)
+
+Mod('itc1',
+    'frappy_psi.mercury.IO',
+    'ITC for heat exchanger and pressures',
+    uri='linvb-ts:3001',
+)
+
+Mod('itc2',
+    'frappy_psi.mercury.IO',
+    'ITC for neck and nv heaters',
+    uri='linvb-ts:3002',
+)
+
+Mod('T_stat',
+    'frappy_psi.mercury.TemperatureAutoFlow',
+    'static heat exchanger temperature',
+    meaning=['temperature_regulation', 27],
+    output_module='htr_stat',
+    needle_valve='p_stat',
+    slot='DB6.T1',
+    io='itc1',
+    tolerance=0.1,
+)
+
+Mod('htr_stat',
+    'frappy_psi.mercury.HeaterOutput',
+    'static heat exchanger heater',
+    slot='DB1.H1',
+    io='itc1',
+)
+
+Mod('p_stat',
+    'frappy_psi.mercury.PressureLoop',
+    'static needle valve pressure',
+    output_module='pos_stat',
+    settling_time=60.0,
+    slot='DB5.P1',
+    io='itc1',
+    tolerance=1.0,
+    value=Param(
+        unit='mbar_flow',
+    ),
+)
+
+Mod('pos_stat',
+    'frappy_psi.mercury.ValvePos',
+    'static needle valve position',
+    slot='DB5.P1,DB3.G1',
+    io='itc1',
+)
+
+Mod('T_dyn',
+    'frappy_psi.mercury.TemperatureAutoFlow',
+    'dynamic heat exchanger temperature',
+    output_module='htr_dyn',
+    needle_valve='p_dyn',
+    slot='DB7.T1',
+    io='itc1',
+    tolerance=0.1,
+)
+
+Mod('htr_dyn',
+    'frappy_psi.mercury.HeaterOutput',
+    'dynamic heat exchanger heater',
+    slot='DB2.H1',
+    io='itc1',
+)
+
+Mod('p_dyn',
+    'frappy_psi.mercury.PressureLoop',
+    'dynamic needle valve pressure',
+    output_module='pos_dyn',
+    settling_time=60.0,
+    slot='DB8.P1',
+    io='itc1',
+    tolerance=1.0,
+    value=Param(
+        unit='mbar_flow',
+    ),
+)
+
+Mod('pos_dyn',
+    'frappy_psi.mercury.ValvePos',
+    'dynamic needle valve position',
+    slot='DB8.P1,DB4.G1',
+    io='itc1',
+)
+
+Mod('lev',
+    'frappy_psi.mercury.HeLevel',
+    'LHe level',
+    slot='DB4.L1',
+    io='itc2',
+)
+
+Mod('n2lev',
+    'frappy_psi.mercury.N2Level',
+    'LN2 level',
+    slot='DB4.L1',
+    io='itc2',
+)
+
+Mod('T_neck1',
+    'frappy_psi.mercury.TemperatureLoop',
+    'neck heater 1 temperature',
+    output_module='htr_neck1',
+    slot='MB1.T1',
+    io='itc2',
+    tolerance=1.0,
+)
+
+Mod('htr_neck1',
+    'frappy_psi.mercury.HeaterOutput',
+    'neck heater 1 power',
+    slot='MB0.H1',
+    io='itc2',
+)
+
+Mod('T_neck2',
+    'frappy_psi.mercury.TemperatureLoop',
+    'neck heater 2 temperature',
+    output_module='htr_neck2',
+    slot='DB6.T1',
+    io='itc2',
+    tolerance=1.0,
+)
+
+Mod('htr_neck2',
+    'frappy_psi.mercury.HeaterOutput',
+    'neck heater 2 power',
+    slot='DB1.H1',
+    io='itc2',
+)
+
+Mod('T_nvs',
+    'frappy_psi.mercury.TemperatureLoop',
+    'static needle valve temperature',
+    output_module='htr_nvs',
+    slot='DB7.T1',
+    io='itc2',
+    tolerance=0.1,
+)
+
+Mod('htr_nvs',
+    'frappy_psi.mercury.HeaterOutput',
+    'static needle valve heater power',
+    slot='DB2.H1',
+    io='itc2',
+)
+
+Mod('T_nvd',
+    'frappy_psi.mercury.TemperatureLoop',
+    'dynamic needle valve heater temperature',
+    output_module='htr_nvd',
+    slot='DB8.T1',
+    io='itc2',
+    tolerance=0.1,
+)
+
+Mod('htr_nvd',
+    'frappy_psi.mercury.HeaterOutput',
+    'dynamic needle valve heater power',
+    slot='DB3.H1',
+    io='itc2',
+)
+
+# Motor controller is not yet available!
+#
+#Mod('om_io',
+#    'frappy_psi.phytron.PhytronIO',
+#    'dom motor IO',
+#    uri='mb11-ts.psi.ch:3004',
+#)
+
+#Mod('om',
+#    'frappy_psi.phytron.Motor',
+#    'stick rotation, typically used for omega',
+#    io='om_io',
+#    target_min=-180,
+#    target_max=360,
+#    encoder_mode='NO',
+#    target=Param(min=-180, max=360)
+#)

cfg/multimeter_cfg.py

@@ -0,0 +1,34 @@
+Node('multimetertest.psi.ch',
+     'multimeter test',
+     'tcp://5000',
+     )
+
+Mod('io',
+     'frappy_psi.HP.HP_IO',
+     'multimeter communication',
+     uri='/dev/cu.usbserial-21410',
+     )
+
+Mod('Voltage',
+     'frappy_psi.HP.Voltage',
+     'voltage',
+     io='io',
+     )
+
+Mod('Current',
+     'frappy_psi.HP.Current',
+     'current',
+     io='io',
+     )
+
+Mod('Resistance',
+     'frappy_psi.HP.Resistance',
+     'resistivity',
+     io='io',
+     )
+
+Mod('Frequency',
+     'frappy_psi.HP.Frequency',
+     'resistivity',
+     io='io',
+     )

cfg/phoenix_cfg.py

@@ -0,0 +1,16 @@
+Node('phoenixtest.psi.ch',
+     'phoenix test',
+     'tcp://5000',
+     )
+
+Mod('io',
+    'frappy_psi.haake.HaakeIO',
+    'connection for Thermo Haake',
+    uri='tcp://ldmprep7-ts:3005',
+    )
+
+Mod('T',
+    'frappy_psi.haake.TemperatureLoop',
+    'holder temperature',
+    io='io',
+    )

cfg/prep2_cfg.py

@@ -1,25 +0,0 @@
-# error creating tt
-# error creating nv
-Node('ori1.psi.ch',
-     'ori1 over SEA',
-     interface='tcp://10767',
-)
-
-Mod('seaconn',
-    'frappy_psi.sea.SeaClient',
-    'a SEA connection',
-)
-
-Mod('tt',
-    'frappy_psi.sea.SeaDrivable',
-    io='seaconn',
-    json_descr='tt.ori1.config',
-    remote_paths='.',
-)
-
-Mod('nv',
-    'frappy_psi.sea.SeaReadable',
-    io='seaconn',
-    json_descr='nv.ori1.config',
-    remote_paths='.',
-)

cfg/prep5_cfg.py

@@ -1,153 +0,0 @@
-# error creating tt
-# error creating nv
-# error creating ln2fill
-# error creating hefill
-# error creating tcoil
-# error creating table
-# error creating lnv
-# error creating lpr
-# error creating lambdawatch
-# error creating ts
-# error creating treg
-# error creating tmon
-# error creating sorb
-# error creating ultrasound
-# error creating fn
-# error creating mirror
-# error creating f
-# error creating pars
-Node('ma11_dil4_ultrasound_sr.psi.ch',
-     'ma11_dil4_ultrasound_sr over SEA',
-     interface='tcp://10767',
-)
-
-Mod('seaconn',
-    'frappy_psi.sea.SeaClient',
-    'a SEA connection',
-)
-
-Mod('tt',
-    'frappy_psi.sea.SeaDrivable',
-    io='seaconn',
-    json_descr='tt.ma11.config',
-    remote_paths='.',
-)
-
-Mod('nv',
-    'frappy_psi.sea.SeaReadable',
-    io='seaconn',
-    json_descr='nv.ma11.config',
-    remote_paths='.',
-)
-
-Mod('ln2fill',
-    'frappy_psi.sea.SeaReadable',
-    io='seaconn',
-    json_descr='ln2fill.ma11.config',
-    remote_paths='.',
-)
-
-Mod('hefill',
-    'frappy_psi.sea.SeaReadable',
-    io='seaconn',
-    json_descr='hefill.ma11.config',
-    remote_paths='.',
-)
-
-Mod('tcoil',
-    'frappy_psi.sea.SeaReadable',
-    io='seaconn',
-    json_descr='tcoil.ma11.config',
-    remote_paths='.',
-)
-
-Mod('table',
-    'frappy_psi.sea.SeaReadable',
-    io='seaconn',
-    json_descr='table.ma11.config',
-    remote_paths='.',
-)
-
-Mod('lnv',
-    'frappy_psi.sea.SeaReadable',
-    io='seaconn',
-    json_descr='lnv.ma11.config',
-    remote_paths='.',
-)
-
-Mod('lpr',
-    'frappy_psi.sea.SeaDrivable',
-    io='seaconn',
-    json_descr='lpr.ma11.config',
-    remote_paths='.',
-)
-
-Mod('lambdawatch',
-    'frappy_psi.sea.SeaReadable',
-    io='seaconn',
-    json_descr='lambdawatch.ma11.config',
-    remote_paths='.',
-)
-
-Mod('ts',
-    'frappy_psi.sea.SeaDrivable',
-    io='seaconn',
-    json_descr='ts.dil4.stick',
-    remote_paths='.',
-)
-
-Mod('treg',
-    'frappy_psi.sea.SeaReadable',
-    io='seaconn',
-    json_descr='treg.dil4.stick',
-    remote_paths='.',
-)
-
-Mod('tmon',
-    'frappy_psi.sea.SeaReadable',
-    io='seaconn',
-    json_descr='tmon.dil4.stick',
-    remote_paths='.',
-)
-
-Mod('sorb',
-    'frappy_psi.sea.SeaDrivable',
-    io='seaconn',
-    json_descr='sorb.dil4.stick',
-    remote_paths='.',
-)
-
-Mod('ultrasound',
-    'frappy_psi.sea.SeaReadable',
-    io='seaconn',
-    json_descr='ultrasound.ultrasound.addon',
-    remote_paths='.',
-)
-
-Mod('fn',
-    'frappy_psi.sea.SeaReadable',
-    io='seaconn',
-    json_descr='fn.ultrasound.addon',
-    remote_paths='.',
-)
-
-Mod('mirror',
-    'frappy_psi.sea.SeaReadable',
-    io='seaconn',
-    json_descr='mirror.ultrasound.addon',
-    remote_paths='.',
-)
-
-Mod('f',
-    'frappy_psi.sea.SeaReadable',
-    io='seaconn',
-    json_descr='f.ultrasound.addon',
-    remote_paths='.',
-)
-
-Mod('pars',
-    'frappy_psi.sea.SeaReadable',
-    io='seaconn',
-    json_descr='pars.ultrasound.addon',
-    remote_paths='.',
-)

cfg/prep6_cfg.py

@@ -1,81 +0,0 @@
-# error creating tvs
-# error creating tvd
-# error creating pstat
-# error creating pdyn
-# error creating tneck1
-# error creating tneck2
-# error creating tnvs
-# error creating tnvd
-# error creating ts
-Node('varioxB_vb.psi.ch',
-     'varioxB_vb over SEA',
-     interface='tcp://10767',
-)
-
-Mod('seaconn',
-    'frappy_psi.sea.SeaClient',
-    'a SEA connection',
-)
-
-Mod('tvs',
-    'frappy_psi.sea.SeaReadable',
-    io='seaconn',
-    json_descr='tvs.varioxB.config',
-    remote_paths='.',
-)
-
-Mod('tvd',
-    'frappy_psi.sea.SeaReadable',
-    io='seaconn',
-    json_descr='tvd.varioxB.config',
-    remote_paths='.',
-)
-
-Mod('pstat',
-    'frappy_psi.sea.SeaReadable',
-    io='seaconn',
-    json_descr='pstat.varioxB.config',
-    remote_paths='.',
-)
-
-Mod('pdyn',
-    'frappy_psi.sea.SeaReadable',
-    io='seaconn',
-    json_descr='pdyn.varioxB.config',
-    remote_paths='.',
-)
-
-Mod('tneck1',
-    'frappy_psi.sea.SeaReadable',
-    io='seaconn',
-    json_descr='tneck1.varioxB.config',
-    remote_paths='.',
-)
-
-Mod('tneck2',
-    'frappy_psi.sea.SeaReadable',
-    io='seaconn',
-    json_descr='tneck2.varioxB.config',
-    remote_paths='.',
-)
-
-Mod('tnvs',
-    'frappy_psi.sea.SeaReadable',
-    io='seaconn',
-    json_descr='tnvs.varioxB.config',
-    remote_paths='.',
-)
-
-Mod('tnvd',
-    'frappy_psi.sea.SeaReadable',
-    io='seaconn',
-    json_descr='tnvd.varioxB.config',
-    remote_paths='.',
-)
-
-Mod('ts',
-    'frappy_psi.sea.SeaReadable',
-    io='seaconn',
-    json_descr='ts.vb.stick',
-    remote_paths='.',
-)

cfg/razorbillUC220T_cfg.py

@@ -0,0 +1,84 @@
+# call $ bin/frappy-server razorbillUC220T
+# in frappy directory, with python with frappy libraries installed.
+
+Node('UC220T.psi.ch',
+     'A Razorbill UC220T controlled by a RP100 high voltage powersupply and a ACM1219 (AD7746) capacitance meter',
+      interface='tcp://5123')
+
+Mod('io1',
+    'frappy_psi.RP100.RP100IO',
+    'communication',
+    uri='serial:///dev/ttyACM0?baudrate=9600+bytesize=8+parity=none+stopbits=1')
+Mod('V1',
+    'frappy_psi.RP100.VoltageChannel',
+    'Voltage Channel 1',
+    temp='T',
+    io='io1',
+    target=Param(min=-200, max=200),
+    max_target=120,
+    min_target=-20,
+    slew_rate=100,
+    channel=1)
+Mod('V2',
+    'frappy_psi.RP100.VoltageChannel',
+    'Voltage Channel 2',
+    temp='T',
+    io='io1',
+    target=Param(min=-200, max=200),
+    max_target=120,
+    min_target=-20,
+    slew_rate=100,
+    channel=2)
+
+Mod('io2',
+    'frappy_psi.ACM1219.ACM1219IO',
+    'communication',
+    uri='serial:///dev/ttyUSB0?baudrate=9600+bytesize=8+parity=none+stopbits=1')
+Mod('C1C2',
+    'frappy_psi.ACM1219.BothChannels',
+    'Capacitance channels 1 and 2',
+    io='io2')
+Mod('d',
+    'frappy_psi.ACM1219.Displacement',
+    'razorbill displacement from capacitance',
+    cap='C1C2',
+    channel=1,
+    alpha290K=56.710,
+    d0=95.443,
+    Cp=0.01883,
+    d0_curve={'a':4.21,'b':-0.00157,'c':-3.38e-5,'d':5.28e-8,'e':-6.93e-11},
+    temp='T')
+Mod('F',
+    'frappy_psi.ACM1219.Force',
+    'razorbill force from capacitance',
+    cap='C1C2',
+    channel=2,
+    alpha290K=374.23,
+    f0=315.63,
+    Cp=0.0755,
+    f0_curve={'a':38.9,'b':-0.0147,'c':-0.000346,'d':8.96e-7,'e':-1.58e-9},
+    temp='T')
+Mod('stress',
+    'frappy_psi.ACM1219.Stress',
+    'Sample stress from force',
+    force='F',
+    area=0.1,
+    )
+Mod('strain',
+    'frappy_psi.ACM1219.Strain',
+    'Sample strain from force',
+    displacement='d',
+    L=3,
+    )
+Mod('YM',
+    'frappy_psi.ACM1219.YoungsModulus',
+    'Sample youngs modulus from stress and strain',
+    stress='stress',
+    strain='strain',
+    )
+
+Mod('T',
+    'frappy_psi.dummy.Temp',
+    'dummy T written from client',
+    target=Param(min=1, max=325),
+    )

cfg/sea/ah2550.addon.json

@@ -0,0 +1,14 @@
+{"cap": {"base": "/cap", "params": [{"path": "", "type": "none", "kids": 8},
+{"path": "send", "type": "text", "readonly": false, "cmd": "cap send", "visibility": 3},
+{"path": "status", "type": "text", "visibility": 3},
+{"path": "cap", "type": "float"},
+{"path": "loss", "type": "float"},
+{"path": "period", "type": "float", "readonly": false, "cmd": "cap period"},
+{"path": "V", "type": "float", "readonly": false, "cmd": "cap V"},
+{"path": "average", "type": "int", "readonly": false, "cmd": "cap average"}]}, "capslope": {"base": "/capslope", "params": [{"path": "", "type": "float", "kids": 6},
+{"path": "send", "type": "text", "readonly": false, "cmd": "capslope send", "visibility": 3},
+{"path": "status", "type": "text", "visibility": 3},
+{"path": "node", "type": "text", "readonly": false, "cmd": "capslope node"},
+{"path": "unit", "type": "float", "readonly": false, "cmd": "capslope unit", "description": "unit=60: mainunits/minutes, unit=1: mainunits/sec"},
+{"path": "ref", "type": "float", "readonly": false, "cmd": "capslope ref"},
+{"path": "buffersize", "type": "float", "readonly": false, "cmd": "capslope buffersize"}]}}

cfg/sea/camea-be-filter.addon.json

@@ -1,41 +1,13 @@
-{"t_be_filter": {"base": "/t_be_filter", "params": [
+{"t_be_filter":
-{"path": "", "type": "none", "kids": 11},
+ {
-{"path": "send", "type": "text", "readonly": false, "cmd": "t_be_filter send", "visibility": 3},
+  "base": "/t_be_filter",
-{"path": "status", "type": "text", "visibility": 3},
+  "params": [
-{"path": "a", "type": "float", "kids": 4},
+   {"path": "", "type": "none", "kids": 11},
-{"path": "a/curve", "type": "text", "readonly": false, "cmd": "t_be_filter a/curve", "kids": 1},
+   {"path": "a", "type": "float"},
-{"path": "a/curve/points", "type": "floatvarar", "readonly": false, "cmd": "t_be_filter a/curve/points", "visibility": 3},
+   {"path": "b", "type": "float"},
-{"path": "a/alarm", "type": "float", "readonly": false, "cmd": "t_be_filter a/alarm"},
+   {"path": "c", "type": "float"},
-{"path": "a/stddev", "type": "float"},
+   {"path": "d", "type": "float"},
-{"path": "a/raw", "type": "float"},
+   {"path": "det", "type": "float"}
-{"path": "b", "type": "float", "kids": 4},
+   ]
-{"path": "b/curve", "type": "text", "readonly": false, "cmd": "t_be_filter b/curve", "kids": 1},
+ }
-{"path": "b/curve/points", "type": "floatvarar", "readonly": false, "cmd": "t_be_filter b/curve/points", "visibility": 3},
+}
-{"path": "b/alarm", "type": "float", "readonly": false, "cmd": "t_be_filter b/alarm"},
-{"path": "b/stddev", "type": "float"},
-{"path": "b/raw", "type": "float"},
-{"path": "c", "type": "float", "kids": 4},
-{"path": "c/curve", "type": "text", "readonly": false, "cmd": "t_be_filter c/curve", "kids": 1},
-{"path": "c/curve/points", "type": "floatvarar", "readonly": false, "cmd": "t_be_filter c/curve/points", "visibility": 3},
-{"path": "c/alarm", "type": "float", "readonly": false, "cmd": "t_be_filter c/alarm"},
-{"path": "c/stddev", "type": "float"},
-{"path": "c/raw", "type": "float"},
-{"path": "d", "type": "float", "kids": 4},
-{"path": "d/curve", "type": "text", "readonly": false, "cmd": "t_be_filter d/curve", "kids": 1},
-{"path": "d/curve/points", "type": "floatvarar", "readonly": false, "cmd": "t_be_filter d/curve/points", "visibility": 3},
-{"path": "d/alarm", "type": "float", "readonly": false, "cmd": "t_be_filter d/alarm"},
-{"path": "d/stddev", "type": "float"},
-{"path": "d/raw", "type": "float"},
-{"path": "det", "type": "float", "kids": 4},
-{"path": "det/curve", "type": "text", "readonly": false, "cmd": "t_be_filter det/curve", "kids": 1},
-{"path": "det/curve/points", "type": "floatvarar", "readonly": false, "cmd": "t_be_filter det/curve/points", "visibility": 3},
-{"path": "det/alarm", "type": "float", "readonly": false, "cmd": "t_be_filter det/alarm"},
-{"path": "det/stddev", "type": "float"},
-{"path": "det/raw", "type": "float"},
-{"path": "display", "type": "text", "readonly": false, "cmd": "t_be_filter display"},
-{"path": "relay1", "type": "text", "readonly": false, "cmd": "t_be_filter relay1", "description": "may be 0,1,A,B,C,D for on,off or alarm channel"},
-{"path": "relay2", "type": "text", "readonly": false, "cmd": "t_be_filter relay2", "description": "may be 0,1,A,B,C,D for on,off or alarm channel"},
-{"path": "remote", "type": "bool"}]},
-
-"addonlock_camea-be-filter": {"base": "/addonlock_camea-be-filter", "params": [
-{"path": "", "type": "text", "readonly": false, "cmd": "addonlock_camea-be-filter = "}]}}

cfg/sea/camea-be-filter_cfg.py

@@ -1,24 +0,0 @@
-Node('cfg/sea/camea-be-filter.cfg',
-     'Camea Be-Filter',
-     interface='5000',
-     name='camea-be-filter',
-)
-
-Mod('sea_addons',
-    'secop_psi.sea.SeaClient',
-    'addons sea connection for camea-be-filter.addon',
-    config='camea-be-filter.addon',
-    service='addons',
-)
-
-Mod('t_be_filter',
-    'secop_psi.sea.SeaReadable',
-    io='sea_addons',
-    sea_object='t_be_filter',
-)
-
-Mod('addonlock_camea-be-filter',
-    'secop_psi.sea.SeaWritable',
-    io='sea_addons',
-    sea_object='addonlock_camea-be-filter',
-)

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},
@@ -80,7 +78,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float"},
 {"path": "hr", "type": "float"},
 {"path": "hc", "type": "float"},
@@ -123,7 +121,7 @@
 {"path": "h5", "type": "float"},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}},
 {"path": "hfb", "type": "float"},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float"},
 {"path": "nl", "type": "float"},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth"},

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},
@@ -86,7 +84,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float"},
 {"path": "hr", "type": "float"},
 {"path": "hc", "type": "float"},
@@ -129,7 +127,7 @@
 {"path": "h5", "type": "float"},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}},
 {"path": "hfb", "type": "float"},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float"},
 {"path": "nl", "type": "float"},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth"},

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": [
@@ -85,7 +83,7 @@
 {"path": "mcr", "type": "float"},
 {"path": "mot", "type": "float"},
 {"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float"},
 {"path": "hr", "type": "float"},
 {"path": "hc", "type": "float"},
@@ -128,7 +126,7 @@
 {"path": "h5", "type": "float"},
 {"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}},
 {"path": "hfb", "type": "float"},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float"},
 {"path": "nl", "type": "float"},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth"},

cfg/sea/ccrpe.config.json

@@ -89,26 +89,26 @@
 {"path": "status", "type": "text", "visibility": 3},
 {"path": "autodevice", "type": "bool", "readonly": false, "cmd": "cc autodevice"},
 {"path": "fav", "type": "bool", "readonly": false, "cmd": "cc fav"},
-{"path": "f", "type": "float", "visibility": 3},
+{"path": "f", "type": "float"},
-{"path": "fs", "type": "enum", "enum": {"ok": 0, "no_sens": 1}, "readonly": false, "cmd": "cc fs", "visibility": 3},
+{"path": "fs", "type": "enum", "enum": {"ok": 0, "no_sens": 1}, "readonly": false, "cmd": "cc fs"},
 {"path": "mav", "type": "bool", "readonly": false, "cmd": "cc mav"},
-{"path": "fm", "type": "enum", "enum": {"idle": 0, "opening": 1, "closing": 2, "opened": 3, "closed": 4, "no_motor": 5}, "visibility": 3},
+{"path": "fm", "type": "enum", "enum": {"idle": 0, "opening": 1, "closing": 2, "opened": 3, "closed": 4, "no_motor": 5}},
-{"path": "fa", "type": "enum", "enum": {"fixed": 0, "controlled": 1, "automatic": 2, "offline": 3}, "readonly": false, "cmd": "cc fa", "visibility": 3},
+{"path": "fa", "type": "enum", "enum": {"fixed": 0, "controlled": 1, "automatic": 2, "offline": 3}, "readonly": false, "cmd": "cc fa"},
-{"path": "mp", "type": "float", "readonly": false, "cmd": "cc mp", "visibility": 3},
+{"path": "mp", "type": "float", "readonly": false, "cmd": "cc mp"},
-{"path": "msp", "type": "float", "visibility": 3},
+{"path": "msp", "type": "float"},
-{"path": "mmp", "type": "float", "visibility": 3},
+{"path": "mmp", "type": "float"},
-{"path": "mc", "type": "float", "readonly": false, "cmd": "cc mc", "visibility": 3},
+{"path": "mc", "type": "float", "readonly": false, "cmd": "cc mc"},
-{"path": "mfc", "type": "float", "readonly": false, "cmd": "cc mfc", "visibility": 3},
+{"path": "mfc", "type": "float", "readonly": false, "cmd": "cc mfc"},
-{"path": "moc", "type": "float", "readonly": false, "cmd": "cc moc", "visibility": 3},
+{"path": "moc", "type": "float", "readonly": false, "cmd": "cc moc"},
-{"path": "mtc", "type": "float", "readonly": false, "cmd": "cc mtc", "visibility": 3},
+{"path": "mtc", "type": "float", "readonly": false, "cmd": "cc mtc"},
-{"path": "mtl", "type": "float", "visibility": 3},
+{"path": "mtl", "type": "float"},
-{"path": "mft", "type": "float", "readonly": false, "cmd": "cc mft", "visibility": 3},
+{"path": "mft", "type": "float", "readonly": false, "cmd": "cc mft"},
-{"path": "mt", "type": "float", "visibility": 3},
+{"path": "mt", "type": "float"},
-{"path": "mo", "type": "float", "visibility": 3},
+{"path": "mo", "type": "float"},
-{"path": "mcr", "type": "float", "visibility": 3},
+{"path": "mcr", "type": "float"},
-{"path": "mot", "type": "float", "visibility": 3},
+{"path": "mot", "type": "float"},
-{"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open", "visibility": 3},
+{"path": "mw", "type": "float", "readonly": false, "cmd": "cc mw", "description": "correction pulse after automatic open"},
-{"path": "hav", "type": "bool", "readonly": false, "cmd": "cc hav"},
+{"path": "hav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc hav"},
 {"path": "h", "type": "float", "visibility": 3},
 {"path": "hr", "type": "float", "visibility": 3},
 {"path": "hc", "type": "float", "visibility": 3},
@@ -132,26 +132,26 @@
 {"path": "hms", "type": "float", "visibility": 3},
 {"path": "hit", "type": "float", "readonly": false, "cmd": "cc hit", "visibility": 3},
 {"path": "hft", "type": "int", "readonly": false, "cmd": "cc hft", "visibility": 3},
-{"path": "hea", "type": "enum", "enum": {"0": 0, "1": 1, "6": 2}, "readonly": false, "cmd": "cc hea"},
+{"path": "hea", "type": "enum", "enum": {"0": 0, "1": 1, "6": 6}, "readonly": false, "cmd": "cc hea"},
-{"path": "hch", "type": "int", "readonly": false, "cmd": "cc hch", "visibility": 3},
+{"path": "hch", "type": "int", "readonly": false, "cmd": "cc hch"},
-{"path": "hwr0", "type": "float", "readonly": false, "cmd": "cc hwr0", "visibility": 3},
+{"path": "hwr0", "type": "float", "readonly": false, "cmd": "cc hwr0"},
-{"path": "hem0", "type": "float", "readonly": false, "cmd": "cc hem0", "description": "sensor length in mm from top to empty pos.", "visibility": 3},
+{"path": "hem0", "type": "float", "readonly": false, "cmd": "cc hem0", "description": "sensor length in mm from top to empty pos."},
-{"path": "hfu0", "type": "float", "readonly": false, "cmd": "cc hfu0", "description": "sensor length in mm from top to full pos.", "visibility": 3},
+{"path": "hfu0", "type": "float", "readonly": false, "cmd": "cc hfu0", "description": "sensor length in mm from top to full pos."},
-{"path": "hd0", "type": "float", "readonly": false, "cmd": "cc hd0", "description": "external sensor drive current (mA)", "visibility": 3},
+{"path": "hd0", "type": "float", "readonly": false, "cmd": "cc hd0", "description": "external sensor drive current (mA)"},
-{"path": "h0", "type": "float", "visibility": 3},
+{"path": "h0", "type": "float"},
-{"path": "hs0", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3},
+{"path": "hs0", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}},
-{"path": "h1", "type": "float", "visibility": 3},
+{"path": "h1", "type": "float"},
-{"path": "hs1", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3},
+{"path": "hs1", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}},
-{"path": "h2", "type": "float", "visibility": 3},
+{"path": "h2", "type": "float"},
-{"path": "hs2", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3},
+{"path": "hs2", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}},
-{"path": "h3", "type": "float", "visibility": 3},
+{"path": "h3", "type": "float"},
-{"path": "hs3", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3},
+{"path": "hs3", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}},
-{"path": "h4", "type": "float", "visibility": 3},
+{"path": "h4", "type": "float"},
-{"path": "hs4", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3},
+{"path": "hs4", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}},
-{"path": "h5", "type": "float", "visibility": 3},
+{"path": "h5", "type": "float"},
-{"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}, "visibility": 3},
+{"path": "hs5", "type": "enum", "enum": {"sens_ok": 0, "sens_warm": 1, "no_sens": 2, "timeout": 3, "not_yet_read": 4, "disabled": 5}},
 {"path": "hfb", "type": "float", "visibility": 3},
-{"path": "nav", "type": "bool", "readonly": false, "cmd": "cc nav"},
+{"path": "nav", "type": "enum",  "type": "enum", "enum": {"none": 0, "int": 1, "ext": 2}, "readonly": false, "cmd": "cc nav"},
 {"path": "nu", "type": "float", "visibility": 3},
 {"path": "nl", "type": "float", "visibility": 3},
 {"path": "nth", "type": "float", "readonly": false, "cmd": "cc nth", "visibility": 3},
@@ -182,6 +182,114 @@
 {"path": "tq", "type": "float", "visibility": 3},
 {"path": "bdl", "type": "float", "readonly": false, "cmd": "cc bdl"}]},
 
+"nv": {"base": "/nv", "params": [
+{"path": "", "type": "enum", "enum": {"fixed": 0, "controlled": 1, "automatic": 2, "close": 3, "open": 4}, "readonly": false, "cmd": "nv", "kids": 11},
+{"path": "send", "type": "text", "readonly": false, "cmd": "nv send", "visibility": 3},
+{"path": "status", "type": "text", "visibility": 3},
+{"path": "motstat", "type": "enum", "enum": {"idle": 0, "opening": 1, "closing": 2, "opened": 3, "closed": 4, "no_motor": 5}},
+{"path": "flow", "type": "float"},
+{"path": "set", "type": "float", "readonly": false, "cmd": "nv set"},
+{"path": "flowmax", "type": "float", "readonly": false, "cmd": "nv flowmax"},
+{"path": "flowp", "type": "float"},
+{"path": "span", "type": "float"},
+{"path": "ctrl", "type": "none", "kids": 13},
+{"path": "ctrl/regtext", "type": "text"},
+{"path": "ctrl/prop_o", "type": "float", "readonly": false, "cmd": "nv ctrl/prop_o", "description": "prop [sec/mbar] when opening. above 4 mbar a 10 times lower value is used"},
+{"path": "ctrl/prop_c", "type": "float", "readonly": false, "cmd": "nv ctrl/prop_c", "description": "prop [sec/mbar] when closing. above 4 mbar a 10 times lower value is used"},
+{"path": "ctrl/deriv_o", "type": "float", "readonly": false, "cmd": "nv ctrl/deriv_o", "description": "convergence target time [sec] when opening"},
+{"path": "ctrl/deriv_c", "type": "float", "readonly": false, "cmd": "nv ctrl/deriv_c", "description": "convergence target time [sec] when closing"},
+{"path": "ctrl/minpulse_o", "type": "float", "readonly": false, "cmd": "nv ctrl/minpulse_o", "description": "minimum close pulse [sec]"},
+{"path": "ctrl/minpulse_c", "type": "float", "readonly": false, "cmd": "nv ctrl/minpulse_c", "description": "standard close pulse [sec]"},
+{"path": "ctrl/hystpulse_o", "type": "float", "readonly": false, "cmd": "nv ctrl/hystpulse_o", "description": "motor pulse to overcome hysteresis when opening"},
+{"path": "ctrl/hystpulse_c", "type": "float", "readonly": false, "cmd": "nv ctrl/hystpulse_c", "description": "motor pulse to overcome hysteresis when closing"},
+{"path": "ctrl/tol", "type": "float", "readonly": false, "cmd": "nv ctrl/tol", "description": "valid below 3 mbar"},
+{"path": "ctrl/tolhigh", "type": "float", "readonly": false, "cmd": "nv ctrl/tolhigh", "description": "valid above 4 mbar"},
+{"path": "ctrl/openpulse", "type": "float", "readonly": false, "cmd": "nv ctrl/openpulse", "description": "time to open from completely closed to a significant opening"},
+{"path": "ctrl/adjust_minpulse", "type": "bool", "readonly": false, "cmd": "nv ctrl/adjust_minpulse", "description": "adjust minpulse automatically"},
+{"path": "autoflow", "type": "none", "kids": 24},
+{"path": "autoflow/suspended", "type": "bool", "readonly": false, "cmd": "nv autoflow/suspended"},
+{"path": "autoflow/prop", "type": "float", "readonly": false, "cmd": "nv autoflow/prop"},
+{"path": "autoflow/flowstd", "type": "float", "readonly": false, "cmd": "nv autoflow/flowstd"},
+{"path": "autoflow/flowlim", "type": "float", "readonly": false, "cmd": "nv autoflow/flowlim"},
+{"path": "autoflow/smooth", "type": "float", "readonly": false, "cmd": "nv autoflow/smooth"},
+{"path": "autoflow/difSize", "type": "float", "readonly": false, "cmd": "nv autoflow/difSize"},
+{"path": "autoflow/difRange", "type": "float", "readonly": false, "cmd": "nv autoflow/difRange"},
+{"path": "autoflow/flowSize", "type": "float", "readonly": false, "cmd": "nv autoflow/flowSize"},
+{"path": "autoflow/convTime", "type": "float", "readonly": false, "cmd": "nv autoflow/convTime"},
+{"path": "autoflow/Tmin", "type": "float", "readonly": false, "cmd": "nv autoflow/Tmin"},
+{"path": "autoflow/script", "type": "text", "readonly": false, "cmd": "nv autoflow/script"},
+{"path": "autoflow/getTemp", "type": "text", "readonly": false, "cmd": "nv autoflow/getTemp"},
+{"path": "autoflow/getTset", "type": "text", "readonly": false, "cmd": "nv autoflow/getTset"},
+{"path": "autoflow/getFlow", "type": "text", "readonly": false, "cmd": "nv autoflow/getFlow"},
+{"path": "autoflow/difBuf", "type": "text"},
+{"path": "autoflow/flowBuf", "type": "text"},
+{"path": "autoflow/flowset", "type": "float"},
+{"path": "autoflow/flowmin", "type": "float"},
+{"path": "autoflow/flowmax", "type": "float"},
+{"path": "autoflow/difmin", "type": "float"},
+{"path": "autoflow/difmax", "type": "float"},
+{"path": "autoflow/setmin", "type": "float"},
+{"path": "autoflow/setmax", "type": "float"},
+{"path": "autoflow/flowtarget", "type": "float"},
+{"path": "calib", "type": "none", "kids": 2},
+{"path": "calib/ln_per_min_per_mbar", "type": "float", "readonly": false, "cmd": "nv calib/ln_per_min_per_mbar"},
+{"path": "calib/mbar_offset", "type": "float", "readonly": false, "cmd": "nv calib/mbar_offset"}]},
+
+"hepump": {"base": "/hepump", "params": [
+{"path": "", "type": "enum", "enum": {"neodry": 8, "xds35_auto": 0, "xds35_manual": 1, "sv65": 2, "other": 3, "no": -1}, "readonly": false, "cmd": "hepump", "description": "xds35: scroll pump, sv65: leybold", "kids": 10},
+{"path": "send", "type": "text", "readonly": false, "cmd": "hepump send", "visibility": 3},
+{"path": "status", "type": "text", "visibility": 3},
+{"path": "running", "type": "bool", "readonly": false, "cmd": "hepump running"},
+{"path": "eco", "type": "bool", "readonly": false, "cmd": "hepump eco"},
+{"path": "auto", "type": "bool", "readonly": false, "cmd": "hepump auto"},
+{"path": "valve", "type": "enum", "enum": {"closed": 0, "closing": 1, "opening": 2, "opened": 3, "undefined": 4}, "readonly": false, "cmd": "hepump valve"},
+{"path": "eco_t_lim", "type": "float", "readonly": false, "cmd": "hepump eco_t_lim", "description": "switch off eco mode when T_set < eco_t_lim and T < eco_t_lim * 2"},
+{"path": "calib", "type": "float", "readonly": false, "cmd": "hepump calib", "visibility": 3},
+{"path": "health", "type": "float"}]},
+
+"hemot": {"base": "/hepump/hemot", "params": [
+{"path": "", "type": "float", "readonly": false, "cmd": "run hemot", "kids": 30},
+{"path": "send", "type": "text", "readonly": false, "cmd": "hemot send", "visibility": 3},
+{"path": "status", "type": "text", "visibility": 3},
+{"path": "is_running", "type": "int", "readonly": false, "cmd": "hemot is_running", "visibility": 3},
+{"path": "pos", "type": "float"},
+{"path": "encoder", "type": "float"},
+{"path": "zero", "type": "float", "readonly": false, "cmd": "hemot zero"},
+{"path": "lowerlimit", "type": "float", "readonly": false, "cmd": "hemot lowerlimit"},
+{"path": "upperlimit", "type": "float", "readonly": false, "cmd": "hemot upperlimit"},
+{"path": "disablelimits", "type": "bool", "readonly": false, "cmd": "hemot disablelimits"},
+{"path": "verbose", "type": "bool", "readonly": false, "cmd": "hemot verbose"},
+{"path": "target", "type": "float"},
+{"path": "runstate", "type": "enum", "enum": {"idle": 0, "running": 1, "finished": 2, "error": 3}},
+{"path": "precision", "type": "float", "readonly": false, "cmd": "hemot precision"},
+{"path": "maxencdif", "type": "float", "readonly": false, "cmd": "hemot maxencdif"},
+{"path": "id", "type": "float", "readonly": false, "cmd": "hemot id"},
+{"path": "pump_number", "type": "float", "readonly": false, "cmd": "hemot pump_number"},
+{"path": "init", "type": "float", "readonly": false, "cmd": "hemot init"},
+{"path": "maxspeed", "type": "float", "readonly": false, "cmd": "hemot maxspeed"},
+{"path": "acceleration", "type": "float", "readonly": false, "cmd": "hemot acceleration"},
+{"path": "maxcurrent", "type": "float", "readonly": false, "cmd": "hemot maxcurrent"},
+{"path": "standbycurrent", "type": "float", "readonly": false, "cmd": "hemot standbycurrent"},
+{"path": "freewheeling", "type": "bool", "readonly": false, "cmd": "hemot freewheeling"},
+{"path": "output0", "type": "bool", "readonly": false, "cmd": "hemot output0"},
+{"path": "output1", "type": "bool", "readonly": false, "cmd": "hemot output1"},
+{"path": "input3", "type": "bool"},
+{"path": "pullup", "type": "float", "readonly": false, "cmd": "hemot pullup"},
+{"path": "nopumpfeedback", "type": "bool", "readonly": false, "cmd": "hemot nopumpfeedback"},
+{"path": "eeprom", "type": "enum", "enum": {"ok": 0, "dirty": 1, "save": 2, "load": 3}, "readonly": false, "cmd": "hemot eeprom"},
+{"path": "customadr", "type": "text", "readonly": false, "cmd": "hemot customadr"},
+{"path": "custompar", "type": "float", "readonly": false, "cmd": "hemot custompar"}]},
+
+"nvflow": {"base": "/nvflow", "params": [
+{"path": "", "type": "float", "kids": 7},
+{"path": "send", "type": "text", "readonly": false, "cmd": "nvflow send", "visibility": 3},
+{"path": "status", "type": "text", "visibility": 3},
+{"path": "stddev", "type": "float"},
+{"path": "nsamples", "type": "int", "readonly": false, "cmd": "nvflow nsamples"},
+{"path": "offset", "type": "float", "readonly": false, "cmd": "nvflow offset"},
+{"path": "scale", "type": "float", "readonly": false, "cmd": "nvflow scale"},
+{"path": "save", "type": "bool", "readonly": false, "cmd": "nvflow save", "description": "unchecked: current calib is not saved. set checked: save calib"}]},
+
 "warmup": {"base": "/warmup", "params": [
 {"path": "", "type": "float", "readonly": false, "cmd": "run warmup", "description": "warmup", "kids": 28},
 {"path": "send", "type": "text", "readonly": false, "cmd": "warmup send", "visibility": 3},
@@ -211,4 +319,10 @@
 {"path": "running", "type": "int"},
 {"path": "tolerance", "type": "float", "readonly": false, "cmd": "warmup tolerance"},
 {"path": "maxwait", "type": "float", "readonly": false, "cmd": "warmup maxwait"},
-{"path": "settle", "type": "float", "readonly": false, "cmd": "warmup settle"}]}}
+{"path": "settle", "type": "float", "readonly": false, "cmd": "warmup settle"}]},
+
+"p": {"base": "/p", "params": [
+{"path": "", "type": "float", "kids": 3},
+{"path": "send", "type": "text", "readonly": false, "cmd": "p send", "visibility": 3},
+{"path": "status", "type": "text", "visibility": 3},
+{"path": "raw", "type": "float"}]}}