Merge pull request #201 from ZLLentz/fix_fb_internal_order

FIX: run fbInternal first to mark states as ready to use
pcdshub · Sep 20, 2023 · 534ceab · 534ceab
2 parents 84f1b81 + 7198ce2
commit 534ceab
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/lcls-twincat-motion/Library/POUs/Motion/States/FB_PositionStateND_Core.TcPOU b/lcls-twincat-motion/Library/POUs/Motion/States/FB_PositionStateND_Core.TcPOU
@@ -51,6 +51,11 @@ END_VAR]]></Declaration>
       <ST><![CDATA[
 stEpicsToPlc.nSetValue := eEnumSet;
 
+fbInternal(
+    astMotionStage:=astMotionStageMax,
+    astPositionState:=astPositionStateMax,
+);
+
 fbRead(
     astMotionStage:=astMotionStageMax,
     astPositionState:=astPositionStateMax,
@@ -69,11 +74,6 @@ fbInput(
     bResetMove=>,
 );
 
-fbInternal(
-    astMotionStage:=astMotionStageMax,
-    astPositionState:=astPositionStateMax,
-);
-
 FOR nIterMotor := 1 TO MotionConstants.MAX_STATE_MOTORS DO
     IF nCurrGoal > 0 THEN
         astMoveGoals[nIterMotor] := astPositionStateMax[nIterMotor][nCurrGoal];