From 8e0417de9c77f1493fd43afa7b8efd7b042c7fd1 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Tue, 4 Jan 2022 21:56:38 +0100 Subject: [PATCH] MeterTestRslt.Passed set correctly in iPerlCommunicationSeq.MakeQ2CorrectedFrom( ) --- .../TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs b/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs index 7702993a8..73e53c948 100644 --- a/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs +++ b/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs @@ -580,7 +580,8 @@ namespace TBF.Rig.TestMethods.iPerlCommunication meterRslt.VolumeMeter = oriMeterRslt.VolumeMeter; meterRslt.VolumeStart = oriMeterRslt.VolumeStart; meterRslt.VolumeEnd = oriMeterRslt.VolumeEnd; - meterRslt.Passed = oriMeterRslt.Passed; + meterRslt.Passed = (meterRslt.Error >= tstRslt.ErrLimLo() + tstRslt.ErrLimMargin() + && meterRslt.Error <= tstRslt.ErrLimHi() - tstRslt.ErrLimMargin()); meterRslt.TestDone = true; tstRslt.TestDone = true; } @@ -593,7 +594,8 @@ namespace TBF.Rig.TestMethods.iPerlCommunication meterRslt.VolumeStart = oriMeterRslt.VolumeStart; double signature = (oriMeterRslt.VolumeEnd > oriMeterRslt.VolumeStart) ? (+1) : (-1); meterRslt.VolumeEnd = meterRslt.VolumeStart + signature * meterRslt.VolumeMeter; - meterRslt.Passed = true; + meterRslt.Passed = (meterRslt.Error >= tstRslt.ErrLimLo() + tstRslt.ErrLimMargin() + && meterRslt.Error <= tstRslt.ErrLimHi() - tstRslt.ErrLimMargin()); meterRslt.TestDone = true; tstRslt.TestDone = true; }