Merge pull request #60 from EuropeanSpallationSource/record-DLYandSTOP-problem

Record: motor record DLY and STOP problem
2018-05-01 09:51:03 -05:00
parent f3d4e0fd1d 38186d00e4
commit 90bb52f3c6
1 changed files with 7 additions and 3 deletions
@@ -1804,9 +1804,13 @@ static RTN_STATUS do_work(motorRecord * pmr, CALLBACK_VALUE proc_ind)
            /* Cancel any operations. */
            if (pmr->mip & MIP_HOME)
                clear_buttons(pmr);
-            
-            pmr->mip = MIP_STOP;
-            MARK(M_MIP);
+
+            if (!(pmr->mip & MIP_DELAY_REQ)) {
+               /* When we wait for DLY, keep it. */
+               /* Otherwise the record may lock up */
+                pmr->mip = MIP_STOP;     
+                MARK(M_MIP);
+            }
            INIT_MSG();
            WRITE_MSG(STOP_AXIS, NULL);
            SEND_MSG();