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

Regenerate template drivers

Browse Source
This commit is contained in:
Douglas Clowes
2014-08-19 11:43:45 +10:00
parent 6f5892f07d
commit a93819572a
33 changed files with 556 additions and 583 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
site_ansto/instrument/bilby/config/motors/sct_shutters.tcl
View File

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

34
site_ansto/instrument/bilby/config/motors/sct_tank.tcl
View File

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