From 5ac7572a3dd2ff49a72d58003b6d9b4af6f42f50 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Wed, 21 Oct 2015 08:00:44 +0200 Subject: [PATCH] MURES component updated, SetFlowOp watches StatusP.RefPulsesMsrmnt flag, version 1.5.133. --- .../BenchControl/Elde/RegulValve/SetFlowOp.cs | 4 ++-- TestBenchFramework/Properties/AssemblyInfo.cs | 4 ++-- .../MURES-PT40/ControlComponent3U.dll | Bin 336384 -> 336384 bytes 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/TestBenchFramework/BenchControl/Elde/RegulValve/SetFlowOp.cs b/TestBenchFramework/BenchControl/Elde/RegulValve/SetFlowOp.cs index 3c54d203d..ec3ddcd22 100644 --- a/TestBenchFramework/BenchControl/Elde/RegulValve/SetFlowOp.cs +++ b/TestBenchFramework/BenchControl/Elde/RegulValve/SetFlowOp.cs @@ -262,7 +262,7 @@ namespace TBF.BenchControl.Elde.RegulValve } else if (opState == OpState.ValveMoveToPosition4) /// Verify { - if (((ulong)controlBoard.StatusP & (ulong)StatusP.TestInProgress) == 0) + if (((ulong)controlBoard.StatusP & (ulong)StatusP.RefPulsesMsrmnt) == 0) { opState = OpState.SendCommandAgain; return Event.None; @@ -326,7 +326,7 @@ namespace TBF.BenchControl.Elde.RegulValve } else if (opState == OpState.ValveMoveToFlow4) { - if (((ulong)controlBoard.StatusP & (ulong)StatusP.TestInProgress) == 0) + if (((ulong)controlBoard.StatusP & (ulong)StatusP.RefPulsesMsrmnt) == 0) { opState = OpState.SendCommandAgain; return Event.None; diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index bd915383f..2cf43e5d4 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.132.1")] -[assembly: AssemblyFileVersion("1.5.132.1")] +[assembly: AssemblyVersion("1.5.133.1")] +[assembly: AssemblyFileVersion("1.5.133.1")] diff --git a/packages/ControlBoard/MURES-PT40/ControlComponent3U.dll b/packages/ControlBoard/MURES-PT40/ControlComponent3U.dll index 752b0a137139e1fbe7dcf3fc4bad8c3eadb746cb..a56fc19fbf2b3c7bd9bab36292be7247ac2a7155 100644 GIT binary patch delta 9607 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 delta 9605 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