Merge branch 'Pelican' into temp

Conflicts:
	sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_218.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
This commit is contained in:
Douglas Clowes
2015-02-19 14:53:33 +11:00

View File

@ -112,3 +112,8 @@ server_init
# WARNING: Do not add any code below server_init, if you do SICS may fail to initialise properly.
# You can add extra-configuration code in ../extraconfig.tcl
# Update chopper speed and phase if a stop or idle command is issued.
sicspoll add /instrument/fermi_chopper/mchs hdb 5
sicspoll add /instrument/fermi_chopper/mchp hdb 5
sicspoll add /instrument/fermi_chopper/schs hdb 5
sicspoll add /instrument/fermi_chopper/schp hdb 5