From ae68ae02c698ed2ab380bdce207d9a10f2685ee5 Mon Sep 17 00:00:00 2001 From: Ron Sluiter Date: Thu, 12 Jun 2014 13:59:57 +0000 Subject: [PATCH] Clear "forceCallback" before processing motor record (from params->callback) and only if forceCallback is ON. (Fixes motor record left in the moving state (DMOV=0) after limit switch error reported by Andy Foster.) --- motorApp/MotorSrc/paramLib.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/motorApp/MotorSrc/paramLib.c b/motorApp/MotorSrc/paramLib.c index 7bedf02f..6d3e8cfd 100644 --- a/motorApp/MotorSrc/paramLib.c +++ b/motorApp/MotorSrc/paramLib.c @@ -265,8 +265,11 @@ static void paramCallCallback( PARAMS params ) } if ( (params->forceCallback || nFlags > 0) && params->callback != NULL ) + { + if (params->forceCallback) + params->forceCallback = 0; params->callback( params->param, nFlags, params->set_flags ); - params->forceCallback=0; + } } /** Forces the next paramCallCallback to actually call the callback routine