Merge pull request #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.
This commit is contained in:
Kevin Peterson
2018-08-20 14:50:07 -05:00
committed by GitHub
+11
View File
@@ -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;