lin-epics-modules/motorBase
0
0
Fork 0
forked from epics_driver_modules/motorBase
Code Pull Requests Activity

- Fix for record hanging because of erroneous retries; see README item #20.

Browse Source
This commit is contained in:
Ron Sluiter
2000-08-16 19:04:39 +00:00
parent 4f774921a3
commit ee511df56f
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/MotorSrc/motorRecord.c
+17 -5
View File
@@ -2,9 +2,9 @@
FILENAME... motorRecord.c
USAGE... Record Support Routines for the Motor record.
Version: $Revision: 1.4 $
Version: $Revision: 1.5 $
Modified By: $Author: sluiter $
Last Modified: $Date: 2000-07-25 20:34:50 $
Last Modified: $Date: 2000-08-16 19:04:39 $
*/
/*
@@ -1343,8 +1343,15 @@ LOGIC:
NORMAL RETURN.
ELSE
Calculate....
IF last dial commanded position = current dial feedback position.
NORMAL RETURN.
IF new raw commanded position = current raw feedback position.
IF not done moving, AND, [either no motion-in-progress, OR,
retry-in-progress].
Set done moving TRUE.
NORMAL RETURN.
NOTE: maybeRetry() can send control here even though the
move is to the same raw position.
ENDIF
ENDIF
....
....
@@ -1806,10 +1813,15 @@ stop_all: /* Cancel any operations. */
npos = NINT(newpos);
if (npos == rpos)
{
if (pmr->dmov == FALSE && pmr->mip == 0)
if (pmr->dmov == FALSE && (pmr->mip == 0 || pmr->mip == MIP_RETRY))
{
pmr->dmov = TRUE;
MARK(M_DMOV);
if (pmr->mip != 0)
{
pmr->mip = 0;
MARK(M_MIP);
}
}
return(OK);
}