Merged Release 1.2

r1897 | ffr | 2007-04-20 11:53:31 +1000 (Fri, 20 Apr 2007) | 2 lines
This commit is contained in:
Ferdi Franceschini
2007-04-20 11:53:31 +10:00
committed by Douglas Clowes
parent d0957b18d5
commit ade5216ea9
22 changed files with 901 additions and 182 deletions

View File

@@ -1,7 +1,7 @@
# $Revision: 1.14 $
# $Date: 2007-04-17 23:32:58 $
# $Revision: 1.15 $
# $Date: 2007-04-20 01:53:31 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: dcl $
# Last revision by: $Author: ffr $
# Required by server_config.tcl
VarMake Instrument Text Internal
@@ -25,6 +25,7 @@ fileeval $cfPath(motors)/motor_configuration.tcl
########
fileeval $cfPath(plc)/plc.tcl
fileeval $cfPath(counter)/counter.tcl
fileeval $cfPath(hmm)/hmm_configuration.tcl
fileeval $cfPath(nexus)/nxscripts.tcl
@@ -70,7 +71,4 @@ detector_type lock
detector_description 8 curved multiwire segments
detector_description lock
fileeval extraconfig.tcl
MakeMultiChan plc_chan 137.157.204.65 30001
MakeSafetyPLC plc plc_chan 0
fileeval extraconfig.tcl