Merged Release 1.2

r1897 | ffr | 2007-04-20 11:53:31 +1000 (Fri, 20 Apr 2007) | 2 lines

site_ansto/instrument/config/hipadaba/common_hipadaba_configuration.tcl

@@ -19,8 +19,13 @@ proc xhmake {path priv dtype pKey pVal} {
 }
 
 hmake /commands spy none
-hsetprop /commands type commandset
 set pathlist(/commands) 1
+hsetprop /commands type commandset
+hmake /graphics spy none 
+set pathlist(/graphics) 1
+hsetprop /graphics type graphset
+hsetprop /commands type commandset
+
 
 #TODO change this to hparts.tcl
 source $cfPath(hipadaba)/hpaths.tcl 
@@ -28,6 +33,9 @@ set instrument [string tolower [SplitReply [Instrument]] ]
 hmake /$instrument spy none
 hsetprop /$instrument type instrument
 set pathlist(/$instrument) 1
+hmake /$instrument/status spy none
+set pathlist(/$instrument/status) 1
+hsetprop /$instrument/status type part
 
 # Generate hipadaba nodes for the paths in the hpaths file
 foreach hp $hpaths {
@@ -75,17 +83,20 @@ foreach motor [sicslist type motor] {
 foreach {obj name part master_obj} $cvirtmotor_hpath {
   set path /$instrument/$part
   hattach $path $obj $name
-  sicspoll add $path/$name hdb 2
+  foreach m $master_obj  {
+    hchain $path/$name $path/$m
+  }
+  #FIXME polling causes scans to abort
+  #sicspoll add $path/$name hdb 2
 }
 
+
 #------------- scan command
-hsetprop /commands type part
- 
-#--- Graphics
-hmake /graphics spy none
-hsetprop /graphics type graphset
 ::scancommand::commands_hpath_setup /commands
 ::scancommand::graphics_hpath_setup /graphics
 ::scancommand::init
 
+#------------- plc controller
+::plc::status_hpath_setup /$instrument/status
+
 unset pathlist;