diff --git a/tcl/drivers/amoroven.tcl b/tcl/drivers/amoroven.tcl index bd83fbf..861406e 100644 --- a/tcl/drivers/amoroven.tcl +++ b/tcl/drivers/amoroven.tcl @@ -22,6 +22,9 @@ proc stdConfig::amoroven {} { node tlimit par 700 node tlimit_without_vacuum par 320 + + node plimit par 75 + node plimit_without_vacuum par 5 } } @@ -33,13 +36,16 @@ proc amoroven::read_press {} { proc amoroven::update_limit {vacuumon} { if {$vacuumon} { set tlim [hval [sct parent]/tlimit] + set plim [hval [sct parent]/plimit] set msg "" } else { set tlim [hval [sct parent]/tlimit_without_vacuum] + set plim [hval [sct parent]/plimit_without_vacuum] set msg " vacuum pump off" } - if {$tlim != [result tt set/limit] || [silent "" hgetpropval /tt/set tlimit_message] ne $msg} { + if {$tlim != [result tt set/limit] || $plim != [result tt set/maxpower] || [silent "" hgetpropval /tt/set tlimit_message] ne $msg} { tt set/limit $tlim + tt set/maxpower $plim hsetprop /tt/set tlimit_message $msg } } diff --git a/tcl/fftf.config b/tcl/fftf.config index e8bc028..16efa6c 100644 --- a/tcl/fftf.config +++ b/tcl/fftf.config @@ -5,7 +5,8 @@ defineTemperature tt makenv tt -driver [lsdriver] { lsc_sensor ts A -sensor pt100e -sensorname sample -alarm 700 lsc_sensor tm B -sensor pt1000e -sensorname body -alarm 320 - lsc_loop set -loop 1 -channel A -maxheater 0.05A -resist 100Ohm -linearpower 75 -mout 15 +# lsc_loop set -loop 1 -channel A -maxheater 0.05A -resist 100Ohm -linearpower 75 -mout 15 + lsc_loop set -loop 1 -channel A -maxheater 2A -resist 10Ohm } GraphAdd tt.set.reg K T_reg auto @@ -26,7 +27,13 @@ GraphAdd p mbar pressure auto GraphAdd p.vacuumpump S pump auto GraphAdd p.gasflow S valve auto +# for PWM setting +#makenv table -driver table /tt/set { +# "tt set/prop" "400:0.5 550:2" +# "tt set/integ" "400:10 550:20" +#} + makenv table -driver table /tt/set { - "tt set/prop" "400:0.5 550:2" - "tt set/integ" "400:10 550:20" + "tt set/prop" "400:5 550:5" + "tt set/integ" "400:20 550:20" }