From 16abfdc65e3ac55fbd1a2e84432341401f8cc757 Mon Sep 17 00:00:00 2001
From: sans <markus.zolliker@psi.ch>
Date: Tue, 22 Oct 2024 10:52:23 +0200
Subject: [PATCH] fix ma7_samplehead_cfg and thermalcond_cfg

---
 cfg/main/ma7_sampleheat_cfg.py     | 15 ++++++++++++---
 cfg/sea/ma7_sampleheat.config.json |  4 ++--
 cfg/sea/thermalcond.stick.json     | 16 ++++++++++++++++
 cfg/stick/thermalcond_cfg.py       |  8 ++++++++
 4 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/cfg/main/ma7_sampleheat_cfg.py b/cfg/main/ma7_sampleheat_cfg.py
index d0c718b..ca59d01 100644
--- a/cfg/main/ma7_sampleheat_cfg.py
+++ b/cfg/main/ma7_sampleheat_cfg.py
@@ -4,7 +4,7 @@ Node('ma7.config.sea.psi.ch',
 
 Mod('sea_main',
     'frappy_psi.sea.SeaClient',
-    'main sea connection for ma7.config',
+    'main sea connection for ma7_sampleheat.config',
     config='ma7_sampleheat.config',
     service='main',
 )
@@ -25,6 +25,7 @@ Mod('th',
     rel_paths=['ts_2', 'setsamp']
 )
 
+
 Mod('ts0',
     'frappy_psi.sea.SeaReadable',
     'sample stick exch. temperature',
@@ -37,13 +38,21 @@ Mod('ts',
     'frappy_psi.parmod.Converging',
     'test for parmod',
     unit='K',
-    value_param='th.value',
-    target_param='th.setsamp',
+    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',
diff --git a/cfg/sea/ma7_sampleheat.config.json b/cfg/sea/ma7_sampleheat.config.json
index eecd44d..aff6d12 100644
--- a/cfg/sea/ma7_sampleheat.config.json
+++ b/cfg/sea/ma7_sampleheat.config.json
@@ -367,14 +367,14 @@
 {"path": "send", "type": "text", "readonly": false, "cmd": "tcoil send", "visibility": 3},
 {"path": "status", "type": "text", "visibility": 3},
 {"path": "excitation", "type": "float", "readonly": false, "cmd": "tcoil excitation", "visibility": 3},
-{"path": "ta", "type": "float", "visibility": 3, "kids": 3},
+{"path": "ta", "type": "float", "kids": 3},
 {"path": "ta/enable", "type": "bool", "readonly": false, "cmd": "tcoil ta/enable"},
 {"path": "ta/r", "type": "float"},
 {"path": "ta/curve", "type": "text", "readonly": false, "cmd": "tcoil ta/curve", "kids": 3},
 {"path": "ta/curve/adjust", "type": "text", "readonly": false, "cmd": "tcoil ta/curve/adjust"},
 {"path": "ta/curve/points", "type": "floatvarar", "readonly": false, "cmd": "tcoil ta/curve/points"},
 {"path": "ta/curve/cpoints", "type": "floatvarar", "readonly": false, "cmd": "tcoil ta/curve/cpoints"},
-{"path": "tb", "type": "float", "visibility": 3, "kids": 3},
+{"path": "tb", "type": "float", "kids": 3},
 {"path": "tb/enable", "type": "bool", "readonly": false, "cmd": "tcoil tb/enable"},
 {"path": "tb/r", "type": "float"},
 {"path": "tb/curve", "type": "text", "readonly": false, "cmd": "tcoil tb/curve", "kids": 3},
diff --git a/cfg/sea/thermalcond.stick.json b/cfg/sea/thermalcond.stick.json
index 1e22470..9359c31 100644
--- a/cfg/sea/thermalcond.stick.json
+++ b/cfg/sea/thermalcond.stick.json
@@ -71,6 +71,22 @@
 {"path": "s4/curve/points", "type": "floatvarar", "readonly": false, "cmd": "res s4/curve/points", "visibility": 3},
 {"path": "s4/alarm", "type": "float", "readonly": false, "cmd": "res s4/alarm"},
 {"path": "s4/raw", "type": "float"},
+{"path": "s5", "type": "float", "kids": 14},
+{"path": "s5/active", "type": "enum", "enum": {"inactive": 0, "active": 1}, "readonly": false, "cmd": "res s5/active"},
+{"path": "s5/autorange", "type": "bool", "readonly": false, "cmd": "res s5/autorange", "description": "autorange (common for all channels)"},
+{"path": "s5/range", "type": "text", "readonly": false, "cmd": "res s5/range", "description": "resistance range in Ohm"},
+{"path": "s5/range_num", "type": "int"},
+{"path": "s5/excitation", "type": "text", "readonly": false, "cmd": "res s5/excitation", "description": "excitation with unit, i.e. 2uV or 3pA"},
+{"path": "s5/excitation_num", "type": "int"},
+{"path": "s5/excitation_mode", "type": "enum", "enum": {"voltage": 0, "current": 1, "off": 2}},
+{"path": "s5/pause", "type": "int", "readonly": false, "cmd": "res s5/pause", "description": "pause time [sec] after channel change"},
+{"path": "s5/filter", "type": "int", "readonly": false, "cmd": "res s5/filter", "description": "filter average time [sec]"},
+{"path": "s5/dwell", "type": "int", "readonly": false, "cmd": "res s5/dwell", "description": "dwell time [sec]. Total time per channel: pause + filter + dwell"},
+{"path": "s5/status", "type": "text"},
+{"path": "s5/curve", "type": "text", "readonly": false, "cmd": "res s5/curve", "kids": 1},
+{"path": "s5/curve/points", "type": "floatvarar", "readonly": false, "cmd": "res s5/curve/points", "visibility": 3},
+{"path": "s5/alarm", "type": "float", "readonly": false, "cmd": "res s5/alarm"},
+{"path": "s5/raw", "type": "float"},
 {"path": "analog2", "type": "float", "readonly": false, "cmd": "res analog2"},
 {"path": "remote", "type": "bool"},
 {"path": "display", "type": "text", "readonly": false, "cmd": "res display"}]}}
diff --git a/cfg/stick/thermalcond_cfg.py b/cfg/stick/thermalcond_cfg.py
index 2547eec..0d070d9 100644
--- a/cfg/stick/thermalcond_cfg.py
+++ b/cfg/stick/thermalcond_cfg.py
@@ -36,3 +36,11 @@ Mod('R4',
     sea_object='res',
     rel_paths=['s4'],
 )
+
+
+Mod('R5',
+    'frappy_psi.sea.SeaReadable', '',
+    io='sea_stick',
+    sea_object='res',
+    rel_paths=['s5'],
+)