From a1572f315214543d0ca92e8f6180b8e1d5e37ee1 Mon Sep 17 00:00:00 2001 From: Douglas Clowes Date: Fri, 30 May 2014 17:17:14 +1000 Subject: [PATCH] Add astrium chopper field 'master' to driver --- .../bilby/config/chopper/astrium_chopper.sct | 6 ++- .../config/chopper/sct_astrium_chopper.tcl | 42 ++++++++++++++++++- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/site_ansto/instrument/bilby/config/chopper/astrium_chopper.sct b/site_ansto/instrument/bilby/config/chopper/astrium_chopper.sct index cdddc380..f7efeabd 100644 --- a/site_ansto/instrument/bilby/config/chopper/astrium_chopper.sct +++ b/site_ansto/instrument/bilby/config/chopper/astrium_chopper.sct @@ -9,6 +9,7 @@ driver astrium_chopper = { read_command = '1'; fetch_function = fetchState; read_function = readState; property 'my_state' = 'idle'; } + var master = { type = text; } var rspeed = { type = float; } var aspeed = { type = float; mutable = true; } var rphase = { type = float; } @@ -21,6 +22,7 @@ driver astrium_chopper = { read_command = '2'; fetch_function = fetchState; read_function = readState; property 'my_state' = 'idle'; } + var master = { type = text; } var rspeed = { type = float; } var aspeed = { type = float; mutable = true; } var rphase = { type = float; } @@ -33,6 +35,7 @@ driver astrium_chopper = { read_command = '3'; fetch_function = fetchState; read_function = readState; property 'my_state' = 'idle'; } + var master = { type = text; } var rspeed = { type = float; } var aspeed = { type = float; mutable = true; } var rphase = { type = float; } @@ -45,6 +48,7 @@ driver astrium_chopper = { read_command = '4'; fetch_function = fetchState; read_function = readState; property 'my_state' = 'idle'; } + var master = { type = text; } var rspeed = { type = float; } var aspeed = { type = float; mutable = true; } var rphase = { type = float; } @@ -84,7 +88,7 @@ driver astrium_chopper = { set rhs "[string trim [lindex ${lst} 1]]" sct "attr_${lhs}" "${rhs}" 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 { "[hval ${base}/${node}]" != "${rhs}" } { hset ${base}/${node} "${rhs}" diff --git a/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl b/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl index 5302b067..0c1e8cdb 100644 --- a/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl +++ b/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl @@ -174,7 +174,7 @@ proc ::scobj::astrium_chopper::readState {tc_root} { set rhs "[string trim [lindex ${lst} 1]]" sct "attr_${lhs}" "${rhs}" 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 { "[hval ${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 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 hsetprop ${scobj_hpath}/blade_1/rphase control 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 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 hsetprop ${scobj_hpath}/blade_2/rphase control 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 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 hsetprop ${scobj_hpath}/blade_3/rphase control 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 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 hsetprop ${scobj_hpath}/blade_4/rphase control true hsetprop ${scobj_hpath}/blade_4/rphase data true