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
This commit is contained in:
committed by
Douglas Clowes
parent
fb97ee8631
commit
7ded983eba
@@ -134,7 +134,7 @@ Motor dummy_motor asim [params \
|
||||
absEnc 1\
|
||||
absEncHome $mphi_Home\
|
||||
cntsPerX 8192]
|
||||
setHomeandRange -motor dummy_motor -home 0 -lowrange 169 uprange 169
|
||||
setHomeandRange -motor dummy_motor -home 0 -lowrange 169 -uprange 169
|
||||
dummy_motor speed 1
|
||||
dummy_motor movecount $move_count
|
||||
dummy_motor precision 0.01
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# $Revision: 1.14 $
|
||||
# $Date: 2008-07-18 04:33:39 $
|
||||
# $Revision: 1.15 $
|
||||
# $Date: 2008-10-20 00:08:30 $
|
||||
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
|
||||
# Last revision by: $Author: ffr $
|
||||
|
||||
@@ -31,23 +31,8 @@ fileeval $cfPath(commands)/commands.tcl
|
||||
fileeval $cfPath(anticollider)/anticollider.tcl
|
||||
source gumxml.tcl
|
||||
|
||||
########
|
||||
# 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
|
||||
server_init
|
||||
###########################################
|
||||
# WARNING: Do not add any code below server_init, if you do SICS may fail to initialise properly.
|
||||
|
||||
catch {
|
||||
::anticollider::init
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user