From e21b3eb1359d81b18babc859e6467bac807709be Mon Sep 17 00:00:00 2001 From: Jing Chen Date: Wed, 24 Oct 2012 16:26:47 +1100 Subject: [PATCH] r3772 | jgn | 2012-10-24 16:26:47 +1100 (Wed, 24 Oct 2012) | 1 line --- .../pelican/config/beamline/sct_power.tcl | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/site_ansto/instrument/pelican/config/beamline/sct_power.tcl b/site_ansto/instrument/pelican/config/beamline/sct_power.tcl index 3344656e..d133ef01 100644 --- a/site_ansto/instrument/pelican/config/beamline/sct_power.tcl +++ b/site_ansto/instrument/pelican/config/beamline/sct_power.tcl @@ -371,7 +371,8 @@ proc ::scobj::ag1010::rdValue {} { set ns /sics/ag1010 #set ns [sct] if {[ catch { - set data [string trim [sct result] " "] + set curVal [sct result] + set data [string trim $curVal " "] hset $ns/responseMsg "$data" #broadcast "rdValue : $data" @@ -581,8 +582,13 @@ proc ::scobj::ag1010::rdValue {} { hset $ns/STA/keyState/Key3 "Off" } } - default { return -code error "Unexpected returned values from the device in rdValue()" } - } + default { return -code error "Unexpected returned values from the device in rdValue()" } + } + if {$curVal != [sct oldval]} { + sct oldval $curVal + sct update $curVal + sct utime readtime + } } message ]} { return -code error "Error in rdValue: $message." } @@ -621,11 +627,9 @@ proc createNode {scobj_hpath sct_controller cmdGroup varName readable writable p } hfactory $nodeName plain $permission $dataType switch $dataType { - "none" {hset $nodeName none} - "text" {hset $nodeName UNKNOWN} - "int" {hset $nodeName 0} - "float" {hset $nodeName 0.0} - default {hset $nodeName UNKNOWN} + "int" {hsetprop $nodeName oldval 0} + "float" {hsetprop $nodeName oldval 0.0} + default {hsetprop $nodeName oldval UNKNOWN} } if {$readable == 1} { hsetprop $nodeName read ${ns}::getValue $scobj_hpath $rdFunc $rdPara