- Fixed a normalisation problem in diffscan when the first value
did not have enough counts - Reduced polling frequency in emon - Fixed a scriptcontext bug which would cause it to dump core in SctTransact on interrupts - Fixed an issue with missing <nl> at the end of batch files - Added a feature which does not call halt when counting stops in hmcontrol.c This is necessary for the BOA CCD - Initalized doNotFree properly in hipadaba.c - Added the travelling salesman reflection measurement algorithm - Added another component to amorset - Removed old SicsWait from nserver.c - Added a means to nxscript to write 16 bit data for BOA - Modified tasub to accept a drivabel as a motor and not only a motor. This became necessary to make EIGER work as A2 on EIGER is a virtual motor SKIPPED: psi/amorcomp.h psi/amordrive.h psi/amorset.c psi/amorset.h psi/amorset.tex psi/amorset.w psi/el734hp.c psi/el737hpdriv.c psi/make_gen psi/pardef.c psi/polterwrite.c psi/psi.c psi/sinqhttpopt.c
This commit is contained in:
36
emon.h
36
emon.h
@@ -1,5 +1,5 @@
|
||||
|
||||
#line 148 "emonitor.w"
|
||||
#line 149 "emonitor.w"
|
||||
|
||||
/*--------------------------------------------------------------------------
|
||||
E N V I R O N M E N T M O N I T O R
|
||||
@@ -14,31 +14,31 @@
|
||||
----------------------------------------------------------------------------*/
|
||||
#ifndef SICSEMON
|
||||
#define SICSEMON
|
||||
typedef struct __EnvMon *pEnvMon;
|
||||
typedef struct __EnvMon *pEnvMon;
|
||||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
#line 85 "emonitor.w"
|
||||
#line 86 "emonitor.w"
|
||||
|
||||
|
||||
pEnvMon CreateEnvMon(void);
|
||||
void DeleteEnvMon(void *pData);
|
||||
pEnvMon CreateEnvMon(void);
|
||||
void DeleteEnvMon(void *pData);
|
||||
|
||||
int EVRegisterController(pEnvMon self, char *pName, void *pData,
|
||||
SConnection * pCon);
|
||||
int EVUnregister(pEnvMon self, char *name);
|
||||
int EVRegisterController(pEnvMon self, char *pName, void *pData,
|
||||
SConnection *pCon);
|
||||
int EVUnregister(pEnvMon self, char *name);
|
||||
|
||||
int EVMonitorControllers(pEnvMon self);
|
||||
|
||||
int EVMonitorControllers(pEnvMon self);
|
||||
int EVList(pEnvMon self, SConnection *pCon);
|
||||
|
||||
int EVList(pEnvMon self, SConnection * pCon);
|
||||
int EVWrapper(SConnection *pCon, SicsInterp *pSics, void *pData,
|
||||
int argc, char *argv[]);
|
||||
|
||||
int EVWrapper(SConnection * pCon, SicsInterp * pSics, void *pData,
|
||||
int argc, char *argv[]);
|
||||
pEnvMon FindEMON(SicsInterp *pSics);
|
||||
|
||||
int EnvMonTask(void *pEv);
|
||||
void EnvMonSignal(void *pEndv, int iSignal, void *pSigData);
|
||||
|
||||
pEnvMon FindEMON(SicsInterp * pSics);
|
||||
|
||||
int EnvMonTask(void *pEv);
|
||||
void EnvMonSignal(void *pEndv, int iSignal, void *pSigData);
|
||||
|
||||
#line 164 "emonitor.w"
|
||||
#line 165 "emonitor.w"
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user