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:
committed by
Douglas Clowes
parent
a2ca46ab67
commit
e6e3c3be52
@@ -1,3 +1,4 @@
|
||||
|
||||
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
|
||||
|
||||
# Required by server_config.tcl
|
||||
@@ -30,6 +31,8 @@ fileeval $cfPath(hmm)/hmm_configuration.tcl
|
||||
fileeval $cfPath(nexus)/nxscripts.tcl
|
||||
fileeval $cfPath(scan)/scan.tcl
|
||||
fileeval $cfPath(commands)/commands.tcl
|
||||
fileeval $cfPath(commands)/pulser.tcl
|
||||
fileeval $cfPath(commands)/hvcommands.tcl
|
||||
fileeval $cfPath(anticollider)/anticollider.tcl
|
||||
fileeval $cfPath(hmm)/hmm_rapid.tcl
|
||||
source gumxml.tcl
|
||||
@@ -41,14 +44,17 @@ source gumxml.tcl
|
||||
# ::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
|
||||
# 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
|
||||
# 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
|
||||
# name IP-address port term LakeshoreModel tol1 tol2
|
||||
add_ls3xx tc1 137.157.201.85 7777 "\r\n" 336 5 5
|
||||
|
||||
# add_ls3xx tc1 137.157.201.86 4001 "\r\" 400 340
|
||||
# add_ls3xx tc2 137.157.201.86 4002 "\r" 5 5 340
|
||||
|
||||
|
||||
#::environment::temperature::add_west400
|
||||
#::environment::temperature::add_west400 137.157.201.88
|
||||
server_init
|
||||
###########################################
|
||||
# WARNING: Do not add any code below server_init, if you do SICS may fail to initialise properly.
|
||||
|
||||
Reference in New Issue
Block a user