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

Add astrium chopper field 'master' to driver

Browse Source
This commit is contained in:
Douglas Clowes
2014-05-30 17:17:14 +10:00
parent bd0c0b5556
commit a1572f3152
2 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
site_ansto/instrument/bilby/config/chopper/astrium_chopper.sct
View File

@ -9,6 +9,7 @@ driver astrium_chopper = {
read_command = '1'; fetch_function = fetchState; read_function = readState; read_command = '1'; fetch_function = fetchState; read_function = readState;
property 'my_state' = 'idle'; property 'my_state' = 'idle';
} }
var master = { type = text; }
var rspeed = { type = float; } var rspeed = { type = float; }
var aspeed = { type = float; mutable = true; } var aspeed = { type = float; mutable = true; }
var rphase = { type = float; } var rphase = { type = float; }
@ -21,6 +22,7 @@ driver astrium_chopper = {
read_command = '2'; fetch_function = fetchState; read_function = readState; read_command = '2'; fetch_function = fetchState; read_function = readState;
property 'my_state' = 'idle'; property 'my_state' = 'idle';
} }
var master = { type = text; }
var rspeed = { type = float; } var rspeed = { type = float; }
var aspeed = { type = float; mutable = true; } var aspeed = { type = float; mutable = true; }
var rphase = { type = float; } var rphase = { type = float; }
@ -33,6 +35,7 @@ driver astrium_chopper = {
read_command = '3'; fetch_function = fetchState; read_function = readState; read_command = '3'; fetch_function = fetchState; read_function = readState;
property 'my_state' = 'idle'; property 'my_state' = 'idle';
} }
var master = { type = text; }
var rspeed = { type = float; } var rspeed = { type = float; }
var aspeed = { type = float; mutable = true; } var aspeed = { type = float; mutable = true; }
var rphase = { type = float; } var rphase = { type = float; }
@ -45,6 +48,7 @@ driver astrium_chopper = {
read_command = '4'; fetch_function = fetchState; read_function = readState; read_command = '4'; fetch_function = fetchState; read_function = readState;
property 'my_state' = 'idle'; property 'my_state' = 'idle';
} }
var master = { type = text; }
var rspeed = { type = float; } var rspeed = { type = float; }
var aspeed = { type = float; mutable = true; } var aspeed = { type = float; mutable = true; }
var rphase = { type = float; } var rphase = { type = float; }
@ -84,7 +88,7 @@ driver astrium_chopper = {
set rhs "[string trim [lindex ${lst} 1]]" set rhs "[string trim [lindex ${lst} 1]]"
sct "attr_${lhs}" "${rhs}" sct "attr_${lhs}" "${rhs}"
set base [pathname [sct]] set base [pathname [sct]]
foreach node [list ASPEED RSPEED APHASE RPHASE] { foreach node [list ASPEED RSPEED APHASE RPHASE MASTER] {
if { [string equal -nocase "${lhs}" "${node}"] } { if { [string equal -nocase "${lhs}" "${node}"] } {
if { "[hval ${base}/${node}]" != "${rhs}" } { if { "[hval ${base}/${node}]" != "${rhs}" } {
hset ${base}/${node} "${rhs}" hset ${base}/${node} "${rhs}"

42
site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
View File

@ -174,7 +174,7 @@ proc ::scobj::astrium_chopper::readState {tc_root} {
set rhs "[string trim [lindex ${lst} 1]]" set rhs "[string trim [lindex ${lst} 1]]"
sct "attr_${lhs}" "${rhs}" sct "attr_${lhs}" "${rhs}"
set base [pathname [sct]] set base [pathname [sct]]
foreach node [list ASPEED RSPEED APHASE RPHASE] { foreach node [list ASPEED RSPEED APHASE RPHASE MASTER] {
if { [string equal -nocase "${lhs}" "${node}"] } { if { [string equal -nocase "${lhs}" "${node}"] } {
if { "[hval ${base}/${node}]" != "${rhs}" } { if { "[hval ${base}/${node}]" != "${rhs}" } {
hset ${base}/${node} "${rhs}" hset ${base}/${node} "${rhs}"
@ -264,6 +264,16 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name } {
hsetprop ${scobj_hpath}/blade_1/aspeed type "part" hsetprop ${scobj_hpath}/blade_1/aspeed type "part"
hsetprop ${scobj_hpath}/blade_1/aspeed nxalias "${name}_blade_1_aspeed" hsetprop ${scobj_hpath}/blade_1/aspeed nxalias "${name}_blade_1_aspeed"
hfactory ${scobj_hpath}/blade_1/master plain user text
hsetprop ${scobj_hpath}/blade_1/master control true
hsetprop ${scobj_hpath}/blade_1/master data true
hsetprop ${scobj_hpath}/blade_1/master mutable false
hsetprop ${scobj_hpath}/blade_1/master nxsave true
hsetprop ${scobj_hpath}/blade_1/master oldval UNKNOWN
hsetprop ${scobj_hpath}/blade_1/master sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/blade_1/master type "part"
hsetprop ${scobj_hpath}/blade_1/master nxalias "${name}_blade_1_master"
hfactory ${scobj_hpath}/blade_1/rphase plain user float hfactory ${scobj_hpath}/blade_1/rphase plain user float
hsetprop ${scobj_hpath}/blade_1/rphase control true hsetprop ${scobj_hpath}/blade_1/rphase control true
hsetprop ${scobj_hpath}/blade_1/rphase data true hsetprop ${scobj_hpath}/blade_1/rphase data true
@ -325,6 +335,16 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name } {
hsetprop ${scobj_hpath}/blade_2/aspeed type "part" hsetprop ${scobj_hpath}/blade_2/aspeed type "part"
hsetprop ${scobj_hpath}/blade_2/aspeed nxalias "${name}_blade_2_aspeed" hsetprop ${scobj_hpath}/blade_2/aspeed nxalias "${name}_blade_2_aspeed"
hfactory ${scobj_hpath}/blade_2/master plain user text
hsetprop ${scobj_hpath}/blade_2/master control true
hsetprop ${scobj_hpath}/blade_2/master data true
hsetprop ${scobj_hpath}/blade_2/master mutable false
hsetprop ${scobj_hpath}/blade_2/master nxsave true
hsetprop ${scobj_hpath}/blade_2/master oldval UNKNOWN
hsetprop ${scobj_hpath}/blade_2/master sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/blade_2/master type "part"
hsetprop ${scobj_hpath}/blade_2/master nxalias "${name}_blade_2_master"
hfactory ${scobj_hpath}/blade_2/rphase plain user float hfactory ${scobj_hpath}/blade_2/rphase plain user float
hsetprop ${scobj_hpath}/blade_2/rphase control true hsetprop ${scobj_hpath}/blade_2/rphase control true
hsetprop ${scobj_hpath}/blade_2/rphase data true hsetprop ${scobj_hpath}/blade_2/rphase data true
@ -386,6 +406,16 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name } {
hsetprop ${scobj_hpath}/blade_3/aspeed type "part" hsetprop ${scobj_hpath}/blade_3/aspeed type "part"
hsetprop ${scobj_hpath}/blade_3/aspeed nxalias "${name}_blade_3_aspeed" hsetprop ${scobj_hpath}/blade_3/aspeed nxalias "${name}_blade_3_aspeed"
hfactory ${scobj_hpath}/blade_3/master plain user text
hsetprop ${scobj_hpath}/blade_3/master control true
hsetprop ${scobj_hpath}/blade_3/master data true
hsetprop ${scobj_hpath}/blade_3/master mutable false
hsetprop ${scobj_hpath}/blade_3/master nxsave true
hsetprop ${scobj_hpath}/blade_3/master oldval UNKNOWN
hsetprop ${scobj_hpath}/blade_3/master sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/blade_3/master type "part"
hsetprop ${scobj_hpath}/blade_3/master nxalias "${name}_blade_3_master"
hfactory ${scobj_hpath}/blade_3/rphase plain user float hfactory ${scobj_hpath}/blade_3/rphase plain user float
hsetprop ${scobj_hpath}/blade_3/rphase control true hsetprop ${scobj_hpath}/blade_3/rphase control true
hsetprop ${scobj_hpath}/blade_3/rphase data true hsetprop ${scobj_hpath}/blade_3/rphase data true
@ -447,6 +477,16 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name } {
hsetprop ${scobj_hpath}/blade_4/aspeed type "part" hsetprop ${scobj_hpath}/blade_4/aspeed type "part"
hsetprop ${scobj_hpath}/blade_4/aspeed nxalias "${name}_blade_4_aspeed" hsetprop ${scobj_hpath}/blade_4/aspeed nxalias "${name}_blade_4_aspeed"
hfactory ${scobj_hpath}/blade_4/master plain user text
hsetprop ${scobj_hpath}/blade_4/master control true
hsetprop ${scobj_hpath}/blade_4/master data true
hsetprop ${scobj_hpath}/blade_4/master mutable false
hsetprop ${scobj_hpath}/blade_4/master nxsave true
hsetprop ${scobj_hpath}/blade_4/master oldval UNKNOWN
hsetprop ${scobj_hpath}/blade_4/master sdsinfo "::nexus::scobj::sdsinfo"
hsetprop ${scobj_hpath}/blade_4/master type "part"
hsetprop ${scobj_hpath}/blade_4/master nxalias "${name}_blade_4_master"
hfactory ${scobj_hpath}/blade_4/rphase plain user float hfactory ${scobj_hpath}/blade_4/rphase plain user float
hsetprop ${scobj_hpath}/blade_4/rphase control true hsetprop ${scobj_hpath}/blade_4/rphase control true
hsetprop ${scobj_hpath}/blade_4/rphase data true hsetprop ${scobj_hpath}/blade_4/rphase data true