linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EL734__BAD_BSY removed

Browse Source
This commit is contained in:
cvs
2000-10-20 06:30:32 +00:00
parent 46def304db
commit ff3ed2dda2
3 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
el734dc.c
View File

@@ -135,9 +135,6 @@
case EL734__BAD_BIND: case EL734__BAD_BIND:
strcat(pBuffer,"EL734__BAD_BIND"); strcat(pBuffer,"EL734__BAD_BIND");
break; break;
case EL734__BAD_BSY:
strcat(pBuffer,"EL734__BAD_BSY");
break;
case EL734__BAD_CMD: case EL734__BAD_CMD:
strcat(pBuffer,"EL734__BAD_CMD"); strcat(pBuffer,"EL734__BAD_CMD");
break; break;
@@ -330,10 +327,6 @@
SICSLogWrite(pBueffel,eHWError); SICSLogWrite(pBueffel,eHWError);
SICSLogWrite("BAD Command or dodgy RS-232",eHWError); SICSLogWrite("BAD Command or dodgy RS-232",eHWError);
return MOTREDO; return MOTREDO;
case EL734__BAD_BSY: /* BSY */
pDriv->Halt(pDriv);
SicsWait(2);
return MOTREDO;
case EL734__EMERG_STOP: case EL734__EMERG_STOP:
return MOTFAIL; return MOTFAIL;
case EL734__BAD_RNG: /* RNG */ case EL734__BAD_RNG: /* RNG */

11
el734driv.c
View File

@@ -124,7 +124,7 @@
EL734Error2Text converts between an EL734 error code to text EL734Error2Text converts between an EL734 error code to text
-----------------------------------------------------------------------------*/ -----------------------------------------------------------------------------*/
extern char cILLGText[256]; extern char EL734_IllgText[256];
static void EL734Error2Text(char *pBuffer, int iErr) static void EL734Error2Text(char *pBuffer, int iErr)
{ {
@@ -137,9 +137,6 @@ extern char cILLGText[256];
case EL734__BAD_BIND: case EL734__BAD_BIND:
strcat(pBuffer,"EL734__BAD_BIND"); strcat(pBuffer,"EL734__BAD_BIND");
break; break;
case EL734__BAD_BSY:
strcat(pBuffer,"EL734__BAD_BSY");
break;
case EL734__BAD_CMD: case EL734__BAD_CMD:
strcat(pBuffer,"EL734__BAD_CMD"); strcat(pBuffer,"EL734__BAD_CMD");
break; break;
@@ -157,7 +154,7 @@ extern char cILLGText[256];
break; break;
case EL734__BAD_ILLG: case EL734__BAD_ILLG:
strcat(pBuffer,"EL734__BAD_ILLG "); strcat(pBuffer,"EL734__BAD_ILLG ");
strcat(pBuffer,cILLGText); strcat(pBuffer,EL734_IllgText);
break; break;
case EL734__BAD_LOC: case EL734__BAD_LOC:
strcat(pBuffer,"EL734__BAD_LOC"); strcat(pBuffer,"EL734__BAD_LOC");
@@ -333,10 +330,6 @@ extern char cILLGText[256];
SICSLogWrite(pBueffel,eHWError); SICSLogWrite(pBueffel,eHWError);
SICSLogWrite("BAD Command or dodgy RS-232",eHWError); SICSLogWrite("BAD Command or dodgy RS-232",eHWError);
return MOTREDO; return MOTREDO;
case EL734__BAD_BSY: /* BSY */
pDriv->Halt(pDriv);
SicsWait(2);
return MOTREDO;
case EL734__EMERG_STOP: case EL734__EMERG_STOP:
return MOTFAIL; return MOTFAIL;
case EL734__BAD_STP: /* motor disabled by switch */ case EL734__BAD_STP: /* motor disabled by switch */

6
hardsup/el734_errcodes.h
View File

@@ -3,9 +3,10 @@
** **
** Include file generated from EL734_ERRCODES.OBJ ** Include file generated from EL734_ERRCODES.OBJ
** **
** 17-FEB-1999 09:17:58.62 ** 29-AUG-2000 09:49:19.60
*/ */
#define EL734__VFY_ERR 0x865809C
#define EL734__NO_SOCKET 0x8658094 #define EL734__NO_SOCKET 0x8658094
#define EL734__NOT_OPEN 0x865808C #define EL734__NOT_OPEN 0x865808C
#define EL734__FORCED_CLOSED 0x8658084 #define EL734__FORCED_CLOSED 0x8658084
@@ -22,7 +23,6 @@
#define EL734__BAD_ILLG 0x865802C #define EL734__BAD_ILLG 0x865802C
#define EL734__BAD_DEV 0x8658024 #define EL734__BAD_DEV 0x8658024
#define EL734__BAD_CMD 0x865801C #define EL734__BAD_CMD 0x865801C
#define EL734__BAD_BSY 0x865801D
#define EL734__BAD_ASYNSRV 0x8658014 #define EL734__BAD_ASYNSRV 0x8658014
#define EL734__BAD_ADR 0x865800C #define EL734__BAD_ADR 0x865800C
#define EL734_FACILITY 0x865 #define EL734__FACILITY 0x865