From 3203c6c9b3b98e944fce41af7e68f778552d526b Mon Sep 17 00:00:00 2001
From: Markus Zolliker <markus.zolliker@psi.ch>
Date: Thu, 5 Jun 2025 10:20:54 +0200
Subject: [PATCH] [WIP] clean dil5 configuration

---
 cfg/dil5_cfg.py | 203 ++++++++++++++++--------------------------------
 1 file changed, 69 insertions(+), 134 deletions(-)

diff --git a/cfg/dil5_cfg.py b/cfg/dil5_cfg.py
index d16de6d..16e0658 100644
--- a/cfg/dil5_cfg.py
+++ b/cfg/dil5_cfg.py
@@ -11,13 +11,13 @@ lsc_uri = '192.168.1.2:7777'
 #lsc_uri='serial:///dev/ttyACM1?baudrate=57600+parity=odd+bytesize=7+stopbits=1',
 
 
-Node('dil5.psi.ch',
-     'dil5 with state machine for condensing and removing',
+Node('dil5_logo.psi.ch',
+     'dil5 logo test',
      interface='tcp://5000',
      secondary = ['ws://8010']
 )
 
-Mod('io',
+Mod('logo',
     'frappy_psi.logo.IO',
     '',
     ip_address = "192.168.0.3",
@@ -26,155 +26,101 @@ Mod('io',
 )
 
 Mod('V1',
-    'frappy_psi.logo.Valve',
+    'frappy_psi.logo.DigitalActuator',
     'Valves',
-    io = 'io',
-    vm_address_input ="V1025.0",
-    vm_address_output ="V1064.3"
+    io = 'logo',
+    feedback_addr ="V1025.0",
+    output_addr ="V1064.3"
 )
 
 Mod('V2',
-    'frappy_psi.logo.Valve',
-    'Valves',
-    io = 'io',
-    vm_address_input ="V1024.2",
-    vm_address_output ="V1064.0",
+    'frappy_psi.logo.DigitalActuator',
+    'dil bypass',
+    io = 'logo',
+    feedback_addr ="V1024.2",
+    output_addr ="V1064.0",
 )
 
 Mod('V4',
-    'frappy_psi.logo.Valve',
-    'Valves',
-    io = 'io',
-    vm_address_input ="V1024.5",
-    vm_address_output ="V1064.7",
+    'frappy_psi.logo.DigitalActuator',
+    'compressor to dump',
+    io = 'logo',
+    # feedback_addr ="V1024.5",  # not verified
+    output_addr ="V1064.7",
+    target_addr ="V404.1",
 )
 
 Mod('V5',
-    'frappy_psi.logo.Valve',
-    'Valves',
-    io = 'io',
-    vm_address_input ="V1024.4",
-    vm_address_output ="V1064.2"
+    'frappy_psi.logo.DigitalActuator',
+    'compressor input',
+    io = 'logo',
+    feedback_addr ="V1024.4",
+    output_addr ="V1064.2",
 )
 
 Mod('V9',
-    'frappy_psi.logo.Valve',
-    'Valves',
-    io = 'io',
-    vm_address_input ="V1024.3",
-    vm_address_output ="V404.1",
+    'frappy_psi.logo.DelayedActuator',
+    'dump output',
+    io = 'logo',
+    delay_addr = 'VW24',
+    feedback_addr ="V1024.3",
+    output_addr ="V1064.5",
+    target_addr ="V404.3",
 )
 
-Mod('pump',
-    'frappy_psi.logo.FluidMachines',
-    'Pump',
-    io = 'io',
-    vm_address_output ="V414.1"
+Mod('forepump',
+    'frappy_psi.logo.DigitalActuator',
+    'forepump',
+    io = 'logo',
+    output_addr ="V1064.6",
+    target_addr ="V404.4",
 )
 
 Mod('compressor',
-    'frappy_psi.logo.FluidMachines',
-    'Compressor',
-    io = 'io',
-    vm_address_output ="V400.1"
+    'frappy_psi.logo.DigitalActuator',
+    '',
+    io = 'logo',
+    output_addr ="V1064.4",
+    target_addr ="V404.2",
 )
 
 Mod('p2',
-    'frappy_psi.logo.Pressure',
-    'Pressure in mBar',
-    io = 'io',
-    vm_address ="VW0",
+    'frappy_psi.logo.Value',
+    'pressure after compressor',
+    io = 'logo',
+    addr ="VW0",
+    value = Param(unit='mbar'),
 )
 
 Mod('p1',
-    'frappy_psi.logo.Pressure',
-    'Pressure in mBar',
-    io = 'io',
-    vm_address ="VW2",
+    'frappy_psi.logo.Value',
+    'dump pressure',
+    io = 'logo',
+    addr ="VW28",
+    value = Param(unit='mbar'),
 )
 
 Mod('p5',
-    'frappy_psi.logo.Pressure',
-    'Pressure in mBar',
-    io = 'io',
-    vm_address ="VW4",
+    'frappy_psi.logo.Value',
+    'pressure after forepump',
+    io = 'logo',
+    addr ="VW4",
+    value = Param(unit='mbar'),
 )
 
-Mod('Druckluft',
+Mod('airpressure',
     'frappy_psi.logo.Airpressure',
     'Airpressure state',
-    io = 'io',
+    io = 'logo',
     vm_address ="VW6",
 )
 
-
-
-Mod('SF1',
-    'frappy_psi.logo.safetyfeatureState',
-    'Safety Feature',
-    io = 'io',
-    vm_address ="V410.1",
-)
-
-Mod('SF2',
-    'frappy_psi.logo.safetyfeatureState',
-    'Safety Feature',
-    io = 'io',
-    vm_address ="V406.1",
-)
-
-Mod('SF3',
-    'frappy_psi.logo.safetyfeatureState',
-    'Safety Feature',
-    io = 'io',
-    vm_address ="V408.1",
-)
-
-Mod('SF4',
-    'frappy_psi.logo.safetyfeatureState',
-    'Safety Feature',
-    io = 'io',
-    vm_address ="V412.1",
-)
-
-Mod('p2max',
-    'frappy_psi.logo.safetyfeatureParam',
-    'Safety Feature Param',
-    io = 'io',
-    target = 2000,
-    vm_address ="VW8",
-)
-
-Mod('pcond',
-    'frappy_psi.logo.safetyfeatureParam',
-    'Safety Feature Param',
-    io = 'io',
-    target = 1800,
-    vm_address ="VW10",
-)
-
-Mod('p5min',
-    'frappy_psi.logo.safetyfeatureParam',
-    'Safety Feature Param',
-    io = 'io',
-    target = 0,
-    vm_address ="VW12",
-)
-
-Mod('p5max',
-    'frappy_psi.logo.safetyfeatureParam',
-    'Safety Feature Param',
-    io = 'io',
-    target = 900,
-    vm_address ="VW14",
-)
-
-
 Mod('io_ls273',
     'frappy_psi.ls372.StringIO',
     'io for Ls372',
     uri=lsc_uri,
     )
+
 Mod('sw',
     'frappy_psi.ls372.Switcher',
     'channel switcher',
@@ -361,10 +307,16 @@ Mod('T_cond',
     io='itc',
 )
 
-Mod('stateMachine',
-    'frappy_psi.dilution_statemachine.DIL5',
-    'Statemachine',
-    
+Mod('safety',
+    'frappy_psi.dilution.Interlock',
+    'interlock mechanism',
+    io='logo',
+)
+
+Mod('dil',
+    'frappy_psi.dilution.DIL5',
+    'dilution state machine and parameters',
+
     condenseline_pressure = "p2",
     condense_valve = "V9",
     dump_valve = "V4",
@@ -378,24 +330,7 @@ Mod('stateMachine',
     #ls372 = "res1",
     V5 = "V5",
     p1 = "p1",
-    
-    MV10 = 'MV10',
-    MV13 ='MV13',
-    MV8 = 'MV8',
-    MVB = 'MVB',
-    MV2 = 'MV2',
-
-    MV1 = 'MV1',
-    MV3a = 'MV3a',
-    MV3b = 'MV3b',
-    GV1 = 'GV1',
-    MV14 = 'MV14',
-    MV12 = 'MV12',
-    MV11 = 'MV11',
-    MV9 = 'MV9',
-    GV2 = 'GV2',
     condensing_p_low  = 150,
     condensing_p_high = 250
 )
 
-