From 4494eb14be2a95bcc6ab85833370a4533327d0f0 Mon Sep 17 00:00:00 2001 From: Keenan Lang Date: Tue, 12 Jul 2016 16:06:07 -0500 Subject: [PATCH 1/3] Switched motor status and statusChanged to be protected instead of private. --- motorApp/MotorSrc/asynMotorAxis.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/motorApp/MotorSrc/asynMotorAxis.h b/motorApp/MotorSrc/asynMotorAxis.h index 7cdc2544..fea0748c 100644 --- a/motorApp/MotorSrc/asynMotorAxis.h +++ b/motorApp/MotorSrc/asynMotorAxis.h @@ -72,10 +72,10 @@ class epicsShareClass asynMotorAxis { double *profileReadbacks_; /**< Array of readback positions for profile moves */ double *profileFollowingErrors_; /**< Array of following errors for profile moves */ int referencingMode_; - - private: MotorStatus status_; int statusChanged_; + + private: int referencingModeMove_; int wasMovingFlag_; int disableFlag_; From 40816ddc65b8d3a15821c76f23075706f98053a5 Mon Sep 17 00:00:00 2001 From: Keenan Lang Date: Mon, 25 Jul 2016 14:38:38 -0500 Subject: [PATCH 2/3] Revert "Switched motor status and statusChanged to be protected instead of private." This reverts commit 36ff229c44b8273cd7c4967a13eb64a24f73d37d. --- motorApp/MotorSrc/asynMotorAxis.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/motorApp/MotorSrc/asynMotorAxis.h b/motorApp/MotorSrc/asynMotorAxis.h index fea0748c..7cdc2544 100644 --- a/motorApp/MotorSrc/asynMotorAxis.h +++ b/motorApp/MotorSrc/asynMotorAxis.h @@ -72,10 +72,10 @@ class epicsShareClass asynMotorAxis { double *profileReadbacks_; /**< Array of readback positions for profile moves */ double *profileFollowingErrors_; /**< Array of following errors for profile moves */ int referencingMode_; + + private: MotorStatus status_; int statusChanged_; - - private: int referencingModeMove_; int wasMovingFlag_; int disableFlag_; From ebe51c0ebb12d9a3a7b362fd32013e8f71995f0b Mon Sep 17 00:00:00 2001 From: Keenan Lang Date: Mon, 25 Jul 2016 14:42:51 -0500 Subject: [PATCH 3/3] Reverted wrong change, this should get it back to what I wanted it to be. --- motorApp/MotorSrc/asynMotorAxis.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/motorApp/MotorSrc/asynMotorAxis.h b/motorApp/MotorSrc/asynMotorAxis.h index 7cdc2544..16cf044c 100644 --- a/motorApp/MotorSrc/asynMotorAxis.h +++ b/motorApp/MotorSrc/asynMotorAxis.h @@ -73,9 +73,10 @@ class epicsShareClass asynMotorAxis { double *profileFollowingErrors_; /**< Array of following errors for profile moves */ int referencingMode_; - private: MotorStatus status_; int statusChanged_; + + private: int referencingModeMove_; int wasMovingFlag_; int disableFlag_;