Merge changes from Dingo 2014-09-09

site_ansto/instrument/dingo/dingo_configuration.tcl

@@ -1,8 +1,8 @@
-# Author: Ferdi Franceschini (ffr@ansto.gov.au)
+# Author: Jing Chen (jgn@ansto.gov.au)
 
 # Required by server_config.tcl
 VarMake Instrument Text Internal
-Instrument bare_dingo
+Instrument dingo
 Instrument lock
 
 #START SERVER CONFIGURATION SECTION
@@ -14,12 +14,46 @@ MakeDrive
 
 ########################################
 # INSTRUMENT SPECIFIC CONFIGURATION
+
+source $cfPath(hipadaba)/hipadaba_configuration.tcl
+
 fileeval $cfPath(source)/source.tcl
-fileeval $cfPath(plc)/plc.tcl
 fileeval $cfPath(motors)/motor_configuration.tcl
+#fileeval $cfPath(motors)/positmotor_configuration.tcl
+#fileeval $cfPath(motors)/extraconfig.tcl
+#fileeval $cfPath(plc)/plc.tcl
+#fileeval $cfPath(counter)/counter.tcl
+#fileeval $cfPath(hmm)/hmm_configuration.tcl
+fileeval $cfPath(nexus)/nxscripts.tcl
 fileeval $cfPath(scan)/scan.tcl
+fileeval $cfPath(commands)/commands.tcl
+#fileeval $cfPath(commands)/pulser.tcl
+#fileeval $cfPath(commands)/hvcommands.tcl
+fileeval $cfPath(anticollider)/anticollider.tcl
+
+source gumxml.tcl
+
+#::utility::mkVar ::anticollider::protect_detector text manager protect_detector false detector true false
+#::anticollider::protect_detector "true"
+
+# fix all motors
+if {1} {
+  set motorlist "[sicslist type motor]"
+  puts $motorlist
+  foreach m $motorlist {
+     if {$m == "motor" || $m == "dummy_motor"} {
+         # skipit
+     } else {
+         $m fixed 1
+     }
+  }
+}
 
 server_init
-exe batchpath ../batch
-exe syspath ../batch
+
 clientput "serverport [get_portnum $::serverport]"
+
+###########################################
+# WARNING: Do not add any code below server_init, if you do SICS may fail to initialise properly.
+
+# You can add extra-configuration code in ../extraconfig.tcl