From 044046080d87e3bd6ccea943d3bbc36fd83df231 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Thu, 12 Jul 2018 15:59:09 +0200 Subject: [PATCH] IPumpFM handling modifications, ver. 2.18.962 --- TBF/BenchControl/Sequences/SequenceBase.cs | 2 +- TBF/BenchControl/StateMachine.cs | 5 ++++- TBF/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/TBF/BenchControl/Sequences/SequenceBase.cs b/TBF/BenchControl/Sequences/SequenceBase.cs index e16cf5c07..70e1796d4 100644 --- a/TBF/BenchControl/Sequences/SequenceBase.cs +++ b/TBF/BenchControl/Sequences/SequenceBase.cs @@ -578,7 +578,7 @@ namespace TBF.BenchControl.Sequences State.Create("SequenceBase.Transition() : Test stopped -> Stopping the pump") .AddOperation(checkUiOp) .AddOperation(StateMachine.ControlBoard.UpdateTankWeightOp()) - .AddOperation((inPath.Pump is GenericDevices.IPumpFM) ? (inPath.Pump as GenericDevices.IPumpFM).TurnOffOp() : null) +// .AddOperation((inPath.Pump is GenericDevices.IPumpFM) ? (inPath.Pump as GenericDevices.IPumpFM).TurnOffOp() : null) /// already switched off .AddOperation(StateMachine.ControlBoard.SetValvesOp(null, inPath.Pump)) .EnterState(); do diff --git a/TBF/BenchControl/StateMachine.cs b/TBF/BenchControl/StateMachine.cs index 99dcb5868..b804119e3 100644 --- a/TBF/BenchControl/StateMachine.cs +++ b/TBF/BenchControl/StateMachine.cs @@ -226,7 +226,10 @@ namespace TBF.BenchControl { SequenceBase.RegulValves.Add(cmpnt as IRegulValve); } - if (cmpnt is IPumpFM) SequenceBase.PumpsWithFM.Add(cmpnt as IPumpFM); + if (cmpnt is IPumpFM && !(cmpnt is Elde.PumpTandem.Pump)) + { + SequenceBase.PumpsWithFM.Add(cmpnt as IPumpFM); + } if (cmpnt is IWaterMeter) SequenceBase.WaterMeters.Add(cmpnt as IWaterMeter); if (cmpnt is ICamera) SequenceBase.Cameras.Add(cmpnt as ICamera); if (cmpnt is GenericDevices.IAmbient) Ambient = cmpnt as GenericDevices.IAmbient; diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 6e3ab7960..cea1e0a91 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.18.961.0")] -[assembly: AssemblyFileVersion("2.18.961.0")] +[assembly: AssemblyVersion("2.18.962.0")] +[assembly: AssemblyFileVersion("2.18.962.0")]