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

Allow 'aqadapter' as the IP and the AsyncQueue name as the port for Lakeshores

Browse Source
This commit is contained in:
Douglas Clowes
2013-06-24 17:14:58 +10:00
parent 3a06651ae3
commit 7d35ca4cf9
3 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
site_ansto/instrument/config/environment/temperature/sct_lakeshore_336.tcl
View File

@@ -1879,8 +1879,14 @@ proc add_sct_ls336 {name IP port terminator {_tol1 1.0} {_tol2 1.0} {_verbose 0}
return return
} }
if {[ catch { if {[ catch {
puts "\nadd_ls336: makesctcontroller $name std ${IP}:$port for Lakeshore model 336" if {[string equal -nocase "aqadapter" "${IP}"]} {
makesctcontroller sct_ls336_$name std ${IP}:$port $terminator # dcl 2013-05-27: in this case the port is the name of the AsyncQueue
puts "\nadd_ls336: makesctcontroller sct_ls336_$name aqadapter ${port} for Lakeshore model 336"
makesctcontroller sct_ls336_$name aqadapter ${port}
} else {
puts "\nadd_ls336: makesctcontroller sct_ls336_$name std ${IP}:$port $terminator for Lakeshore model 336"
makesctcontroller sct_ls336_$name std ${IP}:$port $terminator
}
mk_sct_lakeshore_336 sct_ls336_$name environment $name $_tol1 $_tol2 $_verbose mk_sct_lakeshore_336 sct_ls336_$name environment $name $_tol1 $_tol2 $_verbose
makesctemon $name /sics/$name/emon/monMode_Lp1 /sics/$name/emon/isInTolerance_Lp1 /sics/$name/emon/errhandler makesctemon $name /sics/$name/emon/monMode_Lp1 /sics/$name/emon/isInTolerance_Lp1 /sics/$name/emon/errhandler
# set m2 "_2" # set m2 "_2"

9
site_ansto/instrument/config/environment/temperature/sct_lakeshore_340.tcl
View File

@@ -2086,8 +2086,13 @@ proc add_sct_ls340 {name IP port terminator {_tol1 1.0} {_tol2 1.0} {_verbose 0}
} }
if {[ catch { if {[ catch {
set _ls340_LSmodel 340 set _ls340_LSmodel 340
puts "\nadd_ls340: makesctcontroller $name std ${IP}:$port for Lakeshore model $_ls340_LSmodel" if {[string equal -nocase "aqadapter" "${IP}"]} {
makesctcontroller sct_ls340_$name std ${IP}:$port $terminator puts "\nadd_ls340: makesctcontroller sct_ls340_$name aqadapter ${port} for Lakeshore model 340"
makesctcontroller sct_ls340_$name aqadapter ${port}
} else {
puts "\nadd_ls340: makesctcontroller sct_ls340_$name std ${IP}:$port $terminator for Lakeshore model 340"
makesctcontroller sct_ls340_$name std ${IP}:$port $terminator
}
mk_sct_lakeshore_340 sct_ls340_$name environment $name $_ls340_LSmodel $_tol1 $_tol2 $_verbose mk_sct_lakeshore_340 sct_ls340_$name environment $name $_ls340_LSmodel $_tol1 $_tol2 $_verbose
makesctemon $name /sics/$name/emon/monMode_Lp1 /sics/$name/emon/isInTolerance_Lp1 /sics/$name/emon/errhandler makesctemon $name /sics/$name/emon/monMode_Lp1 /sics/$name/emon/isInTolerance_Lp1 /sics/$name/emon/errhandler
# set m2 "_2" # set m2 "_2"

9
site_ansto/instrument/config/environment/temperature/sct_lakeshore_370.tcl
View File

@@ -904,7 +904,14 @@ namespace eval ::scobj::[set vendor]_[set device] {
debug_log 1 "add_[set [ns]::vendor]_[set [ns]::device] ${name} ${IP} ${port} ${_tol}" debug_log 1 "add_[set [ns]::vendor]_[set [ns]::device] ${name} ${IP} ${port} ${_tol}"
if {[SplitReply [environment_simulation]]=="false"} { if {[SplitReply [environment_simulation]]=="false"} {
debug_log 1 "makesctcontroller sct_ls370_${name} std ${IP}:${port}" debug_log 1 "makesctcontroller sct_ls370_${name} std ${IP}:${port}"
makesctcontroller sct_ls370_${name} std ${IP}:${port} "\r\n" if {[string equal -nocase "aqadapter" "${IP}"]} {
# dcl 2013-05-27: in this case the port is the name of the AsyncQueue
puts "\nadd_ls370: makesctcontroller sct_ls370_$name aqadapter ${port} for Lakeshore model 370"
makesctcontroller sct_ls370_$name aqadapter ${port}
} else {
puts "\nadd_ls370: makesctcontroller sct_ls370_$name std ${IP}:$port $terminator for Lakeshore model 370"
makesctcontroller sct_ls370_$name std ${IP}:$port $terminator
}
} }
debug_log 1 "mk_sct_driver sct_ls370_${name} environment ${name} ${_tol}" debug_log 1 "mk_sct_driver sct_ls370_${name} environment ${name} ${_tol}"
mk_sct_driver sct_ls370_${name} environment ${name} ${_tol} mk_sct_driver sct_ls370_${name} environment ${name} ${_tol}