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

Merge branch 'Quokka' into RELEASE-3_1

Browse Source 
Conflicts:
	sics/site_ansto/instrument/config/environment/sct_hiden_xcs.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_julabo_lh45_gen.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
	sics/site_ansto/instrument/sans/quokka_configuration.tcl
	sics/site_ansto/instrument/util/gen_sct.py
This commit is contained in:
Douglas Clowes
2015-04-17 12:27:57 +10:00
parent 49a43f4d9b 1f9dd8da95
commit 94663632e4
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
site_ansto/instrument/config/environment/temperature/sct_watlow_mrm.tcl
View File

@ -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}" ::scobj::watlow_mrm::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}"
makesctcontroller sct_${name} aqadapter ${tcp_port} makesctcontroller sct_${name} aqadapter ${tcp_port}
} else { } else {
::scobj::watlow_mrm::sics_log 9 "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} std ${ip_address}:${tcp_port} makesctcontroller sct_${name} modbus ${ip_address}:${tcp_port}
} }
} else { } else {
::scobj::watlow_mrm::sics_log 9 "simulation_flag=${simulation_flag} => Null sctcontroller for watlow_mrm" ::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"] } { if { [string equal -nocase ${asyncqueue} "sct"] } {
set ip_address [dict get $v ip] set ip_address [dict get $v ip]
set tcp_port [dict get $v port] set tcp_port [dict get $v port]
makesctcontroller sct_${name} std ${ip_address}:${tcp_port} makesctcontroller sct_${name} modbus ${ip_address}:${tcp_port}
} else { } else {
makesctcontroller sct_${name} aqadapter ${asyncqueue} makesctcontroller sct_${name} aqadapter ${asyncqueue}
} }

2
site_ansto/instrument/config/environment/temperature/watlow_mrm.sct
View File

@ -1,6 +1,6 @@
# vim: ts=8 sts=2 sw=2 expandtab autoindent smartindent nocindent # vim: ts=8 sts=2 sw=2 expandtab autoindent smartindent nocindent
driver watlow_mrm = { driver watlow_mrm = {
protocol = std protocol = modbus
sobj_priv_type = 'user float' sobj_priv_type = 'user float'
class = environment class = environment
simulation_group = environment_simulation simulation_group = environment_simulation

10
site_ansto/instrument/sans/config/motors/positmotor_configuration.tcl
View File

@ -47,11 +47,21 @@ set 10sample_table {
10 -214.5996 10 -214.5996
} }
set 5sample_table {
1 120
2 60
3 0
4 -60
5 -120
}
if { [ info exists ::config_dict ] } { if { [ info exists ::config_dict ] } {
if { [ dict exists $::config_dict sample_stage implementation ] } { if { [ dict exists $::config_dict sample_stage implementation ] } {
set implementation [ dict get $::config_dict sample_stage implementation ] set implementation [ dict get $::config_dict sample_stage implementation ]
if {$implementation == "normal_sample_stage"} { if {$implementation == "normal_sample_stage"} {
# Don't make posit motor # 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"} { } elseif {$implementation == "10_pos_sample_stage"} {
mkPosit sct_mc1 sampleNum float samx sample $10sample_table mkPosit sct_mc1 sampleNum float samx sample $10sample_table
} elseif {$implementation == "20_pos_sample_stage"} { } elseif {$implementation == "20_pos_sample_stage"} {