Merged RELEASE-1_1 back into trunk.

r1836 | ffr | 2007-04-06 19:10:02 +1000 (Fri, 06 Apr 2007) | 2 lines
This commit is contained in:
Ferdi Franceschini
2007-04-06 19:10:02 +10:00
committed by Douglas Clowes
parent 79ac59740f
commit e7324b8335
21 changed files with 1828 additions and 63 deletions

View File

@@ -1,5 +1,5 @@
# $Revision: 1.19 $
# $Date: 2007-03-11 22:43:12 $
# $Revision: 1.20 $
# $Date: 2007-04-06 09:10:02 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: ffr $
@@ -17,6 +17,9 @@ source server_config.tcl
########################################
# INSTRUMENT SPECIFIC CONFIGURATION
#set hmm_mode pulser
#set hmm_mode calibration
set hmm_mode normal
fileeval $cfPath(motors)/motor_configuration.tcl
@@ -68,3 +71,7 @@ detector_description 128 He-3 proportional counter detector tubes (GE Energy Reu
detector_description lock
fileeval extraconfig.tcl
MakeRS232Controller plc_port 137.157.204.65 30002
MakeMultiChan plc_chan plc_port 0
MakeSafetyPLC plc plc_chan 0