diff --git a/tcl/drivers/hepump.tcl b/tcl/drivers/hepump.tcl index 18d2cde..082418a 100644 --- a/tcl/drivers/hepump.tcl +++ b/tcl/drivers/hepump.tcl @@ -10,7 +10,7 @@ proc stdConfig::hepump {{motname hemot}} { obj HePump -int wr default 0 - prop enum xds35_auto,xds35_manual,sv65,other,neodry=8,no=-1 + prop enum neodry=8,xds35_auto=0,xds35_manual=1,sv65=2,other=3,no=-1 prop help "xds35: scroll pump, sv65: leybold" prop read hepump::read prop write hepump::set_type @@ -69,7 +69,7 @@ proc hepump::visible {pumpcode} { } set runv true } elseif {$pumpcode == 8} { - set rv true + set rv false set runv true set v true } else { @@ -146,7 +146,7 @@ proc hepump::set_calib {} { } else { hsetprop [sct]/[sct @motname] group "hepump valve motor" } - set f 0.6 + set f 0.55 } elseif {$pumpcode == 3} { # other hsetprop [sct]/[sct @motname] group "hepump valve motor" set f [hval [sct]/calib] @@ -164,10 +164,10 @@ proc hepump::set_calib {} { } proc hepump::read {} { - set p [silent 0 result cc f] + set p [expr [silent 0 result cc f] * [silent 0.6 hvali /nv/calib/ln_per_min_per_mbar]] set f [silent 0 result nvflow] if {[hvali [sct]/eco] == 0 && $p > 1 && $f > 0.5 && $f < 25} { - set health [expr 100 * $f / ($p * 0.5 - 0.5)] + set health [expr 100 * $f / ($p / 1.2 - 0.5)] set health [expr [silent $health sct health] * 0.95 + 0.05 * $health] sct health $health if {abs($health - [silent 0 hval [sct]/health]) > 1} { diff --git a/tcl/ma6.config b/tcl/ma6.config index 3b5cbb5..bc79aab 100644 --- a/tcl/ma6.config +++ b/tcl/ma6.config @@ -17,6 +17,7 @@ makenv tt -driver [lsdriver] { #tt set/limit 310 makeCCU4 ma6 nv he_ilm + hupdate /nv/set 1.2 makeN2Fill ccu4ilm { ln2fill lowlevel 10 @@ -36,3 +37,12 @@ if {[result instrument] eq "tasp"} { makeIlm -channels 2 -port ma6-ts:3001 makeHePump + +makenv table -driver table /tt/tm { + "tt set/prop" "50:50 300:20 400:10" + "tt set/integ" "10:50 50:20 300:5" + "tt dblctrl/int2" "10:10 50:100 300:600 400:1200" + "tt dblctrl/prop_up" "20:0.1 50:0.4" + "tt dblctrl/prop_lo" "20:0.1 50:0.8" +} + diff --git a/tcl/ma6.stick b/tcl/ma6.stick index c691879..5f0c081 100644 --- a/tcl/ma6.stick +++ b/tcl/ma6.stick @@ -1,3 +1,4 @@ stickDesc = standard MA6 stick stick_sensors x63161 undefined +# stick_sensors x63161 x63163 diff --git a/tcl/sch5.stick b/tcl/sch5.stick index 8861be0..a0e8aaf 100644 --- a/tcl/sch5.stick +++ b/tcl/sch5.stick @@ -14,3 +14,5 @@ if [catch { } msg] { clientput $msg } + +GraphAdd tt.dout 1 heater_switch diff --git a/tcl/seacom.tcl b/tcl/seacom.tcl index 32d3288..e33971a 100644 --- a/tcl/seacom.tcl +++ b/tcl/seacom.tcl @@ -1825,7 +1825,7 @@ clientput "CONFIG $device/$stick/$addons" } } if {$found_stick == 0 && [llength $bad_sticks] > 0} { - hupdate /tt/status "stick seems not to be $devstk (may be $bad_sticks?)" + # hupdate /tt/status "stick seems not to be $devstk (may be $bad_sticks?)" } elseif {[string match "stick *" [hvali /tt/status]]} { hupdate /tt/status "" }