From ff3ed2dda2f2741eb830c0769b1a059dbeee5e07 Mon Sep 17 00:00:00 2001 From: cvs Date: Fri, 20 Oct 2000 06:30:32 +0000 Subject: [PATCH] EL734__BAD_BSY removed --- el734dc.c | 7 ------- el734driv.c | 11 ++--------- hardsup/el734_errcodes.h | 6 +++--- 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/el734dc.c b/el734dc.c index 91e80d02..0f138dfd 100644 --- a/el734dc.c +++ b/el734dc.c @@ -135,9 +135,6 @@ case EL734__BAD_BIND: strcat(pBuffer,"EL734__BAD_BIND"); break; - case EL734__BAD_BSY: - strcat(pBuffer,"EL734__BAD_BSY"); - break; case EL734__BAD_CMD: strcat(pBuffer,"EL734__BAD_CMD"); break; @@ -330,10 +327,6 @@ SICSLogWrite(pBueffel,eHWError); SICSLogWrite("BAD Command or dodgy RS-232",eHWError); return MOTREDO; - case EL734__BAD_BSY: /* BSY */ - pDriv->Halt(pDriv); - SicsWait(2); - return MOTREDO; case EL734__EMERG_STOP: return MOTFAIL; case EL734__BAD_RNG: /* RNG */ diff --git a/el734driv.c b/el734driv.c index c8c1486f..0ebd09ef 100644 --- a/el734driv.c +++ b/el734driv.c @@ -124,7 +124,7 @@ 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) { @@ -137,9 +137,6 @@ extern char cILLGText[256]; case EL734__BAD_BIND: strcat(pBuffer,"EL734__BAD_BIND"); break; - case EL734__BAD_BSY: - strcat(pBuffer,"EL734__BAD_BSY"); - break; case EL734__BAD_CMD: strcat(pBuffer,"EL734__BAD_CMD"); break; @@ -157,7 +154,7 @@ extern char cILLGText[256]; break; case EL734__BAD_ILLG: strcat(pBuffer,"EL734__BAD_ILLG "); - strcat(pBuffer,cILLGText); + strcat(pBuffer,EL734_IllgText); break; case EL734__BAD_LOC: strcat(pBuffer,"EL734__BAD_LOC"); @@ -333,10 +330,6 @@ extern char cILLGText[256]; SICSLogWrite(pBueffel,eHWError); SICSLogWrite("BAD Command or dodgy RS-232",eHWError); return MOTREDO; - case EL734__BAD_BSY: /* BSY */ - pDriv->Halt(pDriv); - SicsWait(2); - return MOTREDO; case EL734__EMERG_STOP: return MOTFAIL; case EL734__BAD_STP: /* motor disabled by switch */ diff --git a/hardsup/el734_errcodes.h b/hardsup/el734_errcodes.h index 81d236cc..1a04d812 100644 --- a/hardsup/el734_errcodes.h +++ b/hardsup/el734_errcodes.h @@ -3,9 +3,10 @@ ** ** 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__NOT_OPEN 0x865808C #define EL734__FORCED_CLOSED 0x8658084 @@ -22,7 +23,6 @@ #define EL734__BAD_ILLG 0x865802C #define EL734__BAD_DEV 0x8658024 #define EL734__BAD_CMD 0x865801C -#define EL734__BAD_BSY 0x865801D #define EL734__BAD_ASYNSRV 0x8658014 #define EL734__BAD_ADR 0x865800C -#define EL734_FACILITY 0x865 +#define EL734__FACILITY 0x865