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/bilby/config/chopper/sct_astrium_chopper.tcl
This commit is contained in:
Douglas Clowes
2014-08-19 11:46:24 +10:00
parent 6266bcdad7 a93819572a
commit 44f6b65aef
36 changed files with 574 additions and 597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
site_ansto/instrument/config/environment/temperature/west4100_sct.tcl
View File

@@ -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
}