Merge from Echidna
This commit is contained in:
@@ -34,6 +34,7 @@ fileeval $cfPath(environment)/sct_keithley_2700.tcl
|
||||
fileeval $cfPath(environment)/temperature/sct_lakeshore_336.tcl
|
||||
fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl
|
||||
fileeval $cfPath(environment)/temperature/sct_oxford_mercury.tcl
|
||||
fileeval $cfPath(environment)/temperature/sct_mercury_scpi.tcl
|
||||
fileeval $cfPath(environment)/temperature/west400.tcl
|
||||
fileeval $cfPath(environment)/temperature/sct_watlow_pm.tcl
|
||||
fileeval $cfPath(hmm)/hmm_configuration.tcl
|
||||
@@ -52,14 +53,19 @@ source gumxml.tcl
|
||||
# Current driver for Lakeshore temperature controllers #
|
||||
##########################################################
|
||||
# driverName shortName IP-address port LineTerminator Tolerance1 Tolerance2 optional_Verbose
|
||||
# add_sct_ls340 tc2 ca5-[instname] 4002 "\r" 0.5 1.0
|
||||
# add_sct_ls336 tc3 137.157.201.24 7777 "\r\n" 5.0 5.0
|
||||
# add_sct_ls336 tc1 137.157.201.23 7777 "\r\n" 5.0 5.0
|
||||
|
||||
# add_sct_ls340 tc1 ca5-[instname] 4001 "\r" 0.5 1.0
|
||||
# add_sct_ls336 tc1 137.157.201.21 7777 "\r\n" 5.0 5.0
|
||||
# add_sct_ls336 tc2 137.157.201.23 7777 "\r\n" 5.0 5.0
|
||||
# add_sct_ls336 tc3 10.157.205.30 7777 "\r\n" 5.0 5.0
|
||||
# add_sct_ls336 tc4 10.157.205.31 7777 "\r\n" 5.0 5.0
|
||||
#::environment::temperature::add_west400 137.157.201.14
|
||||
# ::environment::temperature::add_west400 10.157.205.24
|
||||
#::robot::add_robby
|
||||
# add_robot robby 137.157.201.26 6000
|
||||
#add_robot rosie 137.157.201.26 6000
|
||||
#add_oxford_mercury tc1 10.157.205.5 7020 2.0
|
||||
#add_oxmag magnetic 10.157.205.3 55001
|
||||
#
|
||||
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