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

tcl/drivers/ccu4.tcl

@@ -228,7 +228,7 @@ proc stdConfig::ccu4 {{title CCU4} args} {
     
     node hea out
     prop label "add. He channels"
-    prop enum 0,1,6
+    prop enum 0,1,6=6
 
     node hch out -int
     prop label "LHe channel"  

tcl/drivers/luft.tcl

@@ -45,8 +45,8 @@ proc luft::writeCf {} {
   } else {
     luft::set_error "epics error: $val $errtxt"
   }
-  if {[scan [lindex [sct target] 0] %d period]} {
-    sct timeout [expr [clock seconds] + $period + 10]
+  catch {
+    sct timeout [expr [clock seconds] + $timeout + 10]
   }
   return idle
 }