Merged changes made in-situ

r2768 | ffr | 2009-03-31 17:25:20 +1100 (Tue, 31 Mar 2009) | 2 lines
This commit is contained in:
Ferdi Franceschini
2009-03-31 17:25:20 +11:00
committed by Douglas Clowes
parent d2f57e4615
commit 8e5b7842e3
17 changed files with 471 additions and 229 deletions

View File

@@ -1,5 +1,5 @@
# $Revision: 1.29 $
# $Date: 2008-10-27 04:55:43 $
# $Revision: 1.30 $
# $Date: 2009-03-31 06:25:18 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: ffr $
@@ -28,16 +28,18 @@ fileeval $cfPath(plc)/plc.tcl
fileeval $cfPath(counter)/counter.tcl
#TODO Provide method for choosing environment controller
fileeval $cfPath(environment)/temperature/lakeshore340.tcl
fileeval $cfPath(environment)/temperature/west400.tcl
fileeval $cfPath(hmm)/hmm_configuration.tcl
fileeval $cfPath(nexus)/nxscripts.tcl
fileeval $cfPath(scan)/scan.tcl
fileeval $cfPath(commands)/commands.tcl
fileeval $cfPath(anticollider)/anticollider.tcl
fileeval $cfPath(hmm)/hmm_rapid.tcl
source gumxml.tcl
# ::environment::temperature::add_ls340 tc1 1
# ::environment::temperature::add_ls340 tc2 2
# ::environment::temperature::add_west400
::environment::temperature::add_ls340 tc1 1
::environment::temperature::add_ls340 tc2 2
#::environment::temperature::add_west400
server_init
###########################################
# WARNING: Do not add any code below server_init, if you do SICS may fail to initialise properly.