Merged in-situ modifications for Release 2.5 candidate 5

r2895 | ffr | 2010-04-29 16:02:15 +1000 (Thu, 29 Apr 2010) | 2 lines
This commit is contained in:
Ferdi Franceschini
2010-04-29 16:02:15 +10:00
committed by Douglas Clowes
parent a2ca46ab67
commit e6e3c3be52
24 changed files with 478 additions and 363 deletions

View File

@@ -1,3 +1,4 @@
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Required by server_config.tcl
@@ -35,16 +36,29 @@ fileeval $cfPath(anticollider)/anticollider.tcl
fileeval $cfPath(environment)/robby_configuration.tcl
source gumxml.tcl
# Old Lakeshore340 driver (c-code)
# ::environment::temperature::add_ls340 tc1 1
# ::environment::temperature::add_ls340 tc2 2
#
# New sct Lakeshore340 driver (in tcl)
# ::environment::temperature::add_ls340t tc1 1
# ::environment::temperature::add_ls340t tc2 2
###::environment::temperature::add_ls340 tc2 1
# ::environment::temperature::add_west400 137.157.201.14
::robot::add_robby
##
# New lakeshore driver. BETA status. Data saving not tested
#add_ls340t tc1 ca5-[instname] 4001
#add_ls340t tc2 ca5-[instname] 4002
# New Lakeshore series driver for models 340 and 336
# driverName shortName IP-address portOnMoxa temperatureTolerance1 Tolerance2 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
# axm 2010-02-10: NOTE the ls3xx driver versions 2010-01-25 and newer expect 2 tolerance values,
# one for each control loop.
# name IP-address port term tol1 tol2 LakeshoreModel
# add_ls3xx tc1 137.157.201.23 7777 "\r\n" 2.0 10.0 336
###add_ls3xx tc1 137.157.201.23 7777 "\r\n" 5.0 336
#add_ls3xx tc1 ca5-[instname] 4001 "\r\n" 0.5 340
#add_ls3xx tc2 ca5-[instname] 4001 "\r" 0.5 340
::environment::temperature::add_west400 137.157.201.14
###::robot::add_robby
server_init
###########################################
# WARNING: Do not add any code below server_init, if you do SICS may fail to initialise properly.