Merges from ics1-wombat

r2834 | ffr | 2009-12-09 17:07:45 +1100 (Wed, 09 Dec 2009) | 2 lines
This commit is contained in:
Ferdi Franceschini
2009-12-09 17:07:45 +11:00
committed by Douglas Clowes
parent 64ab146a44
commit c73c4c85c8
15 changed files with 3779 additions and 209 deletions

View File

@@ -1,5 +1,5 @@
# $Revision: 1.31 $
# $Date: 2009-11-24 22:56:46 $
# $Revision: 1.32 $
# $Date: 2009-12-09 06:07:45 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: ffr $
@@ -18,7 +18,6 @@ source server_config.tcl
# INSTRUMENT SPECIFIC CONFIGURATION
fileeval $cfPath(motors)/motor_configuration.tcl
source instrument_vars.tcl
fileeval $cfPath(source)/source.tcl
@@ -38,9 +37,21 @@ 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
# Drivers for Lakeshore Temperature Controller
# old Lakeshore driver (c-code)
::environment::temperature::add_ls340 tc1 1
# ::environment::temperature::add_ls340 tc2 2
# New Lakeshore series driver for models 340 and 336 - (tcl-code, version 20090824) - beta status
# driverName shortName IP-address portOnMoxa temperatureTolerance LakeshoreModel
# ffr 2009-11-11: NOTE I've added a line terminator argument to the ls3xx setup.
# You need to set the line termintator to either "\r\n" for CRLF or "\r" for CR
# add_ls3xx tc1 137.157.201.85 7777 "\r\n" 0.5 336
# add_ls3xx tc2 137.157.201.85 4002 "\r\n" 0.5 340
#::environment::temperature::add_west400
server_init
###########################################
# WARNING: Do not add any code below server_init, if you do SICS may fail to initialise properly.