linse/sea
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
l_samenv
2024-02-23 17:07:35 +01:00
parent 10ae32af6b df53524d1f
commit 0b9bb056e6
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tcl/drivers/trun.tcl
View File

@ -497,9 +497,10 @@ proc trun::read_run {} {
set now [DoubleTime] set now [DoubleTime]
set tr [silent none sct target] set tr [silent none sct target]
set prev_tr [silent $tr sct prev_tr] set prev_tr [silent $tr sct prev_tr]
sct prev_tr $tr
if {$tr eq "none"} { if {$tr eq "none"} {
set tr $tmain set tr $tmain
sct prev_tr $tr sct prev_tr $tmain
} else { } else {
set dif [expr $tr - $prev_tr] set dif [expr $tr - $prev_tr]
updateval_u [sct]/target $tr 0 updateval_u [sct]/target $tr 0

2
tcl/startup/ccu4make.tcl
View File

@ -41,7 +41,7 @@ proc makeCCU4 {args} {
set hepump 1 set hepump 1
} }
nvstep { nvstep {
makenv nv nvstep makenv nv -driver nvstep $sensirion
GraphAdd nv.flow ln/min nv_flow magenta GraphAdd nv.flow ln/min nv_flow magenta
GraphAdd nv.autoflow.flowtarget ln/min nv_set green GraphAdd nv.autoflow.flowtarget ln/min nv_set green
if {[silent 0 result instconfig sensirion]} { if {[silent 0 result instconfig sensirion]} {

2
tcl/startup/flow_ctrl.tcl
View File

@ -161,7 +161,7 @@ proc flow::make {{getT flow::tmts} {getS "result tt tr"} {getF "result nv flow"}
node difRange par 7 node difRange par 7
node flowSize par 10 node flowSize par 10
node convTime par 30 node convTime par 30
node Tmin par 10 node Tmin par 1.5
node script -text par "flow::task" node script -text par "flow::task"
prop width 24 prop width 24
node getTemp -text par "$getT" node getTemp -text par "$getT"