linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge from Wombat, except sics_config.ini

Browse Source 
Conflicts:
	sics/site_ansto/instrument/config/environment/magneticField/sct_green_magnet.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_336.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
	sics/site_ansto/instrument/config/hmm/hmm_object.tcl
	sics/site_ansto/instrument/hipd/config/commands/eulerscan.tcl
	sics/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
	sics/site_ansto/instrument/hipd/util/sics_config.ini
	sics/site_ansto/instrument/server_config.tcl
This commit is contained in:
Douglas Clowes
2014-06-24 17:20:27 +10:00
parent 3f8f5fcba7
commit 648c8003b7
6 changed files with 179 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
site_ansto/instrument/hipd/wombat_configuration.tcl
View File

@@ -37,8 +37,8 @@ fileeval $cfPath(environment)/temperature/sct_qlink.tcl
fileeval $cfPath(environment)/temperature/west400.tcl
fileeval $cfPath(environment)/temperature/sct_oxford_mercury.tcl
fileeval $cfPath(environment)/magneticField/sct_oxford_labview.tcl
#fileeval $cfPath(environment)/he3/sct_he3.tcl
#fileeval $cfPath(environment)/he3/sct_hmp_power.tcl
fileeval $cfPath(environment)/he3/sct_he3.tcl
fileeval $cfPath(environment)/he3/sct_hmp_power.tcl
fileeval $cfPath(environment)/magneticField/sct_green_magnet.tcl
fileeval $cfPath(hmm)/hmm_configuration.tcl
fileeval $cfPath(nexus)/nxscripts.tcl
@@ -65,13 +65,20 @@ SetVoltScale 2000.0
# Eurotherm
# add_et2000 name IP PORT MODBUS_ADDR TOL
# add_et2000 et2000 10.157.205.19 502 1 5
# add tcf1 west400 10.157.205.19 502
# Using a Keithley 2700 mulitimeter to read pressure
# add_k2700 pressure 137.157.201.86 4004 "\r"
# Lakeshore 370 Resistance Bridge
# add_lakeshore_370 ls370 137.157.201.86 4002 2.0
# add_lakeshore_370 ls370 137.157.201.86 4001 2.0
# stabdard cf8
# LS336 01 at 205.28
# LS336 02 at 205.29
add_sct_ls336 tc2 10.157.205.30 7777 "\r\n" 1.0 1.0
add_sct_ls336 tc1 10.157.205.31 7777 "\r\n" 1.0 1.0
add_sct_ls340 tc3 137.157.201.86 4001 "\r\n" 1.0 1.0
server_init
###########################################