Merge branch 'master' of gitlab.psi.ch-samenv:samenv/sea

Conflicts:
	tcl/drivers/hepump.tcl

tcl/startup/autofill.tcl

@@ -19,7 +19,7 @@ proc makeHeFill {levcmd} {
     if {$levcmd eq "ccu"} {
       makenv hefill he_ext_ccu ccu
     } elseif {$levcmd eq "ccu4ilm"} {
-      makenv hefill -driver ccu4ext he lev
+      makenv hefill -driver ccu4ext he /lev
       lappend fast_cmd {lev mode 1}
       lappend slow_cmd {lev mode 0}
     } else {
@@ -90,7 +90,7 @@ proc makeN2Fill {{option ccu} {code 0}} {
     GraphAdd n2.upper K_2 N2_Upper red
     GraphAdd n2.lower K_2 N2_Lower green
   } elseif {$option eq "ccu4ilm"} {
-    makenv ln2fill -driver ccu4ext n2 "lev n2"
+    makenv ln2fill -driver ccu4ext n2 /lev/n2
     GraphAdd lev.n2 % "N2_level" black
     if {! $c} {
       # switch silently to inactive

tcl/startup/ccu4make.tcl

@@ -20,13 +20,14 @@ proc makeCCU4 {args} {
   set badargs [list]
   set cfgdev "0"
   set hepump 0
+  set sensirion [silent 0 result instconfig sensirion]
   foreach arg $args {
     switch $arg {
       nv - nv_release_blocked {
         if {$arg eq "nv_release_blocked"} {
-          makenv nv -driver ccu4flow release_blocked
+          makenv nv -driver ccu4flow release_blocked $sensirion
         } else {
-          makenv nv -driver ccu4flow
+          makenv nv -driver ccu4flow $sensirion
         }
 #        GraphAdd cc.f mbar nv_flow red
         GraphAdd nv.flow ln/min nv_flow magenta
@@ -117,6 +118,7 @@ proc makeCCU4 {args} {
   }
   if {$hepump} {
     makeHePump
+    hsetprop /nv hepump /hepump
   }
   set cfg [ccu4_get_device_config $cfgdev codesfile]
   if {$cfg eq "" || [llength $badargs] > 0} {

tcl/startup/dilpars.tcl

@@ -0,0 +1,8 @@
+proc apply_dilpars {} {
+  catch {
+    ts auto/condenseflow [hval dilpars/condenseflow]
+  }
+  catch {
+    ts auto/circulateflow [hval dilpars/circulateflow]
+  }
+}

tcl/startup/flow_ctrl.tcl

@@ -161,7 +161,7 @@ proc flow::make {{getT flow::tmts} {getS "result tt tr"} {getF "result nv flow"}
     node difRange par 7
     node flowSize par 10
     node convTime par 30
-    node Tmin par 1.5
+    node Tmin par 10
     node script -text par "flow::task"
     prop width 24
     node getTemp -text par "$getT"

tcl/startup/frappy.tcl

@@ -177,7 +177,7 @@ proc get_param_values {hp} {
 }
 
 proc check_or_do {doit service cfgs} {
-  # result: 1: no change needed, 0: change needed, 2: failure
+  # result: 1: no change needed, 0: change needed, "ERROR:...": failure
   set result 1
   set config ""
   set stick ""
@@ -199,7 +199,7 @@ proc check_or_do {doit service cfgs} {
       if {$doit} {
         if {[hval /device/confirmed] eq [hval /device/name]} {
           set msg "do not allow frappy to change from [hval /device/name] to $config"
-          clientlog $msg
+          clientlog ERROR:$msg
           return $msg
         }
         clientlog 0