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

Merge branch 'Echidna' into temp

Browse Source 
Conflicts:
	sics/site_ansto/instrument/config/environment/sct_knauer_pump.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_west_6100.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
This commit is contained in:
Douglas Clowes
2015-02-19 14:57:43 +11:00
parent 4756be739a 31420ab850
commit 4e383b2af2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl
View File

@ -24,7 +24,8 @@ set my_Home 8389613
#set mx_Home 7580366 #set mx_Home 7580366
set mx_Home 8392083 set mx_Home 8392083
#set mom_Home 13442930 #set mom_Home 13442930
set mom_Home 8218065 #set mom_Home 8218065
set mom_Home 8295887
set mtth_Home 11534660 set mtth_Home 11534660
set pcx_Home 6330515 set pcx_Home 6330515
set pcr_Home 21650101 set pcr_Home 21650101

1
site_ansto/instrument/hrpd/echidna_configuration.tcl
View File

@ -41,7 +41,6 @@ fileeval $cfPath(environment)/temperature/sct_ls340.tcl
fileeval $cfPath(environment)/temperature/sct_lakeshore_370.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_370.tcl
fileeval $cfPath(environment)/temperature/sct_lakeshore_m370.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_m370.tcl
fileeval $cfPath(environment)/temperature/sct_oxford_mercury.tcl fileeval $cfPath(environment)/temperature/sct_oxford_mercury.tcl
fileeval $cfPath(environment)/temperature/sct_mercury_valve.tcl
fileeval $cfPath(environment)/sct_protek_common.tcl fileeval $cfPath(environment)/sct_protek_common.tcl
fileeval $cfPath(environment)/sct_protekmm.tcl fileeval $cfPath(environment)/sct_protekmm.tcl
fileeval $cfPath(environment)/temperature/west400.tcl fileeval $cfPath(environment)/temperature/west400.tcl