linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
ba72e77d4c70372d15094923a69641e447651c22
sics/site_ansto/instrument/config/environment
History
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
..
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
2014-09-26 17:04:19 +10: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
2014-09-26 17:04:19 +10:00
agilent_33220A_sct.tcl
Merge branch 'RELEASE-3_1' into RELEASE-3_2
2014-09-26 17:04:19 +10: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 template drivers
2014-08-19 12:04:53 +10:00
hiden_xcs.sct
Changes to sct files
2014-05-01 10:54:09 +10:00
huber_pilot_sct.tcl
Regenerate template drivers
2014-08-19 12:04:53 +10: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 template drivers
2014-08-19 12:04:53 +10:00
isotech_ps.sct
Script Context driver generator files for Hiden XCS and Isotech Power Supply
2014-02-03 11:05:04 +11:00
keithley_m2700_sct.tcl
Regenerate template drivers
2014-08-19 12:04:53 +10: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
Add some more checking and fix drive end bug
2014-09-22 13:48:49 +10:00
nhq_200_sct.tcl
Regenerate template drivers
2014-08-19 12:04:53 +10: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 template drivers
2014-08-19 12:04:53 +10: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 template drivers
2014-08-19 12:04:53 +10: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 knauer_pump.sct
2014-09-19 12:08:13 +10:00
sct_mvp.tcl
SICS-696 Explicity include the namespace on mk_sct_ calls
2014-07-23 14:32:26 +10: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