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

This commit is contained in:
l_samenv
2023-09-05 17:51:47 +02:00
5 changed files with 30 additions and 1 deletions

View File

@ -30,3 +30,8 @@ makenv warmup -driver piloop -invar "tt" -outvar "tt current/manualpower" \
-prop 0.0005 -int 120 -outmin 0 -outmax 0.053 -prop 0.0005 -int 120 -outmin 0 -outmax 0.053
GraphAdd warmup.output kW Htr_wup auto GraphAdd warmup.output kW Htr_wup auto
# pressure reading (from flukepe.addon)
makenv p -driver fluke45 { (X + 0.00015) * 500 * 900 }
GraphAdd p bar p dark_green

View File

@ -72,7 +72,6 @@ proc ccu4ext::changestate {type state} {
cc $auto 1 cc $auto 1
} }
fill { fill {
clientlog FILL$type
cc $cmd 1 cc $cmd 1
cc $auto 1 cc $auto 1
} }

View File

@ -61,6 +61,13 @@ proc stdConfig::sensirion {} {
proc sensirion::updateFlow {} { proc sensirion::updateFlow {} {
lassign [sct result] flow stddev lassign [sct result] flow stddev
if {$flow == 0 && $stddev == 0} {
if {[hgetpropval /nvflow flowsource] eq "flowmeter"} {
hsetprop /nvflow flowsource flowpress
hepump eco 0
error "invalid flow -> switched to pressure"
}
}
sct update $flow sct update $flow
updateval [sct]/stddev $stddev updateval [sct]/stddev $stddev
if {[silent "" hgetpropval [sct]/save saved] eq "" && [silent "" currentCalib] ne ""} { if {[silent "" hgetpropval [sct]/save saved] eq "" && [silent "" currentCalib] ne ""} {

View File

@ -92,6 +92,7 @@ proc makeCCU4 {args} {
set vessel [silent 0 result instconfig hevessel] set vessel [silent 0 result instconfig hevessel]
if {$vessel ne "0"} { if {$vessel ne "0"} {
catch {cc hea 1} catch {cc hea 1}
catch {cc hav 2}
catch {cc hem0 475} catch {cc hem0 475}
catch {cc hfu0 0} catch {cc hfu0 0}
} }

17
tcl/startup/ports.tcl Normal file
View File

@ -0,0 +1,17 @@
proc allports {} {
set result [list]
set pattern {([0-9a-zA_Z.-]*:[0-9]+)$}
foreach obj [obj_list items] {
set port [silent none $obj hostport]
if {[regexp $pattern $port -> port]} {
lappend result $port
} else {
if {[regexp ".* $pattern" [silent 0 $obj creationCmd] -> port]} {
lappend result $port
}
}
}
return $result
}
publishLazy allports spy