Merge pull request epics-modules#99 from EuropeanSpallationSource/JOG…

…_LVIO_JOG_nolockup motorRecord.cc: Jogging against to LVIO in LVIO This change resets the JOGF/JOGR fields to zero when a limit violation occurs, rather than when the JOGF/JOGR fields get reset to zero by the user.
EuropeanSpallationSource · Aug 20, 2018 · a21b1cc · a21b1cc
2 parents c09b49c + 9e5b543
commit a21b1cc
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/motorApp/MotorSrc/motorRecord.cc b/motorApp/MotorSrc/motorRecord.cc
@@ -2011,6 +2011,17 @@ static RTN_STATUS do_work(motorRecord * pmr, CALLBACK_VALUE proc_ind)
             {
                 pmr->lvio = 1;
                 MARK(M_LVIO);
+                /* Prevent record from locking up in mip=JOG_REQ */
+                if (pmr->jogf)
+                {
+                    pmr->jogf = 0;
+                    MARK_AUX(M_JOGF);
+                }
+                if (pmr->jogr)
+                {
+                    pmr->jogr = 0;
+                    MARK_AUX(M_JOGR);
+                }
                 return(OK);
             }
             pmr->mip = pmr->jogf ? MIP_JOGF : MIP_JOGR;