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
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
/* ------------------------------------------------------------------------
|
||||
The OutCode's for SICS have to be translated from text at several
|
||||
places in SICS. Wherever necessary sich code should include this file.
|
||||
places in SICS. Wherever necessary such code should include this file.
|
||||
This restricts changes to Scommon.h and this file
|
||||
|
||||
Mark Koennecke, November 1996
|
||||
@@ -26,5 +26,5 @@ static char *pCode[] = {
|
||||
"logerror",
|
||||
NULL
|
||||
};
|
||||
static int iNoCodes = 13;
|
||||
static int iNoCodes = 15;
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user