(1) Genesis component upgraded, (2) FixedStartMassCollectionSeq : Opening start/stop valve in 2nd repetition fixed, ver. 2.12.453

This commit is contained in:
Milan Hanajik
2017-02-06 17:44:13 +01:00
parent 83fa635ee9
commit 3fd56531da
3 changed files with 15 additions and 6 deletions
@@ -164,10 +164,18 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
//------------------------------------------------ //------------------------------------------------
Bridge.OnActivity(this, Strings.Setting_the_flow); 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<GenericDevices.IValve> valvesOpen = new List<GenericDevices.IValve>();
valvesOpen.Add(inPath.Pump);
valvesOpen.Add(outPath.StartValve);
///
State.Create("FixedStartMassCollection : Starting the pump") State.Create("FixedStartMassCollection : Starting the pump")
.AddOperation(checkUiOp) .AddOperation(checkUiOp)
.AddOperation(cBrd.SetValvesOp(inPath.Pump, null)) .AddOperation(StateMachine.ControlBoard.SetValvesOp(valvesOpen, null))
.AddOperation(heatMetersPromptOp) .AddOperation(heatMetersPromptOp)
.EnterState(); .EnterState();
do do
@@ -178,7 +186,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; } 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") State.Create("FixedStartMassCollection : Setting the flow")
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.12.452.1")] [assembly: AssemblyVersion("2.12.453.1")]
[assembly: AssemblyFileVersion("2.12.452.1")] [assembly: AssemblyFileVersion("2.12.453.1")]
Binary file not shown.