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-11-02 14:25:22 +01:00
parent f463ccf94a e5063b5693
commit 8a53c37bde
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tcl/ori7.stick Normal file
View File

@ -0,0 +1,3 @@
stickDesc = standard ORI7 stick
stick_sensors x186350 undefined

2
tcl/seacom.tcl
View File

@ -655,7 +655,7 @@ proc stick_sensors {sensor1 sensor2} {
proc fix_stick_sensors {} { proc fix_stick_sensors {} {
# fix stick sensors # fix stick sensors
foreach path {/tt/ts/curve /tt/ts_2/curve} { foreach path {/tt/ts/curve /tt/ts_2/curve} {
set curv [silent "" sctval $path] set curv [sctval $path ""]
if {$curv ne ""} { if {$curv ne ""} {
hset $path $curv hset $path $curv
} }

4
tcl/startup/haake.tcl
View File

@ -8,7 +8,7 @@ proc makeHaake {{name thermostat} {with2sensors 0}} {
proc haakeLayout {{name ""} args} { proc haakeLayout {{name ""} args} {
if {[string compare [sicsdescriptor th] notfound] == 0} return if {[string compare [sicsdescriptor th] notfound] == 0} return
set reset 1 set reset 1
if {! [result th running]} { if {! [result th pumprunning]} {
Style Warning Style Warning
Label pump not running Label pump not running
NoNewline NoNewline
@ -61,7 +61,7 @@ proc haakeLayout {{name ""} args} {
set reset 0 set reset 0
} }
Newline Newline
CheckBox "pump running" "th running" CheckBox "pump running" "th pumprunning"
CheckBox "confirm alarm" "th reset/$reset" CheckBox "confirm alarm" "th reset/$reset"
Tip "check this if an external sample sensor is used" Tip "check this if an external sample sensor is used"
if {[result th with2sensors] >= 0} { if {[result th with2sensors] >= 0} {