From 82eb77fa19c91384587d9b0fb653be68bfa28cdf Mon Sep 17 00:00:00 2001 From: Ron Sluiter Date: Thu, 30 Jul 2015 16:56:08 +0000 Subject: [PATCH] Bug introduced with -r 19129; change made to eliminate call to maybeRetry() removed DMOV check. Restored DMOV check. --- motorApp/MotorSrc/motorRecord.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/motorApp/MotorSrc/motorRecord.cc b/motorApp/MotorSrc/motorRecord.cc index b8f958fe..3d7f0942 100644 --- a/motorApp/MotorSrc/motorRecord.cc +++ b/motorApp/MotorSrc/motorRecord.cc @@ -1122,8 +1122,7 @@ LOGIC: ENDIF IF a limit switch is activated, OR, a load-position command is in progress (MIP = MIP_LOAD_P) Set MIP to DONE and MARK it. - ELSE - Initialize delay ticks. + ELSE IF Done Moving (DMOV) is TRUE IF process delay acknowledged is true, OR, ticks <= 0. Clear process delay request and ack. indicators in MIP field. Mark MIP as changed. @@ -1313,7 +1312,7 @@ static long process(dbCommon *arg) pmr->mip = MIP_DONE; MARK(M_MIP); } - else + else if (pmr->dmov == TRUE) { mmap_bits.All = pmr->mmap; /* Initialize for MARKED. */