From 47d5604e1ecd03ab4c1a95c2db7b6bd21131d775 Mon Sep 17 00:00:00 2001 From: Douglas Clowes Date: Mon, 7 Jul 2014 13:58:08 +1000 Subject: [PATCH] Make the Julabo work for asyncqueue adapters --- .../environment/temperature/sct_julabo_lh45.tcl | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/site_ansto/instrument/config/environment/temperature/sct_julabo_lh45.tcl b/site_ansto/instrument/config/environment/temperature/sct_julabo_lh45.tcl index cd5649a6..5c21a3e6 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_julabo_lh45.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_julabo_lh45.tcl @@ -405,6 +405,7 @@ namespace eval ::scobj::lh45 { } namespace export mk_sct_julabo_lh45 } +namespace import ::scobj::lh45::* ## # @brief Create a Julabo lh45 temperature controller @@ -416,9 +417,14 @@ namespace eval ::scobj::lh45 { # @param _tol (optional), this is the initial tolerance setting proc add_julabo_lh45 { name IP port {sensor "bath"} {_tol 5.0} {CID 1} {CTYPE T} } { if {[SplitReply [environment_simulation]]=="false"} { - makesctcontroller sct_lh45 std ${IP}:$port "\r" + if {[string equal -nocase "aqadapter" "${IP}"]} { + ::scobj::julabo_lh45::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" + makesctcontroller sct_${name} aqadapter ${port} + } else { + makesctcontroller sct_${name} std ${IP}:$port "\r" + } } - mk_sct_julabo_lh45 sct_lh45 environment $name $_tol $CID $CTYPE + mk_sct_julabo_lh45 sct_${name} environment $name $_tol $CID $CTYPE set scobj_hpath /sics/$name switch $sensor { "bath" { @@ -518,4 +524,3 @@ if { [info exists ::config_dict] } { } -namespace import ::scobj::lh45::*