Ferdi Franceschini 55347984ec Checked files modified by the merge with: ...

cvs diff -u -rRELEASE-1_2-MERGEPOINT -rHEAD <filepath>
and found no modifications on the trunk between the release 1.2 mergepoint and cvs HEAD

r1946 | ffr | 2007-05-08 15:01:16 +1000 (Tue, 08 May 2007) | 4 lines

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

..

docs

New doxygen config

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

hardsup

Added code for counter source filtering

2012-11-15 13:14:25 +11:00

instrument

Checked files modified by the merge with:

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

TESTS/check_zlib

Ran test on 16M ints 1000 times.

2012-11-15 12:59:11 +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

MJL 4/4/07 Added upload of any dictonary entries starting with 'read_data_' as HTTP options in data read reques to histogram server, allows read data source & format to be adjusted on-the-fly.

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

anstohttp.h

*** empty log message ***

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

anstoutil.c

Added portnum command

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

anstoutil.h

cleanup splint

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

counterdriv.c

Make debug logging dependent on counter debug parameter

2012-11-15 13:02:18 +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

Added to repository.

2012-11-15 12:44:13 +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

Added to repository.

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

make_gen_variables

Added support to generate sicspoll. and sicsdrive.c files from .tc templates.

2012-11-15 13:01:20 +11:00

Makefile

Bringing kowari layout and config inline with the current requirements of

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

motor_asim.c

Implement speed parameter for 'fastscan' differential scan capability

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

motor_asim.h

Added to repository.

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

motor_dmc2280.c

Implement finite state machine model. Improved backlash (unidirectional motor driving). Precision motor creeping. Ensure thread zero is operating. Floating point steps and counts per unit. "send", "reset", "state" and "trace" commands.

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

motor_dmc2280.h

cosmetic changes

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

motor_driver.h

Added to repository.

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

nhq200.c

cosmetic

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

nhq200.h

cosmetic

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

nhq200driv.c

remove some compiler warnings and non-multichan code

2012-11-15 13:00:10 +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

Merged Release 1.2

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

safetyplc.h

First iteration of SICS object to handle the Safety PLC digital I/O

2012-11-15 13:02:27 +11:00

site_ansto.c

Add ActionRoutine hook to motor object

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

site_dummy.c

Added to repository.

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