linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
ba72e77d4c70372d15094923a69641e447651c22
sics/site_ansto
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
..
docs
…
hardsup
A bit of reformatting and set the ADUlen in the default case
2014-09-04 13:41:50 +10:00
instrument
Merge branch 'RELEASE-3_1' into RELEASE-3_2
2014-09-26 17:04:19 +10:00
manual
First commit for Oxford 12T and Oxford Mercury manual chapters
2014-04-14 13:20:41 +10:00
TESTS
Added command latch ready event and camera upload configuration event.
2014-07-24 13:53:34 +10:00
action.c
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
action.h
SICS-188 hdb_path is now a comma separated list of paths. NOTE: nodes listed as derived parameter dependencies aren't added to the path.
2012-11-15 13:41:01 +11:00
ansto_evcontroller.h
Merging release 2.0 branch with CVS trunk
2012-11-15 13:38:17 +11:00
ansto_sctdriveadapter.c
Prevent SEGV in ansto_sctdriveadapter on node not found and add names to messages
2014-06-20 13:15:43 +10:00
ansto_tclmotdriv.c
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
ansto_tclmotdriv.h
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
anstohm.cpp
…
anstohm.h
…
anstohttp.c
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
anstohttp.h
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
anstoutil.c
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
anstoutil.h
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
beamstopaction.c
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
beamstopaction.h
beamstopaction.[ch]
2012-11-15 13:40:48 +11:00
cameradriver.h
Dingo camera driver
2013-02-11 19:14:03 +11:00
counterdriv.c
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
extract_version.sh
Create a PATCH.TXT with "git diff" and include in the deplopment
2014-09-05 16:21:59 +10:00
fsm.c
Change obsoleted eStatus logging to eLog or eValue
2014-05-16 15:39:58 +10:00
fsm.h
add timer value to event trace
2012-11-15 13:37:20 +11:00
hm_asim.cpp
…
hm_asim.h
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
hm_tango.h
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
hmcontrol_ansto.c
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
hmcontrol_ansto.h
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
itc4.c
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
itc4.h
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
itc4.w
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
itc4driv.c
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
lakeshore340.c
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
lakeshore340.h
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
lakeshore340driv.c
Fix some memory leaks and use-after-free (cppcheck)
2014-03-03 17:18:52 +11:00
lh45.c
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
lh45.h
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
lh45driv.c
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
ls340.c
Reworked AsyncQueue sendCommand processing
2014-08-27 16:52:13 +10:00
ls340.h
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
lssmonitor.c
Reworked AsyncQueue sendCommand processing
2014-08-27 16:52:13 +10:00
lssmonitor.h
Merging release 2.0 branch with CVS trunk
2012-11-15 13:38:17 +11:00
make_config.sh
Only run extract_version.sh once
2014-08-07 16:26:19 +10:00
make_gen_variables
Push the server and option code down to reduce dependency loops
2014-05-01 10:54:09 +10:00
Makefile
Pull in Makefile changes from RELEASE-3_2
2014-08-27 16:52:13 +10:00
Makefile_SICS
Break Makefile to make Makefile_SICS for the sics directory
2013-08-01 17:12:30 +10:00
motor_asim.c
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
motor_asim.h
Modified the ANSTO simulated motor driver so that it now accepts a list of named parameters, and supports the extra metadata parameters needed for generating hipadaba interfaces.
2012-11-15 13:16:30 +11:00
motor_dmc2280.c
Reworked AsyncQueue sendCommand processing
2014-08-27 16:52:13 +10:00
motor_dmc2280.h
multichan becomes AsyncQueue and AsyncProtocol
2012-11-15 13:16:58 +11:00
motor_driver.h
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
nhq200.c
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
nhq200.h
complete rewrite
2012-11-15 13:37:28 +11:00
nhq200driv.c
remove unused code
2012-11-15 13:34:48 +11:00
orhvps.c
Reworked AsyncQueue sendCommand processing
2014-08-27 16:52:13 +10:00
orhvps.h
update in line with nhq driver
2012-11-15 13:37:32 +11:00
refl2t.c
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
refl2t.h
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
safetyplc.c
Reworked AsyncQueue sendCommand processing
2014-08-27 16:52:13 +10:00
safetyplc.h
multichan becomes AsyncQueue and AsyncProtocol
2012-11-15 13:16:58 +11:00
sctemonadapter.c
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
site_ansto.c
Add protocol support for the Knauer HPLC pump
2014-08-20 13:35:13 +10:00
site_dummy.c
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
tclClock.c
add HAVE_UNISTD_H for SL6
2012-12-13 13:53:35 +11:00
tclDate.c
add HAVE_UNISTD_H for SL6
2012-12-13 13:53:35 +11:00
tclUnixTime.c
add HAVE_UNISTD_H for SL6
2012-12-13 13:53:35 +11:00
test_west.tcl
Remove superfluous trailing white space from TCL files
2014-05-16 17:23:58 +10:00
west4100.c
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
west4100.h
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
west4100driv.c
Remove superfluous trailing white space from C files
2014-05-16 17:23:44 +10:00
xref.py
Move the view table/creation to after data collection.
2014-04-23 16:50:57 +10:00