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 a2030e9b..f0f81c96 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_watlow_mrm.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_watlow_mrm.tcl @@ -61,8 +61,8 @@ proc ::scobj::watlow_mrm::add_driver {name device_class simulation_flag ip_addre ::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_address}:${tcp_port}" - makesctcontroller sct_${name} std ${ip_address}:${tcp_port} + ::scobj::watlow_mrm::sics_log 9 "makesctcontroller sct_${name} modbus ${ip_address}:${tcp_port}" + makesctcontroller sct_${name} modbus ${ip_address}:${tcp_port} } } else { ::scobj::watlow_mrm::sics_log 9 "simulation_flag=${simulation_flag} => Null sctcontroller for watlow_mrm" @@ -131,7 +131,7 @@ proc ::scobj::watlow_mrm::read_config {} { if { [string equal -nocase ${asyncqueue} "sct"] } { set ip_address [dict get $v ip] set tcp_port [dict get $v port] - makesctcontroller sct_${name} std ${ip_address}:${tcp_port} + makesctcontroller sct_${name} modbus ${ip_address}:${tcp_port} } else { makesctcontroller sct_${name} aqadapter ${asyncqueue} } diff --git a/site_ansto/instrument/config/environment/temperature/watlow_mrm.sct b/site_ansto/instrument/config/environment/temperature/watlow_mrm.sct index c9b1dbf6..e29210a0 100644 --- a/site_ansto/instrument/config/environment/temperature/watlow_mrm.sct +++ b/site_ansto/instrument/config/environment/temperature/watlow_mrm.sct @@ -1,6 +1,6 @@ # vim: ts=8 sts=2 sw=2 expandtab autoindent smartindent nocindent driver watlow_mrm = { - protocol = std + protocol = modbus sobj_priv_type = 'user float' class = environment simulation_group = environment_simulation diff --git a/site_ansto/instrument/sans/config/motors/positmotor_configuration.tcl b/site_ansto/instrument/sans/config/motors/positmotor_configuration.tcl index 860d8b07..5b3f1425 100644 --- a/site_ansto/instrument/sans/config/motors/positmotor_configuration.tcl +++ b/site_ansto/instrument/sans/config/motors/positmotor_configuration.tcl @@ -47,11 +47,21 @@ set 10sample_table { 10 -214.5996 } +set 5sample_table { + 1 120 + 2 60 + 3 0 + 4 -60 + 5 -120 +} + if { [ info exists ::config_dict ] } { if { [ dict exists $::config_dict sample_stage implementation ] } { set implementation [ dict get $::config_dict sample_stage implementation ] if {$implementation == "normal_sample_stage"} { # Don't make posit motor + } elseif {$implementation == "5_pos_sample_tumbler"} { + mkPosit sct_mc1 sampleNum float samx sample $5sample_table } elseif {$implementation == "10_pos_sample_stage"} { mkPosit sct_mc1 sampleNum float samx sample $10sample_table } elseif {$implementation == "20_pos_sample_stage"} {