lin-epics-modules/motorBase
0
0
Fork 0
forked from epics_driver_modules/motorBase
Code Pull Requests Activity

Added support for AquadB modes to position compare

Browse Source
This commit is contained in:
MarkRivers
2015-03-21 17:42:42 +00:00
parent 45ac97b968
commit 0b4a09d8a7
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/NewportSrc/XPSController.h
+9 -3
View File
@@ -25,11 +25,17 @@ USAGE... Newport XPS EPICS asyn motor device driver
#define MAX_SETTLING_TIMES 4
static const double positionComparePulseWidths[MAX_PULSE_WIDTHS] = {0.2, 1.0, 2.5, 10.0};
static const double positionCompareSettlingTimes[MAX_SETTLING_TIMES] = {0.075, 1.0, 4.0, 12.0};
typedef enum {
XPSPositionCompareModeDisable,
XPSPositionCompareModePulse,
XPSPositionCompareModeAquadBWindowed,
XPSPositionCompareModeAquadBAlways
} XPSPositionCompareMode_t;
// drvInfo strings for extra parameters that the XPS controller supports
#define XPSMinJerkString "XPS_MIN_JERK"
#define XPSMaxJerkString "XPS_MAX_JERK"
#define XPSPositionCompareEnableString "XPS_POSITION_COMPARE_ENABLE"
#define XPSPositionCompareModeString "XPS_POSITION_COMPARE_MODE"
#define XPSPositionCompareMinPositionString "XPS_POSITION_COMPARE_MIN_POSITION"
#define XPSPositionCompareMaxPositionString "XPS_POSITION_COMPARE_MAX_POSITION"
#define XPSPositionCompareStepSizeString "XPS_POSITION_COMPARE_STEP_SIZE"
@@ -93,7 +99,7 @@ class epicsShareClass XPSController : public asynMotorController {
#define FIRST_XPS_PARAM XPSMinJerk_
int XPSMinJerk_;
int XPSMaxJerk_;
int XPSPositionCompareEnable_;
int XPSPositionCompareMode_;
int XPSPositionCompareMinPosition_;
int XPSPositionCompareMaxPosition_;
int XPSPositionCompareStepSize_;