Merging release 2.0 branch with CVS trunk
r2601 | ffr | 2008-05-30 10:26:57 +1000 (Fri, 30 May 2008) | 2 lines
This commit is contained in:
committed by
Douglas Clowes
parent
4a937e1608
commit
0749b0effa
@@ -1,20 +1,2 @@
|
||||
#FIXME Nexus path info is coded into this source. This means that if you change the
|
||||
# monitor data path in the config/hipadaba/common_instrument_dictionary.tcl then
|
||||
# you may also need to change the paths here
|
||||
bm SetExponent 0
|
||||
sicslist setatt bm privilege internal
|
||||
namespace eval monitor {
|
||||
command count {text:timer,monitor mode float: preset} {
|
||||
#FIXME remove dependency on hdb path
|
||||
::monitor::count -set feedback status BUSY
|
||||
bm setmode $mode
|
||||
bm count $preset
|
||||
::monitor::count -set feedback counts [SplitReply [bm getcounts]];
|
||||
::monitor::count -set feedback status IDLE
|
||||
}
|
||||
::monitor::count -addfb int counts text status
|
||||
::monitor::count -set feedback status IDLE
|
||||
array set fbarr [::monitor::count -list feedback]
|
||||
::utility::mkData $fbarr(counts) data monitor privilege user mutable true
|
||||
array unset fbarr
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user