More ReadMassOp / Mass / etc.

2021-04-15 16:49:28 +02:00
parent 1f05cc420c
commit b36a76f413
10 changed files with 33 additions and 67 deletions
@@ -439,7 +439,7 @@ namespace TBF.Rig.TestMethods.DiverterTest
                    goto stopTest;
                }
            }
-			while (!e.Contains(Event.ScaleDone));
+            while (!e.Contains(Event.ScaleDone) && !e.Contains(Event.Next));

            tMass1 = StateMachine.Time;
            log.WarnFormat("Start mass = {0}kg", StartMass);
@@ -599,7 +599,7 @@ namespace TBF.Rig.TestMethods.DiverterTest
                    goto stopTest;
                }
            }
-			while (!e.Contains(Event.ScaleDone));
+            while (!e.Contains(Event.ScaleDone) && !e.Contains(Event.Next));
            ///
            tMass2 = StateMachine.Time;
            log.WarnFormat("End mass = {0}kg", EndMass);