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-04 08:41:48 +02:00
parent 1964490fa9 cae06db119
commit c37d0395cd
368 changed files with 348 additions and 40168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tcl/startup/frappy.tcl
View File

@ -266,9 +266,12 @@ proc frappy_async_client {} {
proc get_all_param {args} {
foreach obj $args {
set hp [get_obj_path $obj]
hnotify $hp 1
get_param_values $hp
catch {
set hp [get_obj_path $obj]
hnotify $hp 1
get_param_values $hp
}
# todo: create error message on failure
}
}

4
tcl/startup/helium.tcl
View File

@ -26,9 +26,9 @@ proc helium_update {p instrument label value} {
# Usage example: _lev updatescript /lev "helium_update prep0v dmc dmc_vessel"
catch {
if {[silent "" sct geterror] eq ""} {
$p / "helium_instr_update $instrument $label $value"
$p / helium_instr_update $instrument $label $value
} else {
$p / "helium_instr_update $instrument $label none"
$p / helium_instr_update $instrument $label none
}
}
}

8
tcl/startup/hepump.tcl
View File

@ -8,12 +8,14 @@ proc makeHePump {} {
set type 1
} elseif {$type eq "sv65"} {
set type 2
} elseif {$type eq "neodry"} {
set type 8
} else {
error "unknown hepump type: $type"
}
hset /hepump $type
if {$type == 0} {
if {$type == 0 || $type == 8} {
makenv hemot -driver trinamic -base /hepump/ hepump
if {[silent 0 result instconfig sensirion]} {
makenv nvflow -driver sensirion -controller _hemot
@ -37,8 +39,8 @@ proc pump_is_off {} {
}
}
hupdate [sct]/status $pmsg
return 1
}
return 1
}
if {[string match ${msghead}* [hvali [sct]/status]]} {
hupdate [sct]/status ""
}

15
tcl/startup/sea_man.tcl
View File

@ -116,7 +116,7 @@ proc disconnect_from {caller args} {
}
if {[llength $confirm] != 0} {
if {$caller ne "0"} {
seaman / "book_confirm $caller $confirm"
seaman / book_confirm $caller $confirm
}
}
if {$answer eq ""} {
@ -133,7 +133,8 @@ proc save_samenv {{dev ""}} {
if {$dev eq ""} {
set dev [samenv name]
}
seaman / "samenv_list makeitem [result instrument] $dev"
seaman / samenv_list makeitem [result instrument] $dev
seaman / rack_list makeitem [rack] [result instrument]
}
publishLazy save_samenv
@ -169,7 +170,7 @@ proc request_items {device} {
lappend items $hostport
}
}
seaman / "book_request [result instrument] [info hostname]:$serverport $device $items"
seaman / book_request [result instrument] [info hostname]:$serverport $device $items
set ts_status "Checking serial connections ..."
}
@ -199,7 +200,7 @@ proc reconnect_object {obj {value 0}} {
}
}
if {[is_mobile_port $hostport]} {
seaman / "book_request [result instrument] [info hostname]:$serverport PARTIAL $hostport"
seaman / book_request [result instrument] [info hostname]:$serverport PARTIAL $hostport
set ts_status "Checking serial connection ..."
}
}
@ -249,14 +250,14 @@ proc remote_disconnect {args} {
foreach {item instr} $args {
set disconnect_time($item) [DoubleTime]
}
seaman / "book_this [result instrument] $args"
seaman / book_this [result instrument] $args
}
proc forced_disconnect {item {value 0}} {
global disconnect_time
if {$value} {
catch {unset disconnect_time($item)}
seaman / "book_confirm [result instrument] $item"
seaman / book_confirm [result instrument] $item
} else {
return 0
}
@ -264,7 +265,7 @@ proc forced_disconnect {item {value 0}} {
proc remote_device_none {instrument {value 0}} {
global disconnect_time
seaman / "device_none_on $instrument"
seaman / device_none_on $instrument
set disconnect_time(0) [DoubleTime]
}