michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correction atempt MultiplyFactor for timestamp, volume calculation,

Browse Source
This commit is contained in:
Michal Buzik 2026-07-02 23:53:15 +02:00
parent 92f63e744d
commit 26b7aa7e8b
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TBF/Properties/AssemblyInfo.cs
View File

@ -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")]

14
TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs
View File

@ -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); }
}