diff --git a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_m370.tcl b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_m370.tcl index 85f56563..a3425507 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_m370.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_m370.tcl @@ -27,8 +27,8 @@ proc ::scobj::lakeshore_m370::sics_log {debug_level debug_string} { } catch_message ] } -proc ::scobj::lakeshore_m370::mkDriver { sct_controller name tol } { - ::scobj::lakeshore_m370::sics_log 9 "::scobj::lakeshore_m370::mkDriver ${sct_controller} ${name} ${tol}" +proc ::scobj::lakeshore_m370::mkDriver { sct_controller name id tol } { + ::scobj::lakeshore_m370::sics_log 9 "::scobj::lakeshore_m370::mkDriver ${sct_controller} ${name} ${id} ${tol}" set ns "[namespace current]" set catch_status [ catch { @@ -41,7 +41,11 @@ proc ::scobj::lakeshore_m370::mkDriver { sct_controller name tol } { hsetprop ${scobj_hpath} klass environment hsetprop ${scobj_hpath} debug_threshold 5 # mkDriver hook code starts - mk_sct_driver $sct_controller environment $name $tol + ::scobj::lakeshore_370::mk_sct_driver $sct_controller environment $name $tol + hsetprop ${scobj_hpath}/setpoint permlink data_set T[format "%02d" ${id}]SP01 + hsetprop ${scobj_hpath}/setpoint @description T[format "%02d" ${id}]SP01 + hsetprop ${scobj_hpath}/Sensor/value permlink data_set T[format "%02d" ${id}]S01 + hsetprop ${scobj_hpath}/Sensor/value @description T[format "%02d" ${id}]S01 # mkDriver hook code ends } catch_message ] handle_exception ${catch_status} ${catch_message} @@ -54,9 +58,9 @@ namespace eval ::scobj::lakeshore_m370 { namespace export mkDriver } -proc add_lakeshore_m370 {name IP port tol} { +proc add_lakeshore_m370 {name IP port id tol} { set catch_status [ catch { - ::scobj::lakeshore_m370::sics_log 9 "add_lakeshore_m370 ${name} ${IP} ${port} ${tol}" + ::scobj::lakeshore_m370::sics_log 9 "add_lakeshore_m370 ${name} ${IP} ${port} ${id} ${tol}" if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { if {[string equal -nocase "aqadapter" "${IP}"]} { ::scobj::lakeshore_m370::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" @@ -68,8 +72,8 @@ proc add_lakeshore_m370 {name IP port tol} { } else { ::scobj::lakeshore_m370::sics_log 9 "[environment_simulation] => No sctcontroller for lakeshore_m370" } - ::scobj::lakeshore_m370::sics_log 1 "::scobj::lakeshore_m370::mkDriver sct_${name} ${name} ${tol}" - ::scobj::lakeshore_m370::mkDriver sct_${name} ${name} ${tol} + ::scobj::lakeshore_m370::sics_log 1 "::scobj::lakeshore_m370::mkDriver sct_${name} ${name} ${id} ${tol}" + ::scobj::lakeshore_m370::mkDriver sct_${name} ${name} ${id} ${tol} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -129,7 +133,7 @@ proc ::scobj::lakeshore_m370::read_config {} { } set arg_list [list] set missing_list [list] - foreach arg {tol} { + foreach arg {id tol} { if {[dict exists $u $arg]} { lappend arg_list "[dict get $u $arg]" } elseif {[dict exists $v $arg]} {