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

Regenerated drivers

Browse Source
This commit is contained in:
Douglas Clowes
2014-09-11 13:29:52 +10:00
parent 65b50f3fcc
commit 0cb3f4f91c
36 changed files with 1387 additions and 883 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
site_ansto/instrument/config/robots/sct_epson_pandp.tcl
View File

@@ -27,8 +27,8 @@ proc ::scobj::epson_pandp::sics_log {debug_level debug_string} {
} catch_message ]
}
proc ::scobj::epson_pandp::mkDriver { sct_controller name ip_address tcp_port robot_name } {
::scobj::epson_pandp::sics_log 9 "::scobj::epson_pandp::mkDriver ${sct_controller} ${name} ${ip_address} ${tcp_port} ${robot_name}"
proc ::scobj::epson_pandp::mkDriver { sct_controller name device_class simulation_flag ip_address tcp_port robot_name } {
::scobj::epson_pandp::sics_log 9 "::scobj::epson_pandp::mkDriver ${sct_controller} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${robot_name}"
set ns "[namespace current]"
set catch_status [ catch {
@@ -40,21 +40,27 @@ proc ::scobj::epson_pandp::mkDriver { sct_controller name ip_address tcp_port ro
handle_exception ${catch_status} ${catch_message}
}
proc ::scobj::epson_pandp::add_driver {name device_class simulation_flag ip_address tcp_port robot_name} {
set catch_status [ catch {
::scobj::epson_pandp::sics_log 9 "::scobj::epson_pandp::add_driver ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${robot_name}"
::scobj::epson_pandp::sics_log 9 "No sctcontroller for epson_pandp"
::scobj::epson_pandp::sics_log 1 "::scobj::epson_pandp::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${robot_name}"
::scobj::epson_pandp::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} ${robot_name}
} catch_message ]
handle_exception ${catch_status} ${catch_message}
}
namespace eval ::scobj::epson_pandp {
namespace export debug_threshold
namespace export debug_log
namespace export sics_log
namespace export mkDriver
namespace export add_driver
}
proc add_epson_pandp {name ip_address tcp_port robot_name} {
set catch_status [ catch {
::scobj::epson_pandp::sics_log 9 "add_epson_pandp ${name} ${ip_address} ${tcp_port} ${robot_name}"
::scobj::epson_pandp::sics_log 9 "No sctcontroller for epson_pandp"
::scobj::epson_pandp::sics_log 1 "::scobj::epson_pandp::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${robot_name}"
::scobj::epson_pandp::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port} ${robot_name}
} catch_message ]
handle_exception ${catch_status} ${catch_message}
set simulation_flag "[string tolower [SplitReply [environment_simulation]]]"
::scobj::epson_pandp::add_driver ${name} "environment" "${simulation_flag}" ${ip_address} ${tcp_port} "${robot_name}"
}
clientput "file evaluation of sct_epson_pandp.tcl"
@@ -65,6 +71,8 @@ proc ::scobj::epson_pandp::read_config {} {
set ns "::scobj::epson_pandp"
dict for {k u} $::config_dict {
if { [dict exists $u "implementation"] } {
set simulation_flag "[string tolower [SplitReply [environment_simulation]]]"
set device_class "environment"
if { !([dict exists $u "name"] && [dict exists $u "enabled"]) } {
continue
}
@@ -72,6 +80,12 @@ proc ::scobj::epson_pandp::read_config {} {
if { ! ([string equal -nocase $enabled "true" ] || [string equal -nocase $enabled "always"]) } {
continue
}
if { [dict exists $u "simulation_group"] } {
set simulation_flag [SplitReply [[string tolower [dict get $u "simulation_group"]]]]
}
if { [dict exists $u "device_class"] } {
set device_class "[dict get $u "device_class"]"
}
set name [dict get $u name]
set implementation [dict get $u "implementation"]
if { !([dict exists $::config_dict $implementation]) } {
@@ -82,9 +96,9 @@ proc ::scobj::epson_pandp::read_config {} {
continue
}
if { [string equal -nocase [dict get $v "driver"] "epson_pandp"] } {
if { ![string equal -nocase [SplitReply [environment_simulation]] "false"] } {
if { ![string equal -nocase "${simulation_flag}" "false"] } {
set asyncqueue "null"
${ns}::sics_log 9 "[environment_simulation] => using null asyncqueue"
${ns}::sics_log 9 "simulation_flag=${simulation_flag} => using null asyncqueue"
} elseif { [dict exists $v "asyncqueue"] } {
set asyncqueue [dict get $v "asyncqueue"]
if { [string equal -nocase ${asyncqueue} "sct"] } {
@@ -126,9 +140,9 @@ proc ::scobj::epson_pandp::read_config {} {
error "$name is missing configuration values $missing_list"
}
if { [string equal -nocase ${asyncqueue} "sct"] } {
add_epson_pandp ${name} ${ip_address} ${tcp_port} {*}$arg_list
${ns}::add_driver ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
} else {
add_epson_pandp ${name} "aqadapter" ${asyncqueue} {*}$arg_list
${ns}::add_driver ${name} ${device_class} ${simulation_flag} "aqadapter" ${asyncqueue} {*}$arg_list
}
}
}