Douglas Clowes d698c302fd Merge branch 'RELEASE-3_1' into temp ...

Conflicts:
	sics/site_ansto/instrument/config/environment/temperature/julabo_lh45.sct
	sics/site_ansto/instrument/util/config_edit.py
	sics/site_ansto/instrument/util/gen_sct.py

2014-07-16 12:56:40 +10:00

..

docs

New doxygen config

2012-11-15 12:45:02 +11:00

hardsup

SICS-760 Add NOREPLY mechanism in aqadapter and asyncqueue

2014-07-15 18:48:38 +10:00

instrument

Merge branch 'RELEASE-3_1' into temp

2014-07-16 12:56:40 +10:00

manual

First commit for Oxford 12T and Oxford Mercury manual chapters

2014-04-14 13:20:41 +10:00

TESTS

Remove superfluous trailing white space from C files

2014-05-16 17:23:44 +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

Added to repository.

2012-11-15 12:44:13 +11:00

anstohm.h

Added to repository.

2012-11-15 12:44:13 +11:00

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

Add indicator of local changes relative to commit checksum

2013-02-15 13:25:34 +11: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

Added to repository.

2012-11-15 12:44:13 +11:00

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

Remove superfluous trailing white space from C files

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

ls340.h

Remove superfluous trailing white space from C files

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

lssmonitor.c

Remove superfluous trailing white space from C files

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

lssmonitor.h

Merging release 2.0 branch with CVS trunk

2012-11-15 13:38:17 +11:00

make_config.sh

rename config.h to made_config.h and add to .gitignore

2013-08-02 09:23:15 +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

Add 'make sct' to generate sct_*.tcl from all *.sct files in tree below

2014-06-19 16:35:47 +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

Zeroing rotary encoder motor steps fix

2014-07-15 18:52:05 +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

Remove superfluous trailing white space from C files

2014-05-16 17:23:44 +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

Remove superfluous trailing white space from C files

2014-05-16 17:23:44 +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 huber asyncprotocol and make huber_ap and omron_ap to remove name conflicts

2014-06-23 12:48:46 +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