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

tcl/drivers/ccu4.tcl

@@ -123,7 +123,7 @@ proc stdConfig::ccu4 {{title CCU4} args} {
 
     node hav out
     prop newline 1
-    prop enum 1
+    prop enum none,int,ext
     prop label "He lev. available"
   
     node h upd -secop=helev

tcl/drivers/ccu4ext.tcl

@@ -143,6 +143,9 @@ proc ccu4ext::fillExt {type} {
   } else {
     set valve [sctval /cc/hv]
     set auto [sctval /cc/ha]
+    if {[sctval /cc/hav] != 2} {  # must be on 2=ext
+      hset /cc/hav 2
+    }
   }
   set errtxt ""
   set sm [expr [DoubleTime] > [silent 0 sct change_time] + 10]

tcl/drivers/hcp.tcl

@@ -12,7 +12,9 @@ proc stdConfig::hcp {} {
   prop update hcp::update
   prop complete hcp::complete
 
-  obj hcp rd
+  obj hcp wr
+  prop check hcp::setMain
+  prop write hcp::writeMain
   prop reg M0
   kids "high voltage" {
 
@@ -53,6 +55,14 @@ proc stdConfig::hcp {} {
 }
 
 
+proc hcp::setMain {} {
+  hset [sct]/set [sct target]
+}
+
+proc hcp::writeMain {} {
+  return hcp::read
+}
+
 proc hcp::read {} {
   sct send ">[sct reg]?"
   return update

tcl/drivers/magfield.tcl

@@ -247,8 +247,13 @@ proc magfield::run {} {
     if {[sct phase] != 0 || abs($tf - $pf) > $tol || $pm != 1} {
       # we have to go to persistent field
       if {![sct leads_at_field]} {
+        if {[sct phase] == 2 &&  $now > [silent $now sct start_phase2] + 300} {
+          sct phase 1
+          clientlog "timeout ramping to persistent field -> redo"
+        }
         if {[sct phase] < 2} {
           sct phase 2 ;# ramping leads to field 
+          sct start_phase2 $now
           msg "ramp to persistent field $pf"
           lassign [check_field $pf] ok
           if {!$ok} {