diff --git a/site_ansto/instrument/pelican/config/hmm/sct_hv.tcl b/site_ansto/instrument/pelican/config/hmm/sct_hv.tcl index 1b935587..73660d1b 100644 --- a/site_ansto/instrument/pelican/config/hmm/sct_hv.tcl +++ b/site_ansto/instrument/pelican/config/hmm/sct_hv.tcl @@ -108,12 +108,14 @@ proc ::scobj::hv::rdHVStatusFunc {basePath mode} { hset $basePath/status/state "[lindex $replyText 3] [lindex $replyText 4]" hset $basePath/status/voltage "[lindex $replyText 5] [lindex $replyText 6]" hset $basePath/status/current "[lindex $replyText 7] [lindex $replyText 8]" - hset $basePath/status/pressure1 "[lindex $replyText 10] [lindex $replyText 11]" - hset $basePath/status/pressure2 "[lindex $replyText 13] [lindex $replyText 14]" - hset $basePath/status/pressure3 "[lindex $replyText 16] [lindex $replyText 17]" - hset $basePath/status/pressure4 "[lindex $replyText 19] [lindex $replyText 20]" - hset $basePath/status/pressure5 "[lindex $replyText 22] [lindex $replyText 23]" - hset $basePath/status/pressure6 "[lindex $replyText 25] [lindex $replyText 26]" + + hset $basePath/status/DetectorHighPressure "[lindex $replyText 10] [lindex $replyText 11]" + hset $basePath/status/SampleHighPressure "[lindex $replyText 13] [lindex $replyText 14]" + hset $basePath/status/DetectorLowPressure "[lindex $replyText 16] [lindex $replyText 17]" + hset $basePath/status/SampleLowPressure "[lindex $replyText 19] [lindex $replyText 20]" + hset $basePath/status/pressure5 "[lindex $replyText 22] [lindex $replyText 23]" + hset $basePath/status/pressure6 "[lindex $replyText 25] [lindex $replyText 26]" + hset $basePath/status/PLC-S "[lindex $replyText 28]" hset $basePath/status/PLC-H "[lindex $replyText 30]" hset $basePath/status/Presr-S "[lindex $replyText 32]" @@ -166,12 +168,14 @@ proc ::scobj::hv::mkHV {argList} { hfactory /sics/$pa(NAME)/status plain user none hfactory /sics/$pa(NAME)/status/voltage plain user text hfactory /sics/$pa(NAME)/status/current plain user text - hfactory /sics/$pa(NAME)/status/pressure1 plain user text - hfactory /sics/$pa(NAME)/status/pressure2 plain user text - hfactory /sics/$pa(NAME)/status/pressure3 plain user text - hfactory /sics/$pa(NAME)/status/pressure4 plain user text - hfactory /sics/$pa(NAME)/status/pressure5 plain user text - hfactory /sics/$pa(NAME)/status/pressure6 plain user text + + hfactory /sics/$pa(NAME)/status/DetectorHighPressure plain user text + hfactory /sics/$pa(NAME)/status/SampleHighPressure plain user text + hfactory /sics/$pa(NAME)/status/DetectorLowPressure plain user text + hfactory /sics/$pa(NAME)/status/SampleLowPressure plain user text + hfactory /sics/$pa(NAME)/status/pressure5 plain user text + hfactory /sics/$pa(NAME)/status/pressure6 plain user text + hfactory /sics/$pa(NAME)/status/state plain user text hfactory /sics/$pa(NAME)/status/PLC-S plain user text hfactory /sics/$pa(NAME)/status/PLC-H plain user text @@ -197,7 +201,7 @@ proc ::scobj::hv::mkHV {argList} { # Initialise properties required for generating the API for GumTree and to save data ::scobj::hinitprops $pa(NAME) status config ::scobj::hinitprops $pa(NAME) status/voltage status/current status/state - ::scobj::hinitprops $pa(NAME) status/pressure1 status/pressure2 status/pressure3 status/pressure4 status/pressure5 status/pressure6 + ::scobj::hinitprops $pa(NAME) status/DetectorHighPressure status/SampleHighPressure status/DetectorLowPressure status/SampleLowPressure status/pressure5 status/pressure6 ::scobj::hinitprops $pa(NAME) status/PLC-S status/PLC-H status/Presr-S status/Presr-H status/Soft-S status/Hard-S ::scobj::hinitprops $pa(NAME) config/hv config/pressure_threshold config/mode