- Added a AsconReadDoneReconnect to ascon. This handles the case better when
a server hangs up diretcly after a message. - Some output was suppressed while tracing, fixed - Make ready to compile both with Ubuntu 32 and 64 or /usr/local based ON in general. Just in psi/makefile_linux the top include has to be adapted - Removed epics drivers from SICS. Still in source to be reenabled when needed - Added FindMotor - Added sput, sappend and slab to nxscript using the new sicsget module - Fix to sget to fix the "mot softzero" problem SKIPPED: psi/make_gen psi/psi.c psi/sinqhttpopt.c psi/spss7.c
This commit is contained in:
19
counter.c
19
counter.c
@ -291,16 +291,17 @@ static int CheckCountStatus(void *pData, SConnection * pCon)
|
||||
}
|
||||
}
|
||||
|
||||
if(self->pDriv->fTime > .0){
|
||||
rate = (float)(self->pDriv->lCounts[1])/self->pDriv->fTime;
|
||||
if(rate > 10000){
|
||||
SCWrite(pCon,"WARNING: Your control monitor is running into dead time",
|
||||
eWarning);
|
||||
}
|
||||
}
|
||||
/* if(self->pDriv->fTime > .0){ */
|
||||
/* rate = (float)(self->pDriv->lCounts[1])/self->pDriv->fTime; */
|
||||
/* if(rate > 10000){ */
|
||||
/* SCWrite(pCon,"WARNING: Your control monitor is running into dead time", */
|
||||
/* eLogError); */
|
||||
/* } */
|
||||
/* } */
|
||||
|
||||
/*
|
||||
handle count parameters and notify listeners on progress
|
||||
*/
|
||||
handle count parameters and notify listeners on progress
|
||||
*/
|
||||
sMon.fCurrent = fControl;
|
||||
sMon.fPreset = self->pDriv->fPreset;
|
||||
sMon.pName = self->name;
|
||||
|
Reference in New Issue
Block a user