Merged in-situ changes from Echidna

r3252 | ffr | 2011-09-23 14:21:09 +1000 (Fri, 23 Sep 2011) | 2 lines
This commit is contained in:
Ferdi Franceschini
2011-09-23 14:21:09 +10:00
committed by Douglas Clowes
parent d778dd2bfe
commit d416695b4b
6 changed files with 371 additions and 3 deletions

View File

@@ -25,12 +25,15 @@ fileeval $cfPath(motors)/positmotor_configuration.tcl
fileeval $cfPath(plc)/plc.tcl
fileeval $cfPath(counter)/counter.tcl
#TODO Provide method for choosing environment controller
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/west400.tcl
fileeval $cfPath(hmm)/hmm_configuration.tcl
fileeval $cfPath(nexus)/nxscripts.tcl
fileeval $cfPath(scan)/scan.tcl
fileeval $cfPath(commands)/pulser.tcl
fileeval $cfPath(commands)/hvcommands.tcl
fileeval $cfPath(commands)/commands.tcl
fileeval $cfPath(anticollider)/anticollider.tcl
#fileeval $cfPath(environment)/robby_configuration.tcl
@@ -42,8 +45,9 @@ source gumxml.tcl
# Current driver for Lakeshore temperature controllers #
##########################################################
# driverName shortName IP-address port LineTerminator Tolerance1 Tolerance2 optional_Verbose
#add_sct_ls336 tc1 137.157.201.23 7777 "\r\n" 5.0 5.0
#add_sct_ls340 tc2 ca5-[instname] 4001 "\r" 0.5 1.0
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
#::environment::temperature::add_west400 137.157.201.14
#::robot::add_robby