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

Register readers cleanup, IRegReaderPulses added.

Browse Source
This commit is contained in:
Milan Hanajik
2020-11-13 11:55:20 +01:00
parent 889a370f90
commit c28828fcdd
85 changed files with 355 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
+5 -4
View File
@@ -7,6 +7,7 @@ using System.Text;
using log4net;
using Config.Entities;
using TBF.BenchControl;
using TBF.BenchControl.GenericDevices;
using TBF.Boxes;
using TBF.Resources;
using TBF.UiBridge;
@@ -130,7 +131,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment
{
foreach (var rr in sensPath.RegisterReaders)
{
TBF.BenchControl.Elde.RegisterReader.RegisterReader eldeRR = rr as TBF.BenchControl.Elde.RegisterReader.RegisterReader;
IRegReaderPulses eldeRR = rr as IRegReaderPulses;
if ((eldeRR != null) && (eldeRR.Position >= 1) && (eldeRR.Position <= 8))
{
filters[eldeRR.Position - 1] = eldeRR.Filter;
@@ -321,10 +322,10 @@ namespace TBF.BenchControl.TestMethods.Adjustment
///
/// Find ROI-s
IList<GenericDevices.IRoi> rois = new List<GenericDevices.IRoi>();
IList<GenericDevices.IRegReaderLiveCamera> rois = new List<GenericDevices.IRegReaderLiveCamera>();
foreach (var rr in sensPath.RegisterReaders)
{
GenericDevices.IRoi cameraRoI = rr as GenericDevices.IRoi;
GenericDevices.IRegReaderLiveCamera cameraRoI = rr as GenericDevices.IRegReaderLiveCamera;
if ((cameraRoI != null) && cameraRoI.Detected)
{
rois.Add(cameraRoI);
@@ -472,7 +473,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment
if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Single);
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[i];
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
if (meterRslt != null && regReader != null)
{