improve neodry hepump
This commit is contained in:
@ -10,7 +10,7 @@ proc stdConfig::hepump {{motname hemot}} {
|
|||||||
|
|
||||||
obj HePump -int wr
|
obj HePump -int wr
|
||||||
default 0
|
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 help "xds35: scroll pump, sv65: leybold"
|
||||||
prop read hepump::read
|
prop read hepump::read
|
||||||
prop write hepump::set_type
|
prop write hepump::set_type
|
||||||
@ -69,7 +69,7 @@ proc hepump::visible {pumpcode} {
|
|||||||
}
|
}
|
||||||
set runv true
|
set runv true
|
||||||
} elseif {$pumpcode == 8} {
|
} elseif {$pumpcode == 8} {
|
||||||
set rv true
|
set rv false
|
||||||
set runv true
|
set runv true
|
||||||
set v true
|
set v true
|
||||||
} else {
|
} else {
|
||||||
@ -146,7 +146,7 @@ proc hepump::set_calib {} {
|
|||||||
} else {
|
} else {
|
||||||
hsetprop [sct]/[sct @motname] group "hepump valve motor"
|
hsetprop [sct]/[sct @motname] group "hepump valve motor"
|
||||||
}
|
}
|
||||||
set f 0.6
|
set f 0.5
|
||||||
} elseif {$pumpcode == 3} { # other
|
} elseif {$pumpcode == 3} { # other
|
||||||
hsetprop [sct]/[sct @motname] group "hepump valve motor"
|
hsetprop [sct]/[sct @motname] group "hepump valve motor"
|
||||||
set f [hval [sct]/calib]
|
set f [hval [sct]/calib]
|
||||||
@ -164,10 +164,10 @@ proc hepump::set_calib {} {
|
|||||||
}
|
}
|
||||||
|
|
||||||
proc hepump::read {} {
|
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]
|
set f [silent 0 result nvflow]
|
||||||
if {[hvali [sct]/eco] == 0 && $p > 1 && $f > 0.5 && $f < 25} {
|
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]
|
set health [expr [silent $health sct health] * 0.95 + 0.05 * $health]
|
||||||
sct health $health
|
sct health $health
|
||||||
if {abs($health - [silent 0 hval [sct]/health]) > 1} {
|
if {abs($health - [silent 0 hval [sct]/health]) > 1} {
|
||||||
|
Reference in New Issue
Block a user