From 95c0a4caa22fd946f4b3064d72beb2837e5a845a Mon Sep 17 00:00:00 2001 From: kpetersn Date: Tue, 21 Aug 2018 11:56:25 -0500 Subject: [PATCH 1/2] Don't set "stop" field true if driver returns RA_PROBLEM true. It is the driver's responsiblity to stop a motor if the condition that results in the RA_PROBLEM bit being set doesn't result in the motor automatically stopping. This partially reverts commit 303a9208e368ef07839afff67bac69e429af7332 --- motorApp/MotorSrc/motorRecord.cc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/motorApp/MotorSrc/motorRecord.cc b/motorApp/MotorSrc/motorRecord.cc index 3d1647c3..226cf84c 100644 --- a/motorApp/MotorSrc/motorRecord.cc +++ b/motorApp/MotorSrc/motorRecord.cc @@ -3696,11 +3696,6 @@ static void process_motor_info(motorRecord * pmr, bool initcall) if (ls_active == true || msta.Bits.RA_PROBLEM) { clear_buttons(pmr); - if (msta.Bits.RA_PROBLEM) - { - pmr->stop = 1; - MARK(M_STOP); - } } } else From 26771f23dc6b81cd5486835ebe98feb7d37014a8 Mon Sep 17 00:00:00 2001 From: kpetersn Date: Tue, 21 Aug 2018 12:05:30 -0500 Subject: [PATCH 2/2] Added a comment about reverting the change from .69 --- motorApp/MotorSrc/motorRecord.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/motorApp/MotorSrc/motorRecord.cc b/motorApp/MotorSrc/motorRecord.cc index 226cf84c..dd8cacb7 100644 --- a/motorApp/MotorSrc/motorRecord.cc +++ b/motorApp/MotorSrc/motorRecord.cc @@ -189,6 +189,7 @@ USAGE... Motor Record Support. * .75 05-18-17 rls - Stop motor if URIP is Yes and RDBL read returns an error. * .76 04-04-18 rls - If URIP is Yes and RDBL is inaccessible (e.g., CA server is down), do not start * a new target position move (sans Home search or Jog). + * .78 08-21-18 kmp - Reverted .69 stop on RA_PROBLEM true. */ #define VERSION 6.10