From 16207585454d4d110b441d6f4067dfacd5728636 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Thu, 11 Oct 2018 10:57:43 +0200 Subject: [PATCH] E1 error indicator modified, average flow calculated from CTV volume and test time verified, ver. 2.18.1019 --- TBF/BenchControl/Various/ErrorFlags/Errors.cs | 4 ++-- TBF/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/TBF/BenchControl/Various/ErrorFlags/Errors.cs b/TBF/BenchControl/Various/ErrorFlags/Errors.cs index 840be9445..9537dc1c9 100644 --- a/TBF/BenchControl/Various/ErrorFlags/Errors.cs +++ b/TBF/BenchControl/Various/ErrorFlags/Errors.cs @@ -42,8 +42,8 @@ namespace TBF.BenchControl.Various.ErrorFlags /// Any E# is 'true' on error, 'false' when OK /// Average flow - bool E1 = ProcessData.RefFlowStat.Average < testRslt.Qfrom() - || ProcessData.RefFlowStat.Average > testRslt.Qto(); + double aveFlow = 3.6 * testRslt.VolumeCTV / testRslt.TestTime; + bool E1 = (aveFlow < testRslt.Qfrom()) || (aveFlow > testRslt.Qto()); /// Max. and min. up and down water temperature bool E2 = ProcessData.TempUpStat.Min < testRslt.TempLimLo() diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 0f2b1814c..11f0af4cd 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.1018.0")] -[assembly: AssemblyFileVersion("2.18.1018.0")] +[assembly: AssemblyVersion("2.18.1019.0")] +[assembly: AssemblyFileVersion("2.18.1019.0")]