diff --git a/site_ansto/instrument/config/commands/commands_common.tcl b/site_ansto/instrument/config/commands/commands_common.tcl index 037d11bc..7d4c5669 100644 --- a/site_ansto/instrument/config/commands/commands_common.tcl +++ b/site_ansto/instrument/config/commands/commands_common.tcl @@ -72,9 +72,7 @@ namespace eval monitor { } { ::monitor::count -set feedback status BUSY bm setmode $mode - bm_mode $mode bm count $preset - bm_preset $preset ::monitor::count -set feedback counts [SplitReply [bm getcounts]]; ::monitor::count -set feedback status IDLE } diff --git a/site_ansto/instrument/config/counter/counter_common_1.tcl b/site_ansto/instrument/config/counter/counter_common_1.tcl index 4e257e38..121b29fb 100644 --- a/site_ansto/instrument/config/counter/counter_common_1.tcl +++ b/site_ansto/instrument/config/counter/counter_common_1.tcl @@ -42,8 +42,19 @@ proc ::counter::ic_initialize {} { bm transferscript ::counter::transferscript bm SetExponent 0 sicslist setatt bm privilege internal - ::utility::mkVar bm_mode Text user mode true monitor true true - ::utility::mkVar bm_preset Float user preset true monitor true true + ::utility::macro::getset text bm_mode {} { + return [bm getmode] + } + sicslist setatt bm_mode klass monitor + sicslist setatt bm_mode long_name mode + sicslist setatt bm_mode mutable false + + ::utility::macro::getset float bm_preset {} { + return [bm getpreset] + } + sicslist setatt bm_preset klass monitor + sicslist setatt bm_preset long_name preset + sicslist setatt bm_preset mutable false ::utility::macro::getset float monitor_counts {} {