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

Added new methods: report() and seDeferredMoves()

Browse Source
This commit is contained in:
MarkRivers
2012-03-01 19:41:18 +00:00
parent c1a3aef8fd
commit c17d17cde1
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/MotorSrc/asynMotorController.h
+12 -10
View File
@@ -28,13 +28,13 @@
#define motorDeferMovesString "MOTOR_DEFER_MOVES"
#define motorMoveToHomeString "MOTOR_MOVE_HOME"
#define motorResolutionString "MOTOR_RESOLUTION"
#define motorEncRatioString "MOTOR_ENC_RATIO"
#define motorPgainString "MOTOR_PGAIN"
#define motorIgainString "MOTOR_IGAIN"
#define motorDgainString "MOTOR_DGAIN"
#define motorEncoderRatioString "MOTOR_ENCODER_RATIO"
#define motorPGainString "MOTOR_PGAIN"
#define motorIGainString "MOTOR_IGAIN"
#define motorDGainString "MOTOR_DGAIN"
#define motorHighLimitString "MOTOR_HIGH_LIMIT"
#define motorLowLimitString "MOTOR_LOW_LIMIT"
#define motorSetClosedLoopString "MOTOR_SET_CLOSED_LOOP"
#define motorClosedLoopString "MOTOR_CLOSED_LOOP"
#define motorStatusString "MOTOR_STATUS"
#define motorUpdateStatusString "MOTOR_UPDATE_STATUS"
#define motorStatusDirectionString "MOTOR_STATUS_DIRECTION"
@@ -149,6 +149,7 @@ class epicsShareFunc asynMotorController : public asynPortDriver {
virtual asynStatus writeFloat64Array(asynUser *pasynUser, epicsFloat64 *value, size_t nElements);
virtual asynStatus readFloat64Array(asynUser *pasynUser, epicsFloat64 *value, size_t nElements, size_t *nRead);
virtual asynStatus readGenericPointer(asynUser *pasynUser, void *pointer);
virtual void report(FILE *fp, int details);
/* These are the methods that are new to this class */
virtual asynMotorAxis* getAxis(asynUser *pasynUser);
@@ -156,6 +157,7 @@ class epicsShareFunc asynMotorController : public asynPortDriver {
virtual asynStatus startPoller(double movingPollPeriod, double idlePollPeriod, int forcedFastPolls);
virtual asynStatus wakeupPoller();
virtual asynStatus poll();
virtual asynStatus setDeferredMoves(bool defer);
void asynMotorPoller(); // This should be private but is called from C function
/* Functions to deal with moveToHome.*/
@@ -189,13 +191,13 @@ class epicsShareFunc asynMotorController : public asynPortDriver {
int motorDeferMoves_;
int motorMoveToHome_;
int motorResolution_;
int motorEncRatio_;
int motorPgain_;
int motorIgain_;
int motorDgain_;
int motorEncoderRatio_;
int motorPGain_;
int motorIGain_;
int motorDGain_;
int motorHighLimit_;
int motorLowLimit_;
int motorSetClosedLoop_;
int motorClosedLoop_;
int motorStatus_;
int motorUpdateStatus_;