diff --git a/TestBenchFramework/BenchControl/Elde/RegulValve/SetFlowOp.cs b/TestBenchFramework/BenchControl/Elde/RegulValve/SetFlowOp.cs index 67b9f9535..44249f7f4 100644 --- a/TestBenchFramework/BenchControl/Elde/RegulValve/SetFlowOp.cs +++ b/TestBenchFramework/BenchControl/Elde/RegulValve/SetFlowOp.cs @@ -36,9 +36,12 @@ namespace TBF.BenchControl.Elde.RegulValve { Idle = 0, ValveMoveToPosition, + Wait1, /// This is actual move to position SettingPosition, ValveMoveToFlow, - ValveMoveToFlow2, + Wait2, /// This is actual move to flow + Wait3, + ValveMoveToFlow2, /// This is move to flow 2 SettingFlow, FlowReached, } @@ -203,6 +206,11 @@ namespace TBF.BenchControl.Elde.RegulValve regulValveNr, rvPosition.ToString("F1"), flowMtrFreq, flow, opState); if (opState == OpState.ValveMoveToPosition) + { + opState = OpState.Wait1; + return Event.None; + } + else if (opState == OpState.Wait1) /// Move to position { /// /// Done once, issues an appropriate ValveMove(...) command @@ -226,6 +234,11 @@ namespace TBF.BenchControl.Elde.RegulValve return Event.None; } else if (opState == OpState.ValveMoveToFlow) + { + opState = OpState.Wait2; + return Event.None; + } + else if (opState == OpState.Wait2) /// Move to flow { /// /// Done once, issues an appropriate ValveMove(...) command @@ -244,9 +257,14 @@ namespace TBF.BenchControl.Elde.RegulValve new float[2] { freqLo, freqHi }, regulValve.StableTime); - opState = OpState.ValveMoveToFlow2; + opState = OpState.Wait3; return Event.None; } + else if (opState == OpState.Wait3) + { + opState = OpState.ValveMoveToFlow2; + return Event.None; + } else if (opState == OpState.ValveMoveToFlow2) { /// diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index af6aecc15..9cbde4afb 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("1.5.115.1")] -[assembly: AssemblyFileVersion("1.5.115.1")] +[assembly: AssemblyVersion("1.5.116.1")] +[assembly: AssemblyFileVersion("1.5.116.1")]