66466c1c0f
This is the first working version of the new logging system. Some work
...
in fine tuning still needs to be done. But is reasonably OK now.
2016-02-11 13:40:31 +01:00
5e597e2d10
Merge branch 'maverick' into develop
...
Compile under OSX
2016-01-26 09:48:11 +01:00
b60ce746d4
Merge commit 'refs/merge-requests/1' of ssh://gitorious.psi.ch/sinqdev/sics into merge-requests/1
...
First merge with ANSTO which compiles
Conflicts:
SICSmain.c
asynnet.c
confvirtualmot.c
counter.c
devexec.c
drive.c
exebuf.c
hipadaba.c
interface.h
make_gen
motor.c
nserver.c
nwatch.c
ofac.c
protocol.c
sicshipadaba.c
2015-04-23 17:00:33 +02:00
Ferdi Franceschini
10d29d597c
Cleaned up ANSTO code to merge with sinqdev.sics
...
This is our new RELEASE-4_0 branch which was taken from ansto/93d9a7c
Conflicts:
.gitignore
SICSmain.c
asynnet.c
confvirtualmot.c
counter.c
devexec.c
drive.c
event.h
exebuf.c
exeman.c
histmem.c
interface.h
motor.c
motorlist.c
motorsec.c
multicounter.c
napi.c
napi.h
napi4.c
network.c
nwatch.c
nxscript.c
nxxml.c
nxxml.h
ofac.c
reflist.c
scan.c
sicshipadaba.c
sicsobj.c
site_ansto/docs/Copyright.txt
site_ansto/instrument/lyrebird/config/tasmad/sicscommon/nxsupport.tcl
site_ansto/instrument/lyrebird/config/tasmad/taspub_sics/tasscript.tcl
statusfile.c
tasdrive.c
tasub.c
tasub.h
tasublib.c
tasublib.h
2015-04-23 20:49:26 +10:00
Douglas Clowes
1da5fc9062
Create and use sicsglobal.h and add isDuringInitialization
2014-06-19 16:35:47 +10:00
Douglas Clowes
93276478f5
Push the server and option code down to reduce dependency loops
2014-05-01 10:54:09 +10:00
koennecke
1afe142812
- Removed old code
...
- Extended tasker to support task groups
- Added task functions for motors and counters
- Modifed devexec to use the new task functions
- Modified TAS to treat the monochromator separatly
- Coded a EIGER monochromator module to reflect even more new
requirements
- Added EPICS counters and motors
- Modified multicounter to be better performing
SKIPPED:
psi/eigermono.c
psi/make_gen
psi/makefile_linux
psi/psi.c
psi/sinqhttp.c
2013-04-02 15:13:35 +00:00
Douglas Clowes
0e52709cdc
Report SICS version information on "SICServer -v"
2013-02-15 13:27:03 +11:00
Douglas Clowes
9534ba4b31
refactor, improve usage and save the argv0
2012-12-10 14:51:29 +11:00
Douglas Clowes
27e89241cf
get it to build
2012-11-27 13:34:05 +11:00
koennecke
91d4af0541
- Adapted indenation to new agreed upon system
...
- Added support for second generation scriptcontext based counter
2009-02-13 09:00:03 +00:00
zolliker
6776fc6413
- changed logging functionality (CompactCommandLog option)
2008-01-18 07:49:23 +00:00
zolliker
6f4ec45099
- appended newline to error message
2005-09-09 14:33:49 +00:00
cvs
fdc6b051c9
Initial revision
2000-02-07 10:38:55 +00:00
