Elde.RegisterReader.RegisterReader.Position, IRegisterReader.Position, etc. introduced., ver. 2.24.1365

TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReader.cs

@@ -17,6 +17,15 @@ namespace TBF.BenchControl.Elde.FixedStartRegisterReader
 		readonly ControlBoardDev controlBoard;
 
 
+        public int Position
+        {
+            get
+            {
+                int firstDigitPos = Name.IndexOfAny(new char[] { '1', '2', '3', '4', '5', '6', '7', '8', '9', '0' }); 
+                int position;
+                return (firstDigitPos < 0) ? 0 : (int.TryParse(Name.Substring(firstDigitPos), out position) ? position : 0);
+            }
+        }
         public Config.Entities.RegisterReaderType RegisterReaderType { get { return Config.Entities.RegisterReaderType.Manual; } }
         public double PulsesPerLtr { get { return registerReaderCfg.ProcParams.PulsesPerLtr; } }
 		public double LtrsPerPulse { get { return (PulsesPerLtr <= float.Epsilon) ? 1.0 : (1 / PulsesPerLtr); } }

TBF/BenchControl/Elde/RegisterReader/RegisterReader.cs

@@ -110,13 +110,12 @@ namespace TBF.BenchControl.Elde.RegisterReader
 			wmPulses = lastPulses;
 			wmRefPulses = (int)controlBoard.EtPulses(Position);
 
-			log.DebugFormat("{0}:ReadPulses() completed, wmPulses={1}  wmRefPulses={2}  cb.EtPulses(0)={3}", Name, wmPulses, wmRefPulses, (int)controlBoard.EtPulses(0));
+			log.DebugFormat("{0}:ReadPulses() completed, wmPulses={1}  wmRefPulses={2}", Name, wmPulses, wmRefPulses);
 		}
 
 		/// <summary>Start this operation</summary>
 		public void Start()
 		{
-			log.DebugFormat("{0}:Start()", Name);
 			lastPulsesValid = false;
 			ReadPulses();
 		}
@@ -125,7 +124,6 @@ namespace TBF.BenchControl.Elde.RegisterReader
 		/// <returns>eventDone</returns>
 		public Event Run()
 		{
-			log.DebugFormat("{0}:Run()", Name);
 			ReadPulses();
 			return Event.ReadRegisterDone;
 		}
@@ -133,7 +131,6 @@ namespace TBF.BenchControl.Elde.RegisterReader
 		/// <summary>Stop this operation</summary>
 		public void Stop()
 		{
-			log.DebugFormat("{0}:Stop()", Name);
             ReadPulses();
         }
 	}

TBF/BenchControl/GenericDevices/IRegisterReader.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2017 Sensus Metering Systems
+/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
 ///
 using TBF.BenchControl.Generic;
 using TBF.Boxes;
@@ -10,6 +10,7 @@ namespace TBF.BenchControl.GenericDevices
 	{
         Config.Entities.RegisterReaderType RegisterReaderType { get; }
 
+        int Position { get; }
 		double PulsesPerLtr { get; }	/// [imp/l] ... water meter or volume measurement part of a heat meter
 		double LtrsPerPulse { get; }	/// [l/imp]
 										

TBF/BenchControl/Network/Camera/Roi/Roi.cs

@@ -33,6 +33,15 @@ namespace TBF.BenchControl.Network.Camera.Roi
 		///
 		public GenericDevices.ICamera Camera { get { return NetCamera as GenericDevices.ICamera; } }
 
+        public int Position
+        {
+            get
+            {
+                int firstDigitPos = Name.IndexOfAny(new char[] { '1', '2', '3', '4', '5', '6', '7', '8', '9', '0' });
+                int position;
+                return (firstDigitPos < 0) ? 0 : (int.TryParse(Name.Substring(firstDigitPos), out position) ? position : 0);
+            }
+        }
         public Config.Entities.RegisterReaderType RegisterReaderType { get { return Config.Entities.RegisterReaderType.Camera; } }
         public double PulsesPerLtr { get { return RoiCfg.ProcParams.PulsesPerLtr; } }
 		public double LtrsPerPulse { get { return (PulsesPerLtr <= float.Epsilon) ? 1.0 : (1 / PulsesPerLtr); } }

TBF/BenchControl/Network/Camera/RoiForFixedStart/Roi.cs

@@ -30,6 +30,15 @@ namespace TBF.BenchControl.Network.Camera.RoiForFixedStart
 		public readonly CLP1611.Camera NetCamera;
 		public GenericDevices.ICamera Camera { get { return NetCamera as GenericDevices.ICamera; } }
 
+        public int Position
+        {
+            get
+            {
+                int firstDigitPos = Name.IndexOfAny(new char[] { '1', '2', '3', '4', '5', '6', '7', '8', '9', '0' });
+                int position;
+                return (firstDigitPos < 0) ? 0 : (int.TryParse(Name.Substring(firstDigitPos), out position) ? position : 0);
+            }
+        }
         public Config.Entities.RegisterReaderType RegisterReaderType { get { return Config.Entities.RegisterReaderType.Manual; } }
         public double PulsesPerLtr { get { return roiCfg.ProcParams.PulsesPerLtr; } }
 		public double LtrsPerPulse { get { return (PulsesPerLtr <= float.Epsilon) ? 1.0 : (1 / PulsesPerLtr); } }

TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/RegisterReader.cs

@@ -18,6 +18,15 @@ namespace TBF.BenchControl.RegisterReaders.KPackE.RegisterReader
 		readonly TBF.BenchControl.Elde.ControlBoardDev controlBoard;
 
 
+        public int Position
+        {
+            get
+            {
+                int firstDigitPos = Name.IndexOfAny(new char[] { '1', '2', '3', '4', '5', '6', '7', '8', '9', '0' });
+                int position;
+                return (firstDigitPos < 0) ? 0 : (int.TryParse(Name.Substring(firstDigitPos), out position) ? position : 0);
+            }
+        }
         public Config.Entities.RegisterReaderType RegisterReaderType { get { return Config.Entities.RegisterReaderType.Manual; } }
         public double PulsesPerLtr { get { return registerReaderCfg.ProcParams.PulsesPerLtr; } }
 		public double LtrsPerPulse { get { return (PulsesPerLtr <= float.Epsilon) ? 1.0 : (1 / PulsesPerLtr); } }

TBF/BenchControl/RegisterReaders/SerialStream/SerialStream.cs

@@ -21,6 +21,15 @@ namespace TBF.BenchControl.RegisterReaders.SerialStream
 
 		readonly SerialStreamCfg myCfg;
 
+        public int Position
+        {
+            get
+            {
+                int firstDigitPos = Name.IndexOfAny(new char[] { '1', '2', '3', '4', '5', '6', '7', '8', '9', '0' });
+                int position;
+                return (firstDigitPos < 0) ? 0 : (int.TryParse(Name.Substring(firstDigitPos), out position) ? position : 0);
+            }
+        }
         public Config.Entities.RegisterReaderType RegisterReaderType { get { return Config.Entities.RegisterReaderType.DataStream; } }
         public double PulsesPerLtr { get { return 1000.0; } }
 		public double LtrsPerPulse { get { return 1 / PulsesPerLtr; } }

TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs

@@ -653,7 +653,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
                                 if (regReader.WMPulses >= 1)
                                 {
                                     /// Normal measurement
-                                    meterRslt.TestTime = cBrd.ImpulseTime(i + 1);
+                                    meterRslt.TestTime = cBrd.ImpulseTime(regReader.Position);
                                     meterRslt.VolumeRef = meterRslt.PulsesMaster * tstRslt.ConstMaster;	/// liter
                                 }
                                 else

TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs

@@ -933,7 +933,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
 								meterRslt.PulsesMeter = (isAux == 0 && compoundTestParams.SupressTrills) ? 0 : Convert.ToDouble(regReader.WMPulses);
 								meterRslt.PulsesMaster = Convert.ToDouble(regReader.WMRefPulses);
 
-                                meterRslt.TestTime = cBrd.ImpulseTime(2 * i + isAux + 1);
+                                meterRslt.TestTime = cBrd.ImpulseTime(regReader.Position);
 								meterRslt.VolumeStart = 0;
 								meterRslt.VolumeEnd = 0;
 								meterRslt.VolumeRef = tstRslt.VolumeCTV;
@@ -1118,7 +1118,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
                                 if (regReader.WMPulses >= 1)
                                 {
                                     /// Normal measurement
-                                    meterRslt.TestTime = cBrd.ImpulseTime(i + 1);
+                                    meterRslt.TestTime = cBrd.ImpulseTime(regReader.Position);
                                     meterRslt.VolumeRef = meterRslt.PulsesMaster * tstRslt.ConstMaster;	/// liter
                                 }
                                 else

TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs

@@ -815,7 +815,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
 								meterRslt.PulsesMeter = (isAux == 0 && compoundTestParams.SupressTrills) ? 0 : Convert.ToDouble(regReader.WMPulses);
 								meterRslt.PulsesMaster = Convert.ToDouble(regReader.WMRefPulses);
 
-                                meterRslt.TestTime = cBrd.ImpulseTime(2 * i + isAux + 1);
+                                meterRslt.TestTime = cBrd.ImpulseTime(regReader.Position);
 								meterRslt.VolumeStart = 0;
 								meterRslt.VolumeEnd = 0;
 								meterRslt.VolumeRef = tstRslt.VolumeCTV;

TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs

@@ -803,7 +803,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
 								meterRslt.PulsesMeter = (isAux == 0 && compoundTestParams.SupressTrills) ? 0 : Convert.ToDouble(regReader.WMPulses);
 								meterRslt.PulsesMaster = Convert.ToDouble(regReader.WMRefPulses);
 
-                                meterRslt.TestTime = cBrd.ImpulseTime(2 * i + isAux + 1);
+                                meterRslt.TestTime = cBrd.ImpulseTime(regReader.Position);
 								meterRslt.VolumeStart = 0;
 								meterRslt.VolumeEnd = 0;
 								meterRslt.VolumeRef = tstRslt.VolumeCTV;
@@ -988,7 +988,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
                                 if (regReader.WMPulses >= 1)
                                 {
                                     /// Normal measurement
-                                    meterRslt.TestTime = cBrd.ImpulseTime(i + 1);
+                                    meterRslt.TestTime = cBrd.ImpulseTime(regReader.Position);
                                     meterRslt.VolumeRef = meterRslt.PulsesMaster * tstRslt.ConstMaster;	/// liter
                                 }
                                 else

TBF/BenchControl/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs

@@ -563,7 +563,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection
 								meterRslt.PulsesMeter = (isAux == 0 && compoundTestParams.SupressTrills) ? 0 : Convert.ToDouble(regReader.WMPulses);
 								meterRslt.PulsesMaster = Convert.ToDouble(regReader.WMRefPulses);
 
-                                meterRslt.TestTime = cBrd.ImpulseTime(2 * i + isAux + 1);
+                                meterRslt.TestTime = cBrd.ImpulseTime(regReader.Position);
 								meterRslt.VolumeStart = 0;
 								meterRslt.VolumeEnd = 0;
 								meterRslt.VolumeRef = tstRslt.VolumeCTV;
@@ -677,7 +677,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection
                                 if (regReader.WMPulses >= 1)
                                 {
                                     /// Normal measurement
-                                    meterRslt.TestTime = cBrd.ImpulseTime(i + 1);
+                                    meterRslt.TestTime = cBrd.ImpulseTime(regReader.Position);
                                     meterRslt.VolumeRef = meterRslt.PulsesMaster * tstRslt.ConstMaster;	/// liter
                                 }
                                 else

TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs

@@ -31,6 +31,15 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication.iPerlHead
         public int MuxBoardNrOrGroup14 { get { return iperlHeadCfg.MuxBoardNr; } }
         public int Group { get { return iperlHeadCfg.Group; } }
 
+        public int Position
+        {
+            get
+            {
+                int firstDigitPos = Name.IndexOfAny(new char[] { '1', '2', '3', '4', '5', '6', '7', '8', '9', '0' });
+                int position;
+                return (firstDigitPos < 0) ? 0 : (int.TryParse(Name.Substring(firstDigitPos), out position) ? position : 0);
+            }
+        }
         public Config.Entities.RegisterReaderType RegisterReaderType { get { return Config.Entities.RegisterReaderType.DataStream; } }
         public double PulsesPerLtr { get { return 1000.0; } }
 		public double LtrsPerPulse { get { return 1 / PulsesPerLtr; } }

TBF/Properties/AssemblyInfo.cs

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