Douglas Clowes 30c23b1e0a Merge branch 'RELEASE-3_1' ...

Conflicts:
	sics/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
	sics/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl
	sics/site_ansto/instrument/config/environment/isotech_ps.sct
	sics/site_ansto/instrument/config/environment/isotech_ps_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/julabo_lh45.sct
	sics/site_ansto/instrument/config/environment/temperature/julabo_lh45_gen_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/ls340_sct.tcl
	sics/site_ansto/instrument/util/gen_sct.py

2014-11-13 13:52:46 +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'

2014-11-13 13:52:46 +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'

2014-11-13 13:52:46 +11:00

agilent_33220A_sct.tcl

Regenerate SCT drivers

2014-11-13 12:38:03 +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

Regenerate SCT drivers

2014-11-13 13:43:51 +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

Regenerate SCT drivers

2014-11-13 13:43:51 +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

Regenerate SCT drivers

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

isotech_ps.sct

Changes to protocol_args to add defaults

2014-11-06 16:27:15 +11:00

keithley_m2700_sct.tcl

Regenerate SCT drivers

2014-11-13 12:38:03 +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

knauer_pump_sct.tcl

Regenerate SCT drivers

2014-11-13 13:43:51 +11:00

knauer_pump.sct

Better checks and state machine for Knauer pump

2014-10-07 15:03:52 +11:00

mvp_valve_sct.tcl

Regenerate SCT drivers

2014-11-13 12:38:03 +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

Regenerate SCT drivers

2014-11-13 13:43:51 +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

Regenerate SCT drivers

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

omron_hldc.sct

Remove explicit test debug_threshold from SCT files and regenerate

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

protekmm_sct.tcl

Regenerate SCT drivers

2014-11-13 12:38:03 +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_knauer_pump.tcl

Regenerate SCT drivers

2014-11-13 12:41:22 +11:00

sct_mvp_valve.tcl

Regenerate SCT drivers

2014-11-13 12:41:22 +11: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

sct_syringe_pump.tcl

Regenerate SCT drivers

2014-11-13 12:41:22 +11: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