Merge branch 'master' of gitlab.psi.ch-samenv:samenv/sea
This commit is contained in:
@ -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 ""} {
|
||||
|
@ -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
|
||||
|
@ -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 ""} {
|
||||
|
Reference in New Issue
Block a user