From 03c027ab334ef052a1bc2b73cc73661f35aee84f Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Tue, 18 Oct 2016 11:49:32 +0200 Subject: [PATCH] LogProcessDataHeatMeters, ver. 2.11.371 --- .../Operations/ProcessDataLoggingOp.cs | 18 +++++++--- .../BenchControl/Sequences/SequenceBase.cs | 33 +++++++++++++++++++ .../TestMethods/Adjustment/AdjustmentSeq.cs | 2 +- .../CombinedWithDetectionSeq.cs | 2 +- .../FixedStartAdvancedSeq.cs | 2 +- .../FixedStartMassCollectionSeq.cs | 2 +- .../TestMethods/FlyingStart/FlyingStartSeq.cs | 2 +- .../FlyingStartMassCollectionSeq.cs | 2 +- .../TestMethods/LeakTest/LeakTestSeq.cs | 4 +-- .../TestMethods/PMaxTest/PMaxTestSeq.cs | 4 +-- .../ReferenceFlowmeterCalibrationSeq.cs | 4 +-- .../iPerlCommunicationSeq.cs | 4 +-- TestBenchFramework/Properties/AssemblyInfo.cs | 4 +-- 13 files changed, 62 insertions(+), 21 deletions(-) diff --git a/TestBenchFramework/BenchControl/Operations/ProcessDataLoggingOp.cs b/TestBenchFramework/BenchControl/Operations/ProcessDataLoggingOp.cs index d974f7ef7..158a98f67 100644 --- a/TestBenchFramework/BenchControl/Operations/ProcessDataLoggingOp.cs +++ b/TestBenchFramework/BenchControl/Operations/ProcessDataLoggingOp.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2016 Sensus Metering Systems /// using System; using System.Collections.Generic; @@ -13,22 +13,30 @@ namespace TBF.BenchControl.Operations { ILog logger; SequenceBase sequenceBase; + bool heatMeters; - public ProcessDataLoggingOp(ILog logger, SequenceBase sequenceBase) + public ProcessDataLoggingOp(ILog logger, SequenceBase sequenceBase, bool heatMeters) { this.logger = logger; this.sequenceBase = sequenceBase; + this.heatMeters = heatMeters; } public void Start() { - sequenceBase.LogProcessData(logger); + if (heatMeters) + sequenceBase.LogProcessDataHeatMeters(logger); + else + sequenceBase.LogProcessData(logger); } public Event Run() { - sequenceBase.LogProcessData(logger); - return Event.None; + if (heatMeters) + sequenceBase.LogProcessDataHeatMeters(logger); + else + sequenceBase.LogProcessData(logger); + return Event.None; } public void Stop() diff --git a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs index 01cf4be8c..014b9713f 100644 --- a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs +++ b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs @@ -106,6 +106,39 @@ namespace TBF.BenchControl.Sequences outPath.RegulValve.Position.ToString("F1")); } + public void LogProcessHeaderHeatMeters(ILog logger, string sectionName) + { + logger.Info(Environment.NewLine); + if (sectionName != null) logger.Info(sectionName); + logger.Info("Time Flow TstTime Ref.cnt Ref.vol Tin Tout Tdiv Pin Pout Mass VolMM Tamb Hamb Pamb Rv Thiac1 Thiac2 Tloac1 Tloac2"); + logger.Info(Environment.NewLine); + } + + public void LogProcessDataHeatMeters(ILog logger) + { + logger.InfoFormat("{0} {1} {2} {3} {4} {5} {6} {7} {8} {9} {10} {11} {12} {13} {14} {15} {16} {17} {18} {19}", + DateTime.Now.ToLongTimeString(), + Utils.DoubleToStr(RefFlow.Val, 4), + StateMachine.ControlBoard.TTime.ToString("F3"), + StateMachine.ControlBoard.EtPulses(0), + Formulas.VolumeFromPulses(StateMachine.ControlBoard.EtPulses(0), 1.0f / LtrPerRefPulse).ToString("F3"), + TempIn, + TempOut, + TempDiv, + PressureUp, + PressureDown, + Mass, + "VolMM", + AmbientTemp, + AmbientHumidity, + AmbientPressure, + outPath.RegulValve.Position.ToString("F1"), + TempRefWarm1, + TempRefWarm2, + TempRefCold1, + TempRefCold2); + } + protected Event EmptyTheTank(IValve emptyTankValve, IBalance balance) { diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs index 279efd9ec..fa33cb56d 100644 --- a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs @@ -71,7 +71,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment /// int refPulses = (int)(timeSec * (2000.0f * targetFlow / pOut.FlowMeter.NominalFlow)); int totalPulses = (int)(test.Volume / LtrPerRefPulse + 0.5f); - processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this); + processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this, false); int repetitionNr = 1; /// First test: repetitionNr=1 diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs index 5316a2878..8e3a5414d 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs @@ -113,7 +113,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection /// int refPulses = (int)(timeSec * (2000.0f * targetFlow / pOut.FlowMeter.NominalFlow)); int totalPulses = (int)(test.Volume / LtrPerRefPulse + 0.5f); - processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this); + processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this, false); /// Meters path is required for the following: readRegistersOp = new Operations.ReadMoreRegistersOp(sensPath.RegisterReaders); diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs index e9b8322af..a08a104e9 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs @@ -42,7 +42,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced /// int refPulses = (int)(timeSec * (2000.0f * targetFlow / pOut.FlowMeter.NominalFlow)); int totalPulses = (int)(test.Volume / LtrPerRefPulse + 0.5f); - processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this); + processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this, false); float[] wmBeginStates = new float[Config.Data.WMsCount]; float[] wmEndStates = new float[Config.Data.WMsCount]; diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs index d7b0aa5af..c23ea1fe6 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs @@ -44,7 +44,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection /// int refPulses = (int)(timeSec * (2000.0f * targetFlow / pOut.FlowMeter.NominalFlow)); int totalPulses = (int)(test.Volume / LtrPerRefPulse + 0.5f); - processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this); + processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this, heatMetersTestParams != null); float[] wmBeginStates = new float[Config.Data.WMsCount]; float[] wmEndStates = new float[Config.Data.WMsCount]; diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs index ac5aa6449..7838f9c15 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs @@ -94,7 +94,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart Elde.ControlBoardDev cBrd = StateMachine.ControlBoard; - processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this); + processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this, heatMetersTestParams != null); LtrPerRefPulse = outPath.FlowMeter.LtrPerPulse; /// [ltr/pulse], nominal flow in [m3/h] diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs index 8e717d032..6bf2f7b90 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs @@ -94,7 +94,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection Elde.ControlBoardDev cBrd = StateMachine.ControlBoard; - processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this); + processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this, heatMetersTestParams != null); LtrPerRefPulse = outPath.FlowMeter.LtrPerPulse; int totalPulses = (int)(test.Volume / LtrPerRefPulse + 0.5f); diff --git a/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs b/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs index 7084f19af..838364be7 100644 --- a/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2015-2016 Sensus Metering Systems /// using System; using System.Collections.Generic; @@ -35,7 +35,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest Event retVal = Event.Done; checkUiOp = new Operations.CheckUIOp(true); /// Runs in more then one state - processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this); + processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this, false); TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, 1, 1, 30, Convert.ToInt32(test.TstTime) + 15, 0, 0 }); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Config.Entities.Progress.JustStarted)); diff --git a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs b/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs index 84a6cb625..b5dbb60a0 100644 --- a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2015-2016 Sensus Metering Systems /// using System; using System.Collections.Generic; @@ -35,7 +35,7 @@ namespace TBF.BenchControl.TestMethods.PMaxTest Event retVal = Event.Done; checkUiOp = new Operations.CheckUIOp(true); /// Runs in more then one state - processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this); + processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this, false); TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, 1, 1, 30, Convert.ToInt32(test.TstTime) + 15, 0, 0 }); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Config.Entities.Progress.JustStarted)); diff --git a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs index 0d0fba73f..b7ca83df2 100644 --- a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2015 Sensus Metering Systems +/// Copyright (c) 2013-2016 Sensus Metering Systems /// using System; using System.Collections.Generic; @@ -42,7 +42,7 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration /// int refPulses = (int)(timeSec * (2000.0f * targetFlow / pOut.FlowMeter.NominalFlow)); int totalPulses = (int)(test.Volume / LtrPerRefPulse + 0.5f); - processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this); + processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this, false); int repetitionNr = 1; /// First test: repetitionNr=1 diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs index 55b18c148..61a1b8e1d 100644 --- a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2015 Sensus Metering Systems +/// Copyright (c) 2015-2016 Sensus Metering Systems /// using System; using System.Collections.Generic; @@ -54,7 +54,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication checkUiOp = new Operations.CheckUIOp(true); /// Runs in more then one state modelessDlg = null; - processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this); + processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this, false); const string Q2correctedFromCmd = "q2 corrected from "; const string Hz2correctedFromCmd = "2Hz corrected from "; diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index be758b500..c8d767b6c 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.11.370.1")] -[assembly: AssemblyFileVersion("2.11.370.1")] +[assembly: AssemblyVersion("2.11.371.1")] +[assembly: AssemblyFileVersion("2.11.371.1")]