Douglas Clowes f269a17ef3 Merge branch 'RELEASE-3_1' into RELEASE-3_2 ...

Conflicts:
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
	sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
	sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
	sics/site_ansto/instrument/sans/config/environment/sct_antonparr_MCR500.tcl
	sics/site_ansto/instrument/tas/taipan_configuration.tcl

2015-03-05 13:53:47 +11:00

..

bruker_sct.tcl

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

2015-01-07 13:09:27 +11:00

bruker.sct

Instructed bruker_BEC1 wrapper to not make a script context controller.

2014-12-01 14:32:54 +11:00

green_magnet_labview_sct.tcl

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

2015-01-07 13:09:27 +11:00

green_magnet_labview.sct

Change SCT wrappers to use ip_address and tcp_port

2014-08-19 11:27:43 +10:00

oxford10tlv_sct.tcl

Generate the TCL from the new Oxford

2015-02-13 10:58:50 +11:00

oxford10tlv.sct

Alternative Oxford Magnet Labview interface

2015-02-13 10:56:50 +11:00

oxford12tlv_sct.tcl

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

2015-01-07 13:09:27 +11:00

oxford12tlv.sct

Added sct wrapper to load legacy sct_oxford_labview.tcl driver.

2014-08-08 11:51:49 +10:00

sct_bruker_BEC1.tcl

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

2015-01-07 13:09:27 +11:00

sct_green_magnet.tcl

Pick up some obvious changes from Wombat

2014-06-24 17:32:34 +10:00

sct_lakeshore_460.tcl

SICS-696 Explicity include the namespace on mk_sct_ calls

2014-07-23 14:32:26 +10:00

sct_oxford10tlv.tcl

Generate the TCL from the new Oxford

2015-02-13 10:57:58 +11:00

sct_oxford_ips.tcl

SICS-696 Explicity include the namespace on mk_sct_ calls

2014-07-23 14:32:26 +10:00

sct_oxford_labview.tcl

Use configured magnet name in OxfordSet commands.

2014-08-08 11:52:04 +10:00

tsi_smc_sct.tcl

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

2015-03-05 13:53:47 +11:00

tsi_smc.sct

Pullback limit adjustments from Quokka to sct template drivers

2015-02-19 09:04:43 +11:00