Merge pull request #83 from mp49/autopower_fix

Fix issue with power being left on when using autoPower option in asy…
epics-modules · Apr 27, 2018 · f3d4e0f · f3d4e0f
2 parents beba85f + 8229bb7
commit f3d4e0f
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/motorApp/MotorSrc/asynMotorController.cpp b/motorApp/MotorSrc/asynMotorController.cpp
@@ -280,6 +280,7 @@ asynStatus asynMotorController::writeFloat64(asynUser *pasynUser, epicsFloat64 v
   if (function == motorMoveRel_) {
     if (autoPower == 1) {
       status = pAxis->setClosedLoop(true);
+      pAxis->setWasMovingFlag(1);
       epicsThreadSleep(autoPowerOnDelay);
     }
     getDoubleParam(axis, motorVelBase_, &baseVelocity);
@@ -296,6 +297,7 @@ asynStatus asynMotorController::writeFloat64(asynUser *pasynUser, epicsFloat64 v
   } else if (function == motorMoveAbs_) {
     if (autoPower == 1) {
       status = pAxis->setClosedLoop(true);
+      pAxis->setWasMovingFlag(1);
       epicsThreadSleep(autoPowerOnDelay);
     }
     getDoubleParam(axis, motorVelBase_, &baseVelocity);
@@ -312,6 +314,7 @@ asynStatus asynMotorController::writeFloat64(asynUser *pasynUser, epicsFloat64 v
   } else if (function == motorMoveVel_) {
     if (autoPower == 1) {
       status = pAxis->setClosedLoop(true);
+      pAxis->setWasMovingFlag(1);
       epicsThreadSleep(autoPowerOnDelay);
     }
     getDoubleParam(axis, motorVelBase_, &baseVelocity);
@@ -328,6 +331,7 @@ asynStatus asynMotorController::writeFloat64(asynUser *pasynUser, epicsFloat64 v
   } else if (function == motorHome_) {
     if (autoPower == 1) {
       status = pAxis->setClosedLoop(true);
+      pAxis->setWasMovingFlag(1);
       epicsThreadSleep(autoPowerOnDelay);
     }
     getDoubleParam(axis, motorVelBase_, &baseVelocity);