From a93819572a38a29d01e84bbbc27592eee44bd633 Mon Sep 17 00:00:00 2001 From: Douglas Clowes Date: Tue, 19 Aug 2014 11:43:45 +1000 Subject: [PATCH] Regenerate template drivers --- .../config/chopper/sct_astrium_chopper.tcl | 34 ++++++------ .../bilby/config/motors/sct_shutters.tcl | 34 ++++++------ .../bilby/config/motors/sct_tank.tcl | 34 ++++++------ .../sct_green_magnet_labview.tcl | 28 +++++----- .../magneticField/sct_oxford12tlv.tcl | 34 ++++++------ .../environment/magneticField/sct_tsi_smc.tcl | 34 ++++++------ .../config/environment/sct_agilent_33220A.tcl | 38 ++++++------- .../config/environment/sct_hiden_xcs.tcl | 34 ++++++------ .../config/environment/sct_huber_pilot.tcl | 34 ++++++------ .../config/environment/sct_isotech_ps.tcl | 34 ++++++------ .../config/environment/sct_keithley_m2700.tcl | 34 ++++++------ .../config/environment/sct_nhq_200.tcl | 34 ++++++------ .../config/environment/sct_omron_hldc.tcl | 34 ++++++------ .../config/environment/sct_protekmm.tcl | 34 ++++++------ .../temperature/sct_eurotherm_m2000.tcl | 34 ++++++------ .../temperature/sct_julabo_lh45_gen.tcl | 34 ++++++------ .../temperature/sct_lakeshore_218.tcl | 34 ++++++------ .../temperature/sct_lakeshore_m370.tcl | 34 ++++++------ .../environment/temperature/sct_ls336.tcl | 34 ++++++------ .../environment/temperature/sct_ls340.tcl | 34 ++++++------ .../temperature/sct_mercury_base.tcl | 34 ++++++------ .../temperature/sct_mercury_level.tcl | 34 ++++++------ .../temperature/sct_mercury_pres.tcl | 34 ++++++------ .../temperature/sct_mercury_scpi.tcl | 34 ++++++------ .../temperature/sct_mercury_temp.tcl | 34 ++++++------ .../temperature/sct_mercury_valve.tcl | 34 ++++++------ .../environment/temperature/sct_nprvasm2.tcl | 34 ++++++------ .../temperature/sct_pfeiffer_hg.tcl | 34 ++++++------ .../temperature/sct_watlow_mpm.tcl | 34 ++++++------ .../temperature/sct_watlow_mrm.tcl | 34 ++++++------ .../temperature/sct_watlow_mst4.tcl | 34 ++++++------ .../environment/temperature/sct_west4100.tcl | 53 ++++++------------- .../config/source/sct_reactor_status.tcl | 34 ++++++------ 33 files changed, 556 insertions(+), 583 deletions(-) diff --git a/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl b/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl index 33bc558e..ee696490 100644 --- a/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl +++ b/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl @@ -230,8 +230,8 @@ proc ::scobj::astrium_chopper::setValue {tc_root nextState cmd_str} { handle_exception ${catch_status} ${catch_message} } -proc ::scobj::astrium_chopper::mkDriver { sct_controller name } { - ::scobj::astrium_chopper::sics_log 9 "::scobj::astrium_chopper::mkDriver for ${name}" +proc ::scobj::astrium_chopper::mkDriver { sct_controller name ip_address tcp_port } { + ::scobj::astrium_chopper::sics_log 9 "::scobj::astrium_chopper::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port}" set ns "[namespace current]" set catch_status [ catch { @@ -577,22 +577,22 @@ namespace eval ::scobj::astrium_chopper { namespace export mkDriver } -proc add_astrium_chopper {name IP port} { +proc add_astrium_chopper {name ip_address tcp_port} { set catch_status [ catch { - ::scobj::astrium_chopper::sics_log 9 "add_astrium_chopper ${name} ${IP} ${port}" + ::scobj::astrium_chopper::sics_log 9 "add_astrium_chopper ${name} ${ip_address} ${tcp_port}" if {[string equal -nocase [SplitReply [chopper_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::astrium_chopper::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::astrium_chopper::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::astrium_chopper::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port}" - makesctcontroller sct_${name} std ${IP}:${port} + ::scobj::astrium_chopper::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { ::scobj::astrium_chopper::sics_log 9 "[chopper_simulation] => No sctcontroller for astrium_chopper" } - ::scobj::astrium_chopper::sics_log 1 "::scobj::astrium_chopper::mkDriver sct_${name} ${name}" - ::scobj::astrium_chopper::mkDriver sct_${name} ${name} + ::scobj::astrium_chopper::sics_log 1 "::scobj::astrium_chopper::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port}" + ::scobj::astrium_chopper::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -628,8 +628,8 @@ proc ::scobj::astrium_chopper::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -643,15 +643,15 @@ proc ::scobj::astrium_chopper::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_astrium_chopper ${name} ${IP} ${PORT} + add_astrium_chopper ${name} ${ip_address} ${tcp_port} } else { add_astrium_chopper ${name} "aqadapter" ${asyncqueue} } diff --git a/site_ansto/instrument/bilby/config/motors/sct_shutters.tcl b/site_ansto/instrument/bilby/config/motors/sct_shutters.tcl index 2bdfb092..0c209e86 100644 --- a/site_ansto/instrument/bilby/config/motors/sct_shutters.tcl +++ b/site_ansto/instrument/bilby/config/motors/sct_shutters.tcl @@ -193,8 +193,8 @@ proc ::scobj::shutters::write_switch {tc_root nextState cmd_str} { handle_exception ${catch_status} ${catch_message} } -proc ::scobj::shutters::mkDriver { sct_controller name } { - ::scobj::shutters::sics_log 9 "::scobj::shutters::mkDriver for ${name}" +proc ::scobj::shutters::mkDriver { sct_controller name ip_address tcp_port } { + ::scobj::shutters::sics_log 9 "::scobj::shutters::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port}" set ns "[namespace current]" set catch_status [ catch { @@ -282,22 +282,22 @@ namespace eval ::scobj::shutters { namespace export mkDriver } -proc add_shutters {name IP port} { +proc add_shutters {name ip_address tcp_port} { set catch_status [ catch { - ::scobj::shutters::sics_log 9 "add_shutters ${name} ${IP} ${port}" + ::scobj::shutters::sics_log 9 "add_shutters ${name} ${ip_address} ${tcp_port}" if {[string equal -nocase [SplitReply [motor_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::shutters::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::shutters::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::shutters::sics_log 9 "makesctcontroller sct_${name} dmc2280 ${IP}:${port}" - makesctcontroller sct_${name} dmc2280 ${IP}:${port} + ::scobj::shutters::sics_log 9 "makesctcontroller sct_${name} dmc2280 ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} dmc2280 ${ip_address}:${tcp_port} } } else { ::scobj::shutters::sics_log 9 "[motor_simulation] => No sctcontroller for shutters" } - ::scobj::shutters::sics_log 1 "::scobj::shutters::mkDriver sct_${name} ${name}" - ::scobj::shutters::mkDriver sct_${name} ${name} + ::scobj::shutters::sics_log 1 "::scobj::shutters::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port}" + ::scobj::shutters::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -333,8 +333,8 @@ proc ::scobj::shutters::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -348,15 +348,15 @@ proc ::scobj::shutters::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_shutters ${name} ${IP} ${PORT} + add_shutters ${name} ${ip_address} ${tcp_port} } else { add_shutters ${name} "aqadapter" ${asyncqueue} } diff --git a/site_ansto/instrument/bilby/config/motors/sct_tank.tcl b/site_ansto/instrument/bilby/config/motors/sct_tank.tcl index 67e05d9a..9d0f5c72 100644 --- a/site_ansto/instrument/bilby/config/motors/sct_tank.tcl +++ b/site_ansto/instrument/bilby/config/motors/sct_tank.tcl @@ -201,8 +201,8 @@ proc ::scobj::tank::setValue {tc_root nextState cmd_str} { handle_exception ${catch_status} ${catch_message} } -proc ::scobj::tank::mkDriver { sct_controller name } { - ::scobj::tank::sics_log 9 "::scobj::tank::mkDriver for ${name}" +proc ::scobj::tank::mkDriver { sct_controller name ip_address tcp_port } { + ::scobj::tank::sics_log 9 "::scobj::tank::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port}" set ns "[namespace current]" set catch_status [ catch { @@ -330,22 +330,22 @@ namespace eval ::scobj::tank { namespace export mkDriver } -proc add_tank {name IP port} { +proc add_tank {name ip_address tcp_port} { set catch_status [ catch { - ::scobj::tank::sics_log 9 "add_tank ${name} ${IP} ${port}" + ::scobj::tank::sics_log 9 "add_tank ${name} ${ip_address} ${tcp_port}" if {[string equal -nocase [SplitReply [motor_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::tank::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::tank::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::tank::sics_log 9 "makesctcontroller sct_${name} dmc2280 ${IP}:${port}" - makesctcontroller sct_${name} dmc2280 ${IP}:${port} + ::scobj::tank::sics_log 9 "makesctcontroller sct_${name} dmc2280 ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} dmc2280 ${ip_address}:${tcp_port} } } else { ::scobj::tank::sics_log 9 "[motor_simulation] => No sctcontroller for tank" } - ::scobj::tank::sics_log 1 "::scobj::tank::mkDriver sct_${name} ${name}" - ::scobj::tank::mkDriver sct_${name} ${name} + ::scobj::tank::sics_log 1 "::scobj::tank::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port}" + ::scobj::tank::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -381,8 +381,8 @@ proc ::scobj::tank::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -396,15 +396,15 @@ proc ::scobj::tank::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_tank ${name} ${IP} ${PORT} + add_tank ${name} ${ip_address} ${tcp_port} } else { add_tank ${name} "aqadapter" ${asyncqueue} } diff --git a/site_ansto/instrument/config/environment/magneticField/sct_green_magnet_labview.tcl b/site_ansto/instrument/config/environment/magneticField/sct_green_magnet_labview.tcl index b67de6e4..d9cad5dd 100644 --- a/site_ansto/instrument/config/environment/magneticField/sct_green_magnet_labview.tcl +++ b/site_ansto/instrument/config/environment/magneticField/sct_green_magnet_labview.tcl @@ -27,8 +27,8 @@ proc ::scobj::green_magnet_labview::sics_log {debug_level debug_string} { } catch_message ] } -proc ::scobj::green_magnet_labview::mkDriver { sct_controller name } { - ::scobj::green_magnet_labview::sics_log 9 "::scobj::green_magnet_labview::mkDriver for ${name}" +proc ::scobj::green_magnet_labview::mkDriver { sct_controller name ip_address tcp_port } { + ::scobj::green_magnet_labview::sics_log 9 "::scobj::green_magnet_labview::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port}" set ns "[namespace current]" set catch_status [ catch { @@ -36,8 +36,8 @@ proc ::scobj::green_magnet_labview::mkDriver { sct_controller name } { # TCL code ::scobj::green::mkGreen { name "green_magnet" - IP 137.157.201.88 - PORT 5001 + IP ${ip_address} + PORT ${tcp_port} tuning 1 interval 3 } @@ -53,12 +53,12 @@ namespace eval ::scobj::green_magnet_labview { namespace export mkDriver } -proc add_green_magnet_labview {name IP port} { +proc add_green_magnet_labview {name ip_address tcp_port} { set catch_status [ catch { - ::scobj::green_magnet_labview::sics_log 9 "add_green_magnet_labview ${name} ${IP} ${port}" + ::scobj::green_magnet_labview::sics_log 9 "add_green_magnet_labview ${name} ${ip_address} ${tcp_port}" ::scobj::green_magnet_labview::sics_log 9 "No sctcontroller for green_magnet_labview" - ::scobj::green_magnet_labview::sics_log 1 "::scobj::green_magnet_labview::mkDriver sct_${name} ${name}" - ::scobj::green_magnet_labview::mkDriver sct_${name} ${name} + ::scobj::green_magnet_labview::sics_log 1 "::scobj::green_magnet_labview::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port}" + ::scobj::green_magnet_labview::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -94,8 +94,8 @@ proc ::scobj::green_magnet_labview::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -109,15 +109,15 @@ proc ::scobj::green_magnet_labview::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_green_magnet_labview ${name} ${IP} ${PORT} + add_green_magnet_labview ${name} ${ip_address} ${tcp_port} } else { add_green_magnet_labview ${name} "aqadapter" ${asyncqueue} } diff --git a/site_ansto/instrument/config/environment/magneticField/sct_oxford12tlv.tcl b/site_ansto/instrument/config/environment/magneticField/sct_oxford12tlv.tcl index 078152fc..c4ae5dfd 100644 --- a/site_ansto/instrument/config/environment/magneticField/sct_oxford12tlv.tcl +++ b/site_ansto/instrument/config/environment/magneticField/sct_oxford12tlv.tcl @@ -27,8 +27,8 @@ proc ::scobj::oxford12tlv::sics_log {debug_level debug_string} { } catch_message ] } -proc ::scobj::oxford12tlv::mkDriver { sct_controller name id datype interval } { - ::scobj::oxford12tlv::sics_log 9 "::scobj::oxford12tlv::mkDriver ${sct_controller} ${name} ${id} ${datype} ${interval}" +proc ::scobj::oxford12tlv::mkDriver { sct_controller name ip_address tcp_port id datype interval } { + ::scobj::oxford12tlv::sics_log 9 "::scobj::oxford12tlv::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${interval}" set ns "[namespace current]" set catch_status [ catch { @@ -60,22 +60,22 @@ namespace eval ::scobj::oxford12tlv { namespace export mkDriver } -proc add_oxford12tlv {name IP port id datype interval} { +proc add_oxford12tlv {name ip_address tcp_port id datype interval} { set catch_status [ catch { - ::scobj::oxford12tlv::sics_log 9 "add_oxford12tlv ${name} ${IP} ${port} ${id} ${datype} ${interval}" + ::scobj::oxford12tlv::sics_log 9 "add_oxford12tlv ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${interval}" if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::oxford12tlv::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::oxford12tlv::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::oxford12tlv::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port}" - makesctcontroller sct_${name} std ${IP}:${port} + ::scobj::oxford12tlv::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { ::scobj::oxford12tlv::sics_log 9 "[environment_simulation] => No sctcontroller for oxford12tlv" } - ::scobj::oxford12tlv::sics_log 1 "::scobj::oxford12tlv::mkDriver sct_${name} ${name} ${id} ${datype} ${interval}" - ::scobj::oxford12tlv::mkDriver sct_${name} ${name} ${id} ${datype} ${interval} + ::scobj::oxford12tlv::sics_log 1 "::scobj::oxford12tlv::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${interval}" + ::scobj::oxford12tlv::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${interval} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -111,8 +111,8 @@ proc ::scobj::oxford12tlv::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -126,9 +126,9 @@ proc ::scobj::oxford12tlv::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } @@ -149,7 +149,7 @@ proc ::scobj::oxford12tlv::read_config {} { error "$name is missing configuration values $missing_list" } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_oxford12tlv ${name} ${IP} ${PORT} {*}$arg_list + add_oxford12tlv ${name} ${ip_address} ${tcp_port} {*}$arg_list } else { add_oxford12tlv ${name} "aqadapter" ${asyncqueue} {*}$arg_list } diff --git a/site_ansto/instrument/config/environment/magneticField/sct_tsi_smc.tcl b/site_ansto/instrument/config/environment/magneticField/sct_tsi_smc.tcl index eb5e7570..9b35dded 100644 --- a/site_ansto/instrument/config/environment/magneticField/sct_tsi_smc.tcl +++ b/site_ansto/instrument/config/environment/magneticField/sct_tsi_smc.tcl @@ -263,8 +263,8 @@ proc ::scobj::tsi_smc::setValue {tc_root nextState cmd_str} { handle_exception ${catch_status} ${catch_message} } -proc ::scobj::tsi_smc::mkDriver { sct_controller name id } { - ::scobj::tsi_smc::sics_log 9 "::scobj::tsi_smc::mkDriver ${sct_controller} ${name} ${id}" +proc ::scobj::tsi_smc::mkDriver { sct_controller name ip_address tcp_port id } { + ::scobj::tsi_smc::sics_log 9 "::scobj::tsi_smc::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port} ${id}" set ns "[namespace current]" set catch_status [ catch { @@ -511,22 +511,22 @@ namespace eval ::scobj::tsi_smc { namespace export mkDriver } -proc add_tsi_smc {name IP port {id 1}} { +proc add_tsi_smc {name ip_address tcp_port {id 1}} { set catch_status [ catch { - ::scobj::tsi_smc::sics_log 9 "add_tsi_smc ${name} ${IP} ${port} ${id}" + ::scobj::tsi_smc::sics_log 9 "add_tsi_smc ${name} ${ip_address} ${tcp_port} ${id}" if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::tsi_smc::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::tsi_smc::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::tsi_smc::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port}" - makesctcontroller sct_${name} std ${IP}:${port} + ::scobj::tsi_smc::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { ::scobj::tsi_smc::sics_log 9 "[environment_simulation] => No sctcontroller for tsi_smc" } - ::scobj::tsi_smc::sics_log 1 "::scobj::tsi_smc::mkDriver sct_${name} ${name} ${id}" - ::scobj::tsi_smc::mkDriver sct_${name} ${name} ${id} + ::scobj::tsi_smc::sics_log 1 "::scobj::tsi_smc::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id}" + ::scobj::tsi_smc::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -562,8 +562,8 @@ proc ::scobj::tsi_smc::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -577,9 +577,9 @@ proc ::scobj::tsi_smc::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } @@ -600,7 +600,7 @@ proc ::scobj::tsi_smc::read_config {} { error "$name is missing configuration values $missing_list" } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_tsi_smc ${name} ${IP} ${PORT} {*}$arg_list + add_tsi_smc ${name} ${ip_address} ${tcp_port} {*}$arg_list } else { add_tsi_smc ${name} "aqadapter" ${asyncqueue} {*}$arg_list } diff --git a/site_ansto/instrument/config/environment/sct_agilent_33220A.tcl b/site_ansto/instrument/config/environment/sct_agilent_33220A.tcl index 1f40f4f5..b93207db 100644 --- a/site_ansto/instrument/config/environment/sct_agilent_33220A.tcl +++ b/site_ansto/instrument/config/environment/sct_agilent_33220A.tcl @@ -27,12 +27,14 @@ proc ::scobj::agilent_33220A::sics_log {debug_level debug_string} { } catch_message ] } -proc ::scobj::agilent_33220A::mkDriver { sct_controller name } { - ::scobj::agilent_33220A::sics_log 9 "::scobj::agilent_33220A::mkDriver for ${name}" +proc ::scobj::agilent_33220A::mkDriver { sct_controller name ip_address tcp_port } { + ::scobj::agilent_33220A::sics_log 9 "::scobj::agilent_33220A::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port}" set ns "[namespace current]" set catch_status [ catch { # mkWrapper hook code starts + ${ns}::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} std ${ip_address}:${tcp_port} # mkWrapper hook code ends } catch_message ] handle_exception ${catch_status} ${catch_message} @@ -45,22 +47,12 @@ namespace eval ::scobj::agilent_33220A { namespace export mkDriver } -proc add_agilent_33220A {name IP port} { +proc add_agilent_33220A {name ip_address tcp_port} { set catch_status [ catch { - ::scobj::agilent_33220A::sics_log 9 "add_agilent_33220A ${name} ${IP} ${port}" - if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::agilent_33220A::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} - } else { - ::scobj::agilent_33220A::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port}" - makesctcontroller sct_${name} std ${IP}:${port} - } - } else { - ::scobj::agilent_33220A::sics_log 9 "[environment_simulation] => No sctcontroller for agilent_33220A" - } - ::scobj::agilent_33220A::sics_log 1 "::scobj::agilent_33220A::mkDriver sct_${name} ${name}" - ::scobj::agilent_33220A::mkDriver sct_${name} ${name} + ::scobj::agilent_33220A::sics_log 9 "add_agilent_33220A ${name} ${ip_address} ${tcp_port}" + ::scobj::agilent_33220A::sics_log 9 "No sctcontroller for agilent_33220A" + ::scobj::agilent_33220A::sics_log 1 "::scobj::agilent_33220A::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port}" + ::scobj::agilent_33220A::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -96,8 +88,8 @@ proc ::scobj::agilent_33220A::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -111,15 +103,15 @@ proc ::scobj::agilent_33220A::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_agilent_33220A ${name} ${IP} ${PORT} + add_agilent_33220A ${name} ${ip_address} ${tcp_port} } else { add_agilent_33220A ${name} "aqadapter" ${asyncqueue} } diff --git a/site_ansto/instrument/config/environment/sct_hiden_xcs.tcl b/site_ansto/instrument/config/environment/sct_hiden_xcs.tcl index 7ad8b503..58585188 100644 --- a/site_ansto/instrument/config/environment/sct_hiden_xcs.tcl +++ b/site_ansto/instrument/config/environment/sct_hiden_xcs.tcl @@ -745,8 +745,8 @@ proc ::scobj::hiden_xcs::write_twelve {tc_root nextState cmd_str} { handle_exception ${catch_status} ${catch_message} } -proc ::scobj::hiden_xcs::mkDriver { sct_controller name id } { - ::scobj::hiden_xcs::sics_log 9 "::scobj::hiden_xcs::mkDriver ${sct_controller} ${name} ${id}" +proc ::scobj::hiden_xcs::mkDriver { sct_controller name ip_address tcp_port id } { + ::scobj::hiden_xcs::sics_log 9 "::scobj::hiden_xcs::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port} ${id}" set ns "[namespace current]" set catch_status [ catch { @@ -1140,22 +1140,22 @@ namespace eval ::scobj::hiden_xcs { namespace export mkDriver } -proc add_hiden_xcs {name IP port id} { +proc add_hiden_xcs {name ip_address tcp_port id} { set catch_status [ catch { - ::scobj::hiden_xcs::sics_log 9 "add_hiden_xcs ${name} ${IP} ${port} ${id}" + ::scobj::hiden_xcs::sics_log 9 "add_hiden_xcs ${name} ${ip_address} ${tcp_port} ${id}" if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::hiden_xcs::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::hiden_xcs::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::hiden_xcs::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port}" - makesctcontroller sct_${name} std ${IP}:${port} + ::scobj::hiden_xcs::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { ::scobj::hiden_xcs::sics_log 9 "[environment_simulation] => No sctcontroller for hiden_xcs" } - ::scobj::hiden_xcs::sics_log 1 "::scobj::hiden_xcs::mkDriver sct_${name} ${name} ${id}" - ::scobj::hiden_xcs::mkDriver sct_${name} ${name} ${id} + ::scobj::hiden_xcs::sics_log 1 "::scobj::hiden_xcs::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id}" + ::scobj::hiden_xcs::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -1191,8 +1191,8 @@ proc ::scobj::hiden_xcs::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -1206,9 +1206,9 @@ proc ::scobj::hiden_xcs::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } @@ -1229,7 +1229,7 @@ proc ::scobj::hiden_xcs::read_config {} { error "$name is missing configuration values $missing_list" } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_hiden_xcs ${name} ${IP} ${PORT} {*}$arg_list + add_hiden_xcs ${name} ${ip_address} ${tcp_port} {*}$arg_list } else { add_hiden_xcs ${name} "aqadapter" ${asyncqueue} {*}$arg_list } diff --git a/site_ansto/instrument/config/environment/sct_huber_pilot.tcl b/site_ansto/instrument/config/environment/sct_huber_pilot.tcl index a1241fc8..aaa19519 100644 --- a/site_ansto/instrument/config/environment/sct_huber_pilot.tcl +++ b/site_ansto/instrument/config/environment/sct_huber_pilot.tcl @@ -287,8 +287,8 @@ proc ::scobj::huber_pilot::setValue {tc_root nextState cmd_str} { handle_exception ${catch_status} ${catch_message} } -proc ::scobj::huber_pilot::mkDriver { sct_controller name } { - ::scobj::huber_pilot::sics_log 9 "::scobj::huber_pilot::mkDriver for ${name}" +proc ::scobj::huber_pilot::mkDriver { sct_controller name ip_address tcp_port } { + ::scobj::huber_pilot::sics_log 9 "::scobj::huber_pilot::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port}" set ns "[namespace current]" set catch_status [ catch { @@ -445,22 +445,22 @@ namespace eval ::scobj::huber_pilot { namespace export mkDriver } -proc add_huber_pilot {name IP port} { +proc add_huber_pilot {name ip_address tcp_port} { set catch_status [ catch { - ::scobj::huber_pilot::sics_log 9 "add_huber_pilot ${name} ${IP} ${port}" + ::scobj::huber_pilot::sics_log 9 "add_huber_pilot ${name} ${ip_address} ${tcp_port}" if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::huber_pilot::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::huber_pilot::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::huber_pilot::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port}" - makesctcontroller sct_${name} std ${IP}:${port} + ::scobj::huber_pilot::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { ::scobj::huber_pilot::sics_log 9 "[environment_simulation] => No sctcontroller for huber_pilot" } - ::scobj::huber_pilot::sics_log 1 "::scobj::huber_pilot::mkDriver sct_${name} ${name}" - ::scobj::huber_pilot::mkDriver sct_${name} ${name} + ::scobj::huber_pilot::sics_log 1 "::scobj::huber_pilot::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port}" + ::scobj::huber_pilot::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -496,8 +496,8 @@ proc ::scobj::huber_pilot::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -511,15 +511,15 @@ proc ::scobj::huber_pilot::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_huber_pilot ${name} ${IP} ${PORT} + add_huber_pilot ${name} ${ip_address} ${tcp_port} } else { add_huber_pilot ${name} "aqadapter" ${asyncqueue} } diff --git a/site_ansto/instrument/config/environment/sct_isotech_ps.tcl b/site_ansto/instrument/config/environment/sct_isotech_ps.tcl index 74882d6e..dadc4372 100644 --- a/site_ansto/instrument/config/environment/sct_isotech_ps.tcl +++ b/site_ansto/instrument/config/environment/sct_isotech_ps.tcl @@ -240,8 +240,8 @@ proc ::scobj::isotech_ps::write_voltage {tc_root nextState cmd_str} { handle_exception ${catch_status} ${catch_message} } -proc ::scobj::isotech_ps::mkDriver { sct_controller name } { - ::scobj::isotech_ps::sics_log 9 "::scobj::isotech_ps::mkDriver for ${name}" +proc ::scobj::isotech_ps::mkDriver { sct_controller name ip_address tcp_port } { + ::scobj::isotech_ps::sics_log 9 "::scobj::isotech_ps::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port}" set ns "[namespace current]" set catch_status [ catch { @@ -327,22 +327,22 @@ namespace eval ::scobj::isotech_ps { namespace export mkDriver } -proc add_isotech_ps {name IP port} { +proc add_isotech_ps {name ip_address tcp_port} { set catch_status [ catch { - ::scobj::isotech_ps::sics_log 9 "add_isotech_ps ${name} ${IP} ${port}" + ::scobj::isotech_ps::sics_log 9 "add_isotech_ps ${name} ${ip_address} ${tcp_port}" if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::isotech_ps::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::isotech_ps::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::isotech_ps::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port} \"\\r\"" - makesctcontroller sct_${name} std ${IP}:${port} "\r" + ::scobj::isotech_ps::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port} \"\\r\"" + makesctcontroller sct_${name} std ${ip_address}:${tcp_port} "\r" } } else { ::scobj::isotech_ps::sics_log 9 "[environment_simulation] => No sctcontroller for isotech_ps" } - ::scobj::isotech_ps::sics_log 1 "::scobj::isotech_ps::mkDriver sct_${name} ${name}" - ::scobj::isotech_ps::mkDriver sct_${name} ${name} + ::scobj::isotech_ps::sics_log 1 "::scobj::isotech_ps::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port}" + ::scobj::isotech_ps::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -378,8 +378,8 @@ proc ::scobj::isotech_ps::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -393,15 +393,15 @@ proc ::scobj::isotech_ps::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_isotech_ps ${name} ${IP} ${PORT} + add_isotech_ps ${name} ${ip_address} ${tcp_port} } else { add_isotech_ps ${name} "aqadapter" ${asyncqueue} } diff --git a/site_ansto/instrument/config/environment/sct_keithley_m2700.tcl b/site_ansto/instrument/config/environment/sct_keithley_m2700.tcl index 48a81f98..8c0e70d5 100644 --- a/site_ansto/instrument/config/environment/sct_keithley_m2700.tcl +++ b/site_ansto/instrument/config/environment/sct_keithley_m2700.tcl @@ -27,8 +27,8 @@ proc ::scobj::keithley_m2700::sics_log {debug_level debug_string} { } catch_message ] } -proc ::scobj::keithley_m2700::mkDriver { sct_controller name id datype tol } { - ::scobj::keithley_m2700::sics_log 9 "::scobj::keithley_m2700::mkDriver ${sct_controller} ${name} ${id} ${datype} ${tol}" +proc ::scobj::keithley_m2700::mkDriver { sct_controller name ip_address tcp_port id datype tol } { + ::scobj::keithley_m2700::sics_log 9 "::scobj::keithley_m2700::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${tol}" set ns "[namespace current]" set catch_status [ catch { @@ -55,22 +55,22 @@ namespace eval ::scobj::keithley_m2700 { namespace export mkDriver } -proc add_keithley_m2700 {name IP port id datype tol} { +proc add_keithley_m2700 {name ip_address tcp_port id datype tol} { set catch_status [ catch { - ::scobj::keithley_m2700::sics_log 9 "add_keithley_m2700 ${name} ${IP} ${port} ${id} ${datype} ${tol}" + ::scobj::keithley_m2700::sics_log 9 "add_keithley_m2700 ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${tol}" if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::keithley_m2700::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::keithley_m2700::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::keithley_m2700::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port}" - makesctcontroller sct_${name} std ${IP}:${port} + ::scobj::keithley_m2700::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { ::scobj::keithley_m2700::sics_log 9 "[environment_simulation] => No sctcontroller for keithley_m2700" } - ::scobj::keithley_m2700::sics_log 1 "::scobj::keithley_m2700::mkDriver sct_${name} ${name} ${id} ${datype} ${tol}" - ::scobj::keithley_m2700::mkDriver sct_${name} ${name} ${id} ${datype} ${tol} + ::scobj::keithley_m2700::sics_log 1 "::scobj::keithley_m2700::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${tol}" + ::scobj::keithley_m2700::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${tol} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -106,8 +106,8 @@ proc ::scobj::keithley_m2700::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -121,9 +121,9 @@ proc ::scobj::keithley_m2700::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } @@ -144,7 +144,7 @@ proc ::scobj::keithley_m2700::read_config {} { error "$name is missing configuration values $missing_list" } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_keithley_m2700 ${name} ${IP} ${PORT} {*}$arg_list + add_keithley_m2700 ${name} ${ip_address} ${tcp_port} {*}$arg_list } else { add_keithley_m2700 ${name} "aqadapter" ${asyncqueue} {*}$arg_list } diff --git a/site_ansto/instrument/config/environment/sct_nhq_200.tcl b/site_ansto/instrument/config/environment/sct_nhq_200.tcl index 5ee9537f..dabf95a9 100644 --- a/site_ansto/instrument/config/environment/sct_nhq_200.tcl +++ b/site_ansto/instrument/config/environment/sct_nhq_200.tcl @@ -269,8 +269,8 @@ proc ::scobj::nhq_200::setValue {tc_root nextState cmd_str} { handle_exception ${catch_status} ${catch_message} } -proc ::scobj::nhq_200::mkDriver { sct_controller name } { - ::scobj::nhq_200::sics_log 9 "::scobj::nhq_200::mkDriver for ${name}" +proc ::scobj::nhq_200::mkDriver { sct_controller name ip_address tcp_port } { + ::scobj::nhq_200::sics_log 9 "::scobj::nhq_200::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port}" set ns "[namespace current]" set catch_status [ catch { @@ -716,22 +716,22 @@ namespace eval ::scobj::nhq_200 { namespace export mkDriver } -proc add_nhq_200 {name IP port} { +proc add_nhq_200 {name ip_address tcp_port} { set catch_status [ catch { - ::scobj::nhq_200::sics_log 9 "add_nhq_200 ${name} ${IP} ${port}" + ::scobj::nhq_200::sics_log 9 "add_nhq_200 ${name} ${ip_address} ${tcp_port}" if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::nhq_200::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::nhq_200::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::nhq_200::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port}" - makesctcontroller sct_${name} std ${IP}:${port} + ::scobj::nhq_200::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { ::scobj::nhq_200::sics_log 9 "[environment_simulation] => No sctcontroller for nhq_200" } - ::scobj::nhq_200::sics_log 1 "::scobj::nhq_200::mkDriver sct_${name} ${name}" - ::scobj::nhq_200::mkDriver sct_${name} ${name} + ::scobj::nhq_200::sics_log 1 "::scobj::nhq_200::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port}" + ::scobj::nhq_200::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -767,8 +767,8 @@ proc ::scobj::nhq_200::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -782,15 +782,15 @@ proc ::scobj::nhq_200::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_nhq_200 ${name} ${IP} ${PORT} + add_nhq_200 ${name} ${ip_address} ${tcp_port} } else { add_nhq_200 ${name} "aqadapter" ${asyncqueue} } diff --git a/site_ansto/instrument/config/environment/sct_omron_hldc.tcl b/site_ansto/instrument/config/environment/sct_omron_hldc.tcl index d4b0c8dd..8390cbe5 100644 --- a/site_ansto/instrument/config/environment/sct_omron_hldc.tcl +++ b/site_ansto/instrument/config/environment/sct_omron_hldc.tcl @@ -190,8 +190,8 @@ proc ::scobj::omron_hldc::setValue {tc_root nextState cmd_str} { handle_exception ${catch_status} ${catch_message} } -proc ::scobj::omron_hldc::mkDriver { sct_controller name } { - ::scobj::omron_hldc::sics_log 9 "::scobj::omron_hldc::mkDriver for ${name}" +proc ::scobj::omron_hldc::mkDriver { sct_controller name ip_address tcp_port } { + ::scobj::omron_hldc::sics_log 9 "::scobj::omron_hldc::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port}" set ns "[namespace current]" set catch_status [ catch { @@ -253,22 +253,22 @@ namespace eval ::scobj::omron_hldc { namespace export mkDriver } -proc add_omron_hldc {name IP port} { +proc add_omron_hldc {name ip_address tcp_port} { set catch_status [ catch { - ::scobj::omron_hldc::sics_log 9 "add_omron_hldc ${name} ${IP} ${port}" + ::scobj::omron_hldc::sics_log 9 "add_omron_hldc ${name} ${ip_address} ${tcp_port}" if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::omron_hldc::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::omron_hldc::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::omron_hldc::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port}" - makesctcontroller sct_${name} std ${IP}:${port} + ::scobj::omron_hldc::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { ::scobj::omron_hldc::sics_log 9 "[environment_simulation] => No sctcontroller for omron_hldc" } - ::scobj::omron_hldc::sics_log 1 "::scobj::omron_hldc::mkDriver sct_${name} ${name}" - ::scobj::omron_hldc::mkDriver sct_${name} ${name} + ::scobj::omron_hldc::sics_log 1 "::scobj::omron_hldc::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port}" + ::scobj::omron_hldc::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -304,8 +304,8 @@ proc ::scobj::omron_hldc::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -319,15 +319,15 @@ proc ::scobj::omron_hldc::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_omron_hldc ${name} ${IP} ${PORT} + add_omron_hldc ${name} ${ip_address} ${tcp_port} } else { add_omron_hldc ${name} "aqadapter" ${asyncqueue} } diff --git a/site_ansto/instrument/config/environment/sct_protekmm.tcl b/site_ansto/instrument/config/environment/sct_protekmm.tcl index 6a038fb7..f648948a 100644 --- a/site_ansto/instrument/config/environment/sct_protekmm.tcl +++ b/site_ansto/instrument/config/environment/sct_protekmm.tcl @@ -27,8 +27,8 @@ proc ::scobj::protekmm::sics_log {debug_level debug_string} { } catch_message ] } -proc ::scobj::protekmm::mkDriver { sct_controller name id datype } { - ::scobj::protekmm::sics_log 9 "::scobj::protekmm::mkDriver ${sct_controller} ${name} ${id} ${datype}" +proc ::scobj::protekmm::mkDriver { sct_controller name ip_address tcp_port id datype } { + ::scobj::protekmm::sics_log 9 "::scobj::protekmm::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port} ${id} ${datype}" set ns "[namespace current]" set catch_status [ catch { @@ -55,22 +55,22 @@ namespace eval ::scobj::protekmm { namespace export mkDriver } -proc add_protekmm {name IP port id datype} { +proc add_protekmm {name ip_address tcp_port id datype} { set catch_status [ catch { - ::scobj::protekmm::sics_log 9 "add_protekmm ${name} ${IP} ${port} ${id} ${datype}" + ::scobj::protekmm::sics_log 9 "add_protekmm ${name} ${ip_address} ${tcp_port} ${id} ${datype}" if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::protekmm::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::protekmm::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::protekmm::sics_log 9 "makesctcontroller sct_${name} protek608 ${IP}:${port}" - makesctcontroller sct_${name} protek608 ${IP}:${port} + ::scobj::protekmm::sics_log 9 "makesctcontroller sct_${name} protek608 ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} protek608 ${ip_address}:${tcp_port} } } else { ::scobj::protekmm::sics_log 9 "[environment_simulation] => No sctcontroller for protekmm" } - ::scobj::protekmm::sics_log 1 "::scobj::protekmm::mkDriver sct_${name} ${name} ${id} ${datype}" - ::scobj::protekmm::mkDriver sct_${name} ${name} ${id} ${datype} + ::scobj::protekmm::sics_log 1 "::scobj::protekmm::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype}" + ::scobj::protekmm::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -106,8 +106,8 @@ proc ::scobj::protekmm::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -121,9 +121,9 @@ proc ::scobj::protekmm::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } @@ -144,7 +144,7 @@ proc ::scobj::protekmm::read_config {} { error "$name is missing configuration values $missing_list" } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_protekmm ${name} ${IP} ${PORT} {*}$arg_list + add_protekmm ${name} ${ip_address} ${tcp_port} {*}$arg_list } else { add_protekmm ${name} "aqadapter" ${asyncqueue} {*}$arg_list } diff --git a/site_ansto/instrument/config/environment/temperature/sct_eurotherm_m2000.tcl b/site_ansto/instrument/config/environment/temperature/sct_eurotherm_m2000.tcl index 40c0ed01..cf09e93e 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_eurotherm_m2000.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_eurotherm_m2000.tcl @@ -27,8 +27,8 @@ proc ::scobj::eurotherm_m2000::sics_log {debug_level debug_string} { } catch_message ] } -proc ::scobj::eurotherm_m2000::mkDriver { sct_controller name id datype dev_id tol } { - ::scobj::eurotherm_m2000::sics_log 9 "::scobj::eurotherm_m2000::mkDriver ${sct_controller} ${name} ${id} ${datype} ${dev_id} ${tol}" +proc ::scobj::eurotherm_m2000::mkDriver { sct_controller name ip_address tcp_port id datype dev_id tol } { + ::scobj::eurotherm_m2000::sics_log 9 "::scobj::eurotherm_m2000::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol}" set ns "[namespace current]" set catch_status [ catch { @@ -55,22 +55,22 @@ namespace eval ::scobj::eurotherm_m2000 { namespace export mkDriver } -proc add_eurotherm_m2000 {name IP port id datype dev_id tol} { +proc add_eurotherm_m2000 {name ip_address tcp_port id datype dev_id tol} { set catch_status [ catch { - ::scobj::eurotherm_m2000::sics_log 9 "add_eurotherm_m2000 ${name} ${IP} ${port} ${id} ${datype} ${dev_id} ${tol}" + ::scobj::eurotherm_m2000::sics_log 9 "add_eurotherm_m2000 ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol}" if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::eurotherm_m2000::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::eurotherm_m2000::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::eurotherm_m2000::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port}" - makesctcontroller sct_${name} std ${IP}:${port} + ::scobj::eurotherm_m2000::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { ::scobj::eurotherm_m2000::sics_log 9 "[environment_simulation] => No sctcontroller for eurotherm_m2000" } - ::scobj::eurotherm_m2000::sics_log 1 "::scobj::eurotherm_m2000::mkDriver sct_${name} ${name} ${id} ${datype} ${dev_id} ${tol}" - ::scobj::eurotherm_m2000::mkDriver sct_${name} ${name} ${id} ${datype} ${dev_id} ${tol} + ::scobj::eurotherm_m2000::sics_log 1 "::scobj::eurotherm_m2000::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol}" + ::scobj::eurotherm_m2000::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -106,8 +106,8 @@ proc ::scobj::eurotherm_m2000::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -121,9 +121,9 @@ proc ::scobj::eurotherm_m2000::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } @@ -144,7 +144,7 @@ proc ::scobj::eurotherm_m2000::read_config {} { error "$name is missing configuration values $missing_list" } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_eurotherm_m2000 ${name} ${IP} ${PORT} {*}$arg_list + add_eurotherm_m2000 ${name} ${ip_address} ${tcp_port} {*}$arg_list } else { add_eurotherm_m2000 ${name} "aqadapter" ${asyncqueue} {*}$arg_list } diff --git a/site_ansto/instrument/config/environment/temperature/sct_julabo_lh45_gen.tcl b/site_ansto/instrument/config/environment/temperature/sct_julabo_lh45_gen.tcl index bc6175f7..3850e656 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_julabo_lh45_gen.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_julabo_lh45_gen.tcl @@ -364,8 +364,8 @@ proc ::scobj::julabo_lh45_gen::setValue {tc_root nextState cmd_str} { handle_exception ${catch_status} ${catch_message} } -proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name id ctrl_sensor tol } { - ::scobj::julabo_lh45_gen::sics_log 9 "::scobj::julabo_lh45_gen::mkDriver ${sct_controller} ${name} ${id} ${ctrl_sensor} ${tol}" +proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name ip_address tcp_port id ctrl_sensor tol } { + ::scobj::julabo_lh45_gen::sics_log 9 "::scobj::julabo_lh45_gen::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port} ${id} ${ctrl_sensor} ${tol}" set ns "[namespace current]" set catch_status [ catch { @@ -642,22 +642,22 @@ namespace eval ::scobj::julabo_lh45_gen { namespace export mkDriver } -proc add_julabo_lh45_gen {name IP port {id 1} {ctrl_sensor "bath"} {tol 5.0}} { +proc add_julabo_lh45_gen {name ip_address tcp_port {id 1} {ctrl_sensor "bath"} {tol 5.0}} { set catch_status [ catch { - ::scobj::julabo_lh45_gen::sics_log 9 "add_julabo_lh45_gen ${name} ${IP} ${port} ${id} ${ctrl_sensor} ${tol}" + ::scobj::julabo_lh45_gen::sics_log 9 "add_julabo_lh45_gen ${name} ${ip_address} ${tcp_port} ${id} ${ctrl_sensor} ${tol}" if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::julabo_lh45_gen::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::julabo_lh45_gen::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::julabo_lh45_gen::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port} \"\\r\"" - makesctcontroller sct_${name} std ${IP}:${port} "\r" + ::scobj::julabo_lh45_gen::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port} \"\\r\"" + makesctcontroller sct_${name} std ${ip_address}:${tcp_port} "\r" } } else { ::scobj::julabo_lh45_gen::sics_log 9 "[environment_simulation] => No sctcontroller for julabo_lh45_gen" } - ::scobj::julabo_lh45_gen::sics_log 1 "::scobj::julabo_lh45_gen::mkDriver sct_${name} ${name} ${id} ${ctrl_sensor} ${tol}" - ::scobj::julabo_lh45_gen::mkDriver sct_${name} ${name} ${id} ${ctrl_sensor} ${tol} + ::scobj::julabo_lh45_gen::sics_log 1 "::scobj::julabo_lh45_gen::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${ctrl_sensor} ${tol}" + ::scobj::julabo_lh45_gen::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${ctrl_sensor} ${tol} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -693,8 +693,8 @@ proc ::scobj::julabo_lh45_gen::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -708,9 +708,9 @@ proc ::scobj::julabo_lh45_gen::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } @@ -731,7 +731,7 @@ proc ::scobj::julabo_lh45_gen::read_config {} { error "$name is missing configuration values $missing_list" } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_julabo_lh45_gen ${name} ${IP} ${PORT} {*}$arg_list + add_julabo_lh45_gen ${name} ${ip_address} ${tcp_port} {*}$arg_list } else { add_julabo_lh45_gen ${name} "aqadapter" ${asyncqueue} {*}$arg_list } diff --git a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_218.tcl b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_218.tcl index 3b7af0d8..f01dc469 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_218.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_218.tcl @@ -157,8 +157,8 @@ proc ::scobj::lakeshore_218::setValue {tc_root nextState cmd_str} { handle_exception ${catch_status} ${catch_message} } -proc ::scobj::lakeshore_218::mkDriver { sct_controller name } { - ::scobj::lakeshore_218::sics_log 9 "::scobj::lakeshore_218::mkDriver for ${name}" +proc ::scobj::lakeshore_218::mkDriver { sct_controller name ip_address tcp_port } { + ::scobj::lakeshore_218::sics_log 9 "::scobj::lakeshore_218::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port}" set ns "[namespace current]" set catch_status [ catch { @@ -328,22 +328,22 @@ namespace eval ::scobj::lakeshore_218 { namespace export mkDriver } -proc add_lakeshore_218 {name IP port} { +proc add_lakeshore_218 {name ip_address tcp_port} { set catch_status [ catch { - ::scobj::lakeshore_218::sics_log 9 "add_lakeshore_218 ${name} ${IP} ${port}" + ::scobj::lakeshore_218::sics_log 9 "add_lakeshore_218 ${name} ${ip_address} ${tcp_port}" if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::lakeshore_218::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::lakeshore_218::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::lakeshore_218::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port}" - makesctcontroller sct_${name} std ${IP}:${port} + ::scobj::lakeshore_218::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { ::scobj::lakeshore_218::sics_log 9 "[environment_simulation] => No sctcontroller for lakeshore_218" } - ::scobj::lakeshore_218::sics_log 1 "::scobj::lakeshore_218::mkDriver sct_${name} ${name}" - ::scobj::lakeshore_218::mkDriver sct_${name} ${name} + ::scobj::lakeshore_218::sics_log 1 "::scobj::lakeshore_218::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port}" + ::scobj::lakeshore_218::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -379,8 +379,8 @@ proc ::scobj::lakeshore_218::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -394,15 +394,15 @@ proc ::scobj::lakeshore_218::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_lakeshore_218 ${name} ${IP} ${PORT} + add_lakeshore_218 ${name} ${ip_address} ${tcp_port} } else { add_lakeshore_218 ${name} "aqadapter" ${asyncqueue} } 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 5a04e72d..f40dbae3 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 id tol } { - ::scobj::lakeshore_m370::sics_log 9 "::scobj::lakeshore_m370::mkDriver ${sct_controller} ${name} ${id} ${tol}" +proc ::scobj::lakeshore_m370::mkDriver { sct_controller name ip_address tcp_port id tol } { + ::scobj::lakeshore_m370::sics_log 9 "::scobj::lakeshore_m370::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port} ${id} ${tol}" set ns "[namespace current]" set catch_status [ catch { @@ -59,22 +59,22 @@ namespace eval ::scobj::lakeshore_m370 { namespace export mkDriver } -proc add_lakeshore_m370 {name IP port id tol} { +proc add_lakeshore_m370 {name ip_address tcp_port id tol} { set catch_status [ catch { - ::scobj::lakeshore_m370::sics_log 9 "add_lakeshore_m370 ${name} ${IP} ${port} ${id} ${tol}" + ::scobj::lakeshore_m370::sics_log 9 "add_lakeshore_m370 ${name} ${ip_address} ${tcp_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}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::lakeshore_m370::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::lakeshore_m370::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port}" - makesctcontroller sct_${name} std ${IP}:${port} + ::scobj::lakeshore_m370::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } 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} ${id} ${tol}" - ::scobj::lakeshore_m370::mkDriver sct_${name} ${name} ${id} ${tol} + ::scobj::lakeshore_m370::sics_log 1 "::scobj::lakeshore_m370::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${tol}" + ::scobj::lakeshore_m370::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${tol} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -110,8 +110,8 @@ proc ::scobj::lakeshore_m370::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -125,9 +125,9 @@ proc ::scobj::lakeshore_m370::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } @@ -148,7 +148,7 @@ proc ::scobj::lakeshore_m370::read_config {} { error "$name is missing configuration values $missing_list" } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_lakeshore_m370 ${name} ${IP} ${PORT} {*}$arg_list + add_lakeshore_m370 ${name} ${ip_address} ${tcp_port} {*}$arg_list } else { add_lakeshore_m370 ${name} "aqadapter" ${asyncqueue} {*}$arg_list } diff --git a/site_ansto/instrument/config/environment/temperature/sct_ls336.tcl b/site_ansto/instrument/config/environment/temperature/sct_ls336.tcl index e046f1b8..fa70e8b1 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_ls336.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_ls336.tcl @@ -27,8 +27,8 @@ proc ::scobj::ls336::sics_log {debug_level debug_string} { } catch_message ] } -proc ::scobj::ls336::mkDriver { sct_controller name id datype tol1 tol2 } { - ::scobj::ls336::sics_log 9 "::scobj::ls336::mkDriver ${sct_controller} ${name} ${id} ${datype} ${tol1} ${tol2}" +proc ::scobj::ls336::mkDriver { sct_controller name ip_address tcp_port id datype tol1 tol2 } { + ::scobj::ls336::sics_log 9 "::scobj::ls336::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${tol1} ${tol2}" set ns "[namespace current]" set catch_status [ catch { @@ -55,22 +55,22 @@ namespace eval ::scobj::ls336 { namespace export mkDriver } -proc add_ls336 {name IP port id datype {tol1 1.0} {tol2 1.0}} { +proc add_ls336 {name ip_address tcp_port id datype {tol1 1.0} {tol2 1.0}} { set catch_status [ catch { - ::scobj::ls336::sics_log 9 "add_ls336 ${name} ${IP} ${port} ${id} ${datype} ${tol1} ${tol2}" + ::scobj::ls336::sics_log 9 "add_ls336 ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${tol1} ${tol2}" if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::ls336::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::ls336::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::ls336::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port}" - makesctcontroller sct_${name} std ${IP}:${port} + ::scobj::ls336::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { ::scobj::ls336::sics_log 9 "[environment_simulation] => No sctcontroller for ls336" } - ::scobj::ls336::sics_log 1 "::scobj::ls336::mkDriver sct_${name} ${name} ${id} ${datype} ${tol1} ${tol2}" - ::scobj::ls336::mkDriver sct_${name} ${name} ${id} ${datype} ${tol1} ${tol2} + ::scobj::ls336::sics_log 1 "::scobj::ls336::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${tol1} ${tol2}" + ::scobj::ls336::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${tol1} ${tol2} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -106,8 +106,8 @@ proc ::scobj::ls336::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -121,9 +121,9 @@ proc ::scobj::ls336::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } @@ -144,7 +144,7 @@ proc ::scobj::ls336::read_config {} { error "$name is missing configuration values $missing_list" } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_ls336 ${name} ${IP} ${PORT} {*}$arg_list + add_ls336 ${name} ${ip_address} ${tcp_port} {*}$arg_list } else { add_ls336 ${name} "aqadapter" ${asyncqueue} {*}$arg_list } diff --git a/site_ansto/instrument/config/environment/temperature/sct_ls340.tcl b/site_ansto/instrument/config/environment/temperature/sct_ls340.tcl index ef01c6f2..b2a7f642 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_ls340.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_ls340.tcl @@ -27,8 +27,8 @@ proc ::scobj::ls340::sics_log {debug_level debug_string} { } catch_message ] } -proc ::scobj::ls340::mkDriver { sct_controller name id datype tol1 tol2 } { - ::scobj::ls340::sics_log 9 "::scobj::ls340::mkDriver ${sct_controller} ${name} ${id} ${datype} ${tol1} ${tol2}" +proc ::scobj::ls340::mkDriver { sct_controller name ip_address tcp_port id datype tol1 tol2 } { + ::scobj::ls340::sics_log 9 "::scobj::ls340::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${tol1} ${tol2}" set ns "[namespace current]" set catch_status [ catch { @@ -55,22 +55,22 @@ namespace eval ::scobj::ls340 { namespace export mkDriver } -proc add_ls340 {name IP port id datype {tol1 1.0} {tol2 1.0}} { +proc add_ls340 {name ip_address tcp_port id datype {tol1 1.0} {tol2 1.0}} { set catch_status [ catch { - ::scobj::ls340::sics_log 9 "add_ls340 ${name} ${IP} ${port} ${id} ${datype} ${tol1} ${tol2}" + ::scobj::ls340::sics_log 9 "add_ls340 ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${tol1} ${tol2}" if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::ls340::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::ls340::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::ls340::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port}" - makesctcontroller sct_${name} std ${IP}:${port} + ::scobj::ls340::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { ::scobj::ls340::sics_log 9 "[environment_simulation] => No sctcontroller for ls340" } - ::scobj::ls340::sics_log 1 "::scobj::ls340::mkDriver sct_${name} ${name} ${id} ${datype} ${tol1} ${tol2}" - ::scobj::ls340::mkDriver sct_${name} ${name} ${id} ${datype} ${tol1} ${tol2} + ::scobj::ls340::sics_log 1 "::scobj::ls340::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${tol1} ${tol2}" + ::scobj::ls340::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${tol1} ${tol2} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -106,8 +106,8 @@ proc ::scobj::ls340::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -121,9 +121,9 @@ proc ::scobj::ls340::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } @@ -144,7 +144,7 @@ proc ::scobj::ls340::read_config {} { error "$name is missing configuration values $missing_list" } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_ls340 ${name} ${IP} ${PORT} {*}$arg_list + add_ls340 ${name} ${ip_address} ${tcp_port} {*}$arg_list } else { add_ls340 ${name} "aqadapter" ${asyncqueue} {*}$arg_list } diff --git a/site_ansto/instrument/config/environment/temperature/sct_mercury_base.tcl b/site_ansto/instrument/config/environment/temperature/sct_mercury_base.tcl index 222418ac..b83c09b6 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_mercury_base.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_mercury_base.tcl @@ -266,8 +266,8 @@ proc ::scobj::mercury_base::setValue {tc_root nextState cmd_str} { handle_exception ${catch_status} ${catch_message} } -proc ::scobj::mercury_base::mkDriver { sct_controller name id tol } { - ::scobj::mercury_base::sics_log 9 "::scobj::mercury_base::mkDriver ${sct_controller} ${name} ${id} ${tol}" +proc ::scobj::mercury_base::mkDriver { sct_controller name ip_address tcp_port id tol } { + ::scobj::mercury_base::sics_log 9 "::scobj::mercury_base::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port} ${id} ${tol}" set ns "[namespace current]" set catch_status [ catch { @@ -546,22 +546,22 @@ namespace eval ::scobj::mercury_base { namespace export mkDriver } -proc add_mercury_base {name IP port {id 99} {tol 1}} { +proc add_mercury_base {name ip_address tcp_port {id 99} {tol 1}} { set catch_status [ catch { - ::scobj::mercury_base::sics_log 9 "add_mercury_base ${name} ${IP} ${port} ${id} ${tol}" + ::scobj::mercury_base::sics_log 9 "add_mercury_base ${name} ${ip_address} ${tcp_port} ${id} ${tol}" if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::mercury_base::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::mercury_base::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::mercury_base::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port}" - makesctcontroller sct_${name} std ${IP}:${port} + ::scobj::mercury_base::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { ::scobj::mercury_base::sics_log 9 "[environment_simulation] => No sctcontroller for mercury_base" } - ::scobj::mercury_base::sics_log 1 "::scobj::mercury_base::mkDriver sct_${name} ${name} ${id} ${tol}" - ::scobj::mercury_base::mkDriver sct_${name} ${name} ${id} ${tol} + ::scobj::mercury_base::sics_log 1 "::scobj::mercury_base::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${tol}" + ::scobj::mercury_base::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${tol} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -597,8 +597,8 @@ proc ::scobj::mercury_base::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -612,9 +612,9 @@ proc ::scobj::mercury_base::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } @@ -635,7 +635,7 @@ proc ::scobj::mercury_base::read_config {} { error "$name is missing configuration values $missing_list" } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_mercury_base ${name} ${IP} ${PORT} {*}$arg_list + add_mercury_base ${name} ${ip_address} ${tcp_port} {*}$arg_list } else { add_mercury_base ${name} "aqadapter" ${asyncqueue} {*}$arg_list } diff --git a/site_ansto/instrument/config/environment/temperature/sct_mercury_level.tcl b/site_ansto/instrument/config/environment/temperature/sct_mercury_level.tcl index 3b599f05..40f084b5 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_mercury_level.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_mercury_level.tcl @@ -137,8 +137,8 @@ proc ::scobj::mercury_level::setValue {tc_root nextState cmd_str} { handle_exception ${catch_status} ${catch_message} } -proc ::scobj::mercury_level::mkDriver { sct_controller name id } { - ::scobj::mercury_level::sics_log 9 "::scobj::mercury_level::mkDriver ${sct_controller} ${name} ${id}" +proc ::scobj::mercury_level::mkDriver { sct_controller name ip_address tcp_port id } { + ::scobj::mercury_level::sics_log 9 "::scobj::mercury_level::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port} ${id}" set ns "[namespace current]" set catch_status [ catch { @@ -205,22 +205,22 @@ namespace eval ::scobj::mercury_level { namespace export mkDriver } -proc add_mercury_level {name IP port {id 99}} { +proc add_mercury_level {name ip_address tcp_port {id 99}} { set catch_status [ catch { - ::scobj::mercury_level::sics_log 9 "add_mercury_level ${name} ${IP} ${port} ${id}" + ::scobj::mercury_level::sics_log 9 "add_mercury_level ${name} ${ip_address} ${tcp_port} ${id}" if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::mercury_level::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::mercury_level::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::mercury_level::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port}" - makesctcontroller sct_${name} std ${IP}:${port} + ::scobj::mercury_level::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { ::scobj::mercury_level::sics_log 9 "[environment_simulation] => No sctcontroller for mercury_level" } - ::scobj::mercury_level::sics_log 1 "::scobj::mercury_level::mkDriver sct_${name} ${name} ${id}" - ::scobj::mercury_level::mkDriver sct_${name} ${name} ${id} + ::scobj::mercury_level::sics_log 1 "::scobj::mercury_level::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id}" + ::scobj::mercury_level::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -256,8 +256,8 @@ proc ::scobj::mercury_level::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -271,9 +271,9 @@ proc ::scobj::mercury_level::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } @@ -294,7 +294,7 @@ proc ::scobj::mercury_level::read_config {} { error "$name is missing configuration values $missing_list" } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_mercury_level ${name} ${IP} ${PORT} {*}$arg_list + add_mercury_level ${name} ${ip_address} ${tcp_port} {*}$arg_list } else { add_mercury_level ${name} "aqadapter" ${asyncqueue} {*}$arg_list } diff --git a/site_ansto/instrument/config/environment/temperature/sct_mercury_pres.tcl b/site_ansto/instrument/config/environment/temperature/sct_mercury_pres.tcl index d5f064a2..874a2f7d 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_mercury_pres.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_mercury_pres.tcl @@ -272,8 +272,8 @@ proc ::scobj::mercury_pres::setValue {tc_root nextState cmd_str} { handle_exception ${catch_status} ${catch_message} } -proc ::scobj::mercury_pres::mkDriver { sct_controller name id tol } { - ::scobj::mercury_pres::sics_log 9 "::scobj::mercury_pres::mkDriver ${sct_controller} ${name} ${id} ${tol}" +proc ::scobj::mercury_pres::mkDriver { sct_controller name ip_address tcp_port id tol } { + ::scobj::mercury_pres::sics_log 9 "::scobj::mercury_pres::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port} ${id} ${tol}" set ns "[namespace current]" set catch_status [ catch { @@ -372,22 +372,22 @@ namespace eval ::scobj::mercury_pres { namespace export mkDriver } -proc add_mercury_pres {name IP port {id 99} {tol 1}} { +proc add_mercury_pres {name ip_address tcp_port {id 99} {tol 1}} { set catch_status [ catch { - ::scobj::mercury_pres::sics_log 9 "add_mercury_pres ${name} ${IP} ${port} ${id} ${tol}" + ::scobj::mercury_pres::sics_log 9 "add_mercury_pres ${name} ${ip_address} ${tcp_port} ${id} ${tol}" if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::mercury_pres::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::mercury_pres::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::mercury_pres::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port}" - makesctcontroller sct_${name} std ${IP}:${port} + ::scobj::mercury_pres::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { ::scobj::mercury_pres::sics_log 9 "[environment_simulation] => No sctcontroller for mercury_pres" } - ::scobj::mercury_pres::sics_log 1 "::scobj::mercury_pres::mkDriver sct_${name} ${name} ${id} ${tol}" - ::scobj::mercury_pres::mkDriver sct_${name} ${name} ${id} ${tol} + ::scobj::mercury_pres::sics_log 1 "::scobj::mercury_pres::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${tol}" + ::scobj::mercury_pres::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${tol} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -423,8 +423,8 @@ proc ::scobj::mercury_pres::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -438,9 +438,9 @@ proc ::scobj::mercury_pres::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } @@ -461,7 +461,7 @@ proc ::scobj::mercury_pres::read_config {} { error "$name is missing configuration values $missing_list" } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_mercury_pres ${name} ${IP} ${PORT} {*}$arg_list + add_mercury_pres ${name} ${ip_address} ${tcp_port} {*}$arg_list } else { add_mercury_pres ${name} "aqadapter" ${asyncqueue} {*}$arg_list } diff --git a/site_ansto/instrument/config/environment/temperature/sct_mercury_scpi.tcl b/site_ansto/instrument/config/environment/temperature/sct_mercury_scpi.tcl index fd7177ac..0b9435b3 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_mercury_scpi.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_mercury_scpi.tcl @@ -300,8 +300,8 @@ proc ::scobj::mercury_scpi::setValve {tc_root nextState cmd_str} { handle_exception ${catch_status} ${catch_message} } -proc ::scobj::mercury_scpi::mkDriver { sct_controller name id permlink tol valve_tol } { - ::scobj::mercury_scpi::sics_log 9 "::scobj::mercury_scpi::mkDriver ${sct_controller} ${name} ${id} ${permlink} ${tol} ${valve_tol}" +proc ::scobj::mercury_scpi::mkDriver { sct_controller name ip_address tcp_port id permlink tol valve_tol } { + ::scobj::mercury_scpi::sics_log 9 "::scobj::mercury_scpi::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port} ${id} ${permlink} ${tol} ${valve_tol}" set ns "[namespace current]" set catch_status [ catch { @@ -759,22 +759,22 @@ namespace eval ::scobj::mercury_scpi { namespace export mkDriver } -proc add_mercury_scpi {name IP port {id 99} {permlink LT} {tol 1} {valve_tol 2}} { +proc add_mercury_scpi {name ip_address tcp_port {id 99} {permlink LT} {tol 1} {valve_tol 2}} { set catch_status [ catch { - ::scobj::mercury_scpi::sics_log 9 "add_mercury_scpi ${name} ${IP} ${port} ${id} ${permlink} ${tol} ${valve_tol}" + ::scobj::mercury_scpi::sics_log 9 "add_mercury_scpi ${name} ${ip_address} ${tcp_port} ${id} ${permlink} ${tol} ${valve_tol}" if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::mercury_scpi::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::mercury_scpi::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::mercury_scpi::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port}" - makesctcontroller sct_${name} std ${IP}:${port} + ::scobj::mercury_scpi::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { ::scobj::mercury_scpi::sics_log 9 "[environment_simulation] => No sctcontroller for mercury_scpi" } - ::scobj::mercury_scpi::sics_log 1 "::scobj::mercury_scpi::mkDriver sct_${name} ${name} ${id} ${permlink} ${tol} ${valve_tol}" - ::scobj::mercury_scpi::mkDriver sct_${name} ${name} ${id} ${permlink} ${tol} ${valve_tol} + ::scobj::mercury_scpi::sics_log 1 "::scobj::mercury_scpi::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${permlink} ${tol} ${valve_tol}" + ::scobj::mercury_scpi::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${permlink} ${tol} ${valve_tol} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -810,8 +810,8 @@ proc ::scobj::mercury_scpi::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -825,9 +825,9 @@ proc ::scobj::mercury_scpi::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } @@ -848,7 +848,7 @@ proc ::scobj::mercury_scpi::read_config {} { error "$name is missing configuration values $missing_list" } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_mercury_scpi ${name} ${IP} ${PORT} {*}$arg_list + add_mercury_scpi ${name} ${ip_address} ${tcp_port} {*}$arg_list } else { add_mercury_scpi ${name} "aqadapter" ${asyncqueue} {*}$arg_list } diff --git a/site_ansto/instrument/config/environment/temperature/sct_mercury_temp.tcl b/site_ansto/instrument/config/environment/temperature/sct_mercury_temp.tcl index fd34282b..16cfbd37 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_mercury_temp.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_mercury_temp.tcl @@ -266,8 +266,8 @@ proc ::scobj::mercury_temp::setValue {tc_root nextState cmd_str} { handle_exception ${catch_status} ${catch_message} } -proc ::scobj::mercury_temp::mkDriver { sct_controller name id tol } { - ::scobj::mercury_temp::sics_log 9 "::scobj::mercury_temp::mkDriver ${sct_controller} ${name} ${id} ${tol}" +proc ::scobj::mercury_temp::mkDriver { sct_controller name ip_address tcp_port id tol } { + ::scobj::mercury_temp::sics_log 9 "::scobj::mercury_temp::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port} ${id} ${tol}" set ns "[namespace current]" set catch_status [ catch { @@ -378,22 +378,22 @@ namespace eval ::scobj::mercury_temp { namespace export mkDriver } -proc add_mercury_temp {name IP port {id 99} {tol 1}} { +proc add_mercury_temp {name ip_address tcp_port {id 99} {tol 1}} { set catch_status [ catch { - ::scobj::mercury_temp::sics_log 9 "add_mercury_temp ${name} ${IP} ${port} ${id} ${tol}" + ::scobj::mercury_temp::sics_log 9 "add_mercury_temp ${name} ${ip_address} ${tcp_port} ${id} ${tol}" if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::mercury_temp::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::mercury_temp::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::mercury_temp::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port}" - makesctcontroller sct_${name} std ${IP}:${port} + ::scobj::mercury_temp::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { ::scobj::mercury_temp::sics_log 9 "[environment_simulation] => No sctcontroller for mercury_temp" } - ::scobj::mercury_temp::sics_log 1 "::scobj::mercury_temp::mkDriver sct_${name} ${name} ${id} ${tol}" - ::scobj::mercury_temp::mkDriver sct_${name} ${name} ${id} ${tol} + ::scobj::mercury_temp::sics_log 1 "::scobj::mercury_temp::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${tol}" + ::scobj::mercury_temp::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${tol} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -429,8 +429,8 @@ proc ::scobj::mercury_temp::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -444,9 +444,9 @@ proc ::scobj::mercury_temp::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } @@ -467,7 +467,7 @@ proc ::scobj::mercury_temp::read_config {} { error "$name is missing configuration values $missing_list" } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_mercury_temp ${name} ${IP} ${PORT} {*}$arg_list + add_mercury_temp ${name} ${ip_address} ${tcp_port} {*}$arg_list } else { add_mercury_temp ${name} "aqadapter" ${asyncqueue} {*}$arg_list } diff --git a/site_ansto/instrument/config/environment/temperature/sct_mercury_valve.tcl b/site_ansto/instrument/config/environment/temperature/sct_mercury_valve.tcl index 3312dda7..ab21a31d 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_mercury_valve.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_mercury_valve.tcl @@ -244,8 +244,8 @@ proc ::scobj::mercury_valve::setValve {tc_root nextState cmd_str} { handle_exception ${catch_status} ${catch_message} } -proc ::scobj::mercury_valve::mkDriver { sct_controller name id valve_tol } { - ::scobj::mercury_valve::sics_log 9 "::scobj::mercury_valve::mkDriver ${sct_controller} ${name} ${id} ${valve_tol}" +proc ::scobj::mercury_valve::mkDriver { sct_controller name ip_address tcp_port id valve_tol } { + ::scobj::mercury_valve::sics_log 9 "::scobj::mercury_valve::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port} ${id} ${valve_tol}" set ns "[namespace current]" set catch_status [ catch { @@ -325,22 +325,22 @@ namespace eval ::scobj::mercury_valve { namespace export mkDriver } -proc add_mercury_valve {name IP port {id 99} {valve_tol 2}} { +proc add_mercury_valve {name ip_address tcp_port {id 99} {valve_tol 2}} { set catch_status [ catch { - ::scobj::mercury_valve::sics_log 9 "add_mercury_valve ${name} ${IP} ${port} ${id} ${valve_tol}" + ::scobj::mercury_valve::sics_log 9 "add_mercury_valve ${name} ${ip_address} ${tcp_port} ${id} ${valve_tol}" if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::mercury_valve::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::mercury_valve::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::mercury_valve::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port}" - makesctcontroller sct_${name} std ${IP}:${port} + ::scobj::mercury_valve::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { ::scobj::mercury_valve::sics_log 9 "[environment_simulation] => No sctcontroller for mercury_valve" } - ::scobj::mercury_valve::sics_log 1 "::scobj::mercury_valve::mkDriver sct_${name} ${name} ${id} ${valve_tol}" - ::scobj::mercury_valve::mkDriver sct_${name} ${name} ${id} ${valve_tol} + ::scobj::mercury_valve::sics_log 1 "::scobj::mercury_valve::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${valve_tol}" + ::scobj::mercury_valve::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${valve_tol} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -376,8 +376,8 @@ proc ::scobj::mercury_valve::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -391,9 +391,9 @@ proc ::scobj::mercury_valve::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } @@ -414,7 +414,7 @@ proc ::scobj::mercury_valve::read_config {} { error "$name is missing configuration values $missing_list" } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_mercury_valve ${name} ${IP} ${PORT} {*}$arg_list + add_mercury_valve ${name} ${ip_address} ${tcp_port} {*}$arg_list } else { add_mercury_valve ${name} "aqadapter" ${asyncqueue} {*}$arg_list } diff --git a/site_ansto/instrument/config/environment/temperature/sct_nprvasm2.tcl b/site_ansto/instrument/config/environment/temperature/sct_nprvasm2.tcl index 9d73cd2e..b6ffdb6a 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_nprvasm2.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_nprvasm2.tcl @@ -27,8 +27,8 @@ proc ::scobj::nprvasm2::sics_log {debug_level debug_string} { } catch_message ] } -proc ::scobj::nprvasm2::mkDriver { sct_controller name tol } { - ::scobj::nprvasm2::sics_log 9 "::scobj::nprvasm2::mkDriver ${sct_controller} ${name} ${tol}" +proc ::scobj::nprvasm2::mkDriver { sct_controller name ip_address tcp_port tol } { + ::scobj::nprvasm2::sics_log 9 "::scobj::nprvasm2::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port} ${tol}" set ns "[namespace current]" set catch_status [ catch { @@ -55,22 +55,22 @@ namespace eval ::scobj::nprvasm2 { namespace export mkDriver } -proc add_nprvasm2 {name IP port {tol 1.0}} { +proc add_nprvasm2 {name ip_address tcp_port {tol 1.0}} { set catch_status [ catch { - ::scobj::nprvasm2::sics_log 9 "add_nprvasm2 ${name} ${IP} ${port} ${tol}" + ::scobj::nprvasm2::sics_log 9 "add_nprvasm2 ${name} ${ip_address} ${tcp_port} ${tol}" if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::nprvasm2::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::nprvasm2::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::nprvasm2::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port}" - makesctcontroller sct_${name} std ${IP}:${port} + ::scobj::nprvasm2::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { ::scobj::nprvasm2::sics_log 9 "[environment_simulation] => No sctcontroller for nprvasm2" } - ::scobj::nprvasm2::sics_log 1 "::scobj::nprvasm2::mkDriver sct_${name} ${name} ${tol}" - ::scobj::nprvasm2::mkDriver sct_${name} ${name} ${tol} + ::scobj::nprvasm2::sics_log 1 "::scobj::nprvasm2::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${tol}" + ::scobj::nprvasm2::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${tol} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -106,8 +106,8 @@ proc ::scobj::nprvasm2::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -121,9 +121,9 @@ proc ::scobj::nprvasm2::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } @@ -144,7 +144,7 @@ proc ::scobj::nprvasm2::read_config {} { error "$name is missing configuration values $missing_list" } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_nprvasm2 ${name} ${IP} ${PORT} {*}$arg_list + add_nprvasm2 ${name} ${ip_address} ${tcp_port} {*}$arg_list } else { add_nprvasm2 ${name} "aqadapter" ${asyncqueue} {*}$arg_list } diff --git a/site_ansto/instrument/config/environment/temperature/sct_pfeiffer_hg.tcl b/site_ansto/instrument/config/environment/temperature/sct_pfeiffer_hg.tcl index 5651fa49..8e65436b 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_pfeiffer_hg.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_pfeiffer_hg.tcl @@ -370,8 +370,8 @@ proc ::scobj::pfeiffer_hg::setValue {tc_root nextState cmd_str} { handle_exception ${catch_status} ${catch_message} } -proc ::scobj::pfeiffer_hg::mkDriver { sct_controller name } { - ::scobj::pfeiffer_hg::sics_log 9 "::scobj::pfeiffer_hg::mkDriver for ${name}" +proc ::scobj::pfeiffer_hg::mkDriver { sct_controller name ip_address tcp_port } { + ::scobj::pfeiffer_hg::sics_log 9 "::scobj::pfeiffer_hg::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port}" set ns "[namespace current]" set catch_status [ catch { @@ -480,22 +480,22 @@ namespace eval ::scobj::pfeiffer_hg { namespace export mkDriver } -proc add_pfeiffer_hg {name IP port} { +proc add_pfeiffer_hg {name ip_address tcp_port} { set catch_status [ catch { - ::scobj::pfeiffer_hg::sics_log 9 "add_pfeiffer_hg ${name} ${IP} ${port}" + ::scobj::pfeiffer_hg::sics_log 9 "add_pfeiffer_hg ${name} ${ip_address} ${tcp_port}" if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::pfeiffer_hg::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::pfeiffer_hg::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::pfeiffer_hg::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port}" - makesctcontroller sct_${name} std ${IP}:${port} + ::scobj::pfeiffer_hg::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { ::scobj::pfeiffer_hg::sics_log 9 "[environment_simulation] => No sctcontroller for pfeiffer_hg" } - ::scobj::pfeiffer_hg::sics_log 1 "::scobj::pfeiffer_hg::mkDriver sct_${name} ${name}" - ::scobj::pfeiffer_hg::mkDriver sct_${name} ${name} + ::scobj::pfeiffer_hg::sics_log 1 "::scobj::pfeiffer_hg::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port}" + ::scobj::pfeiffer_hg::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -531,8 +531,8 @@ proc ::scobj::pfeiffer_hg::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -546,15 +546,15 @@ proc ::scobj::pfeiffer_hg::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_pfeiffer_hg ${name} ${IP} ${PORT} + add_pfeiffer_hg ${name} ${ip_address} ${tcp_port} } else { add_pfeiffer_hg ${name} "aqadapter" ${asyncqueue} } diff --git a/site_ansto/instrument/config/environment/temperature/sct_watlow_mpm.tcl b/site_ansto/instrument/config/environment/temperature/sct_watlow_mpm.tcl index a41ccb96..553141b1 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_watlow_mpm.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_watlow_mpm.tcl @@ -27,8 +27,8 @@ proc ::scobj::watlow_mpm::sics_log {debug_level debug_string} { } catch_message ] } -proc ::scobj::watlow_mpm::mkDriver { sct_controller name id datype dev_id tol } { - ::scobj::watlow_mpm::sics_log 9 "::scobj::watlow_mpm::mkDriver ${sct_controller} ${name} ${id} ${datype} ${dev_id} ${tol}" +proc ::scobj::watlow_mpm::mkDriver { sct_controller name ip_address tcp_port id datype dev_id tol } { + ::scobj::watlow_mpm::sics_log 9 "::scobj::watlow_mpm::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol}" set ns "[namespace current]" set catch_status [ catch { @@ -55,22 +55,22 @@ namespace eval ::scobj::watlow_mpm { namespace export mkDriver } -proc add_watlow_mpm {name IP port id datype dev_id tol} { +proc add_watlow_mpm {name ip_address tcp_port id datype dev_id tol} { set catch_status [ catch { - ::scobj::watlow_mpm::sics_log 9 "add_watlow_mpm ${name} ${IP} ${port} ${id} ${datype} ${dev_id} ${tol}" + ::scobj::watlow_mpm::sics_log 9 "add_watlow_mpm ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol}" if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::watlow_mpm::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::watlow_mpm::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::watlow_mpm::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port}" - makesctcontroller sct_${name} std ${IP}:${port} + ::scobj::watlow_mpm::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { ::scobj::watlow_mpm::sics_log 9 "[environment_simulation] => No sctcontroller for watlow_mpm" } - ::scobj::watlow_mpm::sics_log 1 "::scobj::watlow_mpm::mkDriver sct_${name} ${name} ${id} ${datype} ${dev_id} ${tol}" - ::scobj::watlow_mpm::mkDriver sct_${name} ${name} ${id} ${datype} ${dev_id} ${tol} + ::scobj::watlow_mpm::sics_log 1 "::scobj::watlow_mpm::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol}" + ::scobj::watlow_mpm::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -106,8 +106,8 @@ proc ::scobj::watlow_mpm::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -121,9 +121,9 @@ proc ::scobj::watlow_mpm::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } @@ -144,7 +144,7 @@ proc ::scobj::watlow_mpm::read_config {} { error "$name is missing configuration values $missing_list" } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_watlow_mpm ${name} ${IP} ${PORT} {*}$arg_list + add_watlow_mpm ${name} ${ip_address} ${tcp_port} {*}$arg_list } else { add_watlow_mpm ${name} "aqadapter" ${asyncqueue} {*}$arg_list } diff --git a/site_ansto/instrument/config/environment/temperature/sct_watlow_mrm.tcl b/site_ansto/instrument/config/environment/temperature/sct_watlow_mrm.tcl index 1b15c05e..39105958 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_watlow_mrm.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_watlow_mrm.tcl @@ -27,8 +27,8 @@ proc ::scobj::watlow_mrm::sics_log {debug_level debug_string} { } catch_message ] } -proc ::scobj::watlow_mrm::mkDriver { sct_controller name id datype dev_id tol } { - ::scobj::watlow_mrm::sics_log 9 "::scobj::watlow_mrm::mkDriver ${sct_controller} ${name} ${id} ${datype} ${dev_id} ${tol}" +proc ::scobj::watlow_mrm::mkDriver { sct_controller name ip_address tcp_port id datype dev_id tol } { + ::scobj::watlow_mrm::sics_log 9 "::scobj::watlow_mrm::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol}" set ns "[namespace current]" set catch_status [ catch { @@ -55,22 +55,22 @@ namespace eval ::scobj::watlow_mrm { namespace export mkDriver } -proc add_watlow_mrm {name IP port id datype dev_id tol} { +proc add_watlow_mrm {name ip_address tcp_port id datype dev_id tol} { set catch_status [ catch { - ::scobj::watlow_mrm::sics_log 9 "add_watlow_mrm ${name} ${IP} ${port} ${id} ${datype} ${dev_id} ${tol}" + ::scobj::watlow_mrm::sics_log 9 "add_watlow_mrm ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol}" if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::watlow_mrm::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::watlow_mrm::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::watlow_mrm::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port}" - makesctcontroller sct_${name} std ${IP}:${port} + ::scobj::watlow_mrm::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { ::scobj::watlow_mrm::sics_log 9 "[environment_simulation] => No sctcontroller for watlow_mrm" } - ::scobj::watlow_mrm::sics_log 1 "::scobj::watlow_mrm::mkDriver sct_${name} ${name} ${id} ${datype} ${dev_id} ${tol}" - ::scobj::watlow_mrm::mkDriver sct_${name} ${name} ${id} ${datype} ${dev_id} ${tol} + ::scobj::watlow_mrm::sics_log 1 "::scobj::watlow_mrm::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol}" + ::scobj::watlow_mrm::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -106,8 +106,8 @@ proc ::scobj::watlow_mrm::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -121,9 +121,9 @@ proc ::scobj::watlow_mrm::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } @@ -144,7 +144,7 @@ proc ::scobj::watlow_mrm::read_config {} { error "$name is missing configuration values $missing_list" } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_watlow_mrm ${name} ${IP} ${PORT} {*}$arg_list + add_watlow_mrm ${name} ${ip_address} ${tcp_port} {*}$arg_list } else { add_watlow_mrm ${name} "aqadapter" ${asyncqueue} {*}$arg_list } diff --git a/site_ansto/instrument/config/environment/temperature/sct_watlow_mst4.tcl b/site_ansto/instrument/config/environment/temperature/sct_watlow_mst4.tcl index bdc3a9c8..87103a6b 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_watlow_mst4.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_watlow_mst4.tcl @@ -27,8 +27,8 @@ proc ::scobj::watlow_mst4::sics_log {debug_level debug_string} { } catch_message ] } -proc ::scobj::watlow_mst4::mkDriver { sct_controller name id datype dev_id tol } { - ::scobj::watlow_mst4::sics_log 9 "::scobj::watlow_mst4::mkDriver ${sct_controller} ${name} ${id} ${datype} ${dev_id} ${tol}" +proc ::scobj::watlow_mst4::mkDriver { sct_controller name ip_address tcp_port id datype dev_id tol } { + ::scobj::watlow_mst4::sics_log 9 "::scobj::watlow_mst4::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol}" set ns "[namespace current]" set catch_status [ catch { @@ -55,22 +55,22 @@ namespace eval ::scobj::watlow_mst4 { namespace export mkDriver } -proc add_watlow_mst4 {name IP port id datype dev_id tol} { +proc add_watlow_mst4 {name ip_address tcp_port id datype dev_id tol} { set catch_status [ catch { - ::scobj::watlow_mst4::sics_log 9 "add_watlow_mst4 ${name} ${IP} ${port} ${id} ${datype} ${dev_id} ${tol}" + ::scobj::watlow_mst4::sics_log 9 "add_watlow_mst4 ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol}" if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::watlow_mst4::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::watlow_mst4::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::watlow_mst4::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port}" - makesctcontroller sct_${name} std ${IP}:${port} + ::scobj::watlow_mst4::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { ::scobj::watlow_mst4::sics_log 9 "[environment_simulation] => No sctcontroller for watlow_mst4" } - ::scobj::watlow_mst4::sics_log 1 "::scobj::watlow_mst4::mkDriver sct_${name} ${name} ${id} ${datype} ${dev_id} ${tol}" - ::scobj::watlow_mst4::mkDriver sct_${name} ${name} ${id} ${datype} ${dev_id} ${tol} + ::scobj::watlow_mst4::sics_log 1 "::scobj::watlow_mst4::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol}" + ::scobj::watlow_mst4::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -106,8 +106,8 @@ proc ::scobj::watlow_mst4::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -121,9 +121,9 @@ proc ::scobj::watlow_mst4::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } @@ -144,7 +144,7 @@ proc ::scobj::watlow_mst4::read_config {} { error "$name is missing configuration values $missing_list" } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_watlow_mst4 ${name} ${IP} ${PORT} {*}$arg_list + add_watlow_mst4 ${name} ${ip_address} ${tcp_port} {*}$arg_list } else { add_watlow_mst4 ${name} "aqadapter" ${asyncqueue} {*}$arg_list } diff --git a/site_ansto/instrument/config/environment/temperature/sct_west4100.tcl b/site_ansto/instrument/config/environment/temperature/sct_west4100.tcl index 0aa66be7..fc09b87f 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_west4100.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_west4100.tcl @@ -27,23 +27,14 @@ proc ::scobj::west4100::sics_log {debug_level debug_string} { } catch_message ] } -proc ::scobj::west4100::mkDriver { sct_controller name IP dev_id } { - ::scobj::west4100::sics_log 9 "::scobj::west4100::mkDriver ${sct_controller} ${name} ${IP} ${dev_id}" +proc ::scobj::west4100::mkDriver { sct_controller name ip_address tcp_port dev_id } { + ::scobj::west4100::sics_log 9 "::scobj::west4100::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port} ${dev_id}" set ns "[namespace current]" set catch_status [ catch { - MakeSICSObj ${name} SCT_OBJECT - - sicslist setatt ${name} klass environment - sicslist setatt ${name} long_name ${name} - - set scobj_hpath /sics/${name} - hsetprop ${scobj_hpath} klass environment - hsetprop ${scobj_hpath} data true - hsetprop ${scobj_hpath} debug_threshold 5 -# mkDriver hook code starts - ::environment::temperature::mkwest400 $name $IP $dev_id -# mkDriver hook code ends +# mkWrapper hook code starts + ::environment::temperature::mkwest400 ${name} ${ip_address} ${dev_id} +# mkWrapper hook code ends } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -55,22 +46,12 @@ namespace eval ::scobj::west4100 { namespace export mkDriver } -proc add_west4100 {name IP port dev_id} { +proc add_west4100 {name ip_address tcp_port dev_id} { set catch_status [ catch { - ::scobj::west4100::sics_log 9 "add_west4100 ${name} ${IP} ${port} ${IP} ${dev_id}" - if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::west4100::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} - } else { - ::scobj::west4100::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port}" - makesctcontroller sct_${name} std ${IP}:${port} - } - } else { - ::scobj::west4100::sics_log 9 "[environment_simulation] => No sctcontroller for west4100" - } - ::scobj::west4100::sics_log 1 "::scobj::west4100::mkDriver sct_${name} ${name} ${IP} ${dev_id}" - ::scobj::west4100::mkDriver sct_${name} ${name} ${IP} ${dev_id} + ::scobj::west4100::sics_log 9 "add_west4100 ${name} ${ip_address} ${tcp_port} ${dev_id}" + ::scobj::west4100::sics_log 9 "No sctcontroller for west4100" + ::scobj::west4100::sics_log 1 "::scobj::west4100::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${dev_id}" + ::scobj::west4100::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${dev_id} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -106,8 +87,8 @@ proc ::scobj::west4100::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -121,16 +102,16 @@ proc ::scobj::west4100::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } } set arg_list [list] set missing_list [list] - foreach arg {IP dev_id} { + foreach arg {dev_id} { if {[dict exists $u $arg]} { lappend arg_list "[dict get $u $arg]" } elseif {[dict exists $v $arg]} { @@ -144,7 +125,7 @@ proc ::scobj::west4100::read_config {} { error "$name is missing configuration values $missing_list" } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_west4100 ${name} ${IP} ${PORT} {*}$arg_list + add_west4100 ${name} ${ip_address} ${tcp_port} {*}$arg_list } else { add_west4100 ${name} "aqadapter" ${asyncqueue} {*}$arg_list } diff --git a/site_ansto/instrument/config/source/sct_reactor_status.tcl b/site_ansto/instrument/config/source/sct_reactor_status.tcl index 3f031437..95985475 100644 --- a/site_ansto/instrument/config/source/sct_reactor_status.tcl +++ b/site_ansto/instrument/config/source/sct_reactor_status.tcl @@ -216,8 +216,8 @@ proc ::scobj::reactor_status::setValue {tc_root nextState cmd_str} { handle_exception ${catch_status} ${catch_message} } -proc ::scobj::reactor_status::mkDriver { sct_controller name } { - ::scobj::reactor_status::sics_log 9 "::scobj::reactor_status::mkDriver for ${name}" +proc ::scobj::reactor_status::mkDriver { sct_controller name ip_address tcp_port } { + ::scobj::reactor_status::sics_log 9 "::scobj::reactor_status::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port}" set ns "[namespace current]" set catch_status [ catch { @@ -321,22 +321,22 @@ namespace eval ::scobj::reactor_status { namespace export mkDriver } -proc add_reactor_status {name IP port} { +proc add_reactor_status {name ip_address tcp_port} { set catch_status [ catch { - ::scobj::reactor_status::sics_log 9 "add_reactor_status ${name} ${IP} ${port}" + ::scobj::reactor_status::sics_log 9 "add_reactor_status ${name} ${ip_address} ${tcp_port}" if {[string equal -nocase [SplitReply [opal_simulation]] "false"]} { - if {[string equal -nocase "aqadapter" "${IP}"]} { - ::scobj::reactor_status::sics_log 9 "makesctcontroller sct_${name} aqadapter ${port}" - makesctcontroller sct_${name} aqadapter ${port} + if {[string equal -nocase "aqadapter" "${ip_address}"]} { + ::scobj::reactor_status::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}" + makesctcontroller sct_${name} aqadapter ${tcp_port} } else { - ::scobj::reactor_status::sics_log 9 "makesctcontroller sct_${name} std ${IP}:${port}" - makesctcontroller sct_${name} std ${IP}:${port} + ::scobj::reactor_status::sics_log 9 "makesctcontroller sct_${name} std ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} std ${ip_address}:${tcp_port} } } else { ::scobj::reactor_status::sics_log 9 "[opal_simulation] => No sctcontroller for reactor_status" } - ::scobj::reactor_status::sics_log 1 "::scobj::reactor_status::mkDriver sct_${name} ${name}" - ::scobj::reactor_status::mkDriver sct_${name} ${name} + ::scobj::reactor_status::sics_log 1 "::scobj::reactor_status::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port}" + ::scobj::reactor_status::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} } catch_message ] handle_exception ${catch_status} ${catch_message} } @@ -372,8 +372,8 @@ proc ::scobj::reactor_status::read_config {} { } elseif { [dict exists $v "asyncqueue"] } { set asyncqueue [dict get $v "asyncqueue"] if { [string equal -nocase ${asyncqueue} "sct"] } { - set IP [dict get $v ip] - set PORT [dict get $v port] + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] } } else { if { [dict exists $v "asyncprotocol"] } { @@ -387,15 +387,15 @@ proc ::scobj::reactor_status::read_config {} { } } set asyncqueue ${name}_queue - set IP [dict get $v ip] - set PORT [dict get $v port] - MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${IP} ${PORT} + set ip_address [dict get $v ip] + set tcp_port [dict get $v port] + MakeAsyncQueue ${asyncqueue} ${asyncprotocol} ${ip_address} ${tcp_port} if { [dict exists $v "timeout"] } { ${asyncqueue} timeout "[dict get $v "timeout"]" } } if { [string equal -nocase ${asyncqueue} "sct"] } { - add_reactor_status ${name} ${IP} ${PORT} + add_reactor_status ${name} ${ip_address} ${tcp_port} } else { add_reactor_status ${name} "aqadapter" ${asyncqueue} }