- Fixed a bug in conman.c which could cause a core dump when terminating

a connection during an active run.
- Added an additional output mode for the connection in order to
  support the batch run editor.
- Made clientput send everything with eWarning mode in order to support
  the batch run editor.
- Added a better NetReadTillTerm
- Fixed a problem in synchronize.c
- Fixed an issue with reading empty line on normal connection sockets.
- Added a psi scan mode to mesure.c for TRICS
- Made motor print warnings when trying to reposition.
- Fixed abug in hkl.c which cause wrong signs.
This commit is contained in:
cvs
2004-07-21 12:03:08 +00:00
parent 017ac7500f
commit e3ee358dbc
11 changed files with 59 additions and 40 deletions

View File

@@ -17,6 +17,8 @@
#include "hardsup/sinq_prototypes.h"
#include "hardsup/el737_def.h"
#include "hardsup/el737fix.h"
#define BADTRANGE -117766
/*----------------------------- EL737 ------------------------------------*/
typedef struct {
char *host;
@@ -122,6 +124,11 @@
}
else if(self->eMode == eTimer)
{
if(self->fPreset < .1 || self->fPreset > 200000)
{
self->iErrorCode = BADTRANGE;
return HWFault;
}
iRet = EL737_StartTime(&pEL737->pData,self->fPreset,&iRS);
if(iRet == 1)
{
@@ -368,7 +375,15 @@
*iCode = self->iErrorCode;
self->iErrorCode = 0;
return 1;
}
}
else if(self->iErrorCode == BADTRANGE)
{
strncpy(error,"preset time out of range",iErrLen);
*iCode = self->iErrorCode;
self->iErrorCode = 0;
return 1;
}
EL737_ErrInfo(&pErr,&iC1,&iC2, &iC3);
EL737Error2Text(pBueffel,iC1);
@@ -437,6 +452,7 @@
case EL737__BAD_NOT_BCD:
case UNKNOWNPAR:
case BADCOUNTER:
case BADTRANGE:
return COTERM;
break;
case EL737__FORCED_CLOSED: