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

add neodry to hepump

Browse Source
This commit is contained in:
l_samenv
2023-05-23 17:28:47 +02:00
parent 06c1db66af
commit 89054e53c3
2 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
tcl/drivers/hepump.tcl
View File

@ -10,7 +10,7 @@ proc stdConfig::hepump {{motname hemot}} {
obj HePump -int wr obj HePump -int wr
default 0 default 0
prop enum xds35_auto,xds35_manual,sv65,other,no=-1 prop enum xds35_auto,xds35_manual,sv65,other,neodry=8,no=-1
prop help "xds35: scroll pump, sv65: leybold" prop help "xds35: scroll pump, sv65: leybold"
prop read hepump::read prop read hepump::read
prop write hepump::set_type prop write hepump::set_type
@ -67,17 +67,26 @@ proc hepump::visible {pumpcode} {
} else { } else {
set rv true set rv true
} }
set runv true
} elseif {$pumpcode == 8} {
set rv true
set runv true
set v true
} else { } else {
set v false set v false
set rv false set rv false
set runv false
} }
foreach node "valve [sct @motname]" { foreach node "valve [sct @motname]" {
if {[silent true hgetpropval [sct]/$node visible] ne $v} { if {[silent true hgetpropval [sct]/$node visible] ne $v} {
hsetprop [sct]/$node visible $v hsetprop [sct]/$node visible $v
} }
} }
foreach node "running eco auto eco_t_lim" { if {[silent true hgetpropval [sct]/running visible] ne $runv} {
hsetprop [sct]/running visible $runv
}
foreach node "eco auto eco_t_lim" {
if {[silent true hgetpropval [sct]/$node visible] ne $rv} { if {[silent true hgetpropval [sct]/$node visible] ne $rv} {
hsetprop [sct]/$node visible $rv hsetprop [sct]/$node visible $rv
} }
@ -125,6 +134,19 @@ proc hepump::set_calib {} {
} else { } else {
set f 0.6 ;# 0.95 at 30 mbar set f 0.6 ;# 0.95 at 30 mbar
} }
} elseif {$pumpcode == 8} { # neodry
set status [string trim [_[sct @motname] status]]
if {$status eq "disconnected" || $status eq "offline"} {
# clientput [_[sct @motname] hostport]
_[sct @motname] reconnect
}
if {$status eq "no response"} {
set pumpcode 1 ;# treat as manual
hsetprop [sct]/[sct @motname] group "hepump valve motor (not connected)"
} else {
hsetprop [sct]/[sct @motname] group "hepump valve motor"
}
set f 0.6
} elseif {$pumpcode == 3} { # other } elseif {$pumpcode == 3} { # other
hsetprop [sct]/[sct @motname] group "hepump valve motor" hsetprop [sct]/[sct @motname] group "hepump valve motor"
set f [hval [sct]/calib] set f [hval [sct]/calib]
@ -352,7 +374,10 @@ proc hepump::set_eco {} {
} }
proc hepump::get_eco {} { proc hepump::get_eco {} {
if {[sctval [sct parent]] != 0} {return idle} if {[sctval [sct parent]] != 0} {
sct update 0
return idle
}
set eco [sctval [sct parent]/[sct @motname]/output1] set eco [sctval [sct parent]/[sct @motname]/output1]
sct update $eco sct update $eco
[sct controller] queue [sct parent] write hepump::set_calib [sct controller] queue [sct parent] write hepump::set_calib

6
tcl/startup/hepump.tcl
View File

@ -8,6 +8,8 @@ proc makeHePump {} {
set type 1 set type 1
} elseif {$type eq "sv65"} { } elseif {$type eq "sv65"} {
set type 2 set type 2
} elseif {$type eq "neodry"} {
set type 8
} else { } else {
error "unknown hepump type: $type" error "unknown hepump type: $type"
} }
@ -37,8 +39,8 @@ proc pump_is_off {} {
} }
} }
hupdate [sct]/status $pmsg hupdate [sct]/status $pmsg
return 1 return 1
} }
if {[string match ${msghead}* [hvali [sct]/status]]} { if {[string match ${msghead}* [hvali [sct]/status]]} {
hupdate [sct]/status "" hupdate [sct]/status ""
} }