diff --git a/hardsup/velsel_def.h b/hardsup/velsel_def.h index 9809d3fa..276eb65b 100644 --- a/hardsup/velsel_def.h +++ b/hardsup/velsel_def.h @@ -1,6 +1,6 @@ #ifndef _velsel_def_ #define _velsel_def_ -/*------------------------------------------------ VelSel_DEF.H Ident V01A +/*------------------------------------------------ VelSel_DEF.H Ident V01B */ #include #include @@ -9,33 +9,6 @@ #define OffsetOf(type, identifier) ((size_t)(&((type*) NULL)->identifier)) #endif -#define MAX_MOT 12 - -#define MSR__BUSY 0x0001 -#define MSR__OK 0x0002 -#define MSR__REF_OK 0x0004 -#define MSR__STOPPED 0x0008 -#define MSR__LO_LIM 0x0010 -#define MSR__HI_LIM 0x0020 -#define MSR__HALT 0x0040 -#define MSR__RUN_FAULT 0x0080 -#define MSR__RUN_FAIL 0x0100 -#define MSR__POS_FAULT 0x0200 -#define MSR__POS_FAIL 0x0400 -#define MSR__REF_FAIL 0x0800 -#define MSR__AC_FAIL 0x1000 -#define MSR__LIM_ERR 0x2000 - -#define SS__HALT 0x0001 -#define SS__CCW 0x0002 -#define SS__STP 0x0004 -#define SS__LS1 0x0008 -#define SS__LS2 0x0010 -#define SS__LSX 0x0020 - -enum VelSel_Requests {FULL__STATUS, - SHORT__STATUS}; - enum VelSel_Errors {VELSEL__BAD_TMO = -1, VELSEL__BAD_CMD = -3, VELSEL__BAD_OFL = -4, @@ -66,6 +39,8 @@ enum VelSel_Errors {VELSEL__BAD_TMO = -1, VELSEL__BAD_OPEN = -31, VELSEL__FORCED_CLOSED = -32, VELSEL__BAD_STP = -33, + VELSEL__NOT_OPEN = -35, + VELSEL__BAD_ASYNSRV = -36, VELSEL__BAD_REPLY = -34}; /* ** Structure to which the VelSel_Open handle points.