Ferdi Franceschini 6c6156174f Manually merged the following changes from RELEASE-2_0P1 ...

commands_common.tcl
fixed counter feedback

anticollider_common.tcl
implement anticollider administrative override

reflectometer,sans/.../anticollider.tcl
implement administrative override to move detector

r2626 | ffr | 2008-06-12 12:55:28 +1000 (Thu, 12 Jun 2008) | 11 lines

2012-11-15 13:39:18 +11:00

..

docs

New doxygen config

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

hardsup

Merging release 2.0 branch with CVS trunk

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

instrument

Manually merged the following changes from RELEASE-2_0P1

2012-11-15 13:39:18 +11:00

TESTS/check_zlib

Ran test on 16M ints 1000 times.

2012-11-15 12:59:11 +11:00

ansto_evcontroller.h

Merging release 2.0 branch with CVS trunk

2012-11-15 13:38:17 +11: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

suppress sign mismatch compiler diagnostic

2012-11-15 13:34:29 +11:00

anstohttp.h

*** empty log message ***

2012-11-15 12:49:34 +11:00

anstoutil.c

remove unused variable

2012-11-15 13:34:33 +11:00

anstoutil.h

Added "abortbatch" command for use within batch files.

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

counterdriv.c

dereference pointer

2012-11-15 13:34:36 +11:00

fsm.c

add timer value to event trace

2012-11-15 13:37:20 +11: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

Added to repository.

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

hm_tango.h

Added to repository.

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

hmcontrol_ansto.c

MJL 21/11/06 Added ability to select termination object (can now terminate all when a HM terminates, not just counter).

2012-11-15 12:53:43 +11:00

hmcontrol_ansto.h

MJL 21/11/06 Added ability to select termination object (can now terminate all when a HM terminates, not just counter).

2012-11-15 12:53:43 +11:00

itc4.c

Added to repository.

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

itc4.h

Added to repository.

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

itc4.w

Added to repository.

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

itc4driv.c

Added to repository.

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

lakeshore340.c

Added to repository.

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

lakeshore340.h

Added to repository.

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

lakeshore340driv.c

remove unused variables

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

lh45.c

Added to repository.

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

lh45.h

Added to repository.

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

lh45driv.c

remove unused variables

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

ls340.c

Merging release 2.0 branch with CVS trunk

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

ls340.h

Merging release 2.0 branch with CVS trunk

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

lssmonitor.c

Merging release 2.0 branch with CVS trunk

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

lssmonitor.h

Merging release 2.0 branch with CVS trunk

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

make_gen_variables

text formatting

2012-11-15 13:31:30 +11:00

Makefile

Merging release 2.0 branch with CVS trunk

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

motor_asim.c

remove unused variables

2012-11-15 13:34:40 +11: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

Merging release 2.0 branch with CVS trunk

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

motor_dmc2280.h

multichan becomes AsyncQueue and AsyncProtocol

2012-11-15 13:16:58 +11:00

motor_driver.h

Added to repository.

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

nhq200.c

Accept uA instead of mA in response to '#' as found on 6kV suplies

2012-11-15 13:38:58 +11: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

update in line with nhq driver

2012-11-15 13:37:32 +11:00

orhvps.h

update in line with nhq driver

2012-11-15 13:37:32 +11:00

refl2t.c

Added to repository.

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

refl2t.h

Added to repository.

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

safetyplc.c

fix signed mismatch compiler diagnostic

2012-11-15 13:35:00 +11:00

safetyplc.h

multichan becomes AsyncQueue and AsyncProtocol

2012-11-15 13:16:58 +11:00

site_ansto.c

Merging release 2.0 branch with CVS trunk

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

site_dummy.c

Added to repository.

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

test_west.tcl

Merging release 2.0 branch with CVS trunk

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

west4100.c

Merging release 2.0 branch with CVS trunk

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

west4100.h

Merging release 2.0 branch with CVS trunk

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

west4100driv.c

Merging release 2.0 branch with CVS trunk

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