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

Merge branch 'RELEASE-3_1' into RELEASE-3_2

Browse Source 
Conflicts:
	sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
This commit is contained in:
Douglas Clowes
2015-04-17 13:54:48 +10:00
parent 7891c9195f 21c96297f3
commit 4bb05ed67e
12 changed files with 415 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
site_ansto/instrument/config/environment/temperature/watlow_mrm_sct.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}"
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}
}