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

Conflicts:
	sics/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl

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

..

eurotherm_3200_sct.tcl

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

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

eurotherm_3200.sct

Change limites on e3200 setpoint

2014-11-10 18:57:46 +11:00

eurotherm_m2000_sct.tcl

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

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

eurotherm_m2000.sct

Call the add instead of make function for the Eurotherm 2000 wrapper

2014-11-06 12:34:45 +11:00

julabo_lh45_gen_sct.tcl

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

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

julabo_lh45.sct

Realign SCT drivers with R3.2

2014-11-13 14:18:45 +11:00

lakeshore_218_sct.tcl

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

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

lakeshore_218.sct

Make the Lakeshore 218 driver less noisy and have less channels

2014-11-13 14:54:25 +11:00

lakeshore_m370_sct.tcl

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

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

lakeshore_m370.sct

There is no mkdriver_args

2014-09-26 15:30:25 +10:00

ls336_sct.tcl

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

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

ls336.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

ls340_sct.tcl

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

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

ls340.sct

Realign SCT drivers with R3.2

2014-11-13 14:18:45 +11:00

mercury_base_sct.tcl

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

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

mercury_base.sct

Generated modular mercury drivers

2014-05-16 15:42:11 +10:00

mercury_level_sct.tcl

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

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

mercury_level.sct

Generated modular mercury drivers

2014-05-16 15:42:11 +10:00

mercury_pres_sct.tcl

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

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

mercury_pres.sct

Massage the mercury pressure card driver

2014-06-11 10:50:07 +10:00

mercury_scpi_sct.tcl

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

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

mercury_scpi.sct

Changes to sct files

2014-05-01 10:54:09 +10:00

mercury_temp_sct.tcl

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

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

mercury_temp.sct

Generated modular mercury drivers

2014-05-16 15:42:11 +10:00

mercury_valve_sct.tcl

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

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

mercury_valve.sct

Generated modular mercury drivers

2014-05-16 15:42:11 +10:00

nprvasm2_sct.tcl

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

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

nprvasm2.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

oxford_mercury_sct.tcl

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

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

oxford_mercury.sct

Add auto/manual switch and setting, change to all lowercase

2014-11-24 12:44:29 +11:00

pfeiffer_hg_sct.tcl

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

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

pfeiffer_hg.sct

Changes to sct files

2014-05-01 10:54:09 +10:00

sct_eurotherm_2000.tcl

SICS-696 Explicity include the namespace on mk_sct_ calls

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

sct_eurotherm_3200.tcl

Regenerate SCT drivers

2014-12-02 10:09:17 +11:00

sct_julabo_lh45.tcl

SICS-696 Explicity include the namespace on mk_sct_ calls

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

sct_lakeshore_336.tcl

Don't register poll/write when simulating in LS-3xx drivers

2014-08-04 15:45:59 +10:00

sct_lakeshore_340.tcl

Fix for the Lakeshore LS-340 RELAY command on Pelican

2014-11-03 11:53:20 +11:00

sct_lakeshore_370.tcl

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

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

sct_oxford_itc.tcl

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

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

sct_qlink.tcl

SICS-696 Explicity include the namespace on mk_sct_ calls

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

sct_rvasm2.tcl

SICS-696 Explicity include the namespace on mk_sct_ calls

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

sct_srs_sr630.tcl

Regenerate SCT drivers

2014-12-02 10:09:17 +11:00

sct_watlow_pm.tcl

SICS-696 Explicity include the namespace on mk_sct_ calls

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

sct_watlow_rm.tcl

SICS-696 Explicity include the namespace on mk_sct_ calls

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

sct_watlow_st4.tcl

SICS-696 Explicity include the namespace on mk_sct_ calls

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

sct_west_6100.tcl

Regenerate SCT drivers

2014-12-02 10:09:17 +11:00

srs_sr630_sct.tcl

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

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

srs_sr630.sct

Move ls218, nhq200, sr630 from environment to detector

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

watlow_mpm_sct.tcl

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

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

watlow_mpm.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

watlow_mrm_sct.tcl

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

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

watlow_mrm.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

watlow_mst4_sct.tcl

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

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

watlow_mst4.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

west400.tcl

SICS-795 Bring GIT up to date with changes made on ics1-wombat.

2014-10-08 20:29:23 +11:00

west4100_sct.tcl

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

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

west4100.sct

Change SCT wrappers to use ip_address and tcp_port

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

west_6100_sct.tcl

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

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

west_6100.sct

Make West 4100 driveable and add permlinks

2014-10-27 14:40:40 +11:00