diff --git a/motorApp/AerotechSrc/drvEnsemble.h b/motorApp/AerotechSrc/drvEnsemble.h index 6e08fc92..87b41c54 100644 --- a/motorApp/AerotechSrc/drvEnsemble.h +++ b/motorApp/AerotechSrc/drvEnsemble.h @@ -1,15 +1,14 @@ /* -FILENAME... drvEnsemble.h +FILENAME... drvEnsemble.h USAGE... This file contains Aerotech Ensemble driver "include" information. -Version: 1.0 -Modified By: weimer -Last Modified: 2008/04/10 05:52:14 PM +Version: $Revision: 1.2 $ +Modified By: $Author: sluiter $ +Last Modified: $Date: 2008-11-20 22:29:35 $ */ /* - * Original Author: Mark Rivers - * Current Author: Chad Weimer + * Original Author: Chad Weimer * Date: 10/16/97 * * Experimental Physics and Industrial Control System (EPICS) @@ -22,50 +21,38 @@ Last Modified: 2008/04/10 05:52:14 PM * and (W-31-109-ENG-38) at Argonne National Laboratory. * * Initial development by: - * The Controls and Automation Group (AT-8) - * Ground Test Accelerator - * Accelerator Technology Division - * Los Alamos National Laboratory + * The Controls and Automation Group (AT-8) + * Ground Test Accelerator + * Accelerator Technology Division + * Los Alamos National Laboratory * * Co-developed with - * The Controls and Computing Group - * Accelerator Systems Division - * Advanced Photon Source - * Argonne National Laboratory + * The Controls and Computing Group + * Accelerator Systems Division + * Advanced Photon Source + * Argonne National Laboratory * * Modification Log: * ----------------- - * .00 04-01-08 caw initialized from drvMM4000.h (Newport) + * .00 04-01-08 caw initialized from drvMM4000.h (Newport) */ -#ifndef INCdrvEnsembleh -#define INCdrvEnsembleh 1 +#ifndef INCdrvEnsembleh +#define INCdrvEnsembleh 1 #include "motor.h" #include "motordrvCom.h" #include "asynDriver.h" #include "asynOctetSyncIO.h" -/* -enum Ensemble_motor_type -{ - UNUSED, - STEPPER, - DC -}; - -#ifndef __cplusplus -typedef enum Ensemble_motor_type Ensemble_motor_type; -#endif -*/ // The following should be defined to have the same value as // the Ensemble parameters specified -#define ASCII_EOS_CHAR '\n' // AsciiCmdEOSChar -#define ASCII_EOS_STR "\n" -#define ASCII_ACK_CHAR '%' // AsciiCmdAckChar -#define ASCII_NAK_CHAR '!' // AsciiCmdNakChar -#define ASCII_FAULT_CHAR '#' // AsciiCmdFaultChar +#define ASCII_EOS_CHAR '\n' // AsciiCmdEOSChar +#define ASCII_EOS_STR "\n" +#define ASCII_ACK_CHAR '%' // AsciiCmdAckChar +#define ASCII_NAK_CHAR '!' // AsciiCmdNakChar +#define ASCII_FAULT_CHAR '#' // AsciiCmdFaultChar #define BUFF_SIZE 100 /* Maximum length of string to/from Ensemble */ @@ -73,14 +60,15 @@ typedef enum Ensemble_motor_type Ensemble_motor_type; /* Ensemble specific data is stored in this structure. */ struct Ensemblecontroller { - asynUser *pasynUser; /* For RS-232/Ethernet */ - int asyn_address; /* Use for GPIB or other address with asyn */ - char asyn_port[80]; /* asyn port name */ - int axes[MAX_AXIS]; - double drive_resolution[MAX_AXIS]; - int res_decpts[MAX_AXIS]; /* Drive resolution significant dec. pts. */ - double home_preset[MAX_AXIS]; /* Controller's home preset position (XF command). */ - CommStatus status; /* Controller communication status. */ + asynUser *pasynUser; /* For RS-232/Ethernet */ + int asyn_address; /* Use for GPIB or other address with asyn */ + char asyn_port[80]; /* asyn port name */ + int axes[MAX_AXIS]; + double drive_resolution[MAX_AXIS]; + int res_decpts[MAX_AXIS]; /* Drive resolution significant dec. pts. */ + double home_preset[MAX_AXIS]; /* Controller's home preset position (XF command). */ + epicsUInt32 home_dparam[MAX_AXIS]; /* Controller's HomeDirection parameter. */ + CommStatus status; /* Controller communication status. */ }; /* Function prototypes. */ @@ -88,5 +76,5 @@ extern RTN_STATUS EnsembleSetup(int, int); extern RTN_STATUS EnsembleConfig(int, const char *, int); -#endif /* INCdrvEnsembleh */ +#endif /* INCdrvEnsembleh */