diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs index 24e318c5c..924c3078b 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs @@ -164,11 +164,19 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection //------------------------------------------------ Bridge.OnActivity(this, Strings.Setting_the_flow); //------------------------------------------------ - if (inPath.Pump is GenericDevices.IPumpFM) (inPath.Pump as GenericDevices.IPumpFM).TurnOn(test.PumpPower); + if (inPath.Pump is GenericDevices.IPumpFM) + { + (inPath.Pump as GenericDevices.IPumpFM).TurnOn(test.PumpPower); + } + /// + IList valvesOpen = new List(); + valvesOpen.Add(inPath.Pump); + valvesOpen.Add(outPath.StartValve); + /// State.Create("FixedStartMassCollection : Starting the pump") .AddOperation(checkUiOp) - .AddOperation(cBrd.SetValvesOp(inPath.Pump, null)) - .AddOperation(heatMetersPromptOp) + .AddOperation(StateMachine.ControlBoard.SetValvesOp(valvesOpen, null)) + .AddOperation(heatMetersPromptOp) .EnterState(); do { @@ -178,7 +186,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; } } - while (!e.Contains(Event.ValvesSet)); + while (e.Contains(Event.ValvesBusy)); + //-------------------------------- State.Create("FixedStartMassCollection : Setting the flow") diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index df980fc2d..e33c7287a 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.12.452.1")] -[assembly: AssemblyFileVersion("2.12.452.1")] +[assembly: AssemblyVersion("2.12.453.1")] +[assembly: AssemblyFileVersion("2.12.453.1")] diff --git a/packages/ControlBoard/Genesis/ControlComponent3U.dll b/packages/ControlBoard/Genesis/ControlComponent3U.dll index 894f74e41..edb861f0a 100644 Binary files a/packages/ControlBoard/Genesis/ControlComponent3U.dll and b/packages/ControlBoard/Genesis/ControlComponent3U.dll differ