Merge pull request #238 from EuropeanSpallationSource/torsten/rvel-via-motoractvelocity

asynMotor: Introduce motorActVelocity

Author: kmpeters

motorApp/MotorSrc/asynMotorAxis.cpp

@@ -288,7 +288,7 @@ asynStatus asynMotorAxis::setDoubleParam(int function, double value)
         statusChanged_ = 1;
         status_.encoderPosition = value;
     }
-  } else if (function == pC_->motorVelocity_) {
+  } else if (function == pC_->motorActVelocity_) {
     if (value != status_.velocity) {
         statusChanged_ = 1;
         status_.velocity = value;

motorApp/MotorSrc/asynMotorController.cpp

@@ -60,6 +60,7 @@ asynMotorController::asynMotorController(const char *portName, int numAxes, int
   createParam(motorHomeString,                   asynParamFloat64,    &motorHome_);
   createParam(motorStopString,                   asynParamInt32,      &motorStop_);
   createParam(motorVelocityString,               asynParamFloat64,    &motorVelocity_);
+  createParam(motorActVelocityString,            asynParamFloat64,    &motorActVelocity_);
   createParam(motorVelBaseString,                asynParamFloat64,    &motorVelBase_);
   createParam(motorAccelString,                  asynParamFloat64,    &motorAccel_);
   createParam(motorPositionString,               asynParamFloat64,    &motorPosition_);

motorApp/MotorSrc/asynMotorController.h

@@ -24,6 +24,7 @@
 #define motorMoveVelString              "MOTOR_MOVE_VEL"
 #define motorHomeString                 "MOTOR_HOME"
 #define motorStopString                 "MOTOR_STOP_AXIS"
+#define motorActVelocityString          "MOTOR_ACT_VELOCITY"
 #define motorVelocityString             "MOTOR_VELOCITY"
 #define motorVelBaseString              "MOTOR_VEL_BASE"
 #define motorAccelString                "MOTOR_ACCEL"
@@ -207,6 +208,7 @@ class epicsShareClass asynMotorController : public asynPortDriver {
   int motorHome_;
   int motorStop_;
   int motorVelocity_;
+  int motorActVelocity_;
   int motorVelBase_;
   int motorAccel_;
   int motorPosition_;