From 26b7aa7e8bc8e719e7023f08b449f34cdca71d84 Mon Sep 17 00:00:00 2001 From: Michal Buzik Date: Thu, 2 Jul 2026 23:53:15 +0200 Subject: [PATCH] correction atempt MultiplyFactor for timestamp, volume calculation, --- TBF/Properties/AssemblyInfo.cs | 4 ++-- .../iPerlCommunication/iPerlHead/IperlHead.cs | 14 ++++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index d1a4ae381..3c0c127e6 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("3.9.3068.1")] -[assembly: AssemblyFileVersion("3.9.3068.1")] +[assembly: AssemblyVersion("3.9.3069.1")] +[assembly: AssemblyFileVersion("3.9.3069.1")] diff --git a/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs b/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs index b0dc0b28d..cdef3045b 100644 --- a/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs +++ b/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs @@ -400,15 +400,19 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead private double timestampSec; private double timestampSec0; + private const int MultiplyFactor = 4; + /// Test start volume for metrology in seconds public double TimestampSecStart { - get { return TimeFromSamples(optoData, optoDataCount, TestStartTelegramIx, StartEndFilterSamplesCount2); } + //4 * pokus (hodnoty su 4 krat mensie) + get { return MultiplyFactor * TimeFromSamples(optoData, optoDataCount, TestStartTelegramIx, StartEndFilterSamplesCount2); } } /// Test end time for metrology in seconds public double TimestampSecEnd { - get { return TimeFromSamples(optoData, optoDataCount, TestEndTelegramIx, StartEndFilterSamplesCount2); } + //4 * pokus (hodnoty su 4 krat mensie) + get { return MultiplyFactor * TimeFromSamples(optoData, optoDataCount, TestEndTelegramIx, StartEndFilterSamplesCount2); } } /// public bool NoSamples @@ -426,12 +430,14 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead /// Test start volume for metrology in liters public double VolumeLtrStart { - get { return NoSamples ? 0 : VolumeFromSamples(optoData, optoDataCount, TestStartTelegramIx, ScalingFactor(), 0); } + //4 * pokus (hodnoty su 4 krat mensie) + get { return NoSamples ? 0 : MultiplyFactor * VolumeFromSamples(optoData, optoDataCount, TestStartTelegramIx, ScalingFactor(), 0); } } /// Test end volume for metrology in liters public double VolumeLtrEnd { - get { return NoSamples ? 0 : VolumeFromSamples(optoData, optoDataCount, TestEndTelegramIx, ScalingFactor(), StartEndFilterSamplesCount2); } + //4 * pokus (hodnoty su 4 krat mensie) + get { return NoSamples ? 0 : MultiplyFactor * VolumeFromSamples(optoData, optoDataCount, TestEndTelegramIx, ScalingFactor(), StartEndFilterSamplesCount2); } }