diff --git a/tcl/drivers/ccu4.tcl b/tcl/drivers/ccu4.tcl index 7b86657..79fe429 100644 --- a/tcl/drivers/ccu4.tcl +++ b/tcl/drivers/ccu4.tcl @@ -382,12 +382,19 @@ proc stdConfig::ccu4 {{title CCU4} args} { node ax upd node axs upd node axd upd -int - } elseif {$a eq "valve"} { + } elseif {[string match valve* $a]} { + set nvalve [string range $a 5 end] for {set ch 1} {$ch <= 12} {incr ch} { node v$ch upd prop enum valve_off,valve_on,no_valve,timeout,timeout1,boost + if {$ch > $nvalve} { + prop visible false + } node vc$ch out -int prop enum valve_off,valve_on + if {$ch > $nvalve} { + prop visible false + } } } elseif {$a ne "multiHe"} { error "ERROR: unknown argument '$a' to ccu4" diff --git a/tcl/hfflow.config b/tcl/hfflow.config index e291d7a..298ef4e 100644 --- a/tcl/hfflow.config +++ b/tcl/hfflow.config @@ -5,12 +5,12 @@ device stick_menu "flow flow_1" defineTemperature tt makenv tt -driver 336_lsc -port pstc003:7777 { - lsc_sensor tm A -sensor x85571 -sensorname evap - lsc_sensor tsep B -sensor x86021 -sensorname sep -# lsc_sensor tcon C -sensor x86028 -sensorname conus - lsc_sensor ts C -sensorname sample - lsc_sensor tshd D -sensor pt-1000 -sensorname shield - lsc_loop set -loop 1 -channel A -maxheater 50W -resist 50Ohm + lsc_sensor tm D -sensor x85571 -sensorname evap + lsc_sensor tsep C -sensor x86021 -sensorname sep + lsc_sensor tcon B -sensor x86028 -sensorname conus +# lsc_sensor ts A -sensorname sample + lsc_sensor tshd A -sensor pt-1000 -sensorname shield + lsc_loop set -loop 1 -channel D -maxheater 25W -resist 50Ohm lsc_loop setcon -loop 2 -channel C -maxheater 35W -resist 35Ohm } tt set/limit 310 @@ -41,7 +41,11 @@ makeobject magnet array magnet makeitem field #makeNv +makenv v -driver ccu4 -port halflow-ts:3003 valves valve6 aux +v fav 1 +GraphAdd v.f mbar pump_pressure +GraphAdd v.ax mbar sample_pressure #makenv hvac -driver pfeiffertpg -port ldmlab1-ts:3013