From 9500bc4656d02d40796d28fb402404a68ce8e835 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Wed, 20 Apr 2016 12:43:59 +0200 Subject: [PATCH] More logging in RegulValve.SetFlowOp, ver.2.5.269. --- .../BenchControl/Elde/RegulValve/SetFlowOp.cs | 26 ++++++++++++++----- TestBenchFramework/Properties/AssemblyInfo.cs | 4 +-- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/TestBenchFramework/BenchControl/Elde/RegulValve/SetFlowOp.cs b/TestBenchFramework/BenchControl/Elde/RegulValve/SetFlowOp.cs index c8a5e3135..14f253e91 100644 --- a/TestBenchFramework/BenchControl/Elde/RegulValve/SetFlowOp.cs +++ b/TestBenchFramework/BenchControl/Elde/RegulValve/SetFlowOp.cs @@ -175,14 +175,14 @@ namespace TBF.BenchControl.Elde.RegulValve if (regulValve.RegulValveCfg.StoredPositionReuse && FetchTargetPosition(reqFlowAve, out targetPositionLo, out targetPositionHi)) { - log.InfoFormat("Start(): rv#={0} flowMtr#={1} TARGET: flowLo={2} flowHi={3} FETCHED: posLo={4} posHi={5}", + log.InfoFormat("SetFlowOp:Start() rv#={0} flowMtr#={1} TARGET: flowLo={2} flowHi={3} FETCHED: posLo={4} posHi={5}", regulValveNr, flowMeterNr, reqFlowLo, reqFlowHi, targetPositionLo, targetPositionHi); opState = OpState.ValveMoveToPosition1; } else { - log.InfoFormat("Start(): rv#={0} flowMtr#={1} TARGET: flowLo={2} flowHi={3}", + log.InfoFormat("SetFlowOp:Start() rv#={0} flowMtr#={1} TARGET: flowLo={2} flowHi={3}", regulValveNr, flowMeterNr, reqFlowLo, reqFlowHi); opState = OpState.ValveMoveToFlow1; @@ -211,7 +211,7 @@ namespace TBF.BenchControl.Elde.RegulValve if (measuredFlow != null) measuredFlow.Val = flow; - log.InfoFormat("Run(): rv#={0} pos={1}% freq={2} flow={3} opState={4}", + log.InfoFormat("SetFlowOp:Run() rv#={0} pos={1}% freq={2} flow={3} opState={4}", regulValveNr, rvPosition.ToString("F1"), flowMtrFreq, flow, opState); @@ -221,14 +221,14 @@ namespace TBF.BenchControl.Elde.RegulValve if (regulValve.RegulValveCfg.StoredPositionReuse && FetchTargetPosition(reqFlowAve, out targetPositionLo, out targetPositionHi)) { - log.InfoFormat("Start(): rv#={0} flowMtr#={1} TARGET: flowLo={2} flowHi={3} FETCHED: posLo={4} posHi={5}", + log.InfoFormat("SetFlowOp:Start() rv#={0} flowMtr#={1} TARGET: flowLo={2} flowHi={3} FETCHED: posLo={4} posHi={5}", regulValveNr, flowMeterNr, reqFlowLo, reqFlowHi, targetPositionLo, targetPositionHi); opState = OpState.ValveMoveToPosition1; } else { - log.InfoFormat("Start(): rv#={0} flowMtr#={1} TARGET: flowLo={2} flowHi={3}", + log.InfoFormat("SetFlowOp:Start() rv#={0} flowMtr#={1} TARGET: flowLo={2} flowHi={3}", regulValveNr, flowMeterNr, reqFlowLo, reqFlowHi); opState = OpState.ValveMoveToFlow1; @@ -279,7 +279,10 @@ namespace TBF.BenchControl.Elde.RegulValve new float[2] { (targetPositionLo + targetPositionHi) / 2, (targetPositionLo + targetPositionHi) / 2 }, regulValve.StableTime); - opState = OpState.ValveMoveToPosition3; + log.InfoFormat("SetFlowOp: ValveMove({0}, Position, {1}, {2}, {3})", + regulValveNr, (targetPositionLo + targetPositionHi) / 2, (targetPositionLo + targetPositionHi) / 2, regulValve.StableTime); + + opState = OpState.ValveMoveToPosition3; return Event.None; } else if (regulValveNr < 6 && controlBoard.RegulValveState(regulValveNr) != RegulValveState.DacValueRegul) @@ -289,6 +292,9 @@ namespace TBF.BenchControl.Elde.RegulValve new float[2] { targetPositionLo, targetPositionHi }, regulValve.StableTime); + log.InfoFormat("SetFlowOp: ValveMove({0}, Position, {1}, {2}, {3})", + regulValveNr, targetPositionLo, targetPositionHi, regulValve.StableTime); + opState = OpState.ValveMoveToPosition3; return Event.None; } @@ -355,6 +361,9 @@ namespace TBF.BenchControl.Elde.RegulValve new float[2] { (freqLo + freqHi) / 2.0f, (freqLo + freqHi) / 2.0f }, regulValve.StableTime); + log.InfoFormat("SetFlowOp: ValveMove({0}, Frequency, {1}, {2}, {3})", + regulValveNr, (freqLo + freqHi) / 2.0f, (freqLo + freqHi) / 2.0f, regulValve.StableTime); + opState = OpState.ValveMoveToFlow3; return Event.None; } @@ -367,7 +376,10 @@ namespace TBF.BenchControl.Elde.RegulValve new float[2] { freqLo, freqHi }, regulValve.StableTime); - opState = OpState.ValveMoveToFlow3; + log.InfoFormat("SetFlowOp: ValveMove({0}, Frequency, {1}, {2}, {3})", + regulValveNr, freqLo, freqHi, regulValve.StableTime); + + opState = OpState.ValveMoveToFlow3; return Event.None; } else diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index d79ca8680..c6ca15809 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.5.268.1")] -[assembly: AssemblyFileVersion("2.5.268.1")] +[assembly: AssemblyVersion("2.5.269.1")] +[assembly: AssemblyFileVersion("2.5.269.1")]