diff --git a/site_ansto/instrument/config/source/reactor_status.sct b/site_ansto/instrument/config/source/reactor_status.sct index b4ece185..0e3a2aa1 100644 --- a/site_ansto/instrument/config/source/reactor_status.sct +++ b/site_ansto/instrument/config/source/reactor_status.sct @@ -23,7 +23,9 @@ driver reactor_status = { var cns_out = { type = float; priv = spy; mutable = true; property klass = source;} var tg123 = { type = float; priv = spy; mutable = true; property klass = source;} var cg123 = { type = float; priv = spy; mutable = true; property klass = source;} - var tg4 = { type = float; priv = spy; mutable = true; property klass = source;} + var tg4 = { type = text; priv = spy; mutable = true; property klass = source;} + var hb1 = { type = int; priv = spy; mutable = true; property klass = source;} + var hb2 = { type = int; priv = spy; mutable = true; property klass = source;} } code read_function rdValue = { @@ -43,6 +45,8 @@ driver reactor_status = { @ "TG123" { hset ${tc_root}/tg123 $v } @ "CG123" { hset ${tc_root}/cg123 $v } @ "TG4" { hset ${tc_root}/tg4 $v } + @ "HB1" { hset ${tc_root}/hb1 $v } + @ "HB2" { hset ${tc_root}/hb2 $v } @ } @ } @ } diff --git a/site_ansto/instrument/config/source/reactor_status_sct.tcl b/site_ansto/instrument/config/source/reactor_status_sct.tcl index 815bdc0c..acd8cd9b 100644 --- a/site_ansto/instrument/config/source/reactor_status_sct.tcl +++ b/site_ansto/instrument/config/source/reactor_status_sct.tcl @@ -126,6 +126,8 @@ proc ::scobj::reactor_status::rdAll {tc_root} { "TG123" { hset ${tc_root}/tg123 $v } "CG123" { hset ${tc_root}/cg123 $v } "TG4" { hset ${tc_root}/tg4 $v } + "HB1" { hset ${tc_root}/hb1 $v } + "HB2" { hset ${tc_root}/hb2 $v } } } } @@ -254,6 +256,28 @@ proc ::scobj::reactor_status::mkDriver { sct_controller name device_class simula hsetprop ${scobj_hpath}/cns_out type "part" hsetprop ${scobj_hpath}/cns_out nxalias "${name}_cns_out" + hfactory ${scobj_hpath}/hb1 plain spy int + hsetprop ${scobj_hpath}/hb1 control true + hsetprop ${scobj_hpath}/hb1 data true + hsetprop ${scobj_hpath}/hb1 mutable true + hsetprop ${scobj_hpath}/hb1 nxsave true + hsetprop ${scobj_hpath}/hb1 oldval 0 + hsetprop ${scobj_hpath}/hb1 klass "source" + hsetprop ${scobj_hpath}/hb1 sdsinfo "::nexus::scobj::sdsinfo" + hsetprop ${scobj_hpath}/hb1 type "part" + hsetprop ${scobj_hpath}/hb1 nxalias "${name}_hb1" + + hfactory ${scobj_hpath}/hb2 plain spy int + hsetprop ${scobj_hpath}/hb2 control true + hsetprop ${scobj_hpath}/hb2 data true + hsetprop ${scobj_hpath}/hb2 mutable true + hsetprop ${scobj_hpath}/hb2 nxsave true + hsetprop ${scobj_hpath}/hb2 oldval 0 + hsetprop ${scobj_hpath}/hb2 klass "source" + hsetprop ${scobj_hpath}/hb2 sdsinfo "::nexus::scobj::sdsinfo" + hsetprop ${scobj_hpath}/hb2 type "part" + hsetprop ${scobj_hpath}/hb2 nxalias "${name}_hb2" + hfactory ${scobj_hpath}/power plain spy float hsetprop ${scobj_hpath}/power control true hsetprop ${scobj_hpath}/power data true @@ -296,12 +320,12 @@ proc ::scobj::reactor_status::mkDriver { sct_controller name device_class simula hsetprop ${scobj_hpath}/tg123 type "part" hsetprop ${scobj_hpath}/tg123 nxalias "${name}_tg123" - hfactory ${scobj_hpath}/tg4 plain spy float + hfactory ${scobj_hpath}/tg4 plain spy text hsetprop ${scobj_hpath}/tg4 control true hsetprop ${scobj_hpath}/tg4 data true hsetprop ${scobj_hpath}/tg4 mutable true hsetprop ${scobj_hpath}/tg4 nxsave true - hsetprop ${scobj_hpath}/tg4 oldval 0.0 + hsetprop ${scobj_hpath}/tg4 oldval UNKNOWN hsetprop ${scobj_hpath}/tg4 klass "source" hsetprop ${scobj_hpath}/tg4 sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/tg4 type "part"