From 1619e042e9d13fd6fe7cd2241822c70cb4fd8cef Mon Sep 17 00:00:00 2001 From: amor Date: Tue, 8 Jun 2021 11:06:39 +0200 Subject: [PATCH] added fftf furnace and smamor --- cfg/main/{mbe.cfg => fftf.cfg} | 6 ++-- cfg/main/smamor.cfg | 24 +++++++++++++ cfg/sea/{mbe.config.json => fftf.config.json} | 0 cfg/sea/mbe.cfg | 29 --------------- cfg/sea/smamor.config.json | 36 +++++++++++++++++++ 5 files changed, 63 insertions(+), 32 deletions(-) rename cfg/main/{mbe.cfg => fftf.cfg} (86%) create mode 100644 cfg/main/smamor.cfg rename cfg/sea/{mbe.config.json => fftf.config.json} (100%) delete mode 100644 cfg/sea/mbe.cfg create mode 100644 cfg/sea/smamor.config.json diff --git a/cfg/main/mbe.cfg b/cfg/main/fftf.cfg similarity index 86% rename from cfg/main/mbe.cfg rename to cfg/main/fftf.cfg index 31b7f4b..b9c2b74 100644 --- a/cfg/main/mbe.cfg +++ b/cfg/main/fftf.cfg @@ -1,11 +1,11 @@ [NODE] description = thin film oven for AMOR -id = mbe.config.sea.psi.ch +id = fftf.config.sea.psi.ch [sea_main] class = secop_psi.sea.SeaClient -description = main sea connection for mbe.config -config = mbe.config +description = main sea connection for fftf.config +config = fftf.config service = main [tt] diff --git a/cfg/main/smamor.cfg b/cfg/main/smamor.cfg new file mode 100644 index 0000000..781410a --- /dev/null +++ b/cfg/main/smamor.cfg @@ -0,0 +1,24 @@ +[NODE] +description = Keithley 2450 sourcemeter +id = smamor.config.sea.psi.ch + +[sea_main] +class = secop_psi.sea.SeaClient +description = main sea connection for smamor.config +config = smamor.config +service = main + +[smi] +class = secop_psi.sea.SeaDrivable +iodev = sea_main +sea_object = smi + +[smv] +class = secop_psi.sea.SeaDrivable +iodev = sea_main +sea_object = smv + +[r] +class = secop_psi.sea.SeaReadable +iodev = sea_main +sea_object = r diff --git a/cfg/sea/mbe.config.json b/cfg/sea/fftf.config.json similarity index 100% rename from cfg/sea/mbe.config.json rename to cfg/sea/fftf.config.json diff --git a/cfg/sea/mbe.cfg b/cfg/sea/mbe.cfg deleted file mode 100644 index ddc1aab..0000000 --- a/cfg/sea/mbe.cfg +++ /dev/null @@ -1,29 +0,0 @@ -[NODE] -description = thin film oven for AMOR -id = mbe.config.sea.psi.ch - -[sea_main] -class = secop_psi.sea.SeaClient -description = main sea connection for mbe.config -config = mbe.config -service = main - -[tt] -class = secop_psi.sea.SeaDrivable -iodev = sea_main -sea_object = tt - -[cc] -class = secop_psi.sea.SeaReadable -iodev = sea_main -sea_object = cc - -[p] -class = secop_psi.sea.SeaReadable -iodev = sea_main -sea_object = p - -[table] -class = secop_psi.sea.SeaReadable -iodev = sea_main -sea_object = table diff --git a/cfg/sea/smamor.config.json b/cfg/sea/smamor.config.json new file mode 100644 index 0000000..6d162f0 --- /dev/null +++ b/cfg/sea/smamor.config.json @@ -0,0 +1,36 @@ +{"smi": {"base": "/smi", "params": [ +{"path": "", "type": "float", "readonly": false, "cmd": "run smi", "kids": 13}, +{"path": "send", "type": "text", "readonly": false, "cmd": "smi send", "visibility": 3}, +{"path": "status", "type": "text", "visibility": 3}, +{"path": "is_running", "type": "int", "readonly": false, "cmd": "smi is_running", "visibility": 3}, +{"path": "target", "type": "float"}, +{"path": "output", "type": "bool", "readonly": false, "cmd": "smi output"}, +{"path": "set", "type": "float", "readonly": false, "cmd": "smi set"}, +{"path": "limited", "type": "float"}, +{"path": "limit", "type": "float", "readonly": false, "cmd": "smi limit"}, +{"path": "lastmsg", "type": "text"}, +{"path": "script", "type": "text", "readonly": false, "cmd": "smi script", "description": "scriptfile containing 'while' and 'halt' scripts"}, +{"path": "delay", "type": "float", "readonly": false, "cmd": "smi delay"}, +{"path": "step", "type": "float", "readonly": false, "cmd": "smi step"}, +{"path": "codeversion", "type": "text", "visibility": 3}]}, + +"smv": {"base": "/smv", "params": [ +{"path": "", "type": "float", "readonly": false, "cmd": "run smv", "kids": 13}, +{"path": "send", "type": "text", "readonly": false, "cmd": "smv send", "visibility": 3}, +{"path": "status", "type": "text", "visibility": 3}, +{"path": "is_running", "type": "int", "readonly": false, "cmd": "smv is_running", "visibility": 3}, +{"path": "target", "type": "float"}, +{"path": "output", "type": "bool", "readonly": false, "cmd": "smv output"}, +{"path": "set", "type": "float", "readonly": false, "cmd": "smv set"}, +{"path": "limited", "type": "float"}, +{"path": "limit", "type": "float", "readonly": false, "cmd": "smv limit"}, +{"path": "lastmsg", "type": "text"}, +{"path": "script", "type": "text", "readonly": false, "cmd": "smv script", "description": "scriptfile containing 'while' and 'halt' scripts"}, +{"path": "delay", "type": "float", "readonly": false, "cmd": "smv delay"}, +{"path": "step", "type": "float", "readonly": false, "cmd": "smv step"}, +{"path": "codeversion", "type": "text", "visibility": 3}]}, + +"r": {"base": "/r", "params": [ +{"path": "", "type": "float", "kids": 2}, +{"path": "send", "type": "text", "readonly": false, "cmd": "r send", "visibility": 3}, +{"path": "status", "type": "text", "visibility": 3}]}}