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:
zolliker
2023-07-03 18:09:12 +02:00
parent 1d7ab6fb46 dd4c9efdbd
commit 1ee8c31fe1
5 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tcl/drivers/dil12.tcl
View File

@ -257,6 +257,9 @@ proc stdConfig::dil12 args {
prop label "remove mixture status" prop label "remove mixture status"
prop check dil12::check_removephase prop check dil12::check_removephase
prop write stdSct::completeUpdate prop write stdSct::completeUpdate
node ignore_vti_temp -int par 0
prop enum 1
} }
} }
hset $name/heatermode 0 hset $name/heatermode 0
@ -992,10 +995,15 @@ proc dil12::autostep {phase init} {
dil12::openvalves v1 v6 v12 v13 vm_open dil12::openvalves v1 v6 v12 v13 vm_open
sorb mode 0 sorb mode 0
dil12::set_VtiT 1.25
hset [sct]/onekstate 0 hset [sct]/onekstate 0
nv set [silent 5 hvali [sct]/circulateflow] nv set [silent 5 hvali [sct]/circulateflow]
nv 2 ;# auto if {[hval [sct]/ignore_vti_temp]} {
dil12::set_VtiT 0
nv 1 ;# controlled
} else {
dil12::set_VtiT 1.25
nv 2 ;# auto
}
dil12::msg "" dil12::msg ""
} }
circulate { circulate {
@ -1034,7 +1042,11 @@ proc dil12::autostep {phase init} {
sct optimize [clock seconds] sct optimize [clock seconds]
clientput "reduced VTI flow to [hvali [sct]/circulateflow]" clientput "reduced VTI flow to [hvali [sct]/circulateflow]"
nv set $circulateflow nv set $circulateflow
nv 2 ;# auto if {[hval [sct]/ignore_vti_temp]} {
nv 1 ;# controlled
} else {
nv 2 ;# auto
}
} }
} }
} }

4
tcl/ma15.config
View File

@ -15,10 +15,10 @@ tt set/limit 310
makeCCU4 ma15 nv he_ilm makeCCU4 ma15 nv he_ilm
catch { catch {
hupdate /nv/set 1.5 hupdate /nv/set 1
nv ctrl/minpulse_o 0.01 nv ctrl/minpulse_o 0.01
nv ctrl/minpulse_c 0.05 nv ctrl/minpulse_c 0.05
nv tol 0.02 cc mc 75
} }
makeIps -limit 14.9 -startRamp 0.31 -port ma15-ts:3002 makeIps -limit 14.9 -startRamp 0.31 -port ma15-ts:3002

4
tcl/pfeiffertpg.addon
View File

@ -1,6 +1,6 @@
addonDesc = Pfeiffer Pressure gauge RS232 addonDesc = Pfeiffer Pressure gauge RS232
makenv hvac -driver pfeiffertpg -port ldmse3-ts:3005 makenv hvac -driver pfeiffertpg
GraphAdd hvac mbar ivc blue GraphAdd hvac mbar hvac blue

2
tcl/startup/hepump.tcl
View File

@ -15,7 +15,7 @@ proc makeHePump {} {
} }
hset /hepump $type hset /hepump $type
if {$type == 0} { if {$type == 0 || $type == 8} {
makenv hemot -driver trinamic -base /hepump/ hepump makenv hemot -driver trinamic -base /hepump/ hepump
if {[silent 0 result instconfig sensirion]} { if {[silent 0 result instconfig sensirion]} {
makenv nvflow -driver sensirion -controller _hemot makenv nvflow -driver sensirion -controller _hemot

2
tcl/variox.config
View File

@ -14,6 +14,6 @@ tt set/limit 310
tt set/prop 20 tt set/prop 20
tt set/integ 10 tt set/integ 10
makeCCU4 variox nv n2 he makeCCU4 variox nv n2 he
hupdate /nv/set 2.5 hupdate /nv/set 1.2
nv ctrl/minpulse_o 0.01 nv ctrl/minpulse_o 0.01
nv ctrl/minpulse_c 0.1 nv ctrl/minpulse_c 0.1