From da01b1fe613f0f32fa626c818e8599fb07e39ded Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Mon, 24 Aug 2015 15:16:14 +0200 Subject: [PATCH] CalibFactor included in 'summaryResults', version 1.5.97. --- TestBenchFramework/BenchControl/Sequences/SequenceBase.cs | 8 ++++---- .../FlyingStartCollectionMethodSeq.cs | 1 + .../iPerlCommunication/iPerlCommunicationForm.cs | 7 ++++++- TestBenchFramework/Entities/MeterTestResult.cs | 7 ++++--- TestBenchFramework/Properties/AssemblyInfo.cs | 4 ++-- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs index 98a929b1b..9cbdb36b2 100644 --- a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs +++ b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs @@ -901,12 +901,12 @@ namespace TBF.BenchControl.Sequences Entities.MeterTestResult mtrRslt = tstRslt.Meters[i]; sb.Append(";"); sb.Append(mtrRslt.SerialNr); /// WM Ser.No. - sb.Append(";"); sb.Append(mtrRslt.VolumeStart); /// WM Vinit - pri pevnom starte pociatocny stav natukany alebo cez inteligentny system - sb.Append(";"); sb.Append(mtrRslt.VolumeEnd); /// WM Vfin - pri pevnom starte konecny stav natukany alebo cez inteligentny system + sb.Append(";"); sb.Append(mtrRslt.VolumeStart); /// WM Vstart - pociatocny stav pri pevnom starte alebo zachyteny pri data streame + sb.Append(";"); sb.Append(mtrRslt.VolumeEnd); /// WM Vend - konecny stav pri pevnom starte alebo zachyteny pri data streame sb.Append(";"); sb.Append(mtrRslt.VolumeMeter); /// WM Vmer - objem namerany vodomerom - sb.Append(";"); sb.Append(mtrRslt.VolumeRef); /// WM Vet - objem namerany stanicou + sb.Append(";"); sb.Append(mtrRslt.VolumeRef); /// WM Vref - objem namerany stanicou sb.Append(";"); sb.Append(mtrRslt.VolumeErrorPct); /// WM Emt - chyba vodomerom nameraneho objemu - sb.Append(";"); sb.Append(" "); /// WM U - neistota (zatial nechat prazdne) + sb.Append(";"); sb.Append(mtrRslt.CalibFactor); /// iPerl calibration factor used during the test sb.Append(";"); sb.Append(mtrRslt.PulsesMeter); /// WM Np met - pocet impulzov zo skusaneho meradla sb.Append(";"); sb.Append(mtrRslt.PulsesMaster); /// WM Np elm - pocet impulzov etalonu pocas merania pre prislusny vodomer sb.Append(";"); sb.Append(mtrRslt.Time); /// WM Tmet - cas merania (obmedzany pri synchro skuske) diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs index 689ca778b..5cd87832c 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs @@ -460,6 +460,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod tstRslt.Meters[i].Time = (float)(iPerl.TimestampSecEnd - iPerl.TimestampSecStart); tstRslt.Meters[i].TimeStart = (float)iPerl.TimestampSecStart; tstRslt.Meters[i].TimeEnd = (float)iPerl.TimestampSecEnd; + tstRslt.Meters[i].CalibFactor = (iPerl.CalibrationStruct != null) ? iPerl.CalibrationStruct.Calibration : 0; } else { diff --git a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs index 7ebad550f..51224cdbb 100644 --- a/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs +++ b/TestBenchFramework/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs @@ -816,7 +816,12 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication byte[] data = new byte[2] { (byte)(newCalibFactor & 0x00FF), (byte)((newCalibFactor >> 8) & 0x00FF) }; for (int j = 0; j < MaxCommRetries; j++) { - if (0 == WriteRequestPort(wm.MuxBoardNr, MessageID.Calibration, 2, 2, data, CommTimeout)) { error = CommErr.None; break; } + if (0 == WriteRequestPort(wm.MuxBoardNr, MessageID.Calibration, 2, 2, data, CommTimeout)) + { + error = CommErr.None; + wm.CalibrationStruct.Update(data, 2); + break; + } } if (error == CommErr.None) diff --git a/TestBenchFramework/Entities/MeterTestResult.cs b/TestBenchFramework/Entities/MeterTestResult.cs index 67198f8e1..55afc569e 100644 --- a/TestBenchFramework/Entities/MeterTestResult.cs +++ b/TestBenchFramework/Entities/MeterTestResult.cs @@ -22,9 +22,10 @@ namespace TBF.Entities public virtual float PulsesPerLiter { get; set; } /// Pulses per liter public virtual float PulsesMaster { get; set; } public virtual float Time { get; set; } /// sec. - public virtual float TimeStart { get; set; } /// sec. - public virtual float TimeEnd { get; set; } /// sec. - public virtual bool Passed { get; set; } /// true = test passed + public virtual float TimeStart { get; set; } /// sec. - Not mapped to DB !!! + public virtual float TimeEnd { get; set; } /// sec. - Not mapped to DB !!! + public virtual int CalibFactor { get; set; } /// iPerl calibration factor used during the test - Not mapped to DB !!! + public virtual bool Passed { get; set; } /// true=test passed - Not mapped to DB !!! public MeterTestResult() { diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index f6e149404..31db6309d 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("1.5.96.1")] -[assembly: AssemblyFileVersion("1.5.96.1")] +[assembly: AssemblyVersion("1.5.97.1")] +[assembly: AssemblyFileVersion("1.5.97.1")]