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

Conflicts:
	sics/site_ansto/instrument/bilby/config/chopper/sct_astrium_chopper.tcl
	sics/site_ansto/instrument/bilby/config/motors/shutters_sct.tcl
	sics/site_ansto/instrument/bilby/config/motors/tank_sct.tcl
	sics/site_ansto/instrument/bilby/util/sics_config.ini
	sics/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl
	sics/site_ansto/instrument/config/environment/huber_pilot_sct.tcl
	sics/site_ansto/instrument/config/environment/isotech_ps_sct.tcl
	sics/site_ansto/instrument/config/environment/keithley_m2700_sct.tcl
	sics/site_ansto/instrument/config/environment/magneticField/oxford12tlv_sct.tcl
	sics/site_ansto/instrument/config/environment/magneticField/tsi_smc_sct.tcl
	sics/site_ansto/instrument/config/environment/nhq_200_sct.tcl
	sics/site_ansto/instrument/config/environment/omron_hldc_sct.tcl
	sics/site_ansto/instrument/config/environment/protekmm_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/eurotherm_m2000_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/julabo_lh45_gen_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/lakeshore_218_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/ls336_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/ls340_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_base_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_level_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_pres_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_scpi_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_temp_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/mercury_valve_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/nprvasm2_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/pfeiffer_hg_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/watlow_mpm_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/watlow_mrm_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/watlow_mst4_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/west_6100.sct
	sics/site_ansto/instrument/config/source/reactor_status_sct.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
	sics/site_ansto/instrument/sans/quokka_configuration.tcl
	sics/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
	sics/site_ansto/instrument/util/gen_sct.py
	sics/site_ansto/instrument/util/motor_utility.tcl

2014-09-26 17:04:19 +10:00

..

check

Remove superfluous trailing white space from TCL files

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

dmc2280

Remove superfluous trailing white space from TCL files

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

command.tcl

Remove superfluous trailing white space from TCL files

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

config_edit.py

Don't copy 'id' from the option section into the implementation section.

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

config_reader.tcl

Fix string range arguments for removing quotes

2014-05-13 17:41:32 +10:00

displayscreen.py

Remove superfluous trailing white space from Python files

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

eventutil.tcl

Remove superfluous trailing white space from TCL files

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

extra_utility.tcl

Added 'unpad' command to remove leading zeros from base 10 numbers.

2014-06-10 19:20:41 +10:00

fopdt.py

Add the FOPDT and PID modules

2014-08-05 11:44:27 +10:00

gen_sct.py

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

2014-09-26 17:04:19 +10:00

genmotconf_procs.tcl

Trim whitespace from description when generating motor configuration.

2014-06-10 19:16:53 +10:00

genmotconf.tcl

Generate posit_n parameters from posn attributes in the motor configuration CSV files.

2014-06-10 19:23:29 +10:00

gitloader.py

Make gitloader and gitrefer executable

2014-09-08 11:37:10 +10:00

gitrefer.py

Make gitloader and gitrefer executable

2014-09-08 11:37:10 +10:00

mk_SICSmd5.sh

The release number has been relocated

2012-11-15 17:01:44 +11:00

motor_utility.tcl

Copied prun and pdrive from RELEASE-3_2 branch.

2014-09-11 14:29:24 +10:00

pid.py

Add the FOPDT and PID modules

2014-08-05 11:44:27 +10:00

runsics

All

2012-11-15 16:56:00 +11:00

runtestsics

pelican

2012-11-15 13:40:07 +11:00

script_context_util.tcl

Add find_sicsdev and find_myobject functions

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

sicsclient

pelican

2012-11-15 13:40:07 +11:00

utility.tcl

Add hupdateif <path> <value> [<format>] for conditional update of hipadaba

2014-08-19 15:05:51 +10:00

whatsthere.py

Add whatsthere.py to check revs on instruments

2014-07-16 12:57:33 +10:00

write_tree.tcl

writetree - sorted items and continue on error for more resiliency

2014-04-23 16:27:43 +10:00