From 31035631e035a0629100422d92c945345e7dc5ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torsten=20B=C3=B6gershausen?= Date: Tue, 3 Jul 2018 08:01:31 +0200 Subject: [PATCH] motorRecord.cc: Jogging against to LVIO in LVIO When jogging has stopped because the motor is close to a softlimit, the record could lock up when the same jog button is pressed again. STOP didn't help to unlock it, neither did jog into the opposite direction work. Solution: Clear the JOGF and JOGR button in the record. --- motorApp/MotorSrc/motorRecord.cc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/motorApp/MotorSrc/motorRecord.cc b/motorApp/MotorSrc/motorRecord.cc index adfff2d50..eeb2653b9 100644 --- a/motorApp/MotorSrc/motorRecord.cc +++ b/motorApp/MotorSrc/motorRecord.cc @@ -2001,6 +2001,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;