Douglas Clowes 3ce5ae0977 Merge branch 'RELEASE-3_1' ...

Conflicts:
	sics/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_m370.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl
	sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
	sics/site_ansto/instrument/util/gen_sct.py

2014-11-06 14:13:20 +11:00

..

config

Merge branch 'RELEASE-3_1' into RELEASE-3_2

2014-08-06 13:53:18 +10:00

DMC2280

Updated archive with code for handheld controller and eulerian omega

2012-11-15 17:20:58 +11:00

script_validator

Merged 2.4 branch

2012-11-15 16:57:26 +11:00

util

Load available environment controller configurations for kowari

2014-10-17 16:42:55 +11:00

hipadaba_configuration.tcl

Auto-generated from motor_configuration.tcl

2012-11-15 12:53:38 +11:00

hostport_config_test.tcl

SICS-587 Setup hostport dictionary based configuration for Kowari.

2013-06-21 11:23:41 +10:00

hostport_config.tcl

SICS-587 Setup hostport dictionary based configuration for Kowari.

2013-06-21 11:23:41 +10:00

hpaths.tcl

Remove superfluous trailing white space from TCL files

2014-05-16 17:23:58 +10:00

kowari_configuration.tcl

Merge branch 'RELEASE-3_1'

2014-11-06 14:13:20 +11:00

kowari.hdd

Initial kowari configuration.

2012-11-15 12:48:49 +11:00

Makefile

Cleanup

2012-11-15 13:28:56 +11:00

MANIFEST.TXT

Add sics_simulation.tcl to each instrument MANIFEST.TXT file

2014-09-10 10:14:46 +10:00

runsics_def.py

A new runsics script has been implemented in python (runsics.py).

2013-05-13 23:11:15 +10:00

script_validator_ports.tcl

Merged 2.4 branch

2012-11-15 16:57:26 +11:00

sics_ports.tcl

Merged 2.4 branch

2012-11-15 16:57:26 +11:00

sics_simulation.tcl

Break simulation flagss out of the server_config.tcl

2014-09-09 15:14:57 +10:00