More common initialisation code has been moved from the instrument configuration files to server_config.tcl:server_init

server_init now handles restoring status before calling initialisation commands as well as loading extraconfig, building the HDB and catching errors.
Added dummy_motors in the motor_configuration.tcl files for automated tests.

sicshipadaba.c
Fix broken "hset /path start" by set connection object in command callback.

r2724 | ffr | 2008-10-20 11:08:31 +1100 (Mon, 20 Oct 2008) | 7 lines

site_ansto/instrument/pas/pelican_configuration.tcl

@@ -1,5 +1,5 @@
-# $Revision: 1.1 $
-# $Date: 2008-07-11 01:09:57 $
+# $Revision: 1.2 $
+# $Date: 2008-10-20 00:08:30 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
 # Last revision by: $Author: ffr $
 
@@ -17,10 +17,12 @@ source server_config.tcl
 ########################################
 # INSTRUMENT SPECIFIC CONFIGURATION
 
+fileeval $cfPath(motors)/motor_configuration.tcl
+
+
 fileeval $cfPath(source)/source.tcl
 source $cfPath(hipadaba)/hipadaba_configuration.tcl
 fileeval $cfPath(parameters)/parameters.tcl
-fileeval $cfPath(motors)/motor_configuration.tcl
 fileeval $cfPath(plc)/plc.tcl
 fileeval $cfPath(counter)/counter.tcl
 fileeval $cfPath(hmm)/hmm_configuration.tcl
@@ -31,23 +33,8 @@ fileeval $cfPath(commands)/commands.tcl
 fileeval $cfPath(anticollider)/anticollider.tcl
 source gumxml.tcl
 
+server_init
+###########################################
+# WARNING: Do not add any code below server_init, if you do SICS may fail to initialise properly.
 
-########
-# Parameters set above the restore command will be clobbered by
-# the values in the status.tcl file
-# BIG WARNING: DON'T PUT 'restore' IN A CATCH BLOCK BECAUSE IT RETURNS
-# AN ERROR IF THERE IS NO ../log/status.tcl FILE.
-restore
-
-catch {
-  server_init 
-  if [file exists extraconfig.tcl] {
-    fileeval extraconfig.tcl
-  }
-
-  buildHDB instrument_dictionary
-}
-
-clientput $errorContext
-clientput $callStack
-
+# You can add extra-configuration code in ../extraconfig.tcl