Elde.StopPreviousOp modified : STOP command resent if necessary, ver. 2.18.868

2018-04-09 10:59:40 +02:00
parent f2a3c47cf7
commit 0436906a59
2 changed files with 14 additions and 6 deletions
@@ -78,15 +78,23 @@ namespace TBF.BenchControl.Elde
 				}
                else
                {
-                    //opState = OpState.ResendCommand;
+                    opState = OpState.ResendCommand;
                    return Event.None;
                }
 			}
            else if (opState == OpState.ResendCommand)
            {
-                SendStopCommand();
-                opState = OpState.CheckIfStopped;
-                return Event.None;
+                if ((controlBoard.StatusP & (StatusP.TestCompleted | StatusP.TestInProgress)) == 0)
+                {
+                    opState = OpState.Stopped;
+                    return Event.PreviousStopped;
+                }
+                else
+                {
+                    SendStopCommand();
+                    opState = OpState.CheckIfStopped;
+                    return Event.None;
+                }
            }
            else if (opState == OpState.Stopped)
 			{