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
2023-10-26 10:05:55 +02:00
parent 4d1858560b a3cefc36c2
commit 6ee460c2bd
10 changed files with 51 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tcl/drivers/ccu4ext.tcl
View File

@ -181,7 +181,7 @@ proc ccu4ext::fillExt {type} {
set rdpath [hvali [sct]/readpath]
set level [hvali $rdpath]
set levelerror [silent "" hgetpropval $rdpath geterror]
if {$levelerror ne "" && $errtxt eq ""} {
if {$levelerror ne "" && $errtxt eq "" && [hvali [sct]] < 2} {
set errtxt "$txt ($rdpath $levelerror)"
}
if {$errtxt eq ""} {

5
tcl/drivers/hepump.tcl
View File

@ -404,11 +404,12 @@ proc hepump::get_auto {} {
if {$auto && $oldeco != 2} {
set eco [sctval [sct parent]/eco]
set lim [sctval [sct parent]/eco_t_lim 7]
set target [silent [silent $lim hval /tt/target] hval /tt/set/reg]
if {[silent 0 result nv use_pressure]} {
set ecoset 0
} elseif {[silent 10 hval /tt/target] < $lim && [silent 10 hval /tt] < 2 * $lim} {
} elseif {$target < $lim && [silent $lim hval /tt] < 2 * $lim} {
set ecoset 0
} elseif {[silent 10 hval /tt/target] > $lim || [silent 10 hval /tt] > 3 * $lim} {
} elseif {$target > $lim || [silent $lim hval /tt] > 3 * $lim} {
set ecoset 1
} else {
set ecoset $eco

7
tcl/drivers/lsc.tcl
View File

@ -895,7 +895,7 @@ proc lsc::set_curve {} {
}
#write action, direct
proc lsc::check_header {id} {
proc lsc::check_header {{id unknown}} {
upvar #0 lsc::cache_$id cache
if {[lsc::hdreq $cache([sct curveno]) [sct result]]} {
sct oldhdr [sct result]
@ -2950,7 +2950,9 @@ proc lsc::check_set {} {
}
if {[silent 0 sct internalset] eq "0"} {
if {[silent 0 sct setmaintarget] ne "0"} {
eval "[sct setmaintarget] $target"
if {[catch {eval "[sct setmaintarget] $target"} msg]} {
clientlog "WARNING: $msg"
}
}
}
if {$target == 0} {
@ -4626,6 +4628,7 @@ proc stdConfig::lsc_end {} {
if {$lsc(samplesensor) eq ""} {
set lsc(samplesensor) $lsc(mainsensor)
}
dolater 0 fix_stick_sensors
hsetprop $path getcmd "hvali $path/$lsc(mainsensor)"
hsetprop $path getsample "hvali $path/$lsc(samplesensor)"
if {[silent "" set lsc(setsample)] ne ""} {