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

Diverter times saved in SummaryResults and AllResults, timing of 'end' measurement slightly changed, ver. 2.17.706

Browse Source
This commit is contained in:
Milan Hanajik 2017-10-18 12:07:37 +02:00
parent 3822c6f5ab
commit 8b321e36db
4 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Results/Entities/TestRslt.cs
View File

@ -39,8 +39,17 @@ namespace Results.Entities
public virtual double VolumeCTV { get; set; } /// [l] Volume conventional true value
public virtual double VolumeMaster { get; set; } /// [l] Volume from the master flow meter
public virtual double ErrorMaster { get; set; } /// [%]
public virtual float DiverterStart { get; set; } /// [s] Diverter switch time when test starts
public virtual float DivStart10 { get; set; } /// [s] Diverter switch time when test starts at level 10 (e.g. 10%) (not mapped to DB)
public virtual float DivStart50 { get; set; } /// [s] Diverter switch time when test starts at level 50 (e.g. 50%) (not mapped to DB)
public virtual float DivStart90 { get; set; } /// [s] Diverter switch time when test starts at level 90 (e.g. 90%) (not mapped to DB)
public virtual float DiverterEnd { get; set; } /// [s] Diverter switch time when test ends
public virtual float DivEnd90 { get; set; } /// [s] Diverter switch time when test starts at level 90 (e.g. 90%) (not mapped to DB)
public virtual float DivEnd50 { get; set; } /// [s] Diverter switch time when test starts at level 50 (e.g. 50%) (not mapped to DB)
public virtual float DivEnd10 { get; set; } /// [s] Diverter switch time when test starts at level 10 (e.g. 10%) (not mapped to DB)
public virtual int ErrorFlags { get; set; } /// bitfield : bit0=E1, bit1=E2, bit2=E3, etc.
public virtual sbyte ErrorFlagsMd { get; set; } /// 0=off, 1=info, 2=on (evaluated in MeterTestRslt.Passed)

24
TestBenchFramework/BenchControl/Sequences/SequenceBase.cs
View File

@ -894,18 +894,18 @@ namespace TBF.BenchControl.Sequences
sb.Append(";"); sb.Append((outPath != null && outPath.FlowMeter != null && outPath.FlowMeter.LtrPerPulse != 0) ? (1.0f / outPath.FlowMeter.LtrPerPulse) : 0);
/// Const.MID . konstanta eatlonu
sb.Append(";"); sb.Append(" "); /// Const.MA . . konstanta druheho etalonu
sb.Append(";"); sb.Append("0"); /// Time Div Start celkovy cas v [ms]
sb.Append(";"); sb.Append("0"); /// Time Div Start1
sb.Append(";"); sb.Append("0"); /// Time Div Start2
sb.Append(";"); sb.Append("0"); /// Time Div Start3
sb.Append(";"); sb.Append("0"); /// Time Div Start4
sb.Append(";"); sb.Append("0"); /// Time Div Start5
sb.Append(";"); sb.Append("0"); /// Time Div End celkovy cas v [ms]
sb.Append(";"); sb.Append("0"); /// Time Div End1
sb.Append(";"); sb.Append("0"); /// Time Div End2
sb.Append(";"); sb.Append("0"); /// Time Div End3
sb.Append(";"); sb.Append("0"); /// Time Div End4
sb.Append(";"); sb.Append("0"); /// Time Div End5
sb.Append(";"); sb.Append((1000 * tstRslt.DiverterStart).ToString("F0")); /// Time Div Start celkovy cas v [ms]
sb.Append(";"); sb.Append((1000 * tstRslt.DivStart10).ToString("F0"));
sb.Append(";"); sb.Append((1000 * tstRslt.DivStart50).ToString("F0"));
sb.Append(";"); sb.Append((1000 * tstRslt.DivStart90).ToString("F0"));
sb.Append(";"); sb.Append((1000 * tstRslt.DiverterEnd).ToString("F0")); /// Time Div End celkovy cas v [ms]
sb.Append(";"); sb.Append((1000 * tstRslt.DivEnd90).ToString("F0"));
sb.Append(";"); sb.Append((1000 * tstRslt.DivEnd50).ToString("F0"));
sb.Append(";"); sb.Append((1000 * tstRslt.DivEnd10).ToString("F0"));
sb.Append(";"); sb.Append("10"); /// Level 1 [%]
sb.Append(";"); sb.Append("50"); /// Level 2 [%]
sb.Append(";"); sb.Append("90"); /// Level 3 [%]
sb.Append(";"); sb.Append("0"); /// Not used
sb.Append(";"); sb.Append(tstRslt.PulsesMaster); /// Celkovy pocet et. pulzov skusky
sb.Append(";"); sb.Append(" "); /// - '' - pre druhy
for (int i = 0; i < ProcessData.BatchRslts.WMPositionsCount; i++)

14
TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
View File

@ -713,7 +713,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
? StateMachine.Ambient.ReadAmbientOp(AmbTemp, AmbPress, AmbHumi) : null)
.AddOperation(outPath.Scale.ReadMassOp(ref Mass))
.AddOperation(cBrd.UpdateTankWeightOp())
.AddOperation(cBrd.ReadDiverterTransitionOp(1, 3, switchTimeEndLo, switchTimeEndHi))
.AddOperation(cBrd.ReadDiverterTransitionOp(2, 4, switchTimeEndLo, switchTimeEndHi))
.AddOperation(processDataLoggingOp)
.AddOperation(new Operations.TimerOp(test.TimeStop2Mass))
.EnterState();
@ -806,9 +806,17 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
tstRslt.FlowMax = (float)RefFlowStat.Max;
tstRslt.DiverterStart = Math.Abs(switchTimeStartHi.Val - switchTimeStartLo.Val);
tstRslt.DivStart10 = switchTimeStartLo.Val;
tstRslt.DivStart50 = switchTimeStart;
tstRslt.DivStart90 = switchTimeStartHi.Val;
tstRslt.DiverterEnd = Math.Abs(switchTimeEndLo.Val - switchTimeEndHi.Val);
log.DebugFormat("switchTimeStartHi={0} switchTimeStartLo={1} switchTimeEndLo={2} switchTimeEndHi={3}",
switchTimeStartHi.Val, switchTimeStartLo.Val, switchTimeEndLo.Val, switchTimeEndHi.Val);
tstRslt.DivEnd90 = switchTimeEndHi.Val;
tstRslt.DivEnd50 = switchTimeEnd;
tstRslt.DivEnd10 = switchTimeEndLo.Val;
log.DebugFormat("Diverter switch time [s]: Start: {0}({1} {2} {3}) End: {4}({5} {6} {7})",
tstRslt.DiverterStart, tstRslt.DivStart10, tstRslt.DivStart50, tstRslt.DivStart90,
tstRslt.DiverterEnd, tstRslt.DivEnd90, tstRslt.DivEnd50, tstRslt.DivEnd10);
tstRslt.ErrorFlagsMd = (ErrorFlagsComp != null) ? (sbyte)ErrorFlagsComp.Mode : (sbyte)0;
tstRslt.ErrorFlags = (ErrorFlagsComp != null) ? ErrorFlagsComp.GetErrorFlags(tstRslt, true, false, tstRslt.DiverterStart, tstRslt.DiverterEnd) : 0;

4
TestBenchFramework/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.17.705.1")]
[assembly: AssemblyFileVersion("2.17.705.1")]
[assembly: AssemblyVersion("2.17.706.1")]
[assembly: AssemblyFileVersion("2.17.706.1")]