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

..

he3

Remove superfluous trailing white space from TCL files

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

magneticField

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

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

pressure

SICS-696 Explicity include the namespace on mk_sct_ calls

2014-07-31 11:36:22 +10:00

temperature

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

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

agilent_33220A_sct.tcl

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

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

agilent_33220A.sct

Change SCT wrappers to use ip_address and tcp_port

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

hiden_xcs_sct.tcl

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

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

hiden_xcs.sct

Slight change to the way we do PID in SCT files

2014-09-30 17:24:58 +10:00

huber_pilot_sct.tcl

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

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

huber_pilot.sct

Remove explicit test debug_threshold from SCT files and regenerate

2014-07-21 10:58:01 +10:00

isotech_ps_sct.tcl

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

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

isotech_ps.sct

Realign SCT drivers with R3.2

2014-11-13 14:14:04 +11:00

keithley_m2700_sct.tcl

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

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

keithley_m2700.sct

Modify legacy drivers so that they can be called by sct wrappers and define wrapper templates.

2014-07-15 08:59:17 +10:00

keysight_N8740A_sct.tcl

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

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

keysight_N8740A.sct

move keysight from environment to instrument class

2014-12-12 15:24:25 +11:00

knauer_pump_sct.tcl

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

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

knauer_pump.sct

Remove debug_threshold from debugging test

2014-11-13 14:39:26 +11:00

mvp_valve_sct.tcl

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

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

mvp_valve.sct

Wrapper templates to load syringe pump and mvp valve via sics_config.ini.

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

nhq_200_sct.tcl

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

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

nhq_200.sct

Move ls218, nhq200, sr630 from environment to detector

2014-09-10 14:26:16 +10:00

omron_hldc_sct.tcl

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

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

omron_hldc.sct

Change the protocol to omron_ap for the omron driver

2014-12-08 16:26:03 +11:00

protekmm_sct.tcl

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

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

protekmm.sct

Modify legacy drivers so that they can be called by sct wrappers and define wrapper templates.

2014-07-15 08:59:17 +10:00

sct_autolab.tcl

SICS-696 Explicity include the namespace on mk_sct_ calls

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

sct_cybaman.tcl

SICS-696 Explicity include the namespace on mk_sct_ calls

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

sct_keithley_2700.tcl

SICS-696 Explicity include the namespace on mk_sct_ calls

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

sct_mvp.tcl

Merge branch 'RELEASE-3_1'

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

sct_protek_common.tcl

Set an @description property on the protek sensor reading.

2014-07-15 15:17:59 +10:00

sct_syr.tcl

SICS-696 Explicity include the namespace on mk_sct_ calls

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

syringe_pump_sct.tcl

Regenerate SCT drivers

2014-11-13 12:38:03 +11:00

syringe_pump.sct

Wrapper templates to load syringe pump and mvp valve via sics_config.ini.

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