Reconfigured for iPerlNEW

Oracle DB: In the vt_zaehler_pindex_pd.korrimprate should be new CalibFactor, not OrigCalibFactor (Joern Goegge)

.gitignore

@@ -54,6 +54,28 @@ Users/bin/
 Users/obj/
 UserManagement/bin/
 UserManagement/obj/
+DataMatrix4Net/bin/
+DataMatrix4Net/obj/
+GenericTest/bin/
+GenericTest/obj/
+LabelPrinting/bin/
+LabelPrinting/obj/
+OrderManagement/bin/
+OrderManagement/obj/
+ProductionTracing/bin/
+ProductionTracing/obj/
+RecordProcessing/bin/
+RecordProcessing/obj/
+S640TestApp/bin/
+S640TestApp/obj/
+SchematicDrawing/bin/
+SchematicDrawing/obj/
+SharedDatabase/bin/
+SharedDatabase/obj/
+WorkflowConfigurator/bin/
+WorkflowConfigurator/obj/
+Workplace/bin/
+Workplace/obj/
 .vs/
 *.suo
 *.bak

Common/Forms/ModelessForm.cs

@@ -1,4 +1,7 @@
-using System;
+///
+/// Copyright (c) 2021-2023 Sensus Slovensko a.s.
+///
+using System;
 using System.Drawing;
 using System.Windows.Forms;
 
@@ -53,20 +56,20 @@ namespace Common.Forms
         public event EventHandler<MessageEventArgs> UpdateMessageHandler;
         void OnUpdateMessage(object sender, MessageEventArgs args)
         {
-            if (args.Message != null) label1.Text = args.Message;
+            if (args != null && args.Message != null) label1.Text = args.Message;
         }
 
 
         /// <summary>
         /// Called from the state machine when an operation forces a modeless dialog close.
         /// </summary>
-        public static void CloseForm()
+        public void CloseForm()
         {
             if (CloseFormHandler == null) return;
             try { CloseFormHandler(null, null); }
             catch (Exception) { }
         }
-        static public event EventHandler<EventArgs> CloseFormHandler;
+        public event EventHandler<EventArgs> CloseFormHandler;
         void OnCloseForm(object sender, EventArgs args)
         {
             DialogResult = DialogResult.Cancel;

Config/Config.csproj

@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;KRAKOW_50;LANG_PL</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TURA_IPERL_NEW;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -30,7 +30,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;KRAKOW_50;LANG_PL</DefineConstants>
+    <DefineConstants>TRACE;TURA_IPERL_NEW;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>

Config/Data.cs

@@ -38,12 +38,18 @@ namespace Config
 		public const int CompoundWMsCount = 3;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = 3;
-#elif RUM_MOB || TURA_SPECIAL
+#elif RUM_MOB
         public const int WMsCount = 8;
 		public const int LineSize = 8;
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = WMsCount / LineSize;
+#elif TURA_SPECIAL
+        public const int WMsCount = 6;
+		public const int LineSize = 6;
+		public const int CompoundWMsCount = 1;
+		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = WMsCount / LineSize;
 #elif DEWA_300 || FUZHOU_100 || ROMA_200 || LUXEMBURG_40
         public const int WMsCount = 10;
         public const int LineSize = 10;

Config/Formulas.cs

@@ -214,9 +214,9 @@ namespace Config
 		/// </summary>
 		public static double ErrorFromVolumes(double measuredVolume, double trueVolume)
 		{
-			if (trueVolume <= float.Epsilon)
+			if (-float.Epsilon <= trueVolume && trueVolume <= float.Epsilon)
 			{
-				if (measuredVolume <= float.Epsilon)
+				if (-float.Epsilon <= measuredVolume && measuredVolume <= float.Epsilon)
 				{
 					log.WarnFormat("ErrorFromVolumes({0},{1}) returns {2}", measuredVolume, trueVolume, -100.0);
 					return -100.0;

Results/BatchResults.cs

@@ -174,7 +174,7 @@ namespace Results
 			return Batch.GetTestRslt(name, part);
 		}
 
-		public MeterTestRslt GetMeterTestRslt(string name, int wmNr0, CompoundMeterId meterId)
+		public MeterTestRslt GetMeterTestRslt(string name, int wmNr0, CompoundMeterId meterId = CompoundMeterId.Single)
 		{
             if (Batch.WaterMeters != null && Batch.WaterMeters.Count > wmNr0 && !Batch.WaterMeters[wmNr0].Disabled)
 			{

Results/Entities/WaterMeter.cs

@@ -99,8 +99,8 @@ namespace Results.Entities
 		public virtual int	  HydrPruefung		{ get; set; }
 #endif
         public virtual int	  ProcessId	        { get; set; }	/// Not mapped to DB !!!   Tracing DB Process ID
-        public virtual int    SessionId         { get; set; }   /// Not mapped to DB !!!   1 (regular tracing DB session) or 2 (alternative tracing DB session)                                                 
         public virtual bool   LastRecordIsNok   { get; set; }	/// Not mapped to DB !!!   Previous record verification result
+        public virtual bool   PrintLabel        { get; set; }	/// Not mapped to DB !!!
 
         public virtual WaterMeterData WaterMeterData { get; set; }
 		public virtual Batch Batch { get; set; }
@@ -134,8 +134,10 @@ namespace Results.Entities
         public virtual double Q3_Qn_Aux()            { return WaterMeterData.Q3_Qn_Aux; }
         public virtual string MetrologicalClassAux() { return WaterMeterData.MetrologicalClassAux; }
         public virtual string ApprovalInfoAux()      { return WaterMeterData.ApprovalInfoAux; }
-
-		public virtual int    BatchNr()			  { return Batch.BatchNr; }
+#if ORACLE_DB
+        public virtual int    WMTypeId()             { return WaterMeterData.WMTypeId; }
+#endif
+        public virtual int    BatchNr()			  { return Batch.BatchNr; }
 		public virtual int    BenchId()			  { return Batch.TestBenchId; }
 		public virtual string ProcedureName()	  { return Batch.ProcedureName; }
 		public virtual int    ProcedureRevision() { return Batch.ProcedureRevision; }
@@ -338,7 +340,7 @@ namespace Results.Entities
 			return GetMeterTestRslt(testName, CompoundMeterId.SingleOrCompound);
 		}
 
-		public virtual MeterTestRslt GetMeterTestRslt(string testName, CompoundMeterId meterId)
+		public virtual MeterTestRslt GetMeterTestRslt(string testName, CompoundMeterId meterId = CompoundMeterId.Single)
 		{
 			if (string.IsNullOrEmpty(testName)) return null;
 			if (Disabled) return null;
@@ -456,8 +458,8 @@ namespace Results.Entities
             HydrPruefung = 0;
 #endif
             ProcessId = 0;
-            SessionId = 0;
             LastRecordIsNok = false;
+            PrintLabel = true;
         }
 
 
@@ -518,8 +520,8 @@ namespace Results.Entities
 		    HydrPruefung       = src.HydrPruefung;
 #endif
             ProcessId          = src.ProcessId;         /// Not mapped to DB
-            SessionId          = src.SessionId;         /// Not mapped to DB
             LastRecordIsNok    = src.LastRecordIsNok;   /// Not mapped to DB
+            PrintLabel         = src.PrintLabel;        /// Not mapped to DB
 
             foreach (var mtr in MeterTestRslts)
             {
@@ -698,8 +700,8 @@ namespace Results.Entities
             writer.Write(HydrPruefung);
 #endif
             writer.Write(ProcessId);
-            writer.Write(SessionId);
             writer.Write(LastRecordIsNok);
+            writer.Write(PrintLabel);
 
             /// Save WaterMeterData or WaterMeterData.Id
             if (WaterMeterData != null && savedWMDatas != null && !savedWMDatas.Contains(WaterMeterData))
@@ -778,8 +780,8 @@ namespace Results.Entities
             HydrPruefung = reader.ReadInt32();
 #endif
             ProcessId = reader.ReadInt32();
-            SessionId = reader.ReadInt32();
             LastRecordIsNok = reader.ReadBoolean();
+            PrintLabel = reader.ReadBoolean();
 
             /// Retrieve TestData
             if (reader.ReadBoolean())

Results/Forms/MoreWMResultsDlg.Designer.cs

@@ -29,13 +29,15 @@
         private void InitializeComponent()
         {
             this.tabControl1 = new System.Windows.Forms.TabControl();
+            this.allResultsTabPage = new System.Windows.Forms.TabPage();
             this.graphsTabPage = new System.Windows.Forms.TabPage();
             this.productionTracingTabPage = new System.Windows.Forms.TabPage();
             this.productionTracingSplitContainer = new System.Windows.Forms.SplitContainer();
             this.messageLabel = new System.Windows.Forms.Label();
             this.tracingResultsListView = new System.Windows.Forms.ListView();
-            this.allResultsTabPage = new System.Windows.Forms.TabPage();
+            this.oneWMResultsCtrl = new Results.Forms.OneWMResultsRowsCtrl();
             this.tabControl1.SuspendLayout();
+            this.allResultsTabPage.SuspendLayout();
             this.productionTracingTabPage.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.productionTracingSplitContainer)).BeginInit();
             this.productionTracingSplitContainer.Panel1.SuspendLayout();
@@ -55,6 +57,17 @@
             this.tabControl1.Size = new System.Drawing.Size(1195, 448);
             this.tabControl1.TabIndex = 0;
             // 
+            // allResultsTabPage
+            // 
+            this.allResultsTabPage.Controls.Add(this.oneWMResultsCtrl);
+            this.allResultsTabPage.Location = new System.Drawing.Point(4, 22);
+            this.allResultsTabPage.Name = "allResultsTabPage";
+            this.allResultsTabPage.Padding = new System.Windows.Forms.Padding(3);
+            this.allResultsTabPage.Size = new System.Drawing.Size(1187, 422);
+            this.allResultsTabPage.TabIndex = 0;
+            this.allResultsTabPage.Text = "All results";
+            this.allResultsTabPage.UseVisualStyleBackColor = true;
+            // 
             // graphsTabPage
             // 
             this.graphsTabPage.Location = new System.Drawing.Point(4, 22);
@@ -113,6 +126,7 @@
             // 
             this.tracingResultsListView.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tracingResultsListView.GridLines = true;
+            this.tracingResultsListView.HideSelection = false;
             this.tracingResultsListView.Location = new System.Drawing.Point(0, 0);
             this.tracingResultsListView.Name = "tracingResultsListView";
             this.tracingResultsListView.Size = new System.Drawing.Size(1187, 366);
@@ -120,15 +134,14 @@
             this.tracingResultsListView.UseCompatibleStateImageBehavior = false;
             this.tracingResultsListView.View = System.Windows.Forms.View.Details;
             // 
-            // allResultsTabPage
+            // oneWMResultsRowsCtrl
             // 
-            this.allResultsTabPage.Location = new System.Drawing.Point(4, 22);
-            this.allResultsTabPage.Name = "allResultsTabPage";
-            this.allResultsTabPage.Padding = new System.Windows.Forms.Padding(3);
-            this.allResultsTabPage.Size = new System.Drawing.Size(1187, 422);
-            this.allResultsTabPage.TabIndex = 0;
-            this.allResultsTabPage.Text = "All results";
-            this.allResultsTabPage.UseVisualStyleBackColor = true;
+            this.oneWMResultsCtrl.Caption = "---";
+            this.oneWMResultsCtrl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.oneWMResultsCtrl.Location = new System.Drawing.Point(3, 3);
+            this.oneWMResultsCtrl.Name = "oneWMResultsRowsCtrl";
+            this.oneWMResultsCtrl.Size = new System.Drawing.Size(1181, 416);
+            this.oneWMResultsCtrl.TabIndex = 0;
             // 
             // MoreWMResultsDlg
             // 
@@ -140,6 +153,7 @@
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.Text = "Water meter results";
             this.tabControl1.ResumeLayout(false);
+            this.allResultsTabPage.ResumeLayout(false);
             this.productionTracingTabPage.ResumeLayout(false);
             this.productionTracingSplitContainer.Panel1.ResumeLayout(false);
             this.productionTracingSplitContainer.Panel1.PerformLayout();
@@ -153,12 +167,12 @@
         #endregion
 
         private System.Windows.Forms.TabControl tabControl1;
-        private OneWMResultsRowsCtrl oneWMResultsCtrl;
         private System.Windows.Forms.TabPage graphsTabPage;
         private System.Windows.Forms.TabPage productionTracingTabPage;
         private System.Windows.Forms.SplitContainer productionTracingSplitContainer;
         private System.Windows.Forms.Label messageLabel;
         private System.Windows.Forms.ListView tracingResultsListView;
         private System.Windows.Forms.TabPage allResultsTabPage;
+        private OneWMResultsRowsCtrl oneWMResultsCtrl;
     }
 }

Results/Forms/MoreWMResultsDlg.cs

@@ -59,57 +59,57 @@ namespace Results.Forms
         /// <param name="wMtr">Water meter entity</param>
         void ShowAllResults(Results.Entities.WaterMeter wMtr)
         {
-//            string message;
-//            Color commonBackColor = wMtr.GetColorOfResults(false, out message);     /// Ony message is used later on
-//#if ORACLE_DB
-//            oneWMResultsCtrl.Caption = string.Format("{0} ({1}) {2}", (string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr), (wMtr.Pruefindex % 100), message);
-//#else
-//            oneWMResultsCtrl.Caption = string.Format("s/n = {0}", string.IsNullOrEmpty(wMtr.SerialNr) ? string.Empty : wMtr.SerialNr);
-//#endif
+            string message;
+            Color commonBackColor = wMtr.GetColorOfResults(false, out message);     /// Ony message is used later on
+#if ORACLE_DB
+            oneWMResultsCtrl.Caption = string.Format("{0} ({1}) {2}", wMtr.SerialNr ?? string.Empty, wMtr.Pruefindex % 100, message);
+#else
+            oneWMResultsCtrl.Caption = string.Format("s/n = {0}", wMtr.SerialNr ?? string.Empty);
+#endif
 
-//            IList<Results.WMeterRsltItemSpec> items = Results.WMeterRsltItemSpec.AllItems;
+            IList<Results.WMeterRsltItemSpec> items = Results.WMeterRsltItemSpec.AllItems;
 
-//            // Header
-//            oneWMResultsCtrl.Columns.Add(wMtr.WMPosition.ToString(), 100);
-//            int i = 1;
-//            foreach (var str in wMtr.GetAllDecoratedTestNames())
-//            {
-//                oneWMResultsCtrl.Columns.Add(str, 100);
-//                i++;
-//            }
+            // Header
+            oneWMResultsCtrl.Columns.Add(wMtr.WMPosition.ToString(), 100);
+            int i = 1;
+            foreach (var str in wMtr.GetAllDecoratedTestNames())
+            {
+                oneWMResultsCtrl.Columns.Add(str, 100);
+                i++;
+            }
 
-//            foreach (var item in items)
-//            {
-//                ListViewItem lvi = new ListViewItem(item.Name);
+            foreach (var item in items)
+            {
+                ListViewItem lvi = new ListViewItem(item.Name);
 
-//                foreach (var mtr in wMtr.MeterTestRslts)
-//                {
-//                    if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Publish.Never &&
-//                                                                            mtr.Publish() != Publish.Internal)
-//                    {
-//                        string str = item.Print(wMtr, mtr.Name());
+                foreach (var mtr in wMtr.MeterTestRslts)
+                {
+                    if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Common.Publish.Never &&
+                                                                            mtr.Publish() != Common.Publish.Internal)
+                    {
+                        string str = item.Print(wMtr, mtr.Name());
 
-//                        string[] texts = str.Split(new char[] { '|' });
-//                        if (texts.Length == 1)
-//                        {
-//                            lvi.SubItems.Add(str);
-//                        }
-//                        else if (texts.Length == 2)
-//                        {
-//                            Color color = texts[1].Equals("Green") ? Color.Green : (texts[1].Equals("Red") ? Color.Red : Color.White);
-//                            lvi.UseItemStyleForSubItems = false;
-//                            lvi.SubItems.Add(texts[0]);
-//                            lvi.SubItems[lvi.SubItems.Count - 1].BackColor = color;
-//                        }
-//                        else
-//                        {
-//                            lvi.SubItems.Add(string.Empty);
-//                        }
-//                    }
-//                }
+                        string[] texts = str.Split(new char[] { '|' });
+                        if (texts.Length == 1)
+                        {
+                            lvi.SubItems.Add(str);
+                        }
+                        else if (texts.Length == 2)
+                        {
+                            Color color = texts[1].Equals("Green") ? Color.Green : (texts[1].Equals("Red") ? Color.Red : Color.White);
+                            lvi.UseItemStyleForSubItems = false;
+                            lvi.SubItems.Add(texts[0]);
+                            lvi.SubItems[lvi.SubItems.Count - 1].BackColor = color;
+                        }
+                        else
+                        {
+                            lvi.SubItems.Add(string.Empty);
+                        }
+                    }
+                }
 
-//                oneWMResultsCtrl.Items.Add(lvi);
-//            }
+                oneWMResultsCtrl.Items.Add(lvi);
+            }
         }
 
 

Results/Forms/OneWMResultsRowsCtrl.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
+/// Copyright (c) 2019-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Drawing;
@@ -24,13 +24,16 @@ namespace Results.Forms
             }
         }
 
+        public string Caption { set { caption = value; } get { return caption; } }
+
+        public ListView.ListViewItemCollection Items { get { return lView.Items; } }
 
         bool disabled;
         int wmPosition;         /// 1-based water meter position
         string caption;
         Color bkColor;
         int[] columnWidths;
-        IList<Results.WMeterRsltItemSpec> items;
+        IList<WMeterRsltItemSpec> items;
 
 
         public bool Disabled { get { return disabled; } }                                   /// Read only
@@ -45,7 +48,7 @@ namespace Results.Forms
             wmPosition = 0;
             tBox.Text = caption = "---";
             tBox.BackColor = lView.BackColor = bkColor = Color.White;
-            items = new List<Results.WMeterRsltItemSpec>();
+            items = new List<WMeterRsltItemSpec>();
             columnWidths = new int[0];
         }
 
@@ -62,7 +65,7 @@ namespace Results.Forms
             }
         }
 
-        public void Update(IList<Results.WMeterRsltItemSpec> items)
+        public void Update(IList<WMeterRsltItemSpec> items)
         {
             this.items = items;
 

Results/ItemID.cs

@@ -343,6 +343,11 @@ namespace Results
         X9,                             /// 291
 
         RadioAddress,                   /// 292
+        OriRadioAddress,                /// 293
+
+        Pls_per_ltr_aux,                /// 294  Compound water meter constant (water meter data, not used in calculations)
+        Pulses_main,                    /// 295  Compound main meter pulses (recalculated so that the gated ref. pulses for this meter are equal to the total ref. pulses)
+        Pulses_aux,                     /// 296  Compound aux  meter pulses (recalculated so that the gated ref. pulses for this meter are equal to the total ref. pulses)
 
         Count,
     }

Results/Results.csproj

@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;KRAKOW_50;LANG_PL</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TURA_IPERL_NEW;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -29,7 +29,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;KRAKOW_50;LANG_PL</DefineConstants>
+    <DefineConstants>TRACE;TURA_IPERL_NEW;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>

ResultsBrowser/ResultsBrowser.csproj

@@ -21,7 +21,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;KRAKOW_50;LANG_PL</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TURA_IPERL_NEW;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -32,7 +32,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;KRAKOW_50;LANG_PL</DefineConstants>
+    <DefineConstants>TRACE;TURA_IPERL_NEW;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>

TBF.sln

@@ -96,6 +96,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResultsParser", "ResultsPar
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sensus.iPerl.RfidCom", "..\iPerlHead\Sensus.iPerl.RfidCom\Sensus.iPerl.RfidCom.csproj", "{A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NfcS5_DLL", "..\NfcS5_DLL\NfcS5_DLL.csproj", "{34F6AA20-3BEC-44B4-9D18-DC66BAB79A83}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -402,6 +404,18 @@ Global
 		{A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Release|x86.ActiveCfg = Release|Any CPU
 		{A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Release|x86.Build.0 = Release|Any CPU
+		{34F6AA20-3BEC-44B4-9D18-DC66BAB79A83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{34F6AA20-3BEC-44B4-9D18-DC66BAB79A83}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{34F6AA20-3BEC-44B4-9D18-DC66BAB79A83}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{34F6AA20-3BEC-44B4-9D18-DC66BAB79A83}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{34F6AA20-3BEC-44B4-9D18-DC66BAB79A83}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{34F6AA20-3BEC-44B4-9D18-DC66BAB79A83}.Debug|x86.Build.0 = Debug|Any CPU
+		{34F6AA20-3BEC-44B4-9D18-DC66BAB79A83}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{34F6AA20-3BEC-44B4-9D18-DC66BAB79A83}.Release|Any CPU.Build.0 = Release|Any CPU
+		{34F6AA20-3BEC-44B4-9D18-DC66BAB79A83}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{34F6AA20-3BEC-44B4-9D18-DC66BAB79A83}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{34F6AA20-3BEC-44B4-9D18-DC66BAB79A83}.Release|x86.ActiveCfg = Release|Any CPU
+		{34F6AA20-3BEC-44B4-9D18-DC66BAB79A83}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

TBF/Program.cs

@@ -14,6 +14,7 @@ using Users;
 using TBF.Resources;
 using TBF.Rig.Sequences;
 using TBF.UI.Shared;
+using System.Threading;
 
 namespace TBF
 {
@@ -69,7 +70,9 @@ namespace TBF
         [STAThread]
         static void Main()
         {
-			AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(MyHandler);
+            Application.ThreadException += new ThreadExceptionEventHandler(Form1_UIThreadException);
+            Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException);
+            AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(MyHandler);
 
             /// Program version string
 			System.Reflection.Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly();
@@ -536,7 +539,12 @@ namespace TBF
 			log.Info("Exiting application.");
         }
 
-		static void MyHandler(object sender, UnhandledExceptionEventArgs args)
+        private static void Form1_UIThreadException(object sender, ThreadExceptionEventArgs e)
+        {
+            LogException(log, "Unhandled thread exception", (Exception)e.Exception);
+        }
+
+        static void MyHandler(object sender, UnhandledExceptionEventArgs args)
 		{
 			LogException(log, "Unhandled exception", (Exception)args.ExceptionObject);
 		}

TBF/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Sensus")]
 [assembly: AssemblyProduct("TestBenchFramework")]
-[assembly: AssemblyCopyright("Copyright © 2013 - 2023 Sensus Slovensko, a.s.")]
+[assembly: AssemblyCopyright("Copyright © 2013 - 2024 Sensus Slovensko, a.s.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.33.2064.0")]
-[assembly: AssemblyFileVersion("2.33.2064.0")]
+[assembly: AssemblyVersion("2.33.2149.0")]
+[assembly: AssemblyFileVersion("2.33.2149.0")]

TBF/Resources/Strings.Designer.cs

@@ -19,7 +19,7 @@ namespace TBF.Resources {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Strings {
@@ -294,6 +294,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to All files.
+        /// </summary>
+        internal static string All_files {
+            get {
+                return ResourceManager.GetString("All_files", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to All tests must be completed.
         /// </summary>
@@ -645,6 +654,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Calibration certificate.
+        /// </summary>
+        internal static string Calibration_certificate {
+            get {
+                return ResourceManager.GetString("Calibration_certificate", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Calibration certificate validity expired.
         /// </summary>
@@ -1923,6 +1941,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Error when saving and printing results.
+        /// </summary>
+        internal static string Error_when_saving_and_printing_results {
+            get {
+                return ResourceManager.GetString("Error_when_saving_and_printing_results", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Error while creating the database. Reason: .
         /// </summary>
@@ -2274,6 +2301,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Get number of cycles to bypass.
+        /// </summary>
+        internal static string Get_number_of_cycles_to_bypass {
+            get {
+                return ResourceManager.GetString("Get_number_of_cycles_to_bypass", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Grab.
         /// </summary>
@@ -3615,6 +3651,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to PDF files.
+        /// </summary>
+        internal static string PDF_files {
+            get {
+                return ResourceManager.GetString("PDF_files", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to PID.
         /// </summary>
@@ -5091,6 +5136,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Set number of cycles to bypass.
+        /// </summary>
+        internal static string Set_number_of_cycles_to_bypass {
+            get {
+                return ResourceManager.GetString("Set_number_of_cycles_to_bypass", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Set route.
         /// </summary>
@@ -5424,15 +5478,6 @@ namespace TBF.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to .
-        /// </summary>
-        internal static string String1 {
-            get {
-                return ResourceManager.GetString("String1", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Sun.
         /// </summary>
@@ -6273,6 +6318,15 @@ namespace TBF.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Unlock a bypass.
+        /// </summary>
+        internal static string Unlock_bypass {
+            get {
+                return ResourceManager.GetString("Unlock_bypass", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Unlock.
         /// </summary>

TBF/Resources/Strings.cs.resx

@@ -673,7 +673,7 @@
     <value>Tiskárna</value>
   </data>
   <data name="Procedure" xml:space="preserve">
-    <value>Prodedura</value>
+    <value>Procedura</value>
   </data>
   <data name="Procedures" xml:space="preserve">
     <value>Procedury</value>
@@ -1177,7 +1177,7 @@
     <value>Tisk výsledků</value>
   </data>
   <data name="Procedure_name" xml:space="preserve">
-    <value>Jméno postupu</value>
+    <value>Jméno procedury</value>
   </data>
   <data name="Process" xml:space="preserve">
     <value>Proces</value>
@@ -1213,7 +1213,7 @@
     <value>Objem</value>
   </data>
   <data name="PrintBtnText" xml:space="preserve">
-    <value>Vytisknout</value>
+    <value>Tisknout</value>
   </data>
   <data name="Do_you_want_to_save_changes" xml:space="preserve">
     <value>Chcete uložit změny?</value>
@@ -1675,7 +1675,7 @@
     <value>Konfigurace testu {0} : chybí {1}</value>
   </data>
   <data name="Print" xml:space="preserve">
-    <value>Vytisknout</value>
+    <value>Tisknout</value>
   </data>
   <data name="Printer_selection" xml:space="preserve">
     <value>Výběr tiskárny</value>
@@ -1683,4 +1683,25 @@
   <data name="default_printer" xml:space="preserve">
     <value>předvolená tiskárna</value>
   </data>
+  <data name="Get_number_of_cycles_to_bypass" xml:space="preserve">
+    <value>Zjisti počet cyklů bez kontroly</value>
+  </data>
+  <data name="Set_number_of_cycles_to_bypass" xml:space="preserve">
+    <value>Nastav počet cyklů bez kontroly</value>
+  </data>
+  <data name="Unlock_bypass" xml:space="preserve">
+    <value>Odemknout vypnutí kontroly</value>
+  </data>
+  <data name="All_files" xml:space="preserve">
+    <value>Všechny soubory</value>
+  </data>
+  <data name="Calibration_certificate" xml:space="preserve">
+    <value>Kalibrační certifikát</value>
+  </data>
+  <data name="PDF_files" xml:space="preserve">
+    <value>PDF soubory</value>
+  </data>
+  <data name="Error_when_saving_and_printing_results" xml:space="preserve">
+    <value>Chyba při ukládání a tisknutí výsledků</value>
+  </data>
 </root>

TBF/Resources/Strings.resx

@@ -2314,4 +2314,28 @@
   <data name="default_printer" xml:space="preserve">
     <value>default printer</value>
   </data>
+  <data name="Get_number_of_cycles_to_bypass" xml:space="preserve">
+    <value>Get number of cycles to bypass</value>
+  </data>
+  <data name="Set_number_of_cycles_to_bypass" xml:space="preserve">
+    <value>Set number of cycles to bypass</value>
+  </data>
+  <data name="Unlock_bypass" xml:space="preserve">
+    <value>Unlock a bypass</value>
+  </data>
+  <data name="Error_reading_configuration_database" xml:space="preserve">
+    <value>Error reading configuration database</value>
+  </data>
+  <data name="All_files" xml:space="preserve">
+    <value>All files</value>
+  </data>
+  <data name="Calibration_certificate" xml:space="preserve">
+    <value>Calibration certificate</value>
+  </data>
+  <data name="PDF_files" xml:space="preserve">
+    <value>PDF files</value>
+  </data>
+  <data name="Error_when_saving_and_printing_results" xml:space="preserve">
+    <value>Error when saving and printing results</value>
+  </data>
 </root>

TBF/Rig/DataChangeArgs.cs

@@ -0,0 +1,19 @@
+///
+/// Copyright (c) 2023 Sensus Slovensko a.s.
+///
+using System;
+
+namespace TBF.Rig
+{
+	public class DataChangeArgs : EventArgs
+	{
+		public CfgChangeCmd Command;
+		public object Data;
+
+		public DataChangeArgs(CfgChangeCmd command, object data)
+        {
+			Command = command;
+			Data = data;
+        }
+	}
+}

TBF/Rig/DataContainers/BenchInfo/iPerl/ComponentCfg.cs

@@ -47,6 +47,7 @@ namespace TBF.Rig.DataContainers.BenchInfo.iPerl
 
         /// Calibration info serialized parameters displayed in Metrology tab page
         public string CalibCertificateNr { get; set; }
+        public string CertPath { get; set; }
         public DateTime CalibDate { get; set; }
         public DateTime CalibValidDate { get; set; }
 
@@ -88,6 +89,7 @@ namespace TBF.Rig.DataContainers.BenchInfo.iPerl
             MaxTestIndex = 4;
 
             CalibCertificateNr = string.Empty;
+            CertPath = string.Empty;
             CalibDate = TBF.UI.Constants.MinDate;
             CalibValidDate = TBF.UI.Constants.MaxDate;
         }
@@ -349,6 +351,10 @@ namespace TBF.Rig.DataContainers.BenchInfo.iPerl
             prms.LenghtUnit = this.LenghtUnit;
             prms.Side = this.Side;
             prms.MaxTestIndex = this.MaxTestIndex;
+            prms.CalibCertificateNr = this.CalibCertificateNr;
+            prms.CertPath = this.CertPath;
+            prms.CalibDate = this.CalibDate;
+            prms.CalibValidDate = this.CalibValidDate;
         }
 
         public IParamsProvider Clone()

TBF/Rig/DataContainers/Buoyancy/ComponentCfg.cs

@@ -27,6 +27,7 @@ namespace TBF.Rig.DataContainers.Buoyancy
 
         /// Calibration info serialized parameters displayed in Metrology tab page
         public string CalibCertificateNr { get; set; }
+        public string CertPath { get; set; }
         public DateTime CalibDate { get; set; }
         public DateTime CalibValidDate { get; set; }
 
@@ -50,6 +51,7 @@ namespace TBF.Rig.DataContainers.Buoyancy
             Buoyancy = 1.00103;
 
             CalibCertificateNr = string.Empty;
+            CertPath = string.Empty;
             CalibDate = TBF.UI.Constants.MinDate;
             CalibValidDate = TBF.UI.Constants.MaxDate;
         }
@@ -112,6 +114,10 @@ namespace TBF.Rig.DataContainers.Buoyancy
         void CopyContentTo(ComponentCfg prms)
         {
             prms.Buoyancy = this.Buoyancy;
+            prms.CalibCertificateNr = this.CalibCertificateNr;
+            prms.CertPath = this.CertPath;
+            prms.CalibDate = this.CalibDate;
+            prms.CalibValidDate = this.CalibValidDate;
         }
 
         public IParamsProvider Clone()

TBF/Rig/DataContainers/Buoyancy/ComponentFactory.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
+/// Copyright (c) 2019-2023 Sensus Slovensko a.s.
 ///
 using System.Collections.Generic;
 using TBF.Rig.Generic;
@@ -14,7 +14,7 @@ namespace TBF.Rig.DataContainers.Buoyancy
 
 		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Component(cfg); }
 
-		public IComponentCfg DefaultConfig() { return new ComponentCfg(this.GetType().Namespace.Substring(32), this); }
+		public IComponentCfg DefaultConfig() { return new ComponentCfg(GetType().Namespace.Substring(23), this); }
 
         public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
         {

TBF/Rig/DataContainers/Density/ComponentCfg.cs

@@ -28,6 +28,7 @@ namespace TBF.Rig.DataContainers.Density
 
         /// Calibration info serialized parameters displayed in Metrology tab page
         public string CalibCertificateNr { get; set; }
+        public string CertPath { get; set; }
         public DateTime CalibDate { get; set; }
         public DateTime CalibValidDate { get; set; }
 
@@ -52,6 +53,7 @@ namespace TBF.Rig.DataContainers.Density
             AtTemperature = 20.0;   /// °C
 
             CalibCertificateNr = string.Empty;
+            CertPath = string.Empty;
             CalibDate = TBF.UI.Constants.MinDate;
             CalibValidDate = TBF.UI.Constants.MaxDate;
         }
@@ -122,6 +124,10 @@ namespace TBF.Rig.DataContainers.Density
         {
             prms.RealDensity = this.RealDensity;
             prms.AtTemperature = this.AtTemperature;
+            prms.CalibCertificateNr = this.CalibCertificateNr;
+            prms.CertPath = this.CertPath;
+            prms.CalibDate = this.CalibDate;
+            prms.CalibValidDate = this.CalibValidDate;
         }
 
         public IParamsProvider Clone()

TBF/Rig/DataContainers/Density/ComponentFactory.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
+/// Copyright (c) 2019-2023 Sensus Slovensko a.s.
 ///
 using System.Collections.Generic;
 using TBF.Rig.Generic;
@@ -14,7 +14,7 @@ namespace TBF.Rig.DataContainers.Density
 
 		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Component(cfg); }
 
-		public IComponentCfg DefaultConfig() { return new ComponentCfg(this.GetType().Namespace.Substring(32), this); }
+		public IComponentCfg DefaultConfig() { return new ComponentCfg(GetType().Namespace.Substring(23), this); }
 
         public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
         {

TBF/Rig/DataContainers/Evaporation/EvaporationCfg.cs

@@ -21,6 +21,7 @@ namespace TBF.Rig.DataContainers.Evaporation
 
         /// Calibration info serialized parameters displayed in Metrology tab page
         public string CalibCertificateNr { get; set; }
+        public string CertPath { get; set; }
         public DateTime CalibDate { get; set; }
         public DateTime CalibValidDate { get; set; }
 
@@ -42,6 +43,7 @@ namespace TBF.Rig.DataContainers.Evaporation
  		public void InitializeAll()
 		{
             CalibCertificateNr = string.Empty;
+            CertPath = string.Empty;
             CalibDate = TBF.UI.Constants.MinDate;
             CalibValidDate = TBF.UI.Constants.MaxDate;
         }

TBF/Rig/DataContainers/Evaporation/Factory.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2020 Sensus Slovensko a.s.
+/// Copyright (c) 2020-2023 Sensus Slovensko a.s.
 ///
 using System.Collections.Generic;
 using TBF.Rig.Generic;
@@ -16,7 +16,7 @@ namespace TBF.Rig.DataContainers.Evaporation
 
         public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Component(cfg); }
 
-        public IComponentCfg DefaultConfig() { return new EvaporationCfg(this.GetType().Namespace.Substring(32), this); }
+        public IComponentCfg DefaultConfig() { return new EvaporationCfg(GetType().Namespace.Substring(23), this); }
 
         public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
         {

TBF/Rig/DataEntry/DEItem.cs

@@ -6,21 +6,22 @@ using Common;
 
 namespace TBF.Rig.DataEntry
 {
-    ///
-    /// Ac = Action
-    ///
+    /// <summary>
+    /// Action of a DataEntry field
+    /// </summary>
     public enum Ac
     {
         [Description("Clear")]              Clear,          /// Clear when the form is open, save on OK
         [Description("Last from history")]  HistoryLast,
         [Description("Load")]               Load,           /// Load from water meters when the form is open, save on OK
         [Description("Load (readonly)")]    LoadReadOnly,   /// Load from water meters when the form is open, prevent changes, do not save
+        [Description("Set")]                Set,            /// Set to 'yes' when the form is open
         Count,
     }
 
-    ///
-    /// Ct = Content
-    ///
+    /// <summary>
+    /// Content of a DataEntry field
+    /// </summary>
     public enum Ct
     {
         [Description("None")]                None,
@@ -29,7 +30,9 @@ namespace TBF.Rig.DataEntry
         [Description("Radio address")]       RadioAddress,
         [Description("Year of calibration")] YearOfCalibration,
         [Description("Start state")]         StartState,
+        [Description("Start state aux")]     StartStateAux,
         [Description("End state")]           EndState,
+        [Description("End state aux")]       EndStateAux,
         [Description("Archive path")]        ArchivePath,
         [Description("WM Order")]            WmOrder,
         [Description("Batch order")]         BatchOrder,
@@ -37,6 +40,7 @@ namespace TBF.Rig.DataEntry
         [Description("WM Remark")]           WmRemark,
         [Description("Batch remark")]        BatchRemark,
         [Description("Batch and WM remark")] BatchAndWmRemark,
+        [Description("Print label")]         PrintLabel,
 #if ORACLE_DB
         [Description("Prefix")]              Prefix,
         [Description("Suffix")]              Suffix,
@@ -44,6 +48,38 @@ namespace TBF.Rig.DataEntry
         Count
     }
 
+    /// <summary>
+    /// Function of the multi purpose button
+    /// </summary>
+    public enum MultiPurposeBtnFunction
+    {
+        None,
+        AutoSN,
+        PrintLabelsOnOff,
+    }
+
+    ///
+    /// Identifies image instance
+    ///
+    public enum Tst
+    {
+        Start,
+        End,
+        Both,
+    }
+
+    ///
+    /// Image rotation
+    ///
+    public enum Rotation
+    {
+        R0,
+        R90,
+        R180,
+        R270,
+        Count
+    }
+
     public class DEItem
     {
         public readonly Ct Content;

TBF/Rig/DataEntry/DEUtils.cs

@@ -3,6 +3,7 @@
 ///
 using System.Windows.Forms;
 using Results.Entities;
+using TBF.Resources;
 
 namespace TBF.Rig.DataEntry
 {
@@ -15,22 +16,25 @@ namespace TBF.Rig.DataEntry
             switch (content)
             {
                 default:
-                case Ct.None: return string.Empty;
-                case Ct.SerialNr: return (!wm.Disabled && wm.SerialNr != null) ? wm.SerialNr : string.Empty;
-                case Ct.SerialNrAux: return (!wm.Disabled && wm.SerialNrAux != null) ? wm.SerialNrAux : string.Empty;
-                case Ct.RadioAddress: return (!wm.Disabled && wm.RadioAddress != null) ? wm.RadioAddress : string.Empty;
+                case Ct.None:              return string.Empty;
+                case Ct.SerialNr:          return (!wm.Disabled && wm.SerialNr != null) ? wm.SerialNr : string.Empty;
+                case Ct.SerialNrAux:       return (!wm.Disabled && wm.SerialNrAux != null) ? wm.SerialNrAux : string.Empty;
+                case Ct.RadioAddress:      return (!wm.Disabled && wm.RadioAddress != null) ? wm.RadioAddress : string.Empty;
                 case Ct.YearOfCalibration: return (!wm.Disabled) ? wm.YearOfProduction.ToString() : string.Empty;
-                case Ct.StartState: return (!wm.Disabled && wm.GetStartState() != null) ? wm.GetStartState() : string.Empty;
-                case Ct.EndState: return (!wm.Disabled && wm.EndState != null) ? wm.EndState : string.Empty;
-                case Ct.ArchivePath: return (!wm.Disabled && wm.ArchivePath != null) ? wm.ArchivePath : string.Empty;
+                case Ct.StartState:        return (!wm.Disabled && wm.GetStartState() != null) ? wm.GetStartState() : string.Empty;
+                case Ct.StartStateAux:     return string.Empty;
+                case Ct.EndState:          return (!wm.Disabled && wm.EndState != null) ? wm.EndState : string.Empty;
+                case Ct.EndStateAux:       return (!wm.Disabled && wm.GetEndStateAux() != null) ? wm.GetEndStateAux() : string.Empty;
+                case Ct.ArchivePath:       return (!wm.Disabled && wm.ArchivePath != null) ? wm.ArchivePath : string.Empty;
 
-                case Ct.WmOrder: return (!wm.Disabled && wm.PurchaseOrder != null) ? wm.PurchaseOrder : string.Empty;
-                case Ct.BatchOrder: return (wm.Batch != null && wm.Batch.PurchaseOrder != null) ? wm.Batch.PurchaseOrder : string.Empty;
-                case Ct.BatchAndWmOrder: return (wm.Batch != null && wm.Batch.PurchaseOrder != null) ? wm.Batch.PurchaseOrder : string.Empty;
+                case Ct.WmOrder:           return (!wm.Disabled && wm.PurchaseOrder != null) ? wm.PurchaseOrder : string.Empty;
+                case Ct.BatchOrder:        return (wm.Batch != null && wm.Batch.PurchaseOrder != null) ? wm.Batch.PurchaseOrder : string.Empty;
+                case Ct.BatchAndWmOrder:   return (wm.Batch != null && wm.Batch.PurchaseOrder != null) ? wm.Batch.PurchaseOrder : string.Empty;
 
-                case Ct.WmRemark: return (!wm.Disabled && wm.Remark != null) ? wm.Remark : string.Empty;
-                case Ct.BatchRemark: return (wm.Batch != null && wm.Batch.Remark != null) ? wm.Batch.Remark : string.Empty;
-                case Ct.BatchAndWmRemark: return (wm.Batch != null && wm.Batch.Remark != null) ? wm.Batch.Remark : string.Empty;
+                case Ct.WmRemark:          return (!wm.Disabled && wm.Remark != null) ? wm.Remark : string.Empty;
+                case Ct.BatchRemark:       return (wm.Batch != null && wm.Batch.Remark != null) ? wm.Batch.Remark : string.Empty;
+                case Ct.BatchAndWmRemark:  return (wm.Batch != null && wm.Batch.Remark != null) ? wm.Batch.Remark : string.Empty;
+                case Ct.PrintLabel:        return wm.PrintLabel ? Strings.yes : Strings.no;
 #if ORACLE_DB
                 case Ct.Prefix: return (!wm.Disabled && wm.Prefix != null) ? wm.Prefix : string.Empty;
                 case Ct.Suffix: return (!wm.Disabled && wm.Suffix != null) ? wm.Suffix : string.Empty;
@@ -53,7 +57,9 @@ namespace TBF.Rig.DataEntry
                 case Ct.RadioAddress: wm.RadioAddress = value; return;
                 case Ct.YearOfCalibration: if (int.TryParse(value, out year)) wm.YearOfProduction = year; return;
                 case Ct.StartState: wm.SetStartState(value); return;
+                case Ct.StartStateAux: return;
                 case Ct.EndState: wm.EndState = value; return;
+                case Ct.EndStateAux: wm.SetEndStateAux(value); return;
                 case Ct.ArchivePath: wm.ArchivePath = value; return;
 
                 case Ct.WmOrder:
@@ -73,6 +79,10 @@ namespace TBF.Rig.DataEntry
                 case Ct.BatchAndWmRemark:
                     if (wm.Batch != null) wm.Batch.Remark = value;
                     return;
+
+                case Ct.PrintLabel:
+                    wm.PrintLabel = (value == Strings.yes);
+                    return;
 #if ORACLE_DB
                 case Ct.Prefix: wm.Prefix = value; return;
                 case Ct.Suffix: wm.Suffix = value; return;

TBF/Rig/DataEntry/Uni/CycleBgEnForm.cs

@@ -50,6 +50,9 @@ namespace TBF.Rig.DataEntry.Uni
         readonly ComboBox[,] comboBoxes;        /// Combo boxes for values in columns
         readonly CheckBox[] checkBoxes;         /// Check boxes for water meter enable/disable
 
+        readonly MultiPurposeBtnFunction multiPurposeButtonFn;
+        bool multiPurposeButtonFlag;
+
         readonly LocalSettings ls;
 
         bool isHandlersEnabled;                 /// Initially false, set to true after ComboBoxes are filled with data
@@ -124,6 +127,34 @@ namespace TBF.Rig.DataEntry.Uni
             comboBoxes = new ComboBox[colItems.Count, wmsCount];
             checkBoxes = new CheckBox[wmsCount];
 
+            ///
+            /// Determine the multi purpose button function
+            ///
+            multiPurposeButton.Visible = false;
+            multiPurposeButtonFn = MultiPurposeBtnFunction.None;
+            int buttonsWidth = 350;
+            for (int k = 0; k < colItems.Count; k++)
+            {
+                if ((colItems[k].Content == Ct.SerialNr || colItems[k].Content == Ct.SerialNrAux) && colItems[k].Action != Ac.LoadReadOnly)
+                {
+                    multiPurposeButton.Visible = true;
+                    multiPurposeButton.Text = "Auto s/n";
+                    multiPurposeButtonFn = MultiPurposeBtnFunction.AutoSN;
+                    buttonsWidth += 147;
+                    break;
+                }
+
+                if (colItems[k].Content == Ct.PrintLabel)
+                {
+                    multiPurposeButton.Visible = true;
+                    multiPurposeButton.Text = string.Format("{0} ({1}/{2})", Strings.Print, Strings.yes, Strings.no);
+                    multiPurposeButtonFn = MultiPurposeBtnFunction.PrintLabelsOnOff;
+                    multiPurposeButtonFlag = false;
+                    buttonsWidth += 147;
+                    break;
+                }
+            }
+
             /// Layout related readonly variables derived from argument 'sz'
             switch (sz)
             {
@@ -132,7 +163,7 @@ namespace TBF.Rig.DataEntry.Uni
                     meterHeight = 26;       /// Height of a ComboBox control
                     margin = 20;
                     spacing = 8;
-                    buttonsWidth = 350;
+                    this.buttonsWidth = buttonsWidth;
                     hdrHeight = 120;
                     labelWid = 31;
                     checkBoxWid = 23;
@@ -144,7 +175,7 @@ namespace TBF.Rig.DataEntry.Uni
                     meterHeight = 31;       /// Height of a ComboBox control
                     margin = 25;
                     spacing = 10;
-                    buttonsWidth = 350;
+                    this.buttonsWidth = buttonsWidth;
                     hdrHeight = 140;
                     labelWid = 34;
                     checkBoxWid = 23;
@@ -155,7 +186,7 @@ namespace TBF.Rig.DataEntry.Uni
                     meterHeight = 37;       /// Height of a ComboBox control
                     margin = 30;
                     spacing = 12;
-                    buttonsWidth = 350;
+                    this.buttonsWidth = buttonsWidth;
                     hdrHeight = 160;
                     labelWid = 40;
                     checkBoxWid = 23;
@@ -236,6 +267,8 @@ namespace TBF.Rig.DataEntry.Uni
             ///
             /// Table
             ///
+            int commonCheckBoxLeft = 0;
+            int commonCheckBoxTop = 0;
             int columnsTop = Math.Max(hdrHeight, groupBoxHeight + 2 * margin + spacing);
             for (int j = 0; j < linesCount; j++)
             {
@@ -294,14 +327,22 @@ namespace TBF.Rig.DataEntry.Uni
                             TabIndex = tabIndex++,
                             Parent = this,
                         };
-                        
+
                         comboBox.SelectedIndexChanged += new System.EventHandler(this.comboBox_SelectedIndexChanged);
                         comboBox.TextChanged += new System.EventHandler(this.comboBox_TextChanged);
                         comboBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox_KeyPress);
-                        
-                        var lastVals = GetHistoryFromLS(isEnd, k);
-                        comboBox.Items.Add(lastVals.Length > wmPos0 ? lastVals[wmPos0] : string.Empty);   /// History in drop-down menu
-                        
+
+                        if (ci.Content == Ct.PrintLabel)
+                        {
+                            comboBox.Items.Add(Strings.yes);
+                            comboBox.Items.Add(Strings.no);
+                        }
+                        else
+                        {
+                            var lastVals = GetHistoryFromLS(isEnd, k);
+                            comboBox.Items.Add(lastVals.Length > wmPos0 ? lastVals[wmPos0] : string.Empty);   /// History in drop-down menu
+                        }
+
                         left += ci.Width + spacing;
                         comboBoxes[k, wmPos0] = comboBox;
                         this.Controls.Add(comboBox);
@@ -316,7 +357,26 @@ namespace TBF.Rig.DataEntry.Uni
                     };
                     checkBoxes[wmPos0] = checkBox;
                     this.Controls.Add(checkBox);
+
+                    if (commonCheckBoxLeft == 0)
+                    {
+                        commonCheckBoxLeft = left;
+                        commonCheckBoxTop = columnsTop - meterHeight;
+                    }
                 }
+
+                okButton.TabIndex = tabIndex++;
+                clearButton.TabIndex = tabIndex++;
+
+                var commonCheckBox = new CheckBox
+                {
+                    Location = new Point(commonCheckBoxLeft, commonCheckBoxTop + 6),
+                    Size = new Size(checkBoxWid, 23),
+                    TabIndex = tabIndex++,
+                    Parent = this,
+                };
+                commonCheckBox.CheckedChanged += new System.EventHandler(commonCheckBox_CheckedChanged);
+                this.Controls.Add(commonCheckBox);
             }
 
             ///
@@ -442,6 +502,10 @@ namespace TBF.Rig.DataEntry.Uni
                     case Ac.LoadReadOnly:
                         commonComboBoxes[ix].Text = DEUtils.GetContent(commonItems[ix].Content, firstValidWM);
                         break;
+
+                    case Ac.Set:
+                        commonComboBoxes[ix].Text = Strings.yes;
+                        break;
                 }
             }
 
@@ -469,6 +533,13 @@ namespace TBF.Rig.DataEntry.Uni
                             comboBoxes[k, i].Text = DEUtils.GetContent(colItems[k].Content, WaterMeters[i]);
                         }
                         break;
+
+                    case Ac.Set:
+                        for (int i = 0; i < wmsCount; i++)
+                        {
+                            comboBoxes[k, i].Text = (WaterMeters[i] != null && !WaterMeters[i].Disabled) ? Strings.yes : Strings.no;
+                        }
+                        break;
                 }
             }
 
@@ -574,18 +645,120 @@ namespace TBF.Rig.DataEntry.Uni
             }
         }
 
-        private void clearButton_Click(object sender, EventArgs e)
+        private void commonCheckBox_CheckedChanged(object sender, EventArgs e)
         {
-            InitializeBoxes();
+            bool state = (sender as CheckBox).Checked;
+            for (int i = 0; i < wmsCount; i++)
+            {
+                checkBoxes[i].Checked = state;
+            }
         }
 
-		private void okButton_Click(object sender, EventArgs e)
+        private void okButton_Click(object sender, EventArgs e)
         {
             UpdateWMsFromBoxes();
 
             completed = true;
             Close();
         }
+
+        private void clearButton_Click(object sender, EventArgs e)
+        {
+            InitializeBoxes();
+        }
+
+        private void multiPurposeButton_Click(object sender, EventArgs e)
+        {
+            if (multiPurposeButtonFn == MultiPurposeBtnFunction.None) return;
+
+            if (multiPurposeButtonFn == MultiPurposeBtnFunction.AutoSN)
+            {
+                ///
+                /// Find the 1st enabled water meter
+                ///
+                int firstIx;
+                for (firstIx = 0; firstIx < wmsCount; firstIx++)
+                {
+                    if (checkBoxes[firstIx].Checked) break;
+                }
+                if (firstIx == wmsCount)
+                {
+                    return;     /// There is not any enabled water meter
+                }
+
+                char[] digits = new char[] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' };
+
+                ///
+                /// Find a column with serial numbers
+                ///
+                for (int k = 0; k < colItems.Count; k++)
+                {
+                    if ((colItems[k].Content == Ct.SerialNr || colItems[k].Content == Ct.SerialNrAux) && colItems[k].Action != Ac.LoadReadOnly)
+                    {
+                        ///
+                        /// Column with serial numbers found => perform an auto s/n assignment
+                        ///
+                        string firstSN = comboBoxes[k, firstIx].Text;
+
+                        int firstSnNr;
+                        int startIx = firstSN.IndexOfAny(digits);
+                        if (startIx >= 0)
+                        {
+                            int lastDigitPosPlus1 = startIx + 1;
+                            var listOfDigits = new List<char>(digits);
+                            while (lastDigitPosPlus1 < firstSN.Length && listOfDigits.Contains(firstSN[lastDigitPosPlus1]))
+                            {
+                                lastDigitPosPlus1++;
+                            }
+                            int digitsCount = lastDigitPosPlus1 - startIx;
+
+                            if (int.TryParse(firstSN.Substring(startIx, digitsCount), out firstSnNr) && firstSnNr >= 0)
+                            {
+                                for (int ix = firstIx + 1; ix < wmsCount; ix++)
+                                {
+                                    if (checkBoxes[ix].Checked)
+                                    {
+                                        firstSnNr++;
+                                        string newSN = firstSnNr.ToString();
+                                        int len = newSN.Length;
+                                        if (len <= digitsCount)
+                                        {
+                                            comboBoxes[k, ix].Text = firstSN.Substring(0, startIx + digitsCount - len) + newSN + firstSN.Substring(startIx + digitsCount);
+                                        }
+                                        else
+                                        {
+                                            comboBoxes[k, ix].Text = firstSN.Substring(0, startIx) + newSN + firstSN.Substring(startIx + digitsCount); ;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            if (multiPurposeButtonFn == MultiPurposeBtnFunction.PrintLabelsOnOff)
+            {
+                ///
+                /// Find a column with Ct.PrintLabel
+                ///
+                for (int k = 0; k < colItems.Count; k++)
+                {
+                    if (colItems[k].Content == Ct.PrintLabel)
+                    {
+                        for (int ix = 0; ix < wmsCount; ix++)
+                        {
+                            if (WaterMeters[ix] != null && !WaterMeters[ix].Disabled)
+                            {
+                                comboBoxes[k, ix].Text = multiPurposeButtonFlag ? Strings.yes : Strings.no;
+                            }
+                        }
+                    }
+                }
+                multiPurposeButtonFlag = !multiPurposeButtonFlag;
+            }
+        }
+
         private void comboBox_SelectedIndexChanged(object sndr, EventArgs e)
         {
             if (!isHandlersEnabled) return;
@@ -596,7 +769,7 @@ namespace TBF.Rig.DataEntry.Uni
 
             isHandlersEnabled = false;
 
-            if (k >= 0 && comboBoxes[k, j].Text == comboBoxes[k, j].Items[0].ToString())
+            if (k >= 0 && colItems[k].Content != Ct.PrintLabel && comboBoxes[k, j].Text == comboBoxes[k, j].Items[0].ToString())
             {
                 for (int i = 0; i < wmsCount; i++)
                 {

TBF/Rig/DataEntry/Uni/CycleBgEnForm.designer.cs

@@ -34,6 +34,7 @@ namespace TBF.Rig.DataEntry.Uni
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CycleBgEnForm));
             this.okButton = new System.Windows.Forms.Button();
             this.clearButton = new System.Windows.Forms.Button();
+            this.multiPurposeButton = new System.Windows.Forms.Button();
             this.SuspendLayout();
             // 
             // okButton
@@ -52,11 +53,20 @@ namespace TBF.Rig.DataEntry.Uni
             this.clearButton.UseVisualStyleBackColor = true;
             this.clearButton.Click += new System.EventHandler(this.clearButton_Click);
             // 
+            // multiPurposeButton
+            // 
+            resources.ApplyResources(this.multiPurposeButton, "multiPurposeButton");
+            this.multiPurposeButton.ForeColor = System.Drawing.Color.Black;
+            this.multiPurposeButton.Name = "multiPurposeButton";
+            this.multiPurposeButton.UseVisualStyleBackColor = true;
+            this.multiPurposeButton.Click += new System.EventHandler(this.multiPurposeButton_Click);
+            // 
             // CycleBgEnForm
             // 
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.DarkGray;
+            this.Controls.Add(this.multiPurposeButton);
             this.Controls.Add(this.clearButton);
             this.Controls.Add(this.okButton);
             this.ForeColor = System.Drawing.Color.Black;
@@ -71,5 +81,6 @@ namespace TBF.Rig.DataEntry.Uni
 
         private System.Windows.Forms.Button okButton;
         private System.Windows.Forms.Button clearButton;
+        private System.Windows.Forms.Button multiPurposeButton;
     }
 }

TBF/Rig/DataEntry/Uni/CycleBgEnForm.resx

@@ -148,7 +148,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;okButton.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
   </data>
   <data name="clearButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Right</value>
@@ -181,6 +181,42 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;clearButton.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="multiPurposeButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Right</value>
+  </data>
+  <data name="multiPurposeButton.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Verdana, 14.25pt</value>
+  </data>
+  <data name="multiPurposeButton.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="multiPurposeButton.Location" type="System.Drawing.Point, System.Drawing">
+    <value>648, 26</value>
+  </data>
+  <data name="multiPurposeButton.Size" type="System.Drawing.Size, System.Drawing">
+    <value>112, 63</value>
+  </data>
+  <data name="multiPurposeButton.TabIndex" type="System.Int32, mscorlib">
+    <value>9</value>
+  </data>
+  <data name="multiPurposeButton.Text" xml:space="preserve">
+    <value>Multi purpose</value>
+  </data>
+  <data name="multiPurposeButton.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="&gt;&gt;multiPurposeButton.Name" xml:space="preserve">
+    <value>multiPurposeButton</value>
+  </data>
+  <data name="&gt;&gt;multiPurposeButton.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;multiPurposeButton.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;multiPurposeButton.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

TBF/Rig/DataEntry/Uni/EntryFormCfg.cs

@@ -347,7 +347,7 @@ namespace TBF.Rig.DataEntry.Uni
 
             BgItemContent = new Ct[1] { Ct.BatchAndWmOrder };
             BgItemCaption = new string[1] { "Order nr." };
-            BgItemAction = new Ac[1] { Ac.Clear };
+            BgItemAction = new Ac[1] { Ac.HistoryLast };
             BgItemWidth = new int[1] { 200 };
 
             BgColumnContent = new Ct[1] { Ct.SerialNr };
@@ -539,10 +539,13 @@ namespace TBF.Rig.DataEntry.Uni
                             Ct.RadioAddress.ToDescription(),
                             Ct.YearOfCalibration.ToDescription(),
                             Ct.StartState.ToDescription(),
+                            Ct.StartStateAux.ToDescription(),
                             Ct.EndState.ToDescription(),
+                            Ct.EndStateAux.ToDescription(),
                             Ct.ArchivePath.ToDescription(),
                             Ct.WmOrder.ToDescription(),
                             Ct.WmRemark.ToDescription(),
+                            Ct.PrintLabel.ToDescription(),
                         };
                     }
                 case 2:

TBF/Rig/Elde/Diverter/DiverterCfg.cs

@@ -31,6 +31,7 @@ namespace TBF.Rig.Elde.Diverter
 
         /// Calibration info serialized parameters displayed in Metrology tab page
         public string CalibCertificateNr { get; set; }
+        public string CertPath { get; set; }
         public DateTime CalibDate { get; set; }
         public DateTime CalibValidDate { get; set; }
 
@@ -53,6 +54,7 @@ namespace TBF.Rig.Elde.Diverter
             ThresholdHi = 90;
 
             CalibCertificateNr = string.Empty;
+            CertPath = string.Empty;
             CalibDate = TBF.UI.Constants.MinDate;
             CalibValidDate = TBF.UI.Constants.MaxDate;
         }

TBF/Rig/Elde/FlowMeter/FlowMeterCfg.cs

@@ -54,6 +54,12 @@ namespace TBF.Rig.Elde.FlowMeter
         public string CalibCertificate3;
         public string CalibCertificate4;
         public string CalibCertificate5;
+        public string CertPath;
+        public string CertPath1;
+        public string CertPath2;
+        public string CertPath3;
+        public string CertPath4;
+        public string CertPath5;
         public DateTime CalibDate;
         public DateTime CalibDate1;
         public DateTime CalibDate2;
@@ -166,6 +172,34 @@ namespace TBF.Rig.Elde.FlowMeter
             }
         }
 
+        public string GetCertPath(int rangeIx1)
+        {
+            switch (rangeIx1)
+            {
+                default:
+                case 0: return CertPath;
+                case 1: return CertPath1;
+                case 2: return CertPath2;
+                case 3: return CertPath3;
+                case 4: return CertPath4;
+                case 5: return CertPath5;
+            }
+        }
+
+        public void SetCertPath(int rangeIx1, string certificate)
+        {
+            switch (rangeIx1)
+            {
+                default:
+                case 0: CertPath = certificate; return;
+                case 1: CertPath1 = certificate; return;
+                case 2: CertPath2 = certificate; return;
+                case 3: CertPath3 = certificate; return;
+                case 4: CertPath4 = certificate; return;
+                case 5: CertPath5 = certificate; return;
+            }
+        }
+
         public DateTime GetCalibDate(int rangeIx1)
         {
             switch (rangeIx1)

TBF/Rig/Elde/FlowMeterDewa/FlowMeterCfg.cs

@@ -1,9 +1,8 @@
 ///
-/// Copyright (c) 2019 Sensus Slovensko a.s.
+/// Copyright (c) 2019-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Xml.Serialization;
 using TBF.Rig.Generic;
 
@@ -55,6 +54,12 @@ namespace TBF.Rig.Elde.FlowMeterDewa
         public string CalibCertificate3;
         public string CalibCertificate4;
         public string CalibCertificate5;
+        public string CertPath;
+        public string CertPath1;
+        public string CertPath2;
+        public string CertPath3;
+        public string CertPath4;
+        public string CertPath5;
         public DateTime CalibDate;
         public DateTime CalibDate1;
         public DateTime CalibDate2;
@@ -167,6 +172,34 @@ namespace TBF.Rig.Elde.FlowMeterDewa
             }
         }
 
+        public string GetCertPath(int rangeIx1)
+        {
+            switch (rangeIx1)
+            {
+                default:
+                case 0: return CertPath;
+                case 1: return CertPath1;
+                case 2: return CertPath2;
+                case 3: return CertPath3;
+                case 4: return CertPath4;
+                case 5: return CertPath5;
+            }
+        }
+
+        public void SetCertPath(int rangeIx1, string certificate)
+        {
+            switch (rangeIx1)
+            {
+                default:
+                case 0: CertPath = certificate; return;
+                case 1: CertPath1 = certificate; return;
+                case 2: CertPath2 = certificate; return;
+                case 3: CertPath3 = certificate; return;
+                case 4: CertPath4 = certificate; return;
+                case 5: CertPath5 = certificate; return;
+            }
+        }
+
         public DateTime GetCalibDate(int rangeIx1)
         {
             switch (rangeIx1)

TBF/Rig/Elde/FlowMeterTwins/FlowMeterCfg.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;

TBF/Rig/Elde/PressureMeter/PressureMeterCfg.cs

@@ -26,6 +26,7 @@ namespace TBF.Rig.Elde.PressureMeter
 
         /// Calibration info serialized parameters displayed in Metrology tab page
         public string CalibCertificateNr { get; set; }
+        public string CertPath { get; set; }
         public DateTime CalibDate { get; set; }
         public DateTime CalibValidDate { get; set; }
 

TBF/Rig/Elde/PressureMeterInternal/PressureMeterCfg.cs

@@ -29,6 +29,7 @@ namespace TBF.Rig.Elde.PressureMeterInternal
 
         /// Calibration info serialized parameters displayed in Metrology tab page
         public string CalibCertificateNr { get; set; }
+        public string CertPath { get; set; }
         public DateTime CalibDate { get; set; }
         public DateTime CalibValidDate { get; set; }
 

TBF/Rig/Elde/TempMeter/TempMeterCfg.cs

@@ -29,6 +29,7 @@ namespace TBF.Rig.Elde.TempMeter
 
         /// Calibration info serialized parameters displayed in Metrology tab page
         public string CalibCertificateNr { get; set; }
+        public string CertPath { get; set; }
         public DateTime CalibDate { get; set; }
         public DateTime CalibValidDate { get; set; }
 
@@ -51,6 +52,7 @@ namespace TBF.Rig.Elde.TempMeter
             DefaultTemperature = 20.0;
 
             CalibCertificateNr = string.Empty;
+            CertPath = string.Empty;
             CalibDate = TBF.UI.Constants.MinDate;
             CalibValidDate = TBF.UI.Constants.MaxDate;
         }

TBF/Rig/Elde/TempMeterInternal/TempMeterCfg.cs

@@ -29,6 +29,7 @@ namespace TBF.Rig.Elde.TempMeterInternal
 
         /// Calibration info serialized parameters displayed in Metrology tab page
         public string CalibCertificateNr { get; set; }
+        public string CertPath { get; set; }
         public DateTime CalibDate { get; set; }
         public DateTime CalibValidDate { get; set; }
 
@@ -51,6 +52,7 @@ namespace TBF.Rig.Elde.TempMeterInternal
             A5 = 0;
 
             CalibCertificateNr = string.Empty;
+            CertPath = string.Empty;
             CalibDate = TBF.UI.Constants.MinDate;
             CalibValidDate = TBF.UI.Constants.MaxDate;
         }

TBF/Rig/Elde/TempMeterMeret/TempMeterCfg.cs

@@ -44,6 +44,7 @@ namespace TBF.Rig.Elde.TempMeterMeret
 
         /// Calibration info serialized parameters displayed in Metrology tab page
         public string CalibCertificateNr { get; set; }
+        public string CertPath { get; set; }
         public DateTime CalibDate { get; set; }
         public DateTime CalibValidDate { get; set; }
 
@@ -69,6 +70,7 @@ namespace TBF.Rig.Elde.TempMeterMeret
             MeretIdx0 = 4;
 
             CalibCertificateNr = string.Empty;
+            CertPath = string.Empty;
             CalibDate = TBF.UI.Constants.MinDate;
             CalibValidDate = TBF.UI.Constants.MaxDate;
         }
@@ -172,6 +174,10 @@ namespace TBF.Rig.Elde.TempMeterMeret
             prms.TempIdx0 = this.TempIdx0;
             prms.ModbusAddress = this.ModbusAddress;
             prms.MeretIdx0 = this.MeretIdx0;
+            prms.CalibCertificateNr = this.CalibCertificateNr;
+            prms.CertPath = this.CertPath;
+            prms.CalibDate = this.CalibDate;
+            prms.CalibValidDate = this.CalibValidDate;
         }
 
 

TBF/Rig/Events.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
 ///
 namespace TBF.Rig
 {
@@ -31,6 +31,8 @@ namespace TBF.Rig
 		GetAdc,				/// Get regul.valve or diverter ADC
 		GetAdc1,			/// Get regul.valve or diverter ADC feedback value #1
 		GetAdc2,			/// Get regul.valve or diverter ADC feedback value #2
+        SetData,            /// Generic set
+        GetData,            /// Generic get
 	}
 
     public enum ValveCategory
@@ -75,6 +77,7 @@ namespace TBF.Rig
         Starting,           /// During initial phase of some process, sending a command to a device, etc.
         Busy,               /// Useful when waiting in state until at least one is busy (all are done)
         Done,               /// Useful when waiting in state until the first is done, the rest miht still be busy
+        Crashed,            /// Run() function of an operation crashed
         MakeSecondPass,		/// Test completed OK but 2nd pass (evaluation) is required
         EndSession,		    /// Test completed OK (similarly to Event.Done), 'End session' button click is automatically invoked
         /// 

TBF/Rig/GenericDevices/ICalibInfoCfg.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2018 Sensus Metering Systems
+/// Copyright (c) 2018-2023 Sensus Slovensko a.s.
 ///
 using System;
 using TBF.Rig.Generic;
@@ -11,8 +11,9 @@ namespace TBF.Rig.GenericDevices
         ///
         /// Parameters displayed in Metrology tab page
         ///
-        string CalibCertificateNr { get; set; }     /// calibration certificate number
-        DateTime CalibDate { get; set; }            /// date of calibration
-        DateTime CalibValidDate { get; set; }       /// calibration valid until (date)
+        string CalibCertificateNr { get; set; }     /// Calibration certificate ID
+        string CertPath { get; set; }               /// Path to a calibration certificate PDF document
+        DateTime CalibDate { get; set; }            /// Date of calibration
+        DateTime CalibValidDate { get; set; }       /// Calibration is valid until (date)
     }
 }

TBF/Rig/GenericDevices/ICalibRangesCfg.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
 ///
 using System;
 using TBF.Rig.Generic;
@@ -20,11 +20,13 @@ namespace TBF.Rig.GenericDevices
         double GetPressHi(int rangeIx1);
 
         string GetCalibCertificate(int rangeIx1);                   /// Get calibration certificate number
+        string GetCertPath(int rangeIx1);                           /// Get path to a calibration certificate PDF document
         DateTime GetCalibDate(int rangeIx1);                        /// Get the date of calibration
         DateTime GetCalibValidDate(int rangeIx1);                   /// Get calibration valid until (date)
 
         void SetCalibCertificate(int rangeIx1, string certificate); /// Set calibration certificate number
-        void SetCalibDate(int rangeIx1, DateTime date);             /// Get the date of calibration
-        void SetCalibValidDate(int rangeIx1, DateTime date);        /// Get calibration valid until (date)
+        void SetCertPath(int rangeIx1, string certPath);            /// Set path to a calibration certificate PDF document
+        void SetCalibDate(int rangeIx1, DateTime date);             /// Set the date of calibration
+        void SetCalibValidDate(int rangeIx1, DateTime date);        /// Set calibration valid until (date)
     }
 }

TBF/Rig/Hart/Nivotrack/NivotrackCfg.cs

@@ -1,13 +1,10 @@
 ///
-/// Copyright (c) 2018-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2018-2023 Sensus Slovensko a.s.
 ///
 using System;
-using System.IO;
 using System.Collections.Generic;
-using System.IO.Ports;
 using System.Xml.Serialization;
 using Common;
-using Config.Entities;
 using TBF.Rig.Generic;
 
 namespace TBF.Rig.Hart.Nivotrack
@@ -38,6 +35,7 @@ namespace TBF.Rig.Hart.Nivotrack
 
         /// Calibration info serialized parameters displayed in Metrology tab page
         public string CalibCertificateNr { get; set; }
+        public string CertPath { get; set; }
         public DateTime CalibDate { get; set; }
         public DateTime CalibValidDate { get; set; }
 
@@ -63,6 +61,7 @@ namespace TBF.Rig.Hart.Nivotrack
             Par2 = 8;
 
             CalibCertificateNr = string.Empty;
+            CertPath = string.Empty;
             CalibDate = TBF.UI.Constants.MinDate;
             CalibValidDate = TBF.UI.Constants.MaxDate;
         }
@@ -179,6 +178,10 @@ namespace TBF.Rig.Hart.Nivotrack
             prms.Address = this.Address;
             prms.Par1 = this.Par1;
             prms.Par2 = this.Par2;
+            prms.CalibCertificateNr = this.CalibCertificateNr;
+            prms.CertPath = this.CertPath;
+            prms.CalibDate = this.CalibDate;
+            prms.CalibValidDate = this.CalibValidDate;
         }
 
 

TBF/Rig/Keithley/TempMeter/TempMeterCfg.cs

@@ -1,9 +1,8 @@
 ///
-/// Copyright (c) 2016-2021 Sensus Metering Systems
+/// Copyright (c) 2016-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Xml.Serialization;
 using TBF.Rig.Generic;
 
@@ -37,6 +36,7 @@ namespace TBF.Rig.Keithley.TempMeter
 
         /// Calibration info serialized parameters displayed in Metrology tab page
         public string CalibCertificateNr { get; set; }
+        public string CertPath { get; set; }
         public DateTime CalibDate { get; set; }
         public DateTime CalibValidDate { get; set; }
 

TBF/Rig/MettlerToledo/Multi/BalanceCfg.cs

@@ -1,8 +1,7 @@
 ///
-/// Copyright (c) 2015-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2023 Sensus Slovensko a.s.
 ///
 using System;
-using System.IO;
 using System.Collections.Generic;
 using System.IO.Ports;
 using System.Xml.Serialization;
@@ -48,56 +47,20 @@ namespace TBF.Rig.MettlerToledo.Multi
         public StopBits StopBits;
         public Handshake Handshake;
 
-        ///
-        /// Buoyancy related serialized parameters - Displayed in Metrology tab page
-        ///
-        float buoyancyTemp;
-        float buoyancyPress;
-        float buoyancyHumi;
-        float weightStandardDensity;
-        string calibCertificateNr;
-        DateTime calibDate;
-        DateTime calibValidDate;
-        /// 
-        public float BuoyancyTemp
-        {
-            get { return buoyancyTemp; }
-            set { buoyancyTemp = value; }
-        }
-        public float BuoyancyPress
-        {
-            get { return buoyancyPress; }
-            set { buoyancyPress = value; }
-        }
-        public float BuoyancyHumi
-        {
-            get { return buoyancyHumi; }
-            set { buoyancyHumi = value; }
-        }
-        public float WeightStandardDensity
-        {
-            get { return weightStandardDensity; }
-            set { weightStandardDensity = value; }
-        }
-        public string CalibCertificateNr
-        {
-            get { return calibCertificateNr; }
-            set { calibCertificateNr = value; }
-        }
-        public DateTime CalibDate
-        {
-            get { return calibDate; }
-            set { calibDate = value; }
-        }
-        public DateTime CalibValidDate
-        {
-            get { return calibValidDate; }
-            set { calibValidDate = value; }
-        }
-        
+        /// Buoyancy related serialized parameters displayed in Metrology tab page
+        public float BuoyancyTemp { get; set; }
+        public float BuoyancyPress { get; set; }
+        public float BuoyancyHumi { get; set; }
+        public float WeightStandardDensity { get; set; }
+
+        public string CalibCertificateNr { get; set; }
+        public string CertPath { get; set; }
+        public DateTime CalibDate { get; set; }
+        public DateTime CalibValidDate { get; set; }
+
 
         /// Private parameterless constructor invoked by all other (public) constructors
-		BalanceCfg()
+        BalanceCfg()
 		{
             Name = "Balance";
             ParentName = string.Empty;
@@ -119,6 +82,11 @@ namespace TBF.Rig.MettlerToledo.Multi
             BuoyancyTemp = 20.0f;
             BuoyancyPress = 1.0f;
             BuoyancyHumi = 40.0f;
+
+            CalibCertificateNr = string.Empty;
+            CertPath = string.Empty;
+            CalibDate = TBF.UI.Constants.MinDate;
+            CalibValidDate = TBF.UI.Constants.MaxDate;
         }
 
         public BalanceCfg(IComponentFactory factory)

TBF/Rig/MettlerToledo/Standard/BalanceCfg.cs

@@ -1,8 +1,7 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2023 Sensus Slovensko a.s.
 ///
 using System;
-using System.IO;
 using System.Collections.Generic;
 using System.IO.Ports;
 using System.Xml.Serialization;
@@ -52,6 +51,7 @@ namespace TBF.Rig.MettlerToledo.Standard
 
         /// Calibration info serialized parameters displayed in Metrology tab page
         public string CalibCertificateNr { get; set; }
+        public string CertPath { get; set; }
         public DateTime CalibDate { get; set; }
         public DateTime CalibValidDate { get; set; }
 
@@ -88,6 +88,7 @@ namespace TBF.Rig.MettlerToledo.Standard
             BuoyancyHumi = 40.0f;
 
             CalibCertificateNr = string.Empty;
+            CertPath = string.Empty;
             CalibDate = TBF.UI.Constants.MinDate;
             CalibValidDate = TBF.UI.Constants.MaxDate;
         }

TBF/Rig/Modbus/PressureMeter/Meret/PressureMeterCfg.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2016 Sensus Metering Systems
+/// Copyright (c) 2016-2023 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;

TBF/Rig/Output/DB/ProductionTracing/MonitoringCfg.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2018 Sensus Slovensko a.s.
+/// Copyright (c) 2018-2023 Sensus Slovensko a.s.
 ///
 using System.Collections.Generic;
 using System.Xml.Serialization;
@@ -19,7 +19,6 @@ namespace TBF.Rig.Output.DB.ProductionTracing
 
 
 		public string ConnStr;
-        public string ConnStr2;
         public string NetAdapter;
         public bool CheckPreviousRecords;
         public bool SaveTracingRecords;
@@ -30,8 +29,7 @@ namespace TBF.Rig.Output.DB.ProductionTracing
 		{
             ParentName = string.Empty;
             NetAdapter = string.Empty;
-            ConnStr = "server=10.42.128.24; database=sledovanie2020; uid=vyroba2020; pwd=qwerty; charset=utf8;";
-            ConnStr2 = "server=10.42.128.24; database=sledovanie2019; uid=vyroba2019; pwd=qwerty; charset=utf8;";
+            ConnStr = "server=10.42.128.35; database=sledovanie2019; uid=sledovanie2019; pwd=velka-javorina-970; charset=utf8;";
             CheckPreviousRecords = true;
             SaveTracingRecords = true;
         }
@@ -45,12 +43,11 @@ namespace TBF.Rig.Output.DB.ProductionTracing
 
 		public string ToString(int i)
 		{
-            return string.Format("Name={0}, CheckPrev.={1}, SaveRecords={2}, ConnStr={3}, , ConnStr2={4}",
+            return string.Format("Name={0}, CheckPrev={1}, SaveRecords={2}, ConnStr={3}",
                                  Name,
                                  CheckPreviousRecords,
                                  SaveTracingRecords,
-                                 ConnStr,
-                                 ConnStr2);
+                                 ConnStr);
 		}
 	}
 }

TBF/Rig/Output/DB/ProductionTracing/Tracing.cs

@@ -3,7 +3,6 @@
 ///
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Net;
 using log4net;
 using FluentNHibernate.Cfg;
@@ -11,9 +10,7 @@ using FluentNHibernate.Cfg.Db;
 using NHibernate;
 using NHibernate.Criterion;
 using Common;
-using Config.Entities;
 using TracingDB.Entities;
-using Events.Entities;
 
 namespace TBF.Rig.Output.DB.ProductionTracing
 {
@@ -78,17 +75,11 @@ namespace TBF.Rig.Output.DB.ProductionTracing
 		/// </summary>
 		Results.Entities.Batch batch;
 
-
         ISessionFactory sessionFactory;         /// Factory to create database sessions that is initialized in the constructor
         IList<Process> processes;
         Dictionary<int, Process> processDictionary;
         Dictionary<int, IList<Workstep>> workstepsDictionary;
 
-        ISessionFactory sessionFactory2;        /// Factory to create database sessions that is initialized in the constructor
-        IList<Process> processes2;
-        Dictionary<int, Process> processDictionary2;
-        Dictionary<int, IList<Workstep>> workstepsDictionary2;
-
         ///
         /// Previous workstep verification info
         /// 
@@ -97,7 +88,9 @@ namespace TBF.Rig.Output.DB.ProductionTracing
         Workstep verifiedWorkstep;
         Part verifiedPart;                      /// Applicable when verifyReferencePart == false
         bool verifyReferencePart;
-        
+
+        int CyclesToSkip;
+
 
 		public Tracing() {}
 
@@ -127,18 +120,6 @@ namespace TBF.Rig.Output.DB.ProductionTracing
                                          .SetProperty("hibernate.connection.connect_timeout", Const.MySqlConnectTimeoutSec)
                                          .BuildSessionFactory();
 
-                /// Session factory 2 is used to create the 2nd database sessions
-                if (!string.IsNullOrEmpty(tracingCfg.ConnStr2))
-                {
-                    sessionFactory2 = Fluently.Configure()
-                                              .Database(FluentNHibernate.Cfg.Db.MySQLConfiguration.Standard.ConnectionString(tracingCfg.ConnStr2))
-                                              .Mappings(m => m.FluentMappings.AddFromAssemblyOf<TracingDB.Entities.Process>())
-                                              .ExposeConfiguration(TracingDB.DB.BuildSchema)
-                                              .BuildConfiguration()
-                                              .SetProperty("hibernate.connection.connect_timeout", Const.MySqlConnectTimeoutSec)
-                                              .BuildSessionFactory();
-                }
-
                 /// Register this test bench in the tracing DB for approx. 2 weeks
                 var session = sessionFactory.OpenSession();
 #if !DEBUG
@@ -155,6 +136,9 @@ namespace TBF.Rig.Output.DB.ProductionTracing
                 session.Close();
 
                 TracingDB.DB.SessionFactory = sessionFactory;
+
+                CyclesToSkip = 0;
+
                 log.FatalFormat("{0} initialized: {1}", Name, this);
             }
             else
@@ -163,6 +147,35 @@ namespace TBF.Rig.Output.DB.ProductionTracing
             }
         }
 
+        #region Configuration Change Handling
+
+        public static void OnDataChange(object sender, DataChangeArgs args)
+        {
+            if (DataChangeHandler == null) return;
+            try { DataChangeHandler(sender, args); }
+            catch (Exception e) { log.Error("CfgChangeHandler(...) failed", e); }
+        }
+
+        public static event EventHandler<DataChangeArgs> DataChangeHandler;
+
+        public override void StartChangeHandler()
+        {
+            DataChangeHandler += delegate (object sender, DataChangeArgs args)
+            {
+                var intbox = args.Data as Boxes.IntBox;
+                if (args.Command == CfgChangeCmd.SetData && intbox != null)
+                {
+                    CyclesToSkip = intbox.Val;
+                }
+                else if (args.Command == CfgChangeCmd.GetData)
+                {
+                    TracingCfgCtrl.OnCmdResponse(this, new CmdResponseArgs(CfgChangeCmd.GetData, 0, CyclesToSkip));
+                }
+            };
+        }
+
+        #endregion Configuration Change Handling
+
         ///
         /// IDevice interface implementation
         ///
@@ -260,7 +273,16 @@ namespace TBF.Rig.Output.DB.ProductionTracing
                 {
                     log.WarnFormat("{0} : Run() : currentOp = {1}", Name, currentOpState);
                     opCompleted = true;
-                    if (CheckPreviousRecords(waterMeters) != Retv.OK) anyError = true;
+
+                    if (CyclesToSkip > 0)
+                    {
+                        CyclesToSkip--;
+                    }
+                    else if (CheckPreviousRecords(waterMeters) != Retv.OK)
+                    {
+                        anyError = true;
+                    }
+
                     return anyError ? Event.InfoNotRead : Event.InfoRead;
                 }
                 else
@@ -359,7 +381,7 @@ namespace TBF.Rig.Output.DB.ProductionTracing
 
                     if ((wm != null) && !wm.Disabled)
                     {
-                        CheckPreviousRecordOfSingleWM(session, wm, 1);
+                        CheckPreviousRecordOfSingleWM(session, wm);
                         if (wm.LastRecordIsNok)
                         {
                             isAtLeastOneNOK = true;
@@ -370,34 +392,15 @@ namespace TBF.Rig.Output.DB.ProductionTracing
                 retVal = Retv.OK;
             }
 
-            if (isAtLeastOneNOK && (sessionFactory2 != null))
-            {
-                using (ISession session2 = sessionFactory2.OpenSession())
-                {
-                    for (int i = 0; i < waterMeters.Count; i++)
-                    {
-                        Results.Entities.WaterMeter wm = waterMeters[i];
-
-                        if ((wm != null) && !wm.Disabled && wm.LastRecordIsNok)
-                        {
-                            CheckPreviousRecordOfSingleWM(session2, wm, 2);
-                        }
-                    }
-
-                    retVal = Retv.OK;
-                }
-            }
-
             return retVal;
         }
 
-        Retv CheckPreviousRecordOfSingleWM(ISession session, Results.Entities.WaterMeter wm, int sessionId)
+        Retv CheckPreviousRecordOfSingleWM(ISession session, Results.Entities.WaterMeter wm)
         {
             if (string.IsNullOrEmpty(wm.SerialNr))
             {
                 /// S/N is missing
                 wm.ProcessId = 0;
-                wm.SessionId = 0;
 				wm.LastRecordIsNok = false;		/// OK, this is an RFID comm. error, not a production tracing error
                 return Retv.OK;
             }
@@ -431,7 +434,6 @@ namespace TBF.Rig.Output.DB.ProductionTracing
             {
                 /// No records found
                 wm.ProcessId = 0;
-                wm.SessionId = sessionId;
 				wm.LastRecordIsNok = true;		/// NOK
                                                 /// 
                 return Retv.OK;
@@ -479,7 +481,6 @@ namespace TBF.Rig.Output.DB.ProductionTracing
 
 
             wm.ProcessId = currentProcess.Id;
-            wm.SessionId = sessionId;
             wm.LastRecordIsNok = true;			    /// NOK (=default if no matching record found)
             foreach (var rcrd in records)
             {
@@ -500,7 +501,7 @@ namespace TBF.Rig.Output.DB.ProductionTracing
         /// </summary>
         /// <param name="session">DB session</param>
         /// <param name="batch">Batch entity</param>
-        Retv SaveTracingRecords(Results.Entities.Batch batch)
+        public Retv SaveTracingRecords(Results.Entities.Batch batch)
 		{
             ITransaction transaction = null;
             ISession session = null;
@@ -516,10 +517,7 @@ namespace TBF.Rig.Output.DB.ProductionTracing
                 int writtenRecordsCount = 0;
                 foreach (var wMtr in batch.WaterMeters)
                 {
-                    if (wMtr.SessionId == 1)
-                    {
-                        writtenRecordsCount += SaveSingleWM2DB(session, wMtr);
-                    }
+                    writtenRecordsCount += SaveSingleWM2DB(session, wMtr);
                 }
                 transaction.Commit();
                 session.Flush();
@@ -545,51 +543,6 @@ namespace TBF.Rig.Output.DB.ProductionTracing
                 }
             }
 
-            if (sessionFactory2 != null)
-            {
-                ///
-                /// Save to alternative tracing DB
-                ///
-                transaction = null;
-                session = null;
-                try
-                {
-                    session = sessionFactory2.OpenSession();
-                    transaction = session.BeginTransaction();
-
-                    int writtenRecordsCount = 0;
-                    foreach (var wMtr in batch.WaterMeters)
-                    {
-                        if (wMtr.SessionId == 2)
-                        {
-                            writtenRecordsCount += SaveSingleWM2DB(session, wMtr);
-                        }
-                    }
-                    transaction.Commit();
-                    session.Flush();
-
-                    log.ErrorFormat("Batch {0}: {1} of {2} watermeters written to the alternative production tracing DB",
-                                    batch.BatchNr, writtenRecordsCount, batch.WaterMeters.Count);
-                }
-                catch (Exception exc)
-                {
-                    if (transaction != null && !transaction.WasCommitted) transaction.Rollback();
-
-                    log.WarnFormat("Failed to write results of batch {0} to production tracing DB: {1}",
-                                    batch.BatchNr, exc.Message);
-
-                    return Retv.Error;
-                }
-                finally
-                {
-                    if (session != null)
-                    {
-                        session.Close();
-                        session.Dispose();
-                    }
-                }
-            }
-
             return Retv.OK;
  		}
 
@@ -602,12 +555,12 @@ namespace TBF.Rig.Output.DB.ProductionTracing
         /// <returns>Number of written reference record</returns>
 		int SaveSingleWM2DB(ISession session, Results.Entities.WaterMeter wm)
 		{
-            if (string.IsNullOrEmpty(wm.SerialNr) || (wm.ProcessId == 0))
+            if (string.IsNullOrEmpty(wm.SerialNr))
             {
                 /// Without PCB number there is no DB activity
                 return 0;
             }
-            else if ((currentProcess != null) && (wm.ProcessId == currentProcess.Id))
+            else if (wm.ProcessId != 0 && currentProcess != null && wm.ProcessId == currentProcess.Id)
             {
                 /// Process is already loaded => save a reference record for this WM
                 session.SaveOrUpdate(new ReferenceRecord(currentProcess, currentWorkstep, wm.SerialNr, Users.CurrentUser.UserName(), workplace, wm.Passed ? 0 : 1));
@@ -639,23 +592,19 @@ namespace TBF.Rig.Output.DB.ProductionTracing
                 ///
 
                 /// Get all already existing reference records with Code == wm.SerialNr, refRecords[0] will be the most recent one
-                IList<ReferenceRecord> refRecords;
-                int trialsCount = 0;
-                do
-                {
-                    if (trialsCount > 0) ReadProcessesFromDB(session);
+                ReadProcessesFromDB(session);
 
-                    refRecords = session.QueryOver<ReferenceRecord>()
+                var refRecords = session.QueryOver<ReferenceRecord>()
                                         .Where(rr => (rr.Code == wm.SerialNr))
                                         .OrderBy(rr => rr.TimeStamp).Desc
                                         .List();
-                    trialsCount++;
-                }
-                while (refRecords.Count == 0 && trialsCount <= 2);
 
                 /// Save a new reference record from this test bench if workstep "Test_bench" is defined in the obtained WM process
                 IList<Workstep> worksteps;
-                if ((refRecords.Count > 0) && workstepsDictionary.TryGetValue(refRecords[0].Process.Id, out worksteps) && (worksteps.Count == 1))
+                if (refRecords.Count > 0 &&
+                    workstepsDictionary.TryGetValue(refRecords[0].Process.Id, out worksteps) &&
+                    worksteps != null &&
+                    worksteps.Count == 1)
                 {
                     session.SaveOrUpdate(new ReferenceRecord(refRecords[0].Process, worksteps[0], wm.SerialNr, Users.CurrentUser.UserName(), workplace, wm.Passed ? 0 : 1));
                     return 1;

TBF/Rig/Output/DB/ProductionTracing/TracingCfgCtrl.cs

@@ -1,19 +1,24 @@
 ///
-/// Copyright (c) 2018-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2018-2023 Sensus Slovensko a.s.
 ///
 using System;
-using System.Windows.Forms;
-using Common;
-using Config.Entities;
-using TBF.Rig.Generic;
 using System.Collections.Generic;
 using System.Net;
+using System.Windows.Forms;
+using log4net;
+using Common;
+using TBF.Resources;
+using TBF.Rig.Generic;
+using TBF.Rig.Elde.Diverter;
+using TBF.Boxes;
 
 namespace TBF.Rig.Output.DB.ProductionTracing
 {
     public partial class TracingCfgCtrl : Configs.ConfigCtrlUtils, IComponentCfgCtrl
 	{
-		public bool ShowMore { get { return false; } }
+        static readonly ILog log = LogManager.GetLogger(typeof(TracingCfgCtrl));
+
+        public bool ShowMore { get { return false; } }
 
 		MonitoringCfg config;
 		public IComponentCfg Config
@@ -34,21 +39,30 @@ namespace TBF.Rig.Output.DB.ProductionTracing
 		private void WriterCfgCtrl_Load(object sender, EventArgs e)
 		{
             if (config == null) return;
+            Localize();
 			Redraw();
-		}
+            StartResponseHandler();
+        }
 
-		public void Closing()
+        public void Closing()
 		{
-		}
+            StopResponseHandler();
+        }
 
-		void Redraw()
+        void Localize()
+        {
+            unlockBypassButton.Text = Strings.Unlock_bypass;
+            setCyclesToBypassButton.Text = Strings.Set_number_of_cycles_to_bypass;
+            getCyclesToBypassButton.Text = Strings.Get_number_of_cycles_to_bypass;
+        }
+
+        void Redraw()
 		{
 			if (config == null) return;			/// Control was not loaded, settings were not changed
 
             classNameLabel.Text = config.Factory.ClassName;
 			nameTextBox.Text = config.Name;
 			connStrTextBox.Text = config.ConnStr;
-            connStr2TextBox.Text = config.ConnStr2;
             checkPreviousRecordsCheckBox.Checked = config.CheckPreviousRecords;
             saveTracingRecordsCheckBox.Checked = config.SaveTracingRecords;
 
@@ -104,13 +118,30 @@ namespace TBF.Rig.Output.DB.ProductionTracing
 		{
 			nameTextBox.Enabled = true;
 			connStrTextBox.Enabled = true;
-            connStr2TextBox.Enabled = true;
             netAdapterComboBox.Enabled = true;
             checkPreviousRecordsCheckBox.Enabled = true;
             saveTracingRecordsCheckBox.Enabled = true;
+
+            cyclesToBypassTextBox.Enabled = true;
+            setCyclesToBypassButton.Enabled = true;
+            unlockBypassButton.Enabled = false;
         }
 
-		public CfgUpdateFlags VerifyCfg(ref string message)
+        private void unlockSkipCyclesButton_Click(object sender, EventArgs e)
+        {
+            var reqrdGrpMembership = new GID[] { GID.TraceabilityManagement, GID.HeadOfLab };
+            if (!Users.CurrentUser.IsMemberOf(reqrdGrpMembership))
+            {
+                if (new Users.Forms.LoginDlg(TBF.DB.UserSessionFactories, reqrdGrpMembership, ParentForm).ShowDialog() != DialogResult.OK)
+                    return;
+            }
+
+            cyclesToBypassTextBox.Enabled = true;
+            setCyclesToBypassButton.Enabled = true;
+            unlockBypassButton.Enabled = false;
+        }
+
+        public CfgUpdateFlags VerifyCfg(ref string message)
 		{
             return CfgUpdateFlags.None;
 		}
@@ -128,7 +159,6 @@ namespace TBF.Rig.Output.DB.ProductionTracing
 			}
 
             flags |= UpdateDifferent(ref config.ConnStr, connStrTextBox.Text, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd);
-            flags |= UpdateDifferent(ref config.ConnStr2, connStr2TextBox.Text, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd);
             flags |= UpdateDifferent(ref config.CheckPreviousRecords, checkPreviousRecordsCheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd);
             flags |= UpdateDifferent(ref config.SaveTracingRecords, saveTracingRecordsCheckBox.Checked, CfgUpdateFlags.AnyChange | CfgUpdateFlags.RestartRqrd);
 
@@ -144,5 +174,54 @@ namespace TBF.Rig.Output.DB.ProductionTracing
 
 			return flags;
 		}
-	}
+
+        private void setCyclesToSkipButton_Click(object sender, EventArgs e)
+        {
+            int cyclesToSkip = 0;
+            if (!int.TryParse(cyclesToBypassTextBox.Text, out cyclesToSkip) || cyclesToSkip < 0 || cyclesToSkip > 20)
+            {
+                MessageBox.Show(string.Format(Strings.Invalid_0, "(0..20)"));
+                return;
+            }
+
+            Tracing.OnDataChange(this, new DataChangeArgs(CfgChangeCmd.SetData, new IntBox(cyclesToSkip)));
+        }
+
+        private void getCyclesToSkipButton_Click(object sender, EventArgs e)
+        {
+            Tracing.OnDataChange(this, new DataChangeArgs(CfgChangeCmd.GetData, null));
+        }
+
+
+        #region Data Change Handling
+
+        public static void OnCmdResponse(object sender, CmdResponseArgs args)
+        {
+            if (CmdResponseHandler == null) return;
+            try { CmdResponseHandler(sender, args); }
+            catch (Exception e) { log.Error("CmdResponseHandler(...) failed", e); }
+        }
+
+        public static event EventHandler<CmdResponseArgs> CmdResponseHandler;
+
+        public void StartResponseHandler()
+        {
+            CmdResponseHandler += DoCmdResponse;
+        }
+
+        public void StopResponseHandler()
+        {
+            CmdResponseHandler -= DoCmdResponse;
+        }
+
+        void DoCmdResponse(object sender, CmdResponseArgs args)
+        {
+            if (args.Command == CfgChangeCmd.GetData)
+            {
+                cyclesToBypassTextBox2.Text = args.Response.ToString();
+            }
+        }
+
+        #endregion Configuration Change Handling
+    }
 }

TBF/Rig/Output/DB/ProductionTracing/TracingCfgCtrl.designer.cs

@@ -40,8 +40,15 @@ namespace TBF.Rig.Output.DB.ProductionTracing
             this.checkPreviousRecordsCheckBox = new System.Windows.Forms.CheckBox();
             this.netAdapterLabel = new System.Windows.Forms.Label();
             this.netAdapterComboBox = new System.Windows.Forms.ComboBox();
-            this.connStr2TextBox = new System.Windows.Forms.TextBox();
-            this.connStr2Label = new System.Windows.Forms.Label();
+            this.cyclesToBypassTextBox = new System.Windows.Forms.TextBox();
+            this.setCyclesToBypassButton = new System.Windows.Forms.Button();
+            this.getCyclesToBypassButton = new System.Windows.Forms.Button();
+            this.cyclesToBypassTextBox2 = new System.Windows.Forms.TextBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.bypassGroupBox = new System.Windows.Forms.GroupBox();
+            this.unlockBypassButton = new System.Windows.Forms.Button();
+            this.bypassGroupBox.SuspendLayout();
             this.SuspendLayout();
             // 
             // nameTextBox
@@ -73,7 +80,7 @@ namespace TBF.Rig.Output.DB.ProductionTracing
             // connStrTextBox
             // 
             this.connStrTextBox.Enabled = false;
-            this.connStrTextBox.Location = new System.Drawing.Point(8, 74);
+            this.connStrTextBox.Location = new System.Drawing.Point(8, 79);
             this.connStrTextBox.Name = "connStrTextBox";
             this.connStrTextBox.Size = new System.Drawing.Size(435, 20);
             this.connStrTextBox.TabIndex = 4;
@@ -81,7 +88,7 @@ namespace TBF.Rig.Output.DB.ProductionTracing
             // connStrLabel
             // 
             this.connStrLabel.AutoSize = true;
-            this.connStrLabel.Location = new System.Drawing.Point(5, 58);
+            this.connStrLabel.Location = new System.Drawing.Point(5, 63);
             this.connStrLabel.Name = "connStrLabel";
             this.connStrLabel.Size = new System.Drawing.Size(92, 13);
             this.connStrLabel.TabIndex = 3;
@@ -91,7 +98,7 @@ namespace TBF.Rig.Output.DB.ProductionTracing
             // 
             this.saveTracingRecordsCheckBox.AutoSize = true;
             this.saveTracingRecordsCheckBox.Enabled = false;
-            this.saveTracingRecordsCheckBox.Location = new System.Drawing.Point(117, 221);
+            this.saveTracingRecordsCheckBox.Location = new System.Drawing.Point(117, 181);
             this.saveTracingRecordsCheckBox.Name = "saveTracingRecordsCheckBox";
             this.saveTracingRecordsCheckBox.Size = new System.Drawing.Size(177, 17);
             this.saveTracingRecordsCheckBox.TabIndex = 10;
@@ -102,7 +109,7 @@ namespace TBF.Rig.Output.DB.ProductionTracing
             // 
             this.checkPreviousRecordsCheckBox.AutoSize = true;
             this.checkPreviousRecordsCheckBox.Enabled = false;
-            this.checkPreviousRecordsCheckBox.Location = new System.Drawing.Point(117, 199);
+            this.checkPreviousRecordsCheckBox.Location = new System.Drawing.Point(117, 159);
             this.checkPreviousRecordsCheckBox.Name = "checkPreviousRecordsCheckBox";
             this.checkPreviousRecordsCheckBox.Size = new System.Drawing.Size(138, 17);
             this.checkPreviousRecordsCheckBox.TabIndex = 9;
@@ -112,7 +119,7 @@ namespace TBF.Rig.Output.DB.ProductionTracing
             // netAdapterLabel
             // 
             this.netAdapterLabel.AutoSize = true;
-            this.netAdapterLabel.Location = new System.Drawing.Point(5, 147);
+            this.netAdapterLabel.Location = new System.Drawing.Point(5, 107);
             this.netAdapterLabel.Name = "netAdapterLabel";
             this.netAdapterLabel.Size = new System.Drawing.Size(89, 13);
             this.netAdapterLabel.TabIndex = 7;
@@ -122,34 +129,95 @@ namespace TBF.Rig.Output.DB.ProductionTracing
             // 
             this.netAdapterComboBox.Enabled = false;
             this.netAdapterComboBox.FormattingEnabled = true;
-            this.netAdapterComboBox.Location = new System.Drawing.Point(8, 163);
+            this.netAdapterComboBox.Location = new System.Drawing.Point(8, 123);
             this.netAdapterComboBox.Name = "netAdapterComboBox";
             this.netAdapterComboBox.Size = new System.Drawing.Size(435, 21);
             this.netAdapterComboBox.TabIndex = 8;
             // 
-            // connStr2TextBox
+            // cyclesToBypassTextBox
             // 
-            this.connStr2TextBox.Enabled = false;
-            this.connStr2TextBox.Location = new System.Drawing.Point(8, 118);
-            this.connStr2TextBox.Name = "connStr2TextBox";
-            this.connStr2TextBox.Size = new System.Drawing.Size(434, 20);
-            this.connStr2TextBox.TabIndex = 6;
+            this.cyclesToBypassTextBox.Enabled = false;
+            this.cyclesToBypassTextBox.Location = new System.Drawing.Point(41, 25);
+            this.cyclesToBypassTextBox.Name = "cyclesToBypassTextBox";
+            this.cyclesToBypassTextBox.Size = new System.Drawing.Size(50, 20);
+            this.cyclesToBypassTextBox.TabIndex = 11;
             // 
-            // connStr2Label
+            // setCyclesToBypassButton
             // 
-            this.connStr2Label.AutoSize = true;
-            this.connStr2Label.Location = new System.Drawing.Point(5, 102);
-            this.connStr2Label.Name = "connStr2Label";
-            this.connStr2Label.Size = new System.Drawing.Size(101, 13);
-            this.connStr2Label.TabIndex = 5;
-            this.connStr2Label.Text = "Connection string 2:";
+            this.setCyclesToBypassButton.Enabled = false;
+            this.setCyclesToBypassButton.Location = new System.Drawing.Point(113, 23);
+            this.setCyclesToBypassButton.Name = "setCyclesToBypassButton";
+            this.setCyclesToBypassButton.Size = new System.Drawing.Size(163, 23);
+            this.setCyclesToBypassButton.TabIndex = 13;
+            this.setCyclesToBypassButton.Text = "Set number of cycles to bypass";
+            this.setCyclesToBypassButton.UseVisualStyleBackColor = true;
+            this.setCyclesToBypassButton.Click += new System.EventHandler(this.setCyclesToSkipButton_Click);
+            // 
+            // getCyclesToBypassButton
+            // 
+            this.getCyclesToBypassButton.Location = new System.Drawing.Point(41, 59);
+            this.getCyclesToBypassButton.Name = "getCyclesToBypassButton";
+            this.getCyclesToBypassButton.Size = new System.Drawing.Size(163, 23);
+            this.getCyclesToBypassButton.TabIndex = 14;
+            this.getCyclesToBypassButton.Text = "Get number of cycles to bypass";
+            this.getCyclesToBypassButton.UseVisualStyleBackColor = true;
+            this.getCyclesToBypassButton.Click += new System.EventHandler(this.getCyclesToSkipButton_Click);
+            // 
+            // cyclesToBypassTextBox2
+            // 
+            this.cyclesToBypassTextBox2.Location = new System.Drawing.Point(226, 61);
+            this.cyclesToBypassTextBox2.Name = "cyclesToBypassTextBox2";
+            this.cyclesToBypassTextBox2.Size = new System.Drawing.Size(50, 20);
+            this.cyclesToBypassTextBox2.TabIndex = 15;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(93, 28);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(19, 13);
+            this.label1.TabIndex = 16;
+            this.label1.Text = "-->";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(205, 64);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(19, 13);
+            this.label2.TabIndex = 17;
+            this.label2.Text = "-->";
+            // 
+            // bypassGroupBox
+            // 
+            this.bypassGroupBox.Controls.Add(this.getCyclesToBypassButton);
+            this.bypassGroupBox.Controls.Add(this.label2);
+            this.bypassGroupBox.Controls.Add(this.cyclesToBypassTextBox);
+            this.bypassGroupBox.Controls.Add(this.label1);
+            this.bypassGroupBox.Controls.Add(this.setCyclesToBypassButton);
+            this.bypassGroupBox.Controls.Add(this.cyclesToBypassTextBox2);
+            this.bypassGroupBox.Location = new System.Drawing.Point(118, 222);
+            this.bypassGroupBox.Name = "bypassGroupBox";
+            this.bypassGroupBox.Size = new System.Drawing.Size(324, 99);
+            this.bypassGroupBox.TabIndex = 18;
+            this.bypassGroupBox.TabStop = false;
+            // 
+            // unlockBypassButton
+            // 
+            this.unlockBypassButton.Location = new System.Drawing.Point(8, 228);
+            this.unlockBypassButton.Name = "unlockBypassButton";
+            this.unlockBypassButton.Size = new System.Drawing.Size(100, 93);
+            this.unlockBypassButton.TabIndex = 19;
+            this.unlockBypassButton.Text = "Unlock a bypass";
+            this.unlockBypassButton.UseVisualStyleBackColor = true;
+            this.unlockBypassButton.Click += new System.EventHandler(this.unlockSkipCyclesButton_Click);
             // 
             // TracingCfgCtrl
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.connStr2TextBox);
-            this.Controls.Add(this.connStr2Label);
+            this.Controls.Add(this.unlockBypassButton);
+            this.Controls.Add(this.bypassGroupBox);
             this.Controls.Add(this.netAdapterComboBox);
             this.Controls.Add(this.netAdapterLabel);
             this.Controls.Add(this.saveTracingRecordsCheckBox);
@@ -160,8 +228,10 @@ namespace TBF.Rig.Output.DB.ProductionTracing
             this.Controls.Add(this.nameLabel);
             this.Controls.Add(this.classNameLabel);
             this.Name = "TracingCfgCtrl";
-            this.Size = new System.Drawing.Size(450, 250);
+            this.Size = new System.Drawing.Size(450, 350);
             this.Load += new System.EventHandler(this.WriterCfgCtrl_Load);
+            this.bypassGroupBox.ResumeLayout(false);
+            this.bypassGroupBox.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -178,7 +248,13 @@ namespace TBF.Rig.Output.DB.ProductionTracing
         private System.Windows.Forms.CheckBox checkPreviousRecordsCheckBox;
         private System.Windows.Forms.Label netAdapterLabel;
         private System.Windows.Forms.ComboBox netAdapterComboBox;
-        private System.Windows.Forms.TextBox connStr2TextBox;
-        private System.Windows.Forms.Label connStr2Label;
-	}
+        private System.Windows.Forms.TextBox cyclesToBypassTextBox;
+        private System.Windows.Forms.Button setCyclesToBypassButton;
+        private System.Windows.Forms.Button getCyclesToBypassButton;
+        private System.Windows.Forms.TextBox cyclesToBypassTextBox2;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.GroupBox bypassGroupBox;
+        private System.Windows.Forms.Button unlockBypassButton;
+    }
 }

TBF/Rig/Output/DB/SensusOracle/Database.cs

@@ -5,17 +5,14 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using log4net;
-#if MANAGED
 using Oracle.ManagedDataAccess.Client;
-#else
-using Oracle.DataAccess.Client;
-#endif
 using Common;
 using Config;
 using Config.Entities;
 using Results.Output;
 using System.Text;
 using Events.Entities;
+using Results;
 
 namespace TBF.Rig.Output.DB.SensusOracle
 {
@@ -112,9 +109,10 @@ namespace TBF.Rig.Output.DB.SensusOracle
         string procedureSignature;
         IList<SensusTestInfo> oracleTestInfo;   /// Raw incomplete test info from Oracle DB (or null)
         LUTestData[] completeTestInfo;          /// Complete test info obtained from the procedure
+        LUTestData[] distinctTestInfo;          /// Distinct test info obtained from the procedure - if Q3 is splitted to 2 parts, test info is only for one Q3
 
 
-		public Database() {}
+        public Database() {}
 
 		public Database(Generic.IComponentCfg cfg)
             : base(cfg)
@@ -394,10 +392,45 @@ namespace TBF.Rig.Output.DB.SensusOracle
             currentOpState = OpState.None;
 		}
 
-
 #if ORACLE_DB
+        void GetTestInfoFromProcedure(string logCaption)
+        {
+            ///
+            /// Select or create appropriate test infos
+            ///
+            IList<LUTestData> testsToSave = new List<LUTestData>();
+            int maxPruefungsNr = 0;
+            foreach (var td in Sequences.ProcessData.BatchRslts.Batch.Tests)
+            {
+                for (int repNr = 1; repNr <= td.Repeats; repNr++)
+                {
+                    int testId = td.OraId + (td.Repeats - repNr) * td.OraIdRepetMulti;
+                    if (testId != 0)
+                    {
+                        testsToSave.Add(new LUTestData(td, repNr));
+                        if (Math.Abs(testId) > maxPruefungsNr) maxPruefungsNr = Math.Abs(testId);
+                    }
+                }
+            }
+            LUTestData[] testsToSaveArr = testsToSave.ToArray();
+            Array.Sort(testsToSaveArr, new LUTestDataComparer());
+            completeTestInfo = testsToSaveArr;
+
+            distinctTestInfo = testsToSave.GroupBy(x => x.TData.OraId).Select(group => group.First()).ToArray();
+            Array.Sort(distinctTestInfo, new LUTestDataComparer());
+
+            log.WarnFormat("{0} selected test infos:", logCaption);
+            foreach (var cti in distinctTestInfo)
+            {
+                log.WarnFormat("   ID={0} Rev={1} Test={2} PrfNrDB={3} QBzDB={4}",
+                               wmTypeId, wmTypeRevision, cti.TestName, cti.Id, cti.Designation);
+            }
+        }
+
         public Retv ReadStartInfoFromDB(OracleConnection conn)
 		{
+            GetTestInfoFromProcedure("ReadStartInfoFromDB");    /// Create appropriate test infos
+
             bool anyError = false;
             try
             {
@@ -420,9 +453,9 @@ namespace TBF.Rig.Output.DB.SensusOracle
             return anyError ? Retv.Error : Retv.OK;
         }
 
-		/// <summary>
-		/// Read start info of one water meter from the database
- 		/// </summary>
+        /// <summary>
+        /// Read start info of one water meter from the database
+        /// </summary>
         /// <param name="conn">Oracke DB connection</param>
         /// <param name="wm">Water meter entity</param>
         /// <returns>Retv.OK when successful, Retv.Error on error</returns>
@@ -790,35 +823,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
                 throw new Exception(string.Format("Cannot save batch {0} to Oracle, missing entry in VT_WZTYP_SD", bat.BatchNr));
             }
 
-            ///
-            /// Select or create appropriate test infos
-            ///
-            IList<LUTestData> testsToSave = new List<LUTestData>();
-            int maxPruefungsNr = 0;
-            double totalTestTime = 0;
-            foreach (var td in bat.Tests)
-            {
-                for (int repNr = 1; repNr <= td.Repeats; repNr++)
-                {
-                    int testId = td.OraId + (td.Repeats - repNr) * td.OraIdRepetMulti;
-                    if (testId != 0)
-                    {
-                        testsToSave.Add(new LUTestData(td, repNr));
-                        if (Math.Abs(testId) > maxPruefungsNr) maxPruefungsNr = Math.Abs(testId);
-                        totalTestTime += td.TargetTime;
-                    }
-                }
-            }
-            LUTestData[] testsToSaveArr = testsToSave.ToArray();
-            Array.Sort(testsToSaveArr, new LUTestDataComparer());
-            completeTestInfo = testsToSaveArr;
-
-            foreach (var cti in completeTestInfo)
-            {
-                log.WarnFormat("Selected test info : ID={0} Rev={1} Test={2} PrfNrDB={3} QBzDB={4}",
-                               wmTypeId, wmTypeRevision, cti.TestName, cti.Id, cti.Designation);
-            }
-
+            GetTestInfoFromProcedure("SaveBatchData");  /// Create appropriate test infos
 
             if (dbCfg.DebugLevel == DebugMode.Normal)
             {
@@ -854,7 +859,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
                 log.WarnFormat("SIM: VT_PRUEFREIHE_PD inserted, BatchNr={0}, TypeId={1}, TypeRev={2}, Start={3}", bat.BatchNr, bat.WaterMeters[0].WaterMeterData.WMTypeId, wmTypeRevision, bat.StartTime);
             }
 
-            foreach (var testInfo in completeTestInfo)
+            foreach (var testInfo in distinctTestInfo)
             {
                 if ((testInfo.Id != 0) && (-20 <= testInfo.Id) && (testInfo.Id <= 20))      /// LU PruefungsNr-s are between -20 and 20
                 {
@@ -1061,7 +1066,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
                 cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = dbCfg.TestBenchGroupId + wm.Batch.TestBenchId });
                 cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = wm.Batch.BatchNr });
                 cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = hydr_Pruefung });
-                cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = wm.OrigCalibFactor });
+                cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = wm.CalibFactor }); // korrimprate - should be new calib.factor, not wm.OrigCalibFactor
                 cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 });               /// TODO: pressure test
                 cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = wm.WMPosition });
                 cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = wm.Passed ? 1 : 0 });
@@ -1077,7 +1082,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
             }
 
 
-            foreach (var testInfo in completeTestInfo)
+            foreach (var testInfo in distinctTestInfo)
             {
                 if ((testInfo.Id != 0) && (-20 <= testInfo.Id) && (testInfo.Id <= 20))  /// LU PruefungsNr-s are nonzero and between -20 and 20
                 {
@@ -1294,7 +1299,7 @@ namespace TBF.Rig.Output.DB.SensusOracle
                 cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = dbCfg.TestBenchGroupId + wm.Batch.TestBenchId });
                 cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = wm.Batch.BatchNr });
                 cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = hydr_Pruefung });
-                cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = wm.OrigCalibFactor });
+                cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Double, Value = wm.CalibFactor });
                 cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = 0 });               /// TODO
                 cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = wm.WMPosition });
                 cmd.Parameters.Add(new OracleParameter { OracleDbType = OracleDbType.Int32, Value = wm.Passed ? 1 : 0 });

TBF/Rig/Output/Printers/Enhanced/Printer.cs

@@ -3,9 +3,10 @@
 ///
 using System;
 using System.Collections.Generic;
-using System.Drawing.Printing;
 using System.Globalization;
 using System.Threading;
+using Common;
+using Common.Forms;
 using Results.Output.Printers.Enhanced;
 using log4net;
 
@@ -31,8 +32,12 @@ namespace TBF.Rig.Output.Printers.Enhanced
 		IList<Results.WMeterRsltItemSpec> testItems;
 		string footer;
 
+        bool printingCompleted = false;
+        bool statusDlgShown = false;
+        ModelessForm modelessForm;
 
-		public Printer() { }
+
+        public Printer() { }
 
 		public Printer(Generic.IComponentCfg cfg)
 			: base(cfg)
@@ -43,10 +48,19 @@ namespace TBF.Rig.Output.Printers.Enhanced
         public override void Initialize()
         {
             ApplyConfig();
-            log.FatalFormat("{0} initialized: {1}", Name, this);
+            if (printerCfg.DebugLevel == DebugMode.Normal)
+            {
+                string message;
+                if (!PrinterStatus.IsOnline(printerCfg.PrinterName, out message)) throw new ApplicationException(message);
+                log.FatalFormat("{0} initialized: {1}", Name, this);
+            }
+            else
+            {
+                log.FatalFormat("{0} simulated: {1}", Name, this);
+            }
         }
 
-		void ApplyConfig()
+        void ApplyConfig()
 		{
 			header = string.IsNullOrEmpty(printerCfg.Header) ? string.Empty : printerCfg.Header.Replace("~", Environment.NewLine);
 			commonItems = Results.WMeterRsltItemSpec.FromStrArray(printerCfg.CommonItems);
@@ -132,38 +146,67 @@ namespace TBF.Rig.Output.Printers.Enhanced
 		/// <summary>Start this operation</summary>
 		public void Start()
 		{
-            CultureInfo oriCulture = Thread.CurrentThread.CurrentCulture;
-
-            if (printerCfg.Culture != Culture.system)
-            {
-                Thread.CurrentThread.CurrentCulture = new CultureInfo(printerCfg.Culture.ToString());
-            }
-
-            string documentName;
-            try
-            {
-                if (string.IsNullOrEmpty(printerCfg.DocName)) throw (new Exception());
-                documentName = string.Format(printerCfg.DocName, batch.StartTime, batch.EndTime, batch.BatchNr);
-            }
-            catch
-            {
-                documentName = string.Format("{0:yyyyMMdd-HHmm}", batch.EndTime);
-            }
-
-            PrintResults(batch, documentName);
-
-            Thread.CurrentThread.CurrentCulture = oriCulture;
+            printingCompleted = false;
+            statusDlgShown = false;
         }
 
 		/// <summary>Run this operation</summary>
 		/// <returns>Event.ResultsPrinted</returns>
 		public Event Run()
 		{
-			return Event.ResultsPrinted;
-		}
+            string message;
+            if (printingCompleted || printerCfg.DebugLevel != DebugMode.Normal)
+            {
+                return Event.ResultsPrinted;
+            }
+            else if (PrinterStatus.IsOnline(printerCfg.PrinterName, out message))
+            {
+                if (statusDlgShown)
+                {
+                    statusDlgShown = false;
+                    if (modelessForm != null) modelessForm.Close();
+                }
 
-		/// <summary>Stop this operation</summary>
-		public void Stop()
+                /// Printer is online  =>  Print results now
+                CultureInfo oriCulture = Thread.CurrentThread.CurrentCulture;
+                if (printerCfg.Culture != Culture.system)
+                {
+                    Thread.CurrentThread.CurrentCulture = new CultureInfo(printerCfg.Culture.ToString());
+                }
+
+                string documentName;
+                try
+                {
+                    if (string.IsNullOrEmpty(printerCfg.DocName)) throw (new Exception());
+                    documentName = string.Format(printerCfg.DocName, batch.StartTime, batch.EndTime, batch.BatchNr);
+                }
+                catch
+                {
+                    documentName = string.Format("{0:yyyyMMdd-HHmm}", batch.EndTime);
+                }
+
+                PrintResults(batch, documentName);
+
+                Thread.CurrentThread.CurrentCulture = oriCulture;
+
+                printingCompleted = true;
+                return Event.ResultsPrinted;
+            }
+            else
+            {
+                if (!statusDlgShown)
+                {
+                    statusDlgShown = true;
+                    modelessForm = new ModelessForm(message);
+                    new Thread(() => System.Windows.Forms.Application.Run(modelessForm)).Start();
+                }
+
+                return Event.Busy;
+            }
+        }
+
+        /// <summary>Stop this operation</summary>
+        public void Stop()
 		{
 		}
 
@@ -206,7 +249,7 @@ namespace TBF.Rig.Output.Printers.Enhanced
                 for (int i = 1; i <= printerCfg.NrOfCopies; i++)
                 {
                     string docName = string.Format(((printerCfg.NrOfCopies == 1) ? "{0}" : "{0}-{1}"), documentName, i);
-                    var pd = new Results.Output.Printers.Enhanced.EnhancedPrintDocument(batch, cfg, docName);
+                    var pd = new EnhancedPrintDocument(batch, cfg, docName);
                     if (!string.IsNullOrEmpty(printerCfg.PrinterName)) pd.PrinterSettings.PrinterName = printerCfg.PrinterName;
                     pd.Print();
                 }

TBF/Rig/Output/Printers/Enhanced/PrinterCfgCtrl.cs

@@ -74,7 +74,6 @@ namespace TBF.Rig.Output.Printers.Enhanced
 
 		void Localize()
 		{
-            classNameLabel.Text = config.ClassName;
 			nameLabel.Text = Strings.Name;
             printerLabel.Text = Strings.Printer;
             selectPrinterButton.Text = "Select";
@@ -92,7 +91,9 @@ namespace TBF.Rig.Output.Printers.Enhanced
 		void Redraw()
 		{
 			if (config == null) return;			/// Control was not loaded, settings were not changed
-			nameTextBox.Text = config.Name;
+
+            classNameLabel.Text = config.ClassName;
+            nameTextBox.Text = config.Name;
             printerComboBox.Text = string.IsNullOrEmpty(config.PrinterName) ? Strings.default_printer : config.PrinterName;
             templateTextBox.Text = config.Template;
             orientationComboBox.Text = config.PageOrientation.ToString();

TBF/Rig/Output/Printers/Label/Printer.cs

@@ -6,6 +6,8 @@ using System.Collections.Generic;
 using log4net;
 using System.Globalization;
 using System.Threading;
+using Common;
+using Common.Forms;
 using Results.Output.Printers.Label;
 
 namespace TBF.Rig.Output.Printers.Label
@@ -19,16 +21,13 @@ namespace TBF.Rig.Output.Printers.Label
 
 		public bool SupressPrinting { get { return (printerCfg.NrOfCopies == 0); } }
 
-		/// <summary> Data to print </summary>
-		Results.Entities.Batch batch;
+		Results.Entities.Batch batch;					/// Data to print
+        IList<Results.WMeterRsltItemSpec> commonItems;  /// Items to print
+		bool printingCompleted = false;
+        bool statusDlgShown = false;
+        ModelessForm modelessForm;
 
-		///
-		/// Items to print
-		///
-		IList<Results.WMeterRsltItemSpec> commonItems;
-
-
-		public Printer() { }
+        public Printer() { }
 
 		public Printer(Generic.IComponentCfg cfg)
 			: base(cfg)
@@ -39,10 +38,19 @@ namespace TBF.Rig.Output.Printers.Label
         public override void Initialize()
         {
             ApplyConfig();
-            log.FatalFormat("{0} initialized: {1}", Name, this);
+            if (printerCfg.DebugLevel == DebugMode.Normal)
+            {
+                string message;
+                if (!PrinterStatus.IsOnline(printerCfg.PrinterName, out message)) throw new ApplicationException(message);
+                log.FatalFormat("{0} initialized: {1}", Name, this);
+            }
+            else
+            {
+                log.FatalFormat("{0} simulated: {1}", Name, this);
+            }
         }
 
-		void ApplyConfig()
+        void ApplyConfig()
 		{
 			commonItems = Results.WMeterRsltItemSpec.FromStrArray(printerCfg.ItemsToPrint);
 		}
@@ -108,29 +116,58 @@ namespace TBF.Rig.Output.Printers.Label
 		/// <summary>Start this operation</summary>
 		public void Start()
 		{
-            CultureInfo oriCulture = Thread.CurrentThread.CurrentCulture;
+            printingCompleted = false;
+            statusDlgShown = false;
+        }
 
-            if (printerCfg.Culture != Culture.system)
-            {
-                Thread.CurrentThread.CurrentCulture = new CultureInfo(printerCfg.Culture.ToString());
-            }
-
-            foreach (var wm in batch.WaterMeters)
-            {
-                if (wm != null && (!printerCfg.GoodOnly || wm.Passed))
-                {
-                    PrintResults(batch, wm, string.Format("{0}-{1}", batch.BatchNr, wm.WMPosition));
-                }
-            }
-
-            Thread.CurrentThread.CurrentCulture = oriCulture;
-		}
-
-		/// <summary>Run this operation</summary>
-		/// <returns>Event.ResultsPrinted</returns>
-		public Event Run()
+        /// <summary>Run this operation</summary>
+        /// <returns>Event.ResultsPrinted</returns>
+        public Event Run()
 		{
-			return Event.ResultsPrinted;
+			string message;
+			if (printingCompleted || printerCfg.DebugLevel != DebugMode.Normal)
+			{
+                return Event.ResultsPrinted;
+            }
+            else if (PrinterStatus.IsOnline(printerCfg.PrinterName, out message))
+			{
+                if (statusDlgShown)
+                {
+                    statusDlgShown = false;
+                    if (modelessForm != null) modelessForm.Close();
+                }
+
+                /// Printer is online  =>  Print results now
+                CultureInfo oriCulture = Thread.CurrentThread.CurrentCulture;
+                if (printerCfg.Culture != Culture.system)
+                {
+                    Thread.CurrentThread.CurrentCulture = new CultureInfo(printerCfg.Culture.ToString());
+                }
+
+                foreach (var wm in batch.WaterMeters)
+                {
+                    if (wm != null && !wm.Disabled && wm.PrintLabel && (!printerCfg.GoodOnly || wm.Passed))
+                    {
+                        PrintResults(batch, wm, string.Format("{0}-{1}", batch.BatchNr, wm.WMPosition));
+                    }
+                }
+
+                Thread.CurrentThread.CurrentCulture = oriCulture;
+
+                printingCompleted = true;
+                return Event.ResultsPrinted;
+            }
+            else
+			{
+                if (!statusDlgShown)
+                {
+                    statusDlgShown = true;
+                    modelessForm = new ModelessForm(message);
+                    new Thread(() => System.Windows.Forms.Application.Run(modelessForm)).Start();
+                }
+
+                return Event.Busy;
+			}
 		}
 
 		/// <summary>Stop this operation</summary>

TBF/Rig/Output/Printers/MultiLabel/Printer.cs

@@ -3,9 +3,11 @@
 ///
 using System;
 using System.Collections.Generic;
-using log4net;
 using System.Globalization;
 using System.Threading;
+using log4net;
+using Common;
+using Common.Forms;
 using Results.Output.Printers.MultiLabel;
 
 namespace TBF.Rig.Output.Printers.MultiLabel
@@ -27,8 +29,12 @@ namespace TBF.Rig.Output.Printers.MultiLabel
 		///
 		IList<Results.WMeterRsltItemSpec> commonItems;
 
+        bool printingCompleted = false;
+        bool statusDlgShown = false;
+        ModelessForm modelessForm;
 
-		public Printer() { }
+
+        public Printer() { }
 
 		public Printer(Generic.IComponentCfg cfg)
 			: base(cfg)
@@ -39,10 +45,19 @@ namespace TBF.Rig.Output.Printers.MultiLabel
         public override void Initialize()
         {
             ApplyConfig();
-            log.FatalFormat("{0} initialized: {1}", Name, this);
+            if (printerCfg.DebugLevel == DebugMode.Normal)
+            {
+                string message;
+                if (!PrinterStatus.IsOnline(printerCfg.PrinterName, out message)) throw new ApplicationException(message);
+                log.FatalFormat("{0} initialized: {1}", Name, this);
+            }
+            else
+            {
+                log.FatalFormat("{0} simulated: {1}", Name, this);
+            }
         }
 
-		void ApplyConfig()
+        void ApplyConfig()
 		{
 			commonItems = Results.WMeterRsltItemSpec.FromStrArray(printerCfg.ItemsToPrint);
 		}
@@ -112,27 +127,56 @@ namespace TBF.Rig.Output.Printers.MultiLabel
 		/// <summary>Start this operation</summary>
 		public void Start()
 		{
-            CultureInfo oriCulture = Thread.CurrentThread.CurrentCulture;
+            printingCompleted = false;
+            statusDlgShown = false;
+        }
 
-            if (printerCfg.Culture != Culture.system)
-            {
-                Thread.CurrentThread.CurrentCulture = new CultureInfo(printerCfg.Culture.ToString());
-            }
-
-            PrintResults(batch, string.Format("{0}", batch.BatchNr));
-
-            Thread.CurrentThread.CurrentCulture = oriCulture;
-		}
-
-		/// <summary>Run this operation</summary>
-		/// <returns>Event.ResultsPrinted</returns>
-		public Event Run()
+        /// <summary>Run this operation</summary>
+        /// <returns>Event.ResultsPrinted</returns>
+        public Event Run()
 		{
-			return Event.ResultsPrinted;
-		}
+            string message;
+            if (printingCompleted || printerCfg.DebugLevel != DebugMode.Normal)
+            {
+                return Event.ResultsPrinted;
+            }
+            else if (PrinterStatus.IsOnline(printerCfg.PrinterName, out message))
+            {
+                if (statusDlgShown)
+                {
+                    statusDlgShown = false;
+                    if (modelessForm != null) modelessForm.Close();
+                }
 
-		/// <summary>Stop this operation</summary>
-		public void Stop()
+                /// Printer is online  =>  Print results now
+                CultureInfo oriCulture = Thread.CurrentThread.CurrentCulture;
+                if (printerCfg.Culture != Culture.system)
+                {
+                    Thread.CurrentThread.CurrentCulture = new CultureInfo(printerCfg.Culture.ToString());
+                }
+
+                PrintResults(batch, string.Format("{0}", batch.BatchNr));
+
+                Thread.CurrentThread.CurrentCulture = oriCulture;
+
+                printingCompleted = true;
+                return Event.ResultsPrinted;
+            }
+            else
+            {
+                if (!statusDlgShown)
+                {
+                    statusDlgShown = true;
+                    modelessForm = new ModelessForm(message);
+                    new Thread(() => System.Windows.Forms.Application.Run(modelessForm)).Start();
+                }
+
+                return Event.Busy;
+            }
+        }
+
+        /// <summary>Stop this operation</summary>
+        public void Stop()
 		{
 		}
 

TBF/Rig/Output/Printers/Munich/Printer.cs

@@ -2,12 +2,12 @@
 /// Copyright (c) 2013-2023 Sensus Slovensko a.s.
 ///
 using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Printing;
 using log4net;
-using Config.Entities;
-using TBF.Rig;
+using Common;
+using Common.Forms;
+using Results.Output.Printers.Munich;
+using System.Globalization;
+using System.Threading;
 
 namespace TBF.Rig.Output.Printers.Munich
 {
@@ -24,6 +24,10 @@ namespace TBF.Rig.Output.Printers.Munich
 		/// <summary> Data to print </summary>
 		Results.Entities.Batch batch;
 
+        bool printingCompleted = false;
+        bool statusDlgShown = false;
+        ModelessForm modelessForm;
+
         public string Version { get { return printerCfg.Version; } }
 
 
@@ -37,14 +41,23 @@ namespace TBF.Rig.Output.Printers.Munich
 
         public override void Initialize()
         {
-            log.FatalFormat("{0} initialized: {1}", Name, this);
+            if (printerCfg.DebugLevel == DebugMode.Normal)
+            {
+                string message;
+                if (!PrinterStatus.IsOnline(printerCfg.PrinterName, out message)) throw new ApplicationException(message);
+                log.FatalFormat("{0} initialized: {1}", Name, this);
+            }
+            else
+            {
+                log.FatalFormat("{0} simulated: {1}", Name, this);
+            }
         }
 
 
-		/// <summary>Events:  ResultsPrinted</summary>
-		/// <param name="benchId">Procedure to print the results of</param>
-		/// <param name="results">Results to print</param>
-		/// <returns>Reference to the operation</returns>
+        /// <summary>Events:  ResultsPrinted</summary>
+        /// <param name="benchId">Procedure to print the results of</param>
+        /// <param name="results">Results to print</param>
+        /// <returns>Reference to the operation</returns>
         public IOperation ProcessResultsOp(Results.Entities.Batch batch)
 		{
 			this.batch = batch;
@@ -54,23 +67,53 @@ namespace TBF.Rig.Output.Printers.Munich
 		/// <summary>Start this operation</summary>
 		public void Start()
 		{
-			foreach (var wm in batch.WaterMeters)
-			{
-                var pd = new Results.Output.Printers.Munich.MunichPrintDocument(printerCfg.Version, wm, printerCfg.PageOrientation);
-                if (!string.IsNullOrEmpty(printerCfg.PrinterName)) pd.PrinterSettings.PrinterName = printerCfg.PrinterName;
-                pd.Print();
-            }
-		}
+            printingCompleted = false;
+            statusDlgShown = false;
+        }
 
-		/// <summary>Run this operation</summary>
-		/// <returns>Event.ResultsPrinted</returns>
-		public Event Run()
+        /// <summary>Run this operation</summary>
+        /// <returns>Event.ResultsPrinted</returns>
+        public Event Run()
 		{
-			return Event.ResultsPrinted;
-		}
+            string message;
+            if (printingCompleted || printerCfg.DebugLevel != DebugMode.Normal)
+            {
+                return Event.ResultsPrinted;
+            }
+            else if (PrinterStatus.IsOnline(printerCfg.PrinterName, out message))
+            {
+                if (statusDlgShown)
+                {
+                    statusDlgShown = false;
+                    if (modelessForm != null) modelessForm.Close();
+                }
 
-		/// <summary>Stop this operation</summary>
-		public void Stop()
+                /// Printer is online  =>  Print results now
+                foreach (var wm in batch.WaterMeters)
+                {
+                    var pd = new MunichPrintDocument(printerCfg.Version, wm, printerCfg.PageOrientation);
+                    if (!string.IsNullOrEmpty(printerCfg.PrinterName)) pd.PrinterSettings.PrinterName = printerCfg.PrinterName;
+                    pd.Print();
+                }
+
+                printingCompleted = true;
+                return Event.ResultsPrinted;
+            }
+            else
+            {
+                if (!statusDlgShown)
+                {
+                    statusDlgShown = true;
+                    modelessForm = new ModelessForm(message);
+                    new Thread(() => System.Windows.Forms.Application.Run(modelessForm)).Start();
+                }
+
+                return Event.Busy;
+            }
+        }
+
+        /// <summary>Stop this operation</summary>
+        public void Stop()
 		{
 		}
 	}

TBF/Rig/Output/Printers/OnePerBatch/Printer.cs

@@ -5,9 +5,11 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Threading;
+using log4net;
+using Common;
+using Common.Forms;
 using Results.Entities;
 using Results.Output.Printers.OnePerBatch;
-using log4net;
 
 namespace TBF.Rig.Output.Printers.OnePerBatch
 {
@@ -31,8 +33,12 @@ namespace TBF.Rig.Output.Printers.OnePerBatch
 		IList<Results.WMeterRsltItemSpec> testItems;
 		string footer;
 
+        bool printingCompleted = false;
+        bool statusDlgShown = false;
+        ModelessForm modelessForm;
 
-		public Printer() { }
+
+        public Printer() { }
 
 		public Printer(Generic.IComponentCfg cfg)
 			: base(cfg)
@@ -43,10 +49,19 @@ namespace TBF.Rig.Output.Printers.OnePerBatch
         public override void Initialize()
         {
             ApplyConfig();
-            log.FatalFormat("{0} initialized: {1}", Name, this);
+            if (printerCfg.DebugLevel == DebugMode.Normal)
+            {
+                string message;
+                if (!PrinterStatus.IsOnline(printerCfg.PrinterName, out message)) throw new ApplicationException(message);
+                log.FatalFormat("{0} initialized: {1}", Name, this);
+            }
+            else
+            {
+                log.FatalFormat("{0} simulated: {1}", Name, this);
+            }
         }
 
-		void ApplyConfig()
+        void ApplyConfig()
 		{
 			header = string.IsNullOrEmpty(printerCfg.Header) ? string.Empty : printerCfg.Header.Replace("~", Environment.NewLine);
 			commonItems = Results.WMeterRsltItemSpec.FromStrArray(printerCfg.CommonItems1);
@@ -150,49 +165,78 @@ namespace TBF.Rig.Output.Printers.OnePerBatch
 		/// <summary>Start this operation</summary>
 		public void Start()
 		{
-            CultureInfo oriCulture = Thread.CurrentThread.CurrentCulture;
-
-            if (printerCfg.Culture != Culture.system)
-            {
-                Thread.CurrentThread.CurrentCulture = new CultureInfo(printerCfg.Culture.ToString());
-            }
-
-            foreach (var wm in batch.WaterMeters)
-            {
-                if (wm != null && !wm.Disabled && (!printerCfg.GoodOnly || wm.Passed))
-                {
-                    string documentName;
-                    try
-                    {
-                        if (string.IsNullOrEmpty(printerCfg.DocName)) throw (new Exception());
-                        documentName = string.Format(printerCfg.DocName, wm.StartTime(), wm.EndTime(), wm.BatchNr(), wm.WMPosition, wm.SerialNr);
-                    }
-                    catch
-                    {
-                        documentName = string.Format("{0}", batch.BatchNr, wm.WMPosition);
-                    }
-
-                    /// The following condition prevents printing empty AutoTest results protocols
-                    if (string.IsNullOrEmpty(printerCfg.AutoTestParam) || wm.AutoMeterTestRslts(printerCfg.AutoTestParam).Count > 0)
-                    {
-                        PrintResults(batch, wm, documentName);
-                        break;
-                    }
-                }
-            }
-
-            Thread.CurrentThread.CurrentCulture = oriCulture;
+            printingCompleted = false;
+            statusDlgShown = false;
         }
 
-		/// <summary>Run this operation</summary>
-		/// <returns>Event.ResultsPrinted</returns>
-		public Event Run()
+        /// <summary>Run this operation</summary>
+        /// <returns>Event.ResultsPrinted</returns>
+        public Event Run()
 		{
-				return Event.ResultsPrinted;
-		}
+            string message;
+            if (printingCompleted || printerCfg.DebugLevel != DebugMode.Normal)
+            {
+                return Event.ResultsPrinted;
+            }
+            else if (PrinterStatus.IsOnline(printerCfg.PrinterName, out message))
+            {
+                if (statusDlgShown)
+                {
+                    statusDlgShown = false;
+                    if (modelessForm != null) modelessForm.Close();
+                }
 
-		/// <summary>Stop this operation</summary>
-		public void Stop()
+                /// Printer is online  =>  Print results now
+                CultureInfo oriCulture = Thread.CurrentThread.CurrentCulture;
+                if (printerCfg.Culture != Culture.system)
+                {
+                    Thread.CurrentThread.CurrentCulture = new CultureInfo(printerCfg.Culture.ToString());
+                }
+
+                foreach (var wm in batch.WaterMeters)
+                {
+                    if (wm != null && !wm.Disabled && (!printerCfg.GoodOnly || wm.Passed))
+                    {
+                        string documentName;
+                        try
+                        {
+                            if (string.IsNullOrEmpty(printerCfg.DocName)) throw (new Exception());
+                            documentName = string.Format(printerCfg.DocName, wm.StartTime(), wm.EndTime(), wm.BatchNr(), wm.WMPosition, wm.SerialNr);
+                        }
+                        catch
+                        {
+                            documentName = string.Format("{0}", batch.BatchNr, wm.WMPosition);
+                        }
+
+                        /// The following condition prevents printing empty AutoTest results protocols
+                        if (string.IsNullOrEmpty(printerCfg.AutoTestParam) || wm.AutoMeterTestRslts(printerCfg.AutoTestParam).Count > 0)
+                        {
+                            PrintResults(batch, wm, documentName);
+                            break;
+                        }
+                    }
+                }
+
+                Thread.CurrentThread.CurrentCulture = oriCulture;
+
+                printingCompleted = true;
+                return Event.ResultsPrinted;
+            }
+            else
+            {
+                if (!statusDlgShown)
+                {
+                    statusDlgShown = true;
+                    modelessForm = new ModelessForm(message);
+                    new Thread(() => System.Windows.Forms.Application.Run(modelessForm)).Start();
+                }
+
+                return Event.Busy;
+            }
+        }
+
+        /// <summary>Stop this operation</summary>
+        public void Stop()
 		{
 		}
 

TBF/Rig/Output/Printers/OnePerMeter/Printer.cs

@@ -5,9 +5,11 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Threading;
+using log4net;
+using Common;
+using Common.Forms;
 using Results.Entities;
 using Results.Output.Printers.OnePerMeter;
-using log4net;
 
 namespace TBF.Rig.Output.Printers.OnePerMeter
 {
@@ -31,8 +33,12 @@ namespace TBF.Rig.Output.Printers.OnePerMeter
 		IList<Results.WMeterRsltItemSpec> testItems;
 		string footer;
 
+        bool printingCompleted = false;
+        bool statusDlgShown = false;
+        ModelessForm modelessForm;
 
-		public Printer() { }
+
+        public Printer() { }
 
 		public Printer(Generic.IComponentCfg cfg)
 			: base(cfg)
@@ -43,10 +49,19 @@ namespace TBF.Rig.Output.Printers.OnePerMeter
         public override void Initialize()
         {
             ApplyConfig();
-            log.FatalFormat("{0} initialized: {1}", Name, this);
+            if (printerCfg.DebugLevel == DebugMode.Normal)
+            {
+                string message;
+                if (!PrinterStatus.IsOnline(printerCfg.PrinterName, out message)) throw new ApplicationException(message);
+                log.FatalFormat("{0} initialized: {1}", Name, this);
+            }
+            else
+            {
+                log.FatalFormat("{0} simulated: {1}", Name, this);
+            }
         }
 
-		void ApplyConfig()
+        void ApplyConfig()
 		{
 			header = string.IsNullOrEmpty(printerCfg.Header) ? string.Empty : printerCfg.Header.Replace("~", Environment.NewLine);
 			commonItems = Results.WMeterRsltItemSpec.FromStrArray(printerCfg.CommonItems1);
@@ -154,45 +169,74 @@ namespace TBF.Rig.Output.Printers.OnePerMeter
 		/// <summary>Start this operation</summary>
 		public void Start()
 		{
-            CultureInfo oriCulture = Thread.CurrentThread.CurrentCulture;
-
-            if (printerCfg.Culture != Culture.system)
-            {
-                Thread.CurrentThread.CurrentCulture = new CultureInfo(printerCfg.Culture.ToString());
-            }
-
-            foreach (var wm in batch.WaterMeters)
-            {
-                if (wm != null && !wm.Disabled && (!printerCfg.GoodOnly || wm.Passed))
-                {
-                    string documentName;
-                    try
-                    {
-                        if (string.IsNullOrEmpty(printerCfg.DocName)) throw (new Exception());
-                        documentName = string.Format(printerCfg.DocName, wm.StartTime(), wm.EndTime(), wm.BatchNr(), wm.WMPosition, wm.SerialNr, wm.SerialNrAux);
-                        ///                                                  {0}             {1}           {2}           {3}            {4}          {5}
-                    }
-                    catch
-                    {
-                        documentName = string.Format("{0}-{1}", batch.BatchNr, wm.WMPosition);
-                    }
-
-                    PrintResults(batch, wm, documentName);
-                }
-            }
-
-            Thread.CurrentThread.CurrentCulture = oriCulture;
+            printingCompleted = false;
+            statusDlgShown = false;
         }
 
-		/// <summary>Run this operation</summary>
-		/// <returns>Event.ResultsPrinted</returns>
-		public Event Run()
+        /// <summary>Run this operation</summary>
+        /// <returns>Event.ResultsPrinted</returns>
+        public Event Run()
 		{
-				return Event.ResultsPrinted;
-		}
+            string message;
+            if (printingCompleted || printerCfg.DebugLevel != DebugMode.Normal)
+            {
+                return Event.ResultsPrinted;
+            }
+            else if (PrinterStatus.IsOnline(printerCfg.PrinterName, out message))
+            {
+                if (statusDlgShown)
+                {
+                    statusDlgShown = false;
+                    if (modelessForm != null) modelessForm.Close();
+                }
 
-		/// <summary>Stop this operation</summary>
-		public void Stop()
+                /// Printer is online  =>  Print results now
+                CultureInfo oriCulture = Thread.CurrentThread.CurrentCulture;
+                if (printerCfg.Culture != Culture.system)
+                {
+                    Thread.CurrentThread.CurrentCulture = new CultureInfo(printerCfg.Culture.ToString());
+                }
+
+                foreach (var wm in batch.WaterMeters)
+                {
+                    if (wm != null && !wm.Disabled && (!printerCfg.GoodOnly || wm.Passed))
+                    {
+                        string documentName;
+                        try
+                        {
+                            if (string.IsNullOrEmpty(printerCfg.DocName)) throw (new Exception());
+                            documentName = string.Format(printerCfg.DocName, wm.StartTime(), wm.EndTime(), wm.BatchNr(), wm.WMPosition, wm.SerialNr, wm.SerialNrAux);
+                            ///                                                  {0}             {1}           {2}           {3}            {4}          {5}
+                        }
+                        catch
+                        {
+                            documentName = string.Format("{0}-{1}", batch.BatchNr, wm.WMPosition);
+                        }
+
+                        PrintResults(batch, wm, documentName);
+                    }
+                }
+
+                Thread.CurrentThread.CurrentCulture = oriCulture;
+
+                printingCompleted = true;
+                return Event.ResultsPrinted;
+            }
+            else
+            {
+                if (!statusDlgShown)
+                {
+                    statusDlgShown = true;
+                    modelessForm = new ModelessForm(message);
+                    new Thread(() => System.Windows.Forms.Application.Run(modelessForm)).Start();
+                }
+
+                return Event.Busy;
+            }
+        }
+
+        /// <summary>Stop this operation</summary>
+        public void Stop()
 		{
 		}
 

TBF/Rig/Output/Printers/PrinterStatus.cs

@@ -0,0 +1,136 @@
+///
+/// Copyright (c) 2023 Sensus Slovensko a.s.
+///
+using System;
+using System.Management;
+
+namespace TBF.Rig.Output.Printers
+{
+    public static class PrinterStatus
+    {
+        ///
+        /// See also https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-printer
+        ///
+
+        public enum DetectedErrorState : UInt16
+        {
+            Unknown = 0,
+            Other = 1,
+            No_Error = 2,
+            Low_Paper = 3,
+            No_Paper = 4,
+            Low_Toner = 5,
+            No_Toner = 6,
+            Door_Open = 7,
+            Jammed = 8,
+            Offline = 9,
+            Service_Requested = 10,
+            Output_Bin_Full = 11,
+        }
+
+        public enum ExtendedPrinterStatus : UInt16
+        {
+            Other = 1,
+            Unknown = 2,
+            Idle = 3,
+            Printing = 4,
+            Warming_Up = 5,
+            Stopped_Printing = 6,
+            Offline = 7,
+            Paused = 8,
+            Error = 9,
+            Busy = 10,
+            Not_Aavailable = 11,
+            Waiting = 12,
+            Processing = 13,
+            Initialization = 14,
+            Power_Save = 15,
+            Pending_Deletion = 16,
+            IO_Active = 17,
+            Manual_Feed = 18,
+        }
+
+        public static void GetStatus(string printerName)
+        {
+            /// Perform the search for printers and return the listing as a collection
+            var mgmtSearcher = new ManagementObjectSearcher("SELECT * FROM Win32_Printer");
+            var mgmtCollection = mgmtSearcher.Get();
+
+            foreach (ManagementObject wmiObj in mgmtCollection)
+            {
+                if (wmiObj["Name"].ToString().ToLower() == printerName.ToLower())
+                {
+                    /// Management object name fits the printer name
+
+                    var state = (ExtendedPrinterStatus)int.Parse(wmiObj["ExtendedPrinterStatus"].ToString());
+                    if (state == ExtendedPrinterStatus.Other ||
+                        state == ExtendedPrinterStatus.Unknown ||
+                        state == ExtendedPrinterStatus.Offline ||
+                        state == ExtendedPrinterStatus.Error ||
+                        state == ExtendedPrinterStatus.Not_Aavailable)
+                    {
+                        var message = string.Format("Printer '{0}' state is '{1}'", printerName, state.ToString().Replace('_', ' '));
+                        throw new ApplicationException(message);
+                    }
+
+                    var error = (DetectedErrorState)int.Parse(wmiObj["DetectedErrorState"].ToString());
+                    if (error != DetectedErrorState.No_Error)
+                    {
+                        var message = string.Format("Printer '{0}' error state is '{1}'", printerName, error.ToString().Replace('_', ' '));
+                        throw new ApplicationException(message);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns true when printer is online, without errors.
+        /// </summary>
+        /// <param name="printerName">Printer name</param>
+        /// <param name="message">Error message when printer is not online</param>
+        /// <returns>true when online, false when there are any errors or printer is not online</returns>
+        public static bool IsOnline(string printerName, out string message)
+        {
+            // TODO: Uncomment the following line and resolve problems : Unknown status/error always returned
+            // if (string.IsNullOrEmpty(printerName))
+            {
+                /// Default printer
+                message = string.Empty;
+                return true;
+            }
+
+            /// Perform the search for printers and return the listing as a collection
+            var mgmtSearcher = new ManagementObjectSearcher("SELECT * FROM Win32_Printer");
+            var mgmtCollection = mgmtSearcher.Get();
+
+            foreach (ManagementObject wmiObj in mgmtCollection)
+            {
+                if (wmiObj["Name"].ToString().ToLower() == printerName.ToLower())
+                {
+                    /// Management object name fits the printer name
+
+                    var state = (ExtendedPrinterStatus)int.Parse(wmiObj["ExtendedPrinterStatus"].ToString());
+                    if (state == ExtendedPrinterStatus.Other ||
+                        state == ExtendedPrinterStatus.Unknown ||
+                        state == ExtendedPrinterStatus.Offline ||
+                        state == ExtendedPrinterStatus.Error ||
+                        state == ExtendedPrinterStatus.Not_Aavailable)
+                    {
+                        message = string.Format("Printer '{0}' state is '{1}'", printerName, state.ToString().Replace('_', ' '));
+                        return false;
+                    }
+
+                    var error = (DetectedErrorState)int.Parse(wmiObj["DetectedErrorState"].ToString());
+                    if (error != DetectedErrorState.No_Error)
+                    {
+                        message = string.Format("Printer '{0}' error state is '{1}'", printerName, error.ToString().Replace('_', ' '));
+                        return false;
+                    }
+                }
+            }
+
+            message = string.Empty;
+            return true;
+        }
+    }
+}

TBF/Rig/Output/Printers/Zapiska/Printer.cs

@@ -5,8 +5,10 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Threading;
-using Results.Output.Printers.Zapiska;
 using log4net;
+using Common;
+using Common.Forms;
+using Results.Output.Printers.Zapiska;
 
 namespace TBF.Rig.Output.Printers.Zapiska
 {
@@ -30,8 +32,12 @@ namespace TBF.Rig.Output.Printers.Zapiska
 		IList<Results.WMeterRsltItemSpec> testItems;
 		string footer;
 
+        bool printingCompleted = false;
+        bool statusDlgShown = false;
+        ModelessForm modelessForm;
 
-		public Printer() { }
+
+        public Printer() { }
 
 		public Printer(Generic.IComponentCfg cfg)
 			: base(cfg)
@@ -42,10 +48,19 @@ namespace TBF.Rig.Output.Printers.Zapiska
         public override void Initialize()
         {
             ApplyConfig();
-            log.FatalFormat("{0} initialized: {1}", Name, this);
+            if (printerCfg.DebugLevel == DebugMode.Normal)
+            {
+                string message;
+                if (!PrinterStatus.IsOnline(printerCfg.PrinterName, out message)) throw new ApplicationException(message);
+                log.FatalFormat("{0} initialized: {1}", Name, this);
+            }
+            else
+            {
+                log.FatalFormat("{0} simulated: {1}", Name, this);
+            }
         }
 
-		void ApplyConfig()
+        void ApplyConfig()
 		{
 			header = string.IsNullOrEmpty(printerCfg.Header) ? string.Empty : printerCfg.Header.Replace("~", Environment.NewLine);
 			commonItems = Results.WMeterRsltItemSpec.FromStrArray(printerCfg.CommonItems1);
@@ -137,38 +152,67 @@ namespace TBF.Rig.Output.Printers.Zapiska
 		/// <summary>Start this operation</summary>
 		public void Start()
 		{
-            CultureInfo oriCulture = Thread.CurrentThread.CurrentCulture;
-
-            if (printerCfg.Culture != Culture.system)
-            {
-                Thread.CurrentThread.CurrentCulture = new CultureInfo(printerCfg.Culture.ToString());
-            }
-
-            string documentName;
-            try
-            {
-                if (string.IsNullOrEmpty(printerCfg.DocName)) throw (new Exception());
-                documentName = string.Format(printerCfg.DocName, batch.StartTime, batch.EndTime, batch.BatchNr);
-            }
-            catch
-            {
-                documentName = string.Format("{0:yyyyMMdd-HHmm}", batch.EndTime);
-            }
-
-            PrintResults(batch, documentName);
-
-            Thread.CurrentThread.CurrentCulture = oriCulture;
+            printingCompleted = false;
+            statusDlgShown = false;
         }
 
-		/// <summary>Run this operation</summary>
-		/// <returns>Event.ResultsPrinted</returns>
-		public Event Run()
+        /// <summary>Run this operation</summary>
+        /// <returns>Event.ResultsPrinted</returns>
+        public Event Run()
 		{
-			return Event.ResultsPrinted;
-		}
+            string message;
+            if (printingCompleted || printerCfg.DebugLevel != DebugMode.Normal)
+            {
+                return Event.ResultsPrinted;
+            }
+            else if (PrinterStatus.IsOnline(printerCfg.PrinterName, out message))
+            {
+                if (statusDlgShown)
+                {
+                    statusDlgShown = false;
+                    if (modelessForm != null) modelessForm.Close();
+                }
 
-		/// <summary>Stop this operation</summary>
-		public void Stop()
+                /// Printer is online  =>  Print results now
+                CultureInfo oriCulture = Thread.CurrentThread.CurrentCulture;
+                if (printerCfg.Culture != Culture.system)
+                {
+                    Thread.CurrentThread.CurrentCulture = new CultureInfo(printerCfg.Culture.ToString());
+                }
+
+                string documentName;
+                try
+                {
+                    if (string.IsNullOrEmpty(printerCfg.DocName)) throw (new Exception());
+                    documentName = string.Format(printerCfg.DocName, batch.StartTime, batch.EndTime, batch.BatchNr);
+                }
+                catch
+                {
+                    documentName = string.Format("{0:yyyyMMdd-HHmm}", batch.EndTime);
+                }
+
+                PrintResults(batch, documentName);
+
+                Thread.CurrentThread.CurrentCulture = oriCulture;
+
+                printingCompleted = true;
+                return Event.ResultsPrinted;
+            }
+            else
+            {
+                if (!statusDlgShown)
+                {
+                    statusDlgShown = true;
+                    modelessForm = new ModelessForm(message);
+                    new Thread(() => System.Windows.Forms.Application.Run(modelessForm)).Start();
+                }
+
+                return Event.Busy;
+            }
+        }
+
+        /// <summary>Stop this operation</summary>
+        public void Stop()
 		{
 		}
 
@@ -215,7 +259,7 @@ namespace TBF.Rig.Output.Printers.Zapiska
                     Footer = printerCfg.Footer,
 				};
 
-                var pd = new Results.Output.Printers.Zapiska.ZapiskaPrintDocument(batch, cfg, documentName);
+                var pd = new ZapiskaPrintDocument(batch, cfg, documentName);
                 if (!string.IsNullOrEmpty(printerCfg.PrinterName)) pd.PrinterSettings.PrinterName = printerCfg.PrinterName;
                 pd.Print();
             }

TBF/Rig/Sequences/MainSeq.cs

@@ -434,7 +434,7 @@ namespace TBF.Rig.Sequences
                             wm.Disabled = true;
                         }
                         else if (!wm.Disabled && (Users.CurrentUser.UserName() == "milan" ||
-                                                  Users.CurrentUser.UserName() == "augustin" ||
+                                                  Users.CurrentUser.UserName() == "jau" ||
                                                   Users.CurrentUser.UserName() == "michal"   ||
                                                   Users.CurrentUser.UserName() == "michal2"))
                         {
@@ -1343,21 +1343,17 @@ namespace TBF.Rig.Sequences
             printers.CopyTo(rsltProcessors, writers.Length);
             eventTriggers.CopyTo(rsltProcessors, writers.Length + printers.Length);
             ///
-            int rpix = 0;     /// Component index in AddOperation() loop, afterwards rsltProcessors.Length
+            State st = State.Create("MainSeq : Saving and printing results");
+            int rpix = 0;     /// Component index in AddOperation() loop
             try
             {
-                State st = State.Create("MainSeq : Saving and printing results");
                 for (rpix = 0; rpix < rsltProcessors.Length; rpix++ )
                 {
                     var rp = TbfComponents.FindComponent(rsltProcessors[rpix]) as IResultsProcessor;
                     if (rp != null) st.AddOperation(rp.ProcessResultsOp(ProcessData.BatchRslts.Batch));
                 }
-                st.EnterState();
-			    do {
-				    e = StateMachine.WaitRunDevsRunOps();
-				    if (e.Contains(Event.Error)) break;
-			    }
-			    while (e.Contains(Event.Busy));
+
+                st.EnterState();    /// Executes operation.Start() functions of result processors, should be inside try-catch
             }
             catch (Exception exc)
             {
@@ -1366,6 +1362,20 @@ namespace TBF.Rig.Sequences
                 log.FatalFormat("FileWriter {0} crashed: {1}", rpName, exc.Message);
                 goto error;
             }
+
+			do
+            {
+                /// Next line executes operation.Run() of result processors, already try-catch protected (generates Event.Crashed)
+                e = StateMachine.WaitRunDevsRunOps();
+				if (e.Contains(Event.Error)) break;
+			}
+			while (e.Contains(Event.Busy));
+
+            if (e.Contains(Event.Crashed))
+            {
+                Bridge.OnError(this, Strings.Error_when_saving_and_printing_results);
+            }
+
             if (e.Contains(Event.Error)) goto error;
             ///
             if (!e.Contains(Event.ErrorProcessingResults))

TBF/Rig/Sequences/SequenceBase.cs

@@ -2064,8 +2064,8 @@ namespace TBF.Rig.Sequences
                 log.FatalFormat("   Feeding path: {0}", (inPath != null) ? inPath.ToString() : "none");
                 log.FatalFormat("   Bench path: {0}", (benchPath != null) ? benchPath.ToString() : "none");
                 log.FatalFormat("   Output path: {0}", (outPath != null) ? outPath.ToString() : "none");
-                if (inPath.Pump is IPump) log.FatalFormat("   Pump power: {0}%", (inPath.Pump as IPump).Power);
-                else if (inPath.Pump is IValve) log.FatalFormat("   Feeding valve: {0}", (inPath.Pump as IValve).State ? "open" : "close");
+                if (inPath != null && inPath.Pump is IPump) log.FatalFormat("   Pump power: {0}%", (inPath.Pump as IPump).Power);
+                else if (inPath != null && inPath.Pump is IValve) log.FatalFormat("   Feeding valve: {0}", (inPath.Pump as IValve).State ? "open" : "close");
                 if (outPath.RegulValve is IRegValve) log.FatalFormat("   Regulation valve position: {0}%", outPath.RegulValve.Position);
                 log.FatalFormat("   Flow: {0}", RefFlow);
                 log.FatalFormat("   Mass: {0}", Mass);

TBF/Rig/State.cs

@@ -185,19 +185,31 @@ namespace TBF.Rig
 		/// <returns>List of Event-s returned from the state operations</returns>
 		public static IList<Event> RunOperations()
 		{
-		    IList<Event> events = new List<Event>();
+		    IList<Event> events = new List<Event>();	/// List of events from all operation.Run() - initially empty
 
 	        foreach (IOperation operation in currentState.Operations)
 			{
-				Event evnt = operation.Run();
-				if (evnt != Event.None)
+				Event evnt;
+				try
 				{
-					log.InfoFormat("Operation {0}.Run() returned {1}", operation, evnt);
-					events.Add(evnt);
-				}
-				else
+					evnt = operation.Run();
+                }
+				catch (Exception ex)
 				{
-					log.DebugFormat("Operation {0}.Run() returned {1}", operation, evnt);
+                    log.FatalFormat("Operation {0}.Run() crashed: {1}", operation, ex);
+                    evnt = Event.Crashed;
+                    events.Add(Event.Crashed);
+                }
+
+                if (evnt == Event.None)
+                {
+					/// Do not add Event.None to the list of events
+                    log.DebugFormat("Operation {0}.Run() returned {1}", operation, evnt);
+                }
+				else if (evnt != Event.Crashed)
+                {
+                    events.Add(evnt);
+                    log.InfoFormat("Operation {0}.Run() returned {1}", operation, evnt);
 				}
 			}
 

TBF/Rig/StateMachine.cs

@@ -37,8 +37,6 @@ namespace TBF.Rig
     {
 		private static readonly ILog log = LogManager.GetLogger(typeof(StateMachine));
 
-        public static Random Random;
-
 		/// Private devices and components
 		static IList<IComponent> components;		/// list of all components
 		static IList<IDevice> devices;				/// list of devices
@@ -148,7 +146,6 @@ namespace TBF.Rig
             devices = new List<IDevice>();
 			states = new List<State>();
             currentTimeSec = 0;
-            Random = new Random();
         }
 
 		/// <summary>

TBF/Rig/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs

@@ -626,7 +626,6 @@ namespace TBF.Rig.TestMethods.CombinedWithDetection
 
             /// Read the diverter switch time
             switchTimeEnd = 0.001f * (float)cBrd.DivTime(0);
-            switchTimeStart = switchTimeEnd + 0.001f * (StateMachine.Random.Next(20) - 10);
             log.WarnFormat("Diverter switch time on test end = {0} ms", cBrd.DivTime(0));
 
             //------------------------------------------------

TBF/Rig/TestMethods/FixedStart/FixedStartSeq.cs

@@ -626,7 +626,6 @@ namespace TBF.Rig.TestMethods.FixedStart
 
 
             switchTimeEnd = 0.001f * cBrd.ValveOpenCloseTime;
-            switchTimeStart = switchTimeEnd + 0.001f * (StateMachine.Random.Next(20) - 10);
             log.WarnFormat("Start valve switch time on test end = {0} ms", cBrd.ValveOpenCloseTime);
 
 

TBF/Rig/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs

@@ -670,7 +670,6 @@ namespace TBF.Rig.TestMethods.FixedStartDeferredEval
 
             int endPulses = cBrd.RefPulses;
             switchTimeEnd = 0.001f * cBrd.ValveOpenCloseTime;
-            switchTimeStart = switchTimeEnd + 0.001f * (StateMachine.Random.Next(20) - 10);
             log.WarnFormat("Start valve switch time on test end = {0} ms", cBrd.ValveOpenCloseTime);
 
 

TBF/Rig/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs

@@ -754,7 +754,6 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollDeferredEval
             while (e.Contains(Event.ValvesBusy));
 
             switchTimeEnd = 0.001f * cBrd.ValveOpenCloseTime;
-            switchTimeStart = switchTimeEnd + 0.001f * (StateMachine.Random.Next(20) - 10);
             log.WarnFormat("Start valve switch time on test end = {0} ms", cBrd.ValveOpenCloseTime);
 
             State.Create(string.Format("{0}({1}) : Waiting before 2nd mass measurement", test.Method, test.Name))

TBF/Rig/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs

@@ -761,7 +761,6 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollection
 
 
             switchTimeEnd = 0.001f * cBrd.ValveOpenCloseTime;
-            switchTimeStart = switchTimeEnd + 0.001f * (StateMachine.Random.Next(20) - 10);
             log.WarnFormat("Start valve switch time on test end = {0} ms", cBrd.ValveOpenCloseTime);
 
             State.Create(string.Format("{0}({1}) : Waiting before 2nd mass measurement", test.Method, test.Name))

TBF/Rig/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs

@@ -549,7 +549,6 @@ namespace TBF.Rig.TestMethods.FixedStartTankCollection
             while (e.Contains(Event.ValvesBusy));
 
             switchTimeEnd = 0.001f * cBrd.ValveOpenCloseTime;
-            switchTimeStart = switchTimeEnd + 0.001f * (StateMachine.Random.Next(20) - 10);
             log.WarnFormat("Start valve switch time on test end = {0} ms", cBrd.ValveOpenCloseTime);
 
             State.Create(string.Format("{0}({1}) : Waiting before 2nd mass measurement", test.Method, test.Name))

TBF/Rig/TestMethods/Q2CorrectionFromHistory/FromHistorySeq.cs

@@ -83,7 +83,7 @@ namespace TBF.Rig.TestMethods.Q2CorrectionFromHistory
             try
             {
                 GetQ2PreCorrectionClient client = new GetQ2PreCorrectionClient(cfg.BaseUrl);
-                client.GetToken("ReadUser", "sensus", "https://sluprimadev/SensusCore/api/v1/Locations/1/Login2").Wait();
+                client.GetToken("ReadUser", "sensus", "https://deluh1web03.world.fluidtechnology.net/SensusCore/api/v1/Locations/1/Login2").Wait();
                 Q2PreCorrection response = client.GetQ2Correction(cfg.RelativeUrl).Result;
                 if (response != null && response.AreDataCalculated)
                 {

TBF/Rig/TestMethods/iPerlCommunication/OpticalHeadTest.cs

@@ -1,14 +1,19 @@
-using Sensus.iPerl.RfidCom.Helper;
+using log4net;
+using Sensus.iPerl.RfidCom.Helper;
 using Sensus.iPerl.RfidCom.Services;
 using Sensus.iPerl.RfidCom.Structures;
 using System;
 using System.Threading;
+using TBF.Rig.Hart.Common;
 using TBF.Rig.TestMethods.iPerlCommunication.iPerlHead;
+using static Sensus.iPerl.NfcHandler.MCI_Protocol;
 
 namespace TBF.Rig.TestMethods.iPerlCommunication
 {
     internal class OpticalHeadTest
     {
+        protected static readonly ILog rfidDataLogger = LogManager.GetLogger("RfidData");
+
         internal static string OpenSealing(IperlHead iHead)
         {
             if (RfidCommands.OpenSealing($"COM{iHead.RfidComPortNr}")) return "OK";
@@ -20,11 +25,12 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
             try
             {
                 byte[] pcb = null;
-                int readRetVal = iPerlCommunicationForm.ReadRequestPort(iHead, MessageID.Configuration, 16, 5, out pcb);
+                int readRetVal = iPerlCommunicationForm.ReadRequestPort(iHead, MessageID.Configuration, Sensus.iPerl.NfcHandler.MCI_Protocol.StructName.Configuration, 16, 5, out pcb);
                 if (readRetVal == 0)
                 {
                     return RfidHelper.HexLiteral2Unsigned(RfidHelper.SwapHexcode(BitConverter.ToString(pcb).Replace("-", string.Empty))).ToString();
                 }
+                rfidDataLogger.Error($"COM{iHead.RfidComPortNr}: ReadRequest_PCB ({MessageID.Configuration},16,5...) <- Error: {readRetVal}");
                 return "Error";
             }
             catch (Exception ex)
@@ -35,22 +41,37 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
 
         internal static string SetActiveMode(IperlHead iHead)
         {
-            return RfidCommands.SetActiveMode($"COM{iHead.RfidComPortNr}") ? "OK" : "Error Set Active Mode";
+            byte[] cmd = new byte[1] { (byte)Command.SetActiveMode };
+            if (0 == iPerlCommunicationForm.WriteRequestPort(iHead, MessageID.Command, StructName.Command, 0, 1, cmd))
+            {
+                return "OK";
+            }
+            else
+            {
+                return "Error Set Active Mode";
+            }
         }
 
         internal static string SetTestMode(IperlHead iHead)
         {
-            return RfidCommands.SetTestMode($"COM{iHead.RfidComPortNr}") ? "OK" : "Error Set Test Mode";
+            byte[] cmd = new byte[1] { (byte)Command.SetTestMode  };
+            if (0 == iPerlCommunicationForm.WriteRequestPort(iHead, MessageID.Command, StructName.Command, 0, 1, cmd))
+            {
+                return "OK";
+            }
+            else
+            {
+                return "Error Set Test Mode";
+            }
         }
 
+#if IPERL
         internal static string TurnOffRadio(IperlHead iHead)
         {
             try
             {
-                string payload = "03";
-                RfidCommunicationService rfidCommunicationService = new RfidCommunicationService { ComPort = $"COM{iHead.RfidComPortNr}", WaitTimeAfterFailure = 2200, PassThroughWaitTime = 1500, MaxRetries = 3, TimeOut = 5000 };
-                rfidCommunicationService.RfidWrite(Params.u8_WakeUpInterval, payload);
-                return rfidCommunicationService.RfidRead(Params.u8_WakeUpInterval).ToString() == payload? "OK" : "Error";
+                int retValue = iPerlCommunicationForm.WriteRequestPort(iHead, MessageID.RadioPassthrough, StructName.RadioParams, 0x1898, 1, new byte[] { (byte)3 }); // WakeUpInterval
+                return 0 == retValue ? "OK" : "Error";
             }
             catch (Exception ex)
             {
@@ -62,11 +83,8 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
         {
             try
             {
-                string payload = "01"; // 1 set the µC to the production mode, radio should not start
-                RfidCommunicationService rfidCommunicationService = new RfidCommunicationService { ComPort = $"COM{iHead.RfidComPortNr}", WaitTimeAfterFailure = 2200, PassThroughWaitTime = 1500, MaxRetries = 3, TimeOut = 5000 };
-                rfidCommunicationService.RfidWrite(SystemInfo.u8_system_state, payload);
-                Thread.Sleep(1000); // must be for pass thru params
-                return rfidCommunicationService.RfidRead(SystemInfo.u8_system_state).ToString() == payload ? "OK" : "Error";
+                int retValue = iPerlCommunicationForm.WriteRequestPort(iHead, MessageID.RadioPassthrough, StructName.RadioInfo, 0x1804, 1, new byte[] { (byte)1 }); // System Status
+                return 0 == retValue ? "OK" : "Error";
             }
             catch (Exception ex)
             {
@@ -80,11 +98,11 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
             try
             {
                 byte[] cmd = RfidHelper.HexStringToByteArray(custText);
-                if (0 == iPerlCommunicationForm.WriteRequestPort(iHead, MessageID.RadioPassthrough, 0x1899, 9, cmd))
+                if (0 == iPerlCommunicationForm.WriteRequestPort(iHead, MessageID.RadioPassthrough, Sensus.iPerl.NfcHandler.MCI_Protocol.StructName.RadioParams, 0x1899, 9, cmd))
                 {
                     RfidCommunicationService rfidCommunicationService = new RfidCommunicationService { ComPort = $"COM{iHead.RfidComPortNr}", WaitTimeAfterFailure = 2200, PassThroughWaitTime = 1500, MaxRetries = 3, TimeOut = 5000 };
                     //rfidCommunicationService.RfidWrite(Params.u8_Customer_Text, custText);
-                    return rfidCommunicationService.RfidRead(Params.u8_Customer_Text).ToString();
+                    return rfidCommunicationService.RfidRead<string>(Params.u8_Customer_Text).ToString();
                 }
             }
             catch (Exception ex)
@@ -93,5 +111,6 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
             }
             return $"Error COM{iHead.RfidComPortNr}";
         }
+#endif /// IPERL
     }
 }

TBF/Rig/TestMethods/iPerlCommunication/TestMethodCfg.cs

@@ -2,6 +2,8 @@
 /// Copyright (c) 2015-2021 Sensus Slovensko a.s.
 ///
 using System.Collections.Generic;
+using System.IO.Ports;
+using System.Threading;
 using System.Xml.Serialization;
 using Common;
 using Config.Entities;
@@ -27,6 +29,15 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
         public int NrThreads;			/// Numbwr of parallel threads (1, 2 or 4)
         public int IperlCheckErrorsToStop;
 
+        ///
+        /// NFC S4.5 Combihead params
+        ///
+        public int MciTimeoutMs;
+        public int BaudRate;
+        public int DataBits;
+        public Parity ParityBit;
+        public StopBits StopBits;
+
         public int DfltQ2c_15_rl;
         public int DfltQ2c_15_lr;
         public int DfltQ2c_20_rl;
@@ -65,8 +76,13 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
             PassThroughWaitTime = 1500;
             NrThreads = 2;				/// 1, 2 or 4 threads
 			IperlCheckErrorsToStop = 10;
+            MciTimeoutMs = 4000; // ms, NFC interface
+            BaudRate = 57600; // NFC Interface
+            DataBits = 8; // NFC Interface
+            ParityBit = Parity.None; // NFC Interface
+            StopBits = StopBits.Two; // NFC Interface
 
-			TestParams = CreateTestParamsProvider() as iPerlCommunicationParams;
+            TestParams = CreateTestParamsProvider() as iPerlCommunicationParams;
 		}
 
         public TestMethodCfg(IComponentFactory factory)

TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2022 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -11,6 +11,9 @@ using RestClient;
 using TBF.Rig.Sequences;
 using TBF.Resources;
 using TBF.UiBridge;
+using Results;
+using Results.Entities;
+using TBF.Rig.TestMethods.iPerlCommunication.iPerlHead;
 
 namespace TBF.Rig.TestMethods.iPerlCommunication
 {
@@ -22,9 +25,10 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
         public const string StrictQ2ErrorCheckStr = "Strict Q2 error check ";
         public const string Q2correctionCheckCmd = "Q2 correction check ";
         public const string IperlCheckCmd = "iPERL_check ";
+        public const string SimulateCmd = "simulate ";
 
 
-		System.Windows.Forms.Form modelessDlg;
+        System.Windows.Forms.Form modelessDlg;
 		/// 
 		delegate void iPerlCommFormDlgt(iPerlCommunicationSeq myRef, TestMethod method, Test test, iPerlCommunicationParams testParams);
 		/// 
@@ -71,17 +75,16 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
 
                 /// Get 'wmType' from IperlHead procedure parameters
                 int wmType = 0;
-                if (IperlHeads != null)
+#if IPERL
+                foreach (var wm in ProcessData.BatchRslts.Batch.WaterMeters)
                 {
-                    foreach (var ih in IperlHeads)
+                    if (wm != null && !wm.Disabled && wm.WMTypeId() > 0)
                     {
-                        if (ih.WMType_ID > 0)
-                        {
-                            wmType = ih.WMType_ID;
-                            break;
-                        }
+                        wmType = wm.WMTypeId();
+                        break;
                     }
                 }
+#endif
 
                 if (cfg.UseWebService)
                 {
@@ -288,7 +291,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
 
                 return new List<Event> { Event.Done };
             }
-            else if (testParams.Activity.ToLower().Contains(cmd = "simulate "))
+            else if (testParams.Activity.ToLower().Contains(cmd = SimulateCmd))
             {
                 TestProgressEventArgs.SetEstimatedTimes(new int[] { 0, 0, 0, 30, 0, 30, 0, 0 });
                 Bridge.OnTestProgress(this, new TestProgressEventArgs(test, Progress.JustStarted));
@@ -301,6 +304,46 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
                 else if (testParams.Activity.Substring(cmd.Length).ToLower() == "compound nok") MakeSimulatedCompound(test, 1, 0, 4.7f, 0.9f);
                 else if (testParams.Activity.Substring(cmd.Length).ToLower() == "compound rise") MakeSimulatedCompound(test, 1, 0, 0.7f, 0.0f);
                 else if (testParams.Activity.Substring(cmd.Length).ToLower() == "compound fall") MakeSimulatedCompound(test, 1, 0, 0.7f, 0.9f);
+                else if (testParams.Activity.Substring(cmd.Length).ToLower() == "iperls")
+                {
+                    string[] pcbNrs = new string[] { "831232435539", "831232435562", "831232435587",
+                                                     "831232432141", "831232432497", "831232763641" };
+
+                    TestRslt tstRslt = BatchRslts.GetTestRslt(test.Name, test.Part);
+                    if (tstRslt != null)
+                    {
+                        Results.Utils.GetCounterStates(tstRslt, Program.LocalSettings.Counters);
+
+                        /// Auxiliary results ... not required
+
+                        /// Main results
+                        tstRslt.MethodClass = TbfComponents.FindComponent(test.Method).ClassName;
+                        tstRslt.TestDone = true;
+                        tstRslt.StartTime = tstRslt.Batch.StartTime;
+                        tstRslt.EndTime = DateTime.Now;
+                        tstRslt.FlowSetTime = 0;
+                        tstRslt.MassOfEvapWater = 0;
+                        tstRslt.TestTime = 1;
+
+                        for (int i = 0; i < BatchRslts.Batch.WaterMeters.Count; i++)
+                        {
+                            MeterTestRslt meterRslt =
+                            BatchRslts.GetMeterTestRslt(test.Name, i, CompoundMeterId.Single);
+
+                            if (meterRslt != null)
+                            {
+                                meterRslt.WaterMeter.SerialNr = pcbNrs[i % pcbNrs.Length];
+                                meterRslt.Passed = true;
+                                meterRslt.TestDone = true;
+                            }
+                            //if (iperlHeads[i] != null)
+                            //{
+                            //    iperlHeads[i].CommFailed = iperlHeads[i].Disabled = false;
+                            //    iperlHeads[i].SerialNr = pcbNrs[i % pcbNrs.Length];
+                            //}
+                        }
+                    }
+                }
 
                 Bridge.OnTestProgress(this, new TestProgressEventArgs(test, Progress.Completed));
                 Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, ProcessData.BatchRslts.GetTestRslt(Common.Utils.GetTestName(test.Name, 1, 1), 0)));
@@ -311,8 +354,8 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
                 //------------------------------------------------
 
                 State.Create(string.Format("iPerlCommunicationSeq : {0}", testParams.Activity))
-                    .AddOperation(checkUiOp)
-                    .EnterState();
+                     .AddOperation(checkUiOp)
+                     .EnterState();
                 e = StateMachine.WaitRunDevsRunOps();
 
                 if (TestAndLogUiCmdStop(test, e))
@@ -383,7 +426,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
             try
             {
                 GetQ2PreCorrectionClient client = new GetQ2PreCorrectionClient(cfg.BaseUrl);
-                client.GetToken("ReadUser", "sensus", "https://sluprimadev/SensusCore/api/v1/Locations/1/Login2").Wait();
+                client.GetToken("ReadUser", "sensus", "https://deluh1web03.world.fluidtechnology.net/SensusCore/api/v1/Locations/1/Login2").Wait();
                 Q2PreCorrection response = client.GetQ2Correction(string.Format(cfg.RelativeUrl, wmType)).Result;
                 if (response != null && response.AreDataCalculated)
                 {
@@ -574,15 +617,18 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
 
 			for (int i = 0; i < ProcessData.BatchRslts.WMPositionsCount; i++)
 			{
-				Results.Entities.MeterTestRslt oriMeterRslt = ProcessData.BatchRslts.GetMeterTestRslt(oriTestName, i, CompoundMeterId.Single);
-				Results.Entities.MeterTestRslt meterRslt = ProcessData.BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Single);
+                var q3mtr = ProcessData.BatchRslts.GetMeterTestRslt("Q3", i);
+                double q3error = (q3mtr != null) ? q3mtr.Error : 0;
+
+                Results.Entities.MeterTestRslt oriMeterRslt = ProcessData.BatchRslts.GetMeterTestRslt(oriTestName, i);
+				Results.Entities.MeterTestRslt meterRslt = ProcessData.BatchRslts.GetMeterTestRslt(testName, i);
 
 				/// Reference to iPerl water meter or null:
                 TestMethods.iPerlCommunication.iPerlHead.IperlHead iPerl = ((sensPath != null) && (sensPath.RegisterReaders != null) && (i < sensPath.RegisterReaders.Length))
 													                     ? (sensPath.RegisterReaders[i] as TestMethods.iPerlCommunication.iPerlHead.IperlHead)
 													                     : null;
 
-				if (meterRslt != null && oriMeterRslt != null)
+				if (iPerl != null && meterRslt != null && oriMeterRslt != null)
 				{
 #if ORACLE_DB
                     meterRslt.ErrorBC = oriMeterRslt.Error;
@@ -593,22 +639,15 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
 					meterRslt.VolumeRef = oriMeterRslt.VolumeRef;
 					meterRslt.TestTime = oriMeterRslt.TestTime;
 
-					if (iPerl == null || ((iPerl.Q2CorrRL == 0) && (iPerl.Q2CorrLR == 0)))
-					{
-						/// Either no iPerl head or no Q2 correction
-                        meterRslt.Error = oriMeterRslt.Error;
-                    }
-					else if (isPlus)
+					if (q3error * oriMeterRslt.Error < 0)
 					{
                         /// iPerl with Q2 correction => generate an artificial error equal to +1/10 of the original one (relative to Q2 target error)
-                        double targetError = iPerl.CalibTargetQ2;
-                        meterRslt.Error = targetError + 0.1 * (oriMeterRslt.Error - targetError);
+                        meterRslt.Error = 0.1 * oriMeterRslt.Error;
                     }
 					else
 					{
                         /// iPerl with Q2 correction => generate an artificial error equal to -1/10 of the original one (relative to Q2 target error)
-                        double targetError = iPerl.CalibTargetQ2;
-                        meterRslt.Error = targetError - 0.1 * (oriMeterRslt.Error - targetError);
+                        meterRslt.Error = - 0.1 * oriMeterRslt.Error;
                     }
 
                     meterRslt.VolumeMeter = meterRslt.VolumeRef * (100.0 + meterRslt.Error) / 100.0;
@@ -897,14 +936,8 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
                     meterRslt.TestDone       = meterRsltQ2ac.TestDone;
                     tstRslt.TestDone         = true;
 
-                    double targetError = 0;
-                    if ((sensPath != null) && (sensPath.RegisterReaders != null) && (sensPath.RegisterReaders.Length > i) && (sensPath.RegisterReaders[i] is iPerlHead.IperlHead))
-                    {
-                        targetError = (sensPath.RegisterReaders[i] as iPerlHead.IperlHead).CalibTargetQ2;
-                    }
-
-                    if ((((meterRsltQ2bc.Error - targetError) < -0.51) && (meterRsltQ2ac.Error < meterRsltQ2bc.Error)) ||
-                        (((meterRsltQ2bc.Error - targetError) > +0.51) && (meterRsltQ2ac.Error > meterRsltQ2bc.Error)))
+                    if (((meterRsltQ2bc.Error < -0.51) && (meterRsltQ2ac.Error < meterRsltQ2bc.Error)) ||
+                        ((meterRsltQ2bc.Error > +0.51) && (meterRsltQ2ac.Error > meterRsltQ2bc.Error)))
                     {
                         meterRslt.Passed = false;   /// Q2 correction check failed
                     }

TBF/Rig/TestMethods/iPerlCommunication/iPerlDataWrite.cs

@@ -2,19 +2,22 @@
 /// Copyright (c) 2021 Sensus Slovensko a.s.
 ///
 using TBF.Rig.TestMethods.iPerlCommunication.iPerlHead;
+using static Sensus.iPerl.NfcHandler.MCI_Protocol;
 
 namespace TBF.Rig.TestMethods.iPerlCommunication
 {
     public class iPerlDataWrite
     {
         public MessageID MessageID;
+        public StructName StructName;
         public int Offset;
         public byte[] Data;
         public string Description;
 
-        public iPerlDataWrite(MessageID mesageID, int offset, byte[] data, string description)
+        public iPerlDataWrite(MessageID mesageID, StructName structName, int offset, byte[] data, string description)
         {
             MessageID = mesageID;
+            StructName = structName;
             Offset = offset;
             Data = data;
             Description = description;

TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/Enums.cs

@@ -104,4 +104,10 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
         Flush = 0,
         ProcessAndSave,
 	}
+
+	public enum CommunicationInterface
+	{
+		RFID,
+		NFC
+	}
 }

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

@@ -43,6 +43,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
         public int MuxBoardNrOrGroup14 { get { return iperlHeadCfg.MuxBoardNr; } }
         public int Group { get { return iperlHeadCfg.Group; } }
         public iPerlHead.MeterType MeterType { get { return iperlHeadCfg.MeterType; } }
+        public CommunicationInterface CommInterface { get { return iperlHeadCfg.CommunicationInterface; } }
 
         public int Position
         {
@@ -58,11 +59,9 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
 		public double LtrsPerPulse { get { return 1 / PulsesPerLtr; } }
 
         public double CalibTarget { get { return iperlHeadCfg.ProcParams.CalibTarget; } }
-        public double CalibTargetQ2 { get { return iperlHeadCfg.ProcParams.CalibTargetQ2; } }
         public ushort FactorLimitLo { get { return (ushort)iperlHeadCfg.ProcParams.FactorLimitLo; } }
 		public ushort FactorLimitHi { get { return (ushort)iperlHeadCfg.ProcParams.FactorLimitHi; } }
         public Counting InitFlowDir { get { return (iperlHeadCfg != null && iperlHeadCfg.ProcParams != null) ? iperlHeadCfg.ProcParams.Counting : Counting.Arbitrary; } }
-        public int WMType_ID { get { return iperlHeadCfg.ProcParams.WMType_ID; } }		        /// Required by Oracle DB
 
 
         /// Properties set by the Begin and the End form
@@ -70,10 +69,17 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
 		{
 			get
             {
-                if (ConfigStruct != null) return ConfigStruct.GetPcbNrString();
-                else return string.Empty;
+                if (ConfigStruct != null)
+                    return ConfigStruct.GetPcbNrString();
+                else if (simulatedPcbNr != null)
+                    return simulatedPcbNr;
+                else
+                    return string.Empty;
+            }
+			set
+            {
+                simulatedPcbNr = value;
             }
-			set { }
 		}
 
 		public bool Disabled;
@@ -154,6 +160,8 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
         public double WMVolume { get { return wmVolume; } }
         public double WMTestTime { get { return wmTestTime; } }
 
+        string simulatedPcbNr = null;
+
         int wmPulses;
         int wmRefPulses;
         double beginWMState;
@@ -215,11 +223,11 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
         /// <param name="nominalFlow">Nominal flow in m3/h</param>
         /// <param name="currentFactor">0 or the current Q2 correction factor when updating the factor</param>
         /// <returns>Calculated Q2 correction factor</returns>
-        public double CalculateQ2CorrectionFactor(Results.Entities.MeterTestRslt q2adjResult, double calibTarget, double nominalFlow, int currentFactor = 0)
+        public double CalculateQ2CorrectionFactor(Results.Entities.MeterTestRslt currentQ2Result, int currentFactor, double nominalFlow, double errorTarget = 0)
 		{
-            double nominalTestFlowLph = Common.Units.ConvertTo(Common.Unit.lph, nominalFlow);
-            double volumeRefShiftedToTarget = q2adjResult.VolumeRef * (1.0 + calibTarget / 100.0);
-            double q2adjErrorShiftedToTarget = Config.Formulas.ErrorFromVolumes(q2adjResult.VolumeMeter, volumeRefShiftedToTarget);
+            double nominalTestFlowLph = Units.ConvertTo(Unit.lph, nominalFlow);
+            double volumeRefShiftedToTarget = currentQ2Result.VolumeRef * (1.0 + errorTarget / 100.0);
+            double q2adjErrorShiftedToTarget = Config.Formulas.ErrorFromVolumes(currentQ2Result.VolumeMeter, volumeRefShiftedToTarget);
 
 			double A = 16.0 / ScalingFactor();			/// Raw units per ml: DN15=16, DN20=8, DN25=4, DN32=2, DN40=1
 			const double B = 8.0;						/// Raw units per minute, 8
@@ -228,14 +236,16 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
 			double F = D / (nominalTestFlowLph * 10.0);	/// Error corrected with 8 Raw Units per minute [%]
 			double G = F / B;							/// Error corrected with 1 Raw Unit per minute [%]
 
-            double q2CorrectionFactor = Convert.ToDouble(currentFactor)
-                                      - (q2adjErrorShiftedToTarget / G) * (volumeRefShiftedToTarget / q2adjResult.VolumeMeter);
+            /// Do not change the factor for an invalid measurement (q2adjResult.VolumeMeter == 0)
+            double q2CorrectionFactor = (Math.Abs(currentQ2Result.VolumeMeter) <= float.Epsilon) ? Convert.ToDouble(currentFactor) :
+                Convert.ToDouble(currentFactor) - (q2adjErrorShiftedToTarget / G) * (volumeRefShiftedToTarget / currentQ2Result.VolumeMeter);
 
-            log.WarnFormat("CalculateQ2CorrectionFactor() : Pos={0}, PCB#={1}, Error={2}%, CalTarget={3}%, Q2CorrFactor={4}",
+            log.WarnFormat("CalculateQ2CorrectionFactor() : Pos={0}, PCB#={1}, Error={2}%, Target={3}%, Current factor={4} New factor={5}",
 						   Name,
 						   SerialNr,
-						   q2adjResult.Error.ToString("F2"),
-                           calibTarget.ToString("F1"),
+						   currentQ2Result.Error.ToString("F2"),
+                           errorTarget.ToString("F3"),
+                           currentFactor.ToString("F1"),
                            q2CorrectionFactor.ToString("F1"));
 
             return q2CorrectionFactor;
@@ -462,6 +472,8 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
 			Q2CorrRL = 0;
             Q2CorrLR = 0;
 
+            simulatedPcbNr = null;
+
             dataStreamState = DataStreamState.Flush;
 
             currentFlowDir = InitFlowDir;
@@ -997,6 +1009,22 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
             }
 		}
 
+        public string ReadOptoData()
+        {
+            string received = ".";
+            lock (this)
+            {
+                int nrBytes = optoSerialPort.BytesToRead;
+                if (nrBytes > 0)
+                {
+                    char[] buffer = new char[nrBytes];
+                    optoSerialPort.Read(buffer, 0, nrBytes);
+                    received = new string(buffer);
+                }
+            }
+            return received;
+        }
+
 
         void OptoTelegramReceived(int currentIx, bool async, Int64 volumeRawExt, Int64 timestampRawExt)
 		{
@@ -1028,6 +1056,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
 
 
         /// <summary>
+        /// 
         /// Called from the state machine when a test is selected and UI needs to be updated.
         /// </summary>
         public void OnOptoReceived(object sender, OptoReceivedEventArgs args)

TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHeadCfg.cs

@@ -25,6 +25,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
         public int RfidComPortNr;       /// 0 = use MuxBoardNr
         public int MuxBoardNr;			/// 0 = use RfidComPort(Nr), otherwise mux. board nr. 1 .. 4
 		public int Group;				/// Number written to QuidoRS to connct the watermeter to RfidComPort, 1 .. 10
+        public CommunicationInterface CommunicationInterface; /// Communication Interface: RFID or NFC
 
 		/// <summary> Procedure parameters </summary>
 		[XmlIgnore]
@@ -45,6 +46,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
             RfidComPortNr = 0;              /// = use mux. board
             MuxBoardNr = 1;
             ProcParams = CreateProcParamsProvider() as ProcParams;
+            CommunicationInterface = CommunicationInterface.RFID;
         }
 
         public IperlHeadCfg(IComponentFactory factory)
@@ -55,12 +57,13 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
 
 		public string ToString(int i)
 		{
-            return string.Format("{0}  Group1 (mux#)={1}, Group2={2}, Opto=Com{3}, RFID=Com{4}",
+            return string.Format("{0}  Group1 (mux#)={1}, Group2={2}, Opto=Com{3}, RFID=Com{4}, Interface={5}",
                                  Name,
                                  MuxBoardNr,
                                  Group,
                                  OptoComPortNr,
-                                 RfidComPortNr);
+                                 RfidComPortNr,
+                                 CommunicationInterface);
 		}
 	}
 }

TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHeadCfgCtrl.cs

@@ -3,16 +3,14 @@
 ///
 using System;
 using System.Net;
-using System.Net.Sockets;
 using System.Windows.Forms;
 using Common;
-using Config.Entities;
 using TBF.Rig.Generic;
 using TBF.Resources;
 
 namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
 {
-	public partial class IperlHeadCfgCtrl : UserControl, IComponentCfgCtrl
+    public partial class IperlHeadCfgCtrl : UserControl, IComponentCfgCtrl
 	{
 		public bool ShowMore { get { return false; } }
 
@@ -55,7 +53,9 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
             rfidPortNrTextBox.Text = config.RfidComPortNr.ToString();
             muxBoardNrTextBox.Text = config.MuxBoardNr.ToString();
 			groupTextBox.Text = config.Group.ToString();
-		}
+            comboBoxCommunicationInterface.SelectedItem = config.CommunicationInterface.ToString();
+            tabPage2.Controls.Add(new IperlHeadTestCtrl(config));
+        }
 
 		public void Unlock()
 		{
@@ -68,6 +68,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
             rfidPortNrTextBox.Enabled = true;
             muxBoardNrTextBox.Enabled = true;
 			groupTextBox.Enabled = true;
+            comboBoxCommunicationInterface.Enabled = true;
 		}
 
 		public CfgUpdateFlags VerifyCfg(ref string message)
@@ -144,8 +145,9 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
             config.RfidComPortNr = int.Parse(rfidPortNrTextBox.Text);
             config.MuxBoardNr = int.Parse(muxBoardNrTextBox.Text);
 			config.Group = int.Parse(groupTextBox.Text);
+            config.CommunicationInterface = (CommunicationInterface)comboBoxCommunicationInterface.SelectedIndex;
 
 			return flags;
 		}
-	}
+    }
 }

TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHeadCfgCtrl.designer.cs

@@ -31,149 +31,145 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
 		/// </summary>
 		private void InitializeComponent()
 		{
-            this.nameTextBox = new System.Windows.Forms.TextBox();
-            this.nameLabel = new System.Windows.Forms.Label();
-            this.classNameLabel = new System.Windows.Forms.Label();
-            this.optoSerialPortTextBox = new System.Windows.Forms.TextBox();
-            this.optoSerialPortLabel = new System.Windows.Forms.Label();
-            this.muxBoardNrTextBox = new System.Windows.Forms.TextBox();
-            this.muxBoardNrLabel = new System.Windows.Forms.Label();
-            this.groupTextBox = new System.Windows.Forms.TextBox();
-            this.groupLabel = new System.Windows.Forms.Label();
+            this.tabControl1 = new System.Windows.Forms.TabControl();
+            this.tabPage1 = new System.Windows.Forms.TabPage();
+            this.label4 = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.comboBoxCommunicationInterface = new System.Windows.Forms.ComboBox();
+            this.label1 = new System.Windows.Forms.Label();
             this.rfidPortNrTextBox = new System.Windows.Forms.TextBox();
             this.rfidSerialPortNrLabel = new System.Windows.Forms.Label();
-            this.radioButton1 = new System.Windows.Forms.RadioButton();
-            this.radioButton2 = new System.Windows.Forms.RadioButton();
             this.optoDataGroupBox = new System.Windows.Forms.GroupBox();
             this.tcpipPortLabel = new System.Windows.Forms.Label();
             this.tcpipPortTextBox = new System.Windows.Forms.TextBox();
             this.ipAddressLabel = new System.Windows.Forms.Label();
             this.ipAddressTextBox = new System.Windows.Forms.TextBox();
-            this.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.label3 = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
-            this.optoDataGroupBox.SuspendLayout();
+            this.radioButton1 = new System.Windows.Forms.RadioButton();
+            this.radioButton2 = new System.Windows.Forms.RadioButton();
+            this.optoSerialPortLabel = new System.Windows.Forms.Label();
+            this.optoSerialPortTextBox = new System.Windows.Forms.TextBox();
+            this.groupTextBox = new System.Windows.Forms.TextBox();
+            this.groupLabel = new System.Windows.Forms.Label();
+            this.muxBoardNrTextBox = new System.Windows.Forms.TextBox();
+            this.muxBoardNrLabel = new System.Windows.Forms.Label();
+            this.nameTextBox = new System.Windows.Forms.TextBox();
+            this.nameLabel = new System.Windows.Forms.Label();
+            this.classNameLabel = new System.Windows.Forms.Label();
+            this.tabPage2 = new System.Windows.Forms.TabPage();
+            this.tabControl1.SuspendLayout();
+            this.tabPage1.SuspendLayout();
             this.groupBox1.SuspendLayout();
+            this.optoDataGroupBox.SuspendLayout();
             this.SuspendLayout();
             // 
-            // nameTextBox
+            // tabControl1
             // 
-            this.nameTextBox.Enabled = false;
-            this.nameTextBox.Location = new System.Drawing.Point(135, 40);
-            this.nameTextBox.Name = "nameTextBox";
-            this.nameTextBox.Size = new System.Drawing.Size(121, 20);
-            this.nameTextBox.TabIndex = 2;
+            this.tabControl1.Controls.Add(this.tabPage1);
+            this.tabControl1.Controls.Add(this.tabPage2);
+            this.tabControl1.Location = new System.Drawing.Point(3, 3);
+            this.tabControl1.Name = "tabControl1";
+            this.tabControl1.SelectedIndex = 0;
+            this.tabControl1.Size = new System.Drawing.Size(611, 432);
+            this.tabControl1.TabIndex = 0;
             // 
-            // nameLabel
+            // tabPage1
             // 
-            this.nameLabel.AutoSize = true;
-            this.nameLabel.Location = new System.Drawing.Point(25, 43);
-            this.nameLabel.Name = "nameLabel";
-            this.nameLabel.Size = new System.Drawing.Size(35, 13);
-            this.nameLabel.TabIndex = 1;
-            this.nameLabel.Text = "Name";
+            this.tabPage1.Controls.Add(this.label4);
+            this.tabPage1.Controls.Add(this.label3);
+            this.tabPage1.Controls.Add(this.groupBox1);
+            this.tabPage1.Controls.Add(this.optoDataGroupBox);
+            this.tabPage1.Controls.Add(this.groupTextBox);
+            this.tabPage1.Controls.Add(this.groupLabel);
+            this.tabPage1.Controls.Add(this.muxBoardNrTextBox);
+            this.tabPage1.Controls.Add(this.muxBoardNrLabel);
+            this.tabPage1.Controls.Add(this.nameTextBox);
+            this.tabPage1.Controls.Add(this.nameLabel);
+            this.tabPage1.Controls.Add(this.classNameLabel);
+            this.tabPage1.Location = new System.Drawing.Point(4, 25);
+            this.tabPage1.Name = "tabPage1";
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage1.Size = new System.Drawing.Size(603, 403);
+            this.tabPage1.TabIndex = 0;
+            this.tabPage1.Text = "Config";
+            this.tabPage1.UseVisualStyleBackColor = true;
             // 
-            // classNameLabel
+            // label4
             // 
-            this.classNameLabel.AutoSize = true;
-            this.classNameLabel.Location = new System.Drawing.Point(132, 16);
-            this.classNameLabel.Name = "classNameLabel";
-            this.classNameLabel.Size = new System.Drawing.Size(60, 13);
-            this.classNameLabel.TabIndex = 0;
-            this.classNameLabel.Text = "ClassName";
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(208, 101);
+            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(40, 16);
+            this.label4.TabIndex = 25;
+            this.label4.Text = "1 .. 10";
             // 
-            // optoSerialPortTextBox
+            // label3
             // 
-            this.optoSerialPortTextBox.Enabled = false;
-            this.optoSerialPortTextBox.Location = new System.Drawing.Point(329, 42);
-            this.optoSerialPortTextBox.Name = "optoSerialPortTextBox";
-            this.optoSerialPortTextBox.Size = new System.Drawing.Size(34, 20);
-            this.optoSerialPortTextBox.TabIndex = 7;
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(208, 72);
+            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(33, 16);
+            this.label3.TabIndex = 24;
+            this.label3.Text = "1 .. 4";
             // 
-            // optoSerialPortLabel
+            // groupBox1
             // 
-            this.optoSerialPortLabel.AutoSize = true;
-            this.optoSerialPortLabel.Location = new System.Drawing.Point(241, 45);
-            this.optoSerialPortLabel.Name = "optoSerialPortLabel";
-            this.optoSerialPortLabel.Size = new System.Drawing.Size(72, 13);
-            this.optoSerialPortLabel.TabIndex = 6;
-            this.optoSerialPortLabel.Text = "Serial port nr.:";
+            this.groupBox1.Controls.Add(this.comboBoxCommunicationInterface);
+            this.groupBox1.Controls.Add(this.label1);
+            this.groupBox1.Controls.Add(this.rfidPortNrTextBox);
+            this.groupBox1.Controls.Add(this.rfidSerialPortNrLabel);
+            this.groupBox1.Location = new System.Drawing.Point(10, 259);
+            this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
+            this.groupBox1.Size = new System.Drawing.Size(552, 68);
+            this.groupBox1.TabIndex = 23;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "RFID / NFC communication (in case mux. board is not used)";
             // 
-            // muxBoardNrTextBox
+            // comboBoxCommunicationInterface
             // 
-            this.muxBoardNrTextBox.Enabled = false;
-            this.muxBoardNrTextBox.Location = new System.Drawing.Point(135, 63);
-            this.muxBoardNrTextBox.Name = "muxBoardNrTextBox";
-            this.muxBoardNrTextBox.Size = new System.Drawing.Size(34, 20);
-            this.muxBoardNrTextBox.TabIndex = 9;
+            this.comboBoxCommunicationInterface.Enabled = false;
+            this.comboBoxCommunicationInterface.FormattingEnabled = true;
+            this.comboBoxCommunicationInterface.Items.AddRange(new object[] {
+            "RFID",
+            "NFC"});
+            this.comboBoxCommunicationInterface.Location = new System.Drawing.Point(201, 27);
+            this.comboBoxCommunicationInterface.Name = "comboBoxCommunicationInterface";
+            this.comboBoxCommunicationInterface.Size = new System.Drawing.Size(71, 24);
+            this.comboBoxCommunicationInterface.TabIndex = 9;
             // 
-            // muxBoardNrLabel
+            // label1
             // 
-            this.muxBoardNrLabel.AutoSize = true;
-            this.muxBoardNrLabel.Location = new System.Drawing.Point(25, 66);
-            this.muxBoardNrLabel.Name = "muxBoardNrLabel";
-            this.muxBoardNrLabel.Size = new System.Drawing.Size(106, 13);
-            this.muxBoardNrLabel.TabIndex = 8;
-            this.muxBoardNrLabel.Text = "Group 1 (mux. board)";
-            // 
-            // groupTextBox
-            // 
-            this.groupTextBox.Enabled = false;
-            this.groupTextBox.Location = new System.Drawing.Point(135, 86);
-            this.groupTextBox.Name = "groupTextBox";
-            this.groupTextBox.Size = new System.Drawing.Size(34, 20);
-            this.groupTextBox.TabIndex = 11;
-            // 
-            // groupLabel
-            // 
-            this.groupLabel.AutoSize = true;
-            this.groupLabel.Location = new System.Drawing.Point(25, 89);
-            this.groupLabel.Name = "groupLabel";
-            this.groupLabel.Size = new System.Drawing.Size(45, 13);
-            this.groupLabel.TabIndex = 10;
-            this.groupLabel.Text = "Group 2";
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(41, 30);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(153, 16);
+            this.label1.TabIndex = 8;
+            this.label1.Text = "Communication Interface";
             // 
             // rfidPortNrTextBox
             // 
             this.rfidPortNrTextBox.Enabled = false;
-            this.rfidPortNrTextBox.Location = new System.Drawing.Point(329, 21);
+            this.rfidPortNrTextBox.Location = new System.Drawing.Point(439, 26);
+            this.rfidPortNrTextBox.Margin = new System.Windows.Forms.Padding(4);
             this.rfidPortNrTextBox.Name = "rfidPortNrTextBox";
-            this.rfidPortNrTextBox.Size = new System.Drawing.Size(34, 20);
+            this.rfidPortNrTextBox.Size = new System.Drawing.Size(44, 22);
             this.rfidPortNrTextBox.TabIndex = 7;
             // 
             // rfidSerialPortNrLabel
             // 
             this.rfidSerialPortNrLabel.AutoSize = true;
-            this.rfidSerialPortNrLabel.Location = new System.Drawing.Point(241, 24);
+            this.rfidSerialPortNrLabel.Location = new System.Drawing.Point(321, 30);
+            this.rfidSerialPortNrLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.rfidSerialPortNrLabel.Name = "rfidSerialPortNrLabel";
-            this.rfidSerialPortNrLabel.Size = new System.Drawing.Size(72, 13);
+            this.rfidSerialPortNrLabel.Size = new System.Drawing.Size(88, 16);
             this.rfidSerialPortNrLabel.TabIndex = 6;
             this.rfidSerialPortNrLabel.Text = "Serial port nr.:";
             // 
-            // radioButton1
-            // 
-            this.radioButton1.AutoSize = true;
-            this.radioButton1.Enabled = false;
-            this.radioButton1.Location = new System.Drawing.Point(22, 19);
-            this.radioButton1.Name = "radioButton1";
-            this.radioButton1.Size = new System.Drawing.Size(83, 17);
-            this.radioButton1.TabIndex = 0;
-            this.radioButton1.TabStop = true;
-            this.radioButton1.Text = "Use TCP/IP";
-            this.radioButton1.UseVisualStyleBackColor = true;
-            // 
-            // radioButton2
-            // 
-            this.radioButton2.AutoSize = true;
-            this.radioButton2.Enabled = false;
-            this.radioButton2.Location = new System.Drawing.Point(234, 19);
-            this.radioButton2.Name = "radioButton2";
-            this.radioButton2.Size = new System.Drawing.Size(92, 17);
-            this.radioButton2.TabIndex = 1;
-            this.radioButton2.TabStop = true;
-            this.radioButton2.Text = "Use serial port";
-            this.radioButton2.UseVisualStyleBackColor = true;
-            // 
             // optoDataGroupBox
             // 
             this.optoDataGroupBox.Controls.Add(this.tcpipPortLabel);
@@ -184,125 +180,222 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
             this.optoDataGroupBox.Controls.Add(this.radioButton2);
             this.optoDataGroupBox.Controls.Add(this.optoSerialPortLabel);
             this.optoDataGroupBox.Controls.Add(this.optoSerialPortTextBox);
-            this.optoDataGroupBox.Location = new System.Drawing.Point(28, 114);
+            this.optoDataGroupBox.Location = new System.Drawing.Point(10, 131);
+            this.optoDataGroupBox.Margin = new System.Windows.Forms.Padding(4);
             this.optoDataGroupBox.Name = "optoDataGroupBox";
-            this.optoDataGroupBox.Size = new System.Drawing.Size(414, 97);
-            this.optoDataGroupBox.TabIndex = 5;
+            this.optoDataGroupBox.Padding = new System.Windows.Forms.Padding(4);
+            this.optoDataGroupBox.Size = new System.Drawing.Size(552, 119);
+            this.optoDataGroupBox.TabIndex = 18;
             this.optoDataGroupBox.TabStop = false;
             this.optoDataGroupBox.Text = "Opto-data";
             // 
             // tcpipPortLabel
             // 
             this.tcpipPortLabel.AutoSize = true;
-            this.tcpipPortLabel.Location = new System.Drawing.Point(31, 71);
+            this.tcpipPortLabel.Location = new System.Drawing.Point(41, 87);
+            this.tcpipPortLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.tcpipPortLabel.Name = "tcpipPortLabel";
-            this.tcpipPortLabel.Size = new System.Drawing.Size(47, 13);
+            this.tcpipPortLabel.Size = new System.Drawing.Size(54, 16);
             this.tcpipPortLabel.TabIndex = 4;
             this.tcpipPortLabel.Text = "Port nr..:";
             // 
             // tcpipPortTextBox
             // 
             this.tcpipPortTextBox.Enabled = false;
-            this.tcpipPortTextBox.Location = new System.Drawing.Point(107, 68);
+            this.tcpipPortTextBox.Location = new System.Drawing.Point(143, 84);
+            this.tcpipPortTextBox.Margin = new System.Windows.Forms.Padding(4);
             this.tcpipPortTextBox.Name = "tcpipPortTextBox";
-            this.tcpipPortTextBox.Size = new System.Drawing.Size(39, 20);
+            this.tcpipPortTextBox.Size = new System.Drawing.Size(51, 22);
             this.tcpipPortTextBox.TabIndex = 5;
             // 
             // ipAddressLabel
             // 
             this.ipAddressLabel.AutoSize = true;
-            this.ipAddressLabel.Location = new System.Drawing.Point(31, 48);
+            this.ipAddressLabel.Location = new System.Drawing.Point(41, 59);
+            this.ipAddressLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ipAddressLabel.Name = "ipAddressLabel";
-            this.ipAddressLabel.Size = new System.Drawing.Size(63, 13);
+            this.ipAddressLabel.Size = new System.Drawing.Size(78, 16);
             this.ipAddressLabel.TabIndex = 2;
             this.ipAddressLabel.Text = "IP address.:";
             // 
             // ipAddressTextBox
             // 
             this.ipAddressTextBox.Enabled = false;
-            this.ipAddressTextBox.Location = new System.Drawing.Point(107, 45);
+            this.ipAddressTextBox.Location = new System.Drawing.Point(143, 55);
+            this.ipAddressTextBox.Margin = new System.Windows.Forms.Padding(4);
             this.ipAddressTextBox.Name = "ipAddressTextBox";
-            this.ipAddressTextBox.Size = new System.Drawing.Size(98, 20);
+            this.ipAddressTextBox.Size = new System.Drawing.Size(129, 22);
             this.ipAddressTextBox.TabIndex = 3;
             // 
-            // groupBox1
+            // radioButton1
             // 
-            this.groupBox1.Controls.Add(this.rfidPortNrTextBox);
-            this.groupBox1.Controls.Add(this.rfidSerialPortNrLabel);
-            this.groupBox1.Location = new System.Drawing.Point(28, 218);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(414, 55);
-            this.groupBox1.TabIndex = 12;
-            this.groupBox1.TabStop = false;
-            this.groupBox1.Text = "RFID communication (in case mux. board is not used)";
+            this.radioButton1.AutoSize = true;
+            this.radioButton1.Checked = true;
+            this.radioButton1.Enabled = false;
+            this.radioButton1.Location = new System.Drawing.Point(29, 23);
+            this.radioButton1.Margin = new System.Windows.Forms.Padding(4);
+            this.radioButton1.Name = "radioButton1";
+            this.radioButton1.Size = new System.Drawing.Size(99, 20);
+            this.radioButton1.TabIndex = 0;
+            this.radioButton1.TabStop = true;
+            this.radioButton1.Text = "Use TCP/IP";
+            this.radioButton1.UseVisualStyleBackColor = true;
             // 
-            // label3
+            // radioButton2
             // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(176, 66);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(31, 13);
-            this.label3.TabIndex = 13;
-            this.label3.Text = "1 .. 4";
+            this.radioButton2.AutoSize = true;
+            this.radioButton2.Enabled = false;
+            this.radioButton2.Location = new System.Drawing.Point(312, 23);
+            this.radioButton2.Margin = new System.Windows.Forms.Padding(4);
+            this.radioButton2.Name = "radioButton2";
+            this.radioButton2.Size = new System.Drawing.Size(115, 20);
+            this.radioButton2.TabIndex = 1;
+            this.radioButton2.Text = "Use serial port";
+            this.radioButton2.UseVisualStyleBackColor = true;
             // 
-            // label4
+            // optoSerialPortLabel
             // 
-            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(176, 89);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(37, 13);
-            this.label4.TabIndex = 14;
-            this.label4.Text = "1 .. 10";
+            this.optoSerialPortLabel.AutoSize = true;
+            this.optoSerialPortLabel.Location = new System.Drawing.Point(321, 55);
+            this.optoSerialPortLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.optoSerialPortLabel.Name = "optoSerialPortLabel";
+            this.optoSerialPortLabel.Size = new System.Drawing.Size(88, 16);
+            this.optoSerialPortLabel.TabIndex = 6;
+            this.optoSerialPortLabel.Text = "Serial port nr.:";
             // 
-            // WaterMeterCfgCtrl
+            // optoSerialPortTextBox
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.optoSerialPortTextBox.Enabled = false;
+            this.optoSerialPortTextBox.Location = new System.Drawing.Point(439, 52);
+            this.optoSerialPortTextBox.Margin = new System.Windows.Forms.Padding(4);
+            this.optoSerialPortTextBox.Name = "optoSerialPortTextBox";
+            this.optoSerialPortTextBox.Size = new System.Drawing.Size(44, 22);
+            this.optoSerialPortTextBox.TabIndex = 7;
+            // 
+            // groupTextBox
+            // 
+            this.groupTextBox.Enabled = false;
+            this.groupTextBox.Location = new System.Drawing.Point(153, 97);
+            this.groupTextBox.Margin = new System.Windows.Forms.Padding(4);
+            this.groupTextBox.Name = "groupTextBox";
+            this.groupTextBox.Size = new System.Drawing.Size(44, 22);
+            this.groupTextBox.TabIndex = 22;
+            // 
+            // groupLabel
+            // 
+            this.groupLabel.AutoSize = true;
+            this.groupLabel.Location = new System.Drawing.Point(6, 101);
+            this.groupLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.groupLabel.Name = "groupLabel";
+            this.groupLabel.Size = new System.Drawing.Size(54, 16);
+            this.groupLabel.TabIndex = 21;
+            this.groupLabel.Text = "Group 2";
+            // 
+            // muxBoardNrTextBox
+            // 
+            this.muxBoardNrTextBox.Enabled = false;
+            this.muxBoardNrTextBox.Location = new System.Drawing.Point(153, 69);
+            this.muxBoardNrTextBox.Margin = new System.Windows.Forms.Padding(4);
+            this.muxBoardNrTextBox.Name = "muxBoardNrTextBox";
+            this.muxBoardNrTextBox.Size = new System.Drawing.Size(44, 22);
+            this.muxBoardNrTextBox.TabIndex = 20;
+            // 
+            // muxBoardNrLabel
+            // 
+            this.muxBoardNrLabel.AutoSize = true;
+            this.muxBoardNrLabel.Location = new System.Drawing.Point(6, 72);
+            this.muxBoardNrLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.muxBoardNrLabel.Name = "muxBoardNrLabel";
+            this.muxBoardNrLabel.Size = new System.Drawing.Size(131, 16);
+            this.muxBoardNrLabel.TabIndex = 19;
+            this.muxBoardNrLabel.Text = "Group 1 (mux. board)";
+            // 
+            // nameTextBox
+            // 
+            this.nameTextBox.Enabled = false;
+            this.nameTextBox.Location = new System.Drawing.Point(153, 40);
+            this.nameTextBox.Margin = new System.Windows.Forms.Padding(4);
+            this.nameTextBox.Name = "nameTextBox";
+            this.nameTextBox.Size = new System.Drawing.Size(160, 22);
+            this.nameTextBox.TabIndex = 17;
+            // 
+            // nameLabel
+            // 
+            this.nameLabel.AutoSize = true;
+            this.nameLabel.Location = new System.Drawing.Point(6, 44);
+            this.nameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.nameLabel.Name = "nameLabel";
+            this.nameLabel.Size = new System.Drawing.Size(44, 16);
+            this.nameLabel.TabIndex = 16;
+            this.nameLabel.Text = "Name";
+            // 
+            // classNameLabel
+            // 
+            this.classNameLabel.AutoSize = true;
+            this.classNameLabel.Location = new System.Drawing.Point(149, 11);
+            this.classNameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.classNameLabel.Name = "classNameLabel";
+            this.classNameLabel.Size = new System.Drawing.Size(78, 16);
+            this.classNameLabel.TabIndex = 15;
+            this.classNameLabel.Text = "ClassName";
+            // 
+            // tabPage2
+            // 
+            this.tabPage2.Location = new System.Drawing.Point(4, 25);
+            this.tabPage2.Name = "tabPage2";
+            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage2.Size = new System.Drawing.Size(603, 403);
+            this.tabPage2.TabIndex = 1;
+            this.tabPage2.Text = "Test";
+            this.tabPage2.UseVisualStyleBackColor = true;
+            // 
+            // IperlHeadCfgCtrl
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.label4);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.groupBox1);
-            this.Controls.Add(this.optoDataGroupBox);
-            this.Controls.Add(this.groupTextBox);
-            this.Controls.Add(this.groupLabel);
-            this.Controls.Add(this.muxBoardNrTextBox);
-            this.Controls.Add(this.muxBoardNrLabel);
-            this.Controls.Add(this.nameTextBox);
-            this.Controls.Add(this.nameLabel);
-            this.Controls.Add(this.classNameLabel);
-            this.Name = "WaterMeterCfgCtrl";
-            this.Size = new System.Drawing.Size(500, 300);
+            this.Controls.Add(this.tabControl1);
+            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Name = "IperlHeadCfgCtrl";
+            this.Size = new System.Drawing.Size(617, 438);
             this.Load += new System.EventHandler(this.WaterMeterCfgCtrl_Load);
-            this.optoDataGroupBox.ResumeLayout(false);
-            this.optoDataGroupBox.PerformLayout();
+            this.tabControl1.ResumeLayout(false);
+            this.tabPage1.ResumeLayout(false);
+            this.tabPage1.PerformLayout();
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
+            this.optoDataGroupBox.ResumeLayout(false);
+            this.optoDataGroupBox.PerformLayout();
             this.ResumeLayout(false);
-            this.PerformLayout();
 
 		}
 
-		#endregion
+        #endregion
 
-		private System.Windows.Forms.TextBox nameTextBox;
-		private System.Windows.Forms.Label nameLabel;
-		private System.Windows.Forms.Label classNameLabel;
-		private System.Windows.Forms.TextBox optoSerialPortTextBox;
-		private System.Windows.Forms.Label optoSerialPortLabel;
-		private System.Windows.Forms.TextBox muxBoardNrTextBox;
-		private System.Windows.Forms.Label muxBoardNrLabel;
-		private System.Windows.Forms.TextBox groupTextBox;
-        private System.Windows.Forms.Label groupLabel;
+        private System.Windows.Forms.TabControl tabControl1;
+        private System.Windows.Forms.TabPage tabPage1;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.ComboBox comboBoxCommunicationInterface;
+        private System.Windows.Forms.Label label1;
         private System.Windows.Forms.TextBox rfidPortNrTextBox;
         private System.Windows.Forms.Label rfidSerialPortNrLabel;
-        private System.Windows.Forms.RadioButton radioButton1;
-        private System.Windows.Forms.RadioButton radioButton2;
         private System.Windows.Forms.GroupBox optoDataGroupBox;
         private System.Windows.Forms.Label tcpipPortLabel;
         private System.Windows.Forms.TextBox tcpipPortTextBox;
         private System.Windows.Forms.Label ipAddressLabel;
         private System.Windows.Forms.TextBox ipAddressTextBox;
-        private System.Windows.Forms.GroupBox groupBox1;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.Label label4;
-	}
+        private System.Windows.Forms.RadioButton radioButton1;
+        private System.Windows.Forms.RadioButton radioButton2;
+        private System.Windows.Forms.Label optoSerialPortLabel;
+        private System.Windows.Forms.TextBox optoSerialPortTextBox;
+        private System.Windows.Forms.TextBox groupTextBox;
+        private System.Windows.Forms.Label groupLabel;
+        private System.Windows.Forms.TextBox muxBoardNrTextBox;
+        private System.Windows.Forms.Label muxBoardNrLabel;
+        private System.Windows.Forms.TextBox nameTextBox;
+        private System.Windows.Forms.Label nameLabel;
+        private System.Windows.Forms.Label classNameLabel;
+        private System.Windows.Forms.TabPage tabPage2;
+    }
 }

TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHeadTestCtrl.Designer.cs

@@ -0,0 +1,137 @@
+namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
+{
+    partial class IperlHeadTestCtrl
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.optoTestGroupBox = new System.Windows.Forms.GroupBox();
+            this.optoListBox = new System.Windows.Forms.ListBox();
+            this.rfidOutputListBox = new System.Windows.Forms.ListBox();
+            this.RfidTestGroupBox = new System.Windows.Forms.GroupBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.rfidCommandComboBox = new System.Windows.Forms.ComboBox();
+            this.commandTestButton = new System.Windows.Forms.Button();
+            this.optoTestGroupBox.SuspendLayout();
+            this.RfidTestGroupBox.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // optoTestGroupBox
+            // 
+            this.optoTestGroupBox.Controls.Add(this.optoListBox);
+            this.optoTestGroupBox.Location = new System.Drawing.Point(5, 4);
+            this.optoTestGroupBox.Name = "optoTestGroupBox";
+            this.optoTestGroupBox.Size = new System.Drawing.Size(591, 161);
+            this.optoTestGroupBox.TabIndex = 2;
+            this.optoTestGroupBox.TabStop = false;
+            this.optoTestGroupBox.Text = "Opto-data";
+            // 
+            // optoListBox
+            // 
+            this.optoListBox.FormattingEnabled = true;
+            this.optoListBox.ItemHeight = 16;
+            this.optoListBox.Location = new System.Drawing.Point(7, 22);
+            this.optoListBox.Name = "optoListBox";
+            this.optoListBox.Size = new System.Drawing.Size(573, 132);
+            this.optoListBox.TabIndex = 0;
+            // 
+            // rfidOutputListBox
+            // 
+            this.rfidOutputListBox.FormattingEnabled = true;
+            this.rfidOutputListBox.ItemHeight = 16;
+            this.rfidOutputListBox.Location = new System.Drawing.Point(5, 54);
+            this.rfidOutputListBox.Name = "rfidOutputListBox";
+            this.rfidOutputListBox.SelectionMode = System.Windows.Forms.SelectionMode.None;
+            this.rfidOutputListBox.Size = new System.Drawing.Size(575, 164);
+            this.rfidOutputListBox.TabIndex = 3;
+            // 
+            // RfidTestGroupBox
+            // 
+            this.RfidTestGroupBox.Controls.Add(this.rfidOutputListBox);
+            this.RfidTestGroupBox.Controls.Add(this.label2);
+            this.RfidTestGroupBox.Controls.Add(this.rfidCommandComboBox);
+            this.RfidTestGroupBox.Controls.Add(this.commandTestButton);
+            this.RfidTestGroupBox.Location = new System.Drawing.Point(5, 171);
+            this.RfidTestGroupBox.Name = "RfidTestGroupBox";
+            this.RfidTestGroupBox.Size = new System.Drawing.Size(591, 224);
+            this.RfidTestGroupBox.TabIndex = 3;
+            this.RfidTestGroupBox.TabStop = false;
+            this.RfidTestGroupBox.Text = "RFID / NFC data";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(2, 25);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(69, 16);
+            this.label2.TabIndex = 2;
+            this.label2.Text = "Command";
+            // 
+            // rfidCommandComboBox
+            // 
+            this.rfidCommandComboBox.FormattingEnabled = true;
+            this.rfidCommandComboBox.Location = new System.Drawing.Point(86, 19);
+            this.rfidCommandComboBox.Name = "rfidCommandComboBox";
+            this.rfidCommandComboBox.Size = new System.Drawing.Size(341, 24);
+            this.rfidCommandComboBox.TabIndex = 1;
+            // 
+            // commandTestButton
+            // 
+            this.commandTestButton.Location = new System.Drawing.Point(449, 19);
+            this.commandTestButton.Name = "commandTestButton";
+            this.commandTestButton.Size = new System.Drawing.Size(126, 24);
+            this.commandTestButton.TabIndex = 0;
+            this.commandTestButton.Text = "Send command";
+            this.commandTestButton.UseVisualStyleBackColor = true;
+            this.commandTestButton.MouseClick += new System.Windows.Forms.MouseEventHandler(this.CommandTestButtonClick);
+            // 
+            // IperlHeadTestCtrl
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.optoTestGroupBox);
+            this.Controls.Add(this.RfidTestGroupBox);
+            this.Name = "IperlHeadTestCtrl";
+            this.Size = new System.Drawing.Size(611, 432);
+            this.Load += new System.EventHandler(this.UserControl_Load);
+            this.optoTestGroupBox.ResumeLayout(false);
+            this.RfidTestGroupBox.ResumeLayout(false);
+            this.RfidTestGroupBox.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.GroupBox optoTestGroupBox;
+        private System.Windows.Forms.ListBox rfidOutputListBox;
+        private System.Windows.Forms.GroupBox RfidTestGroupBox;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.ComboBox rfidCommandComboBox;
+        private System.Windows.Forms.Button commandTestButton;
+        private System.Windows.Forms.ListBox optoListBox;
+    }
+}

TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHeadTestCtrl.cs

@@ -0,0 +1,155 @@
+using Common;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.IO.Ports;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Web.UI.WebControls;
+using System.Windows.Forms;
+using TBF.Rig.DataEntry.S620.CheckItems;
+using TBF.Rig.Generic;
+using TBF.Rig.Sequences;
+
+namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
+{
+    public partial class IperlHeadTestCtrl : UserControl
+    {
+        IperlHeadCfg config;
+        IperlHead iPerlHead;
+        Thread optoThread;
+
+        private bool stopWorkerThread;
+        public event EventHandler<OptoReceivedEventArgs> OptoReceivedHandler;
+
+        public IperlHeadTestCtrl(IperlHeadCfg config)
+        {
+            this.config = config;
+            InitializeComponent();
+            if (config == null) return;
+
+            iPerlCommunicationForm.cfg = new TestMethodCfg(null); // default values for iPerlCommunication
+
+            foreach(var head in ProcessData.IperlHeads)
+            {
+                if (head != null && head.Name == config.Name) { iPerlHead = head; }
+            }
+
+            rfidCommandComboBox.DisplayMember = "Name";
+            rfidCommandComboBox.ValueMember = "Value";
+            var items = new[]
+            {
+                new {Name = "Read PCB", Value = "ReadPCB" },
+                new {Name = "Set Test Mode", Value = "SetTestMode" },
+                new {Name = "Set Active Mode", Value = "SetActiveMode" }
+            };
+            /*
+            // CTRL+ALT+double click - hidden poweruser menu
+            if (((Keyboard.ModifierKeys & Keys.Control) == Keys.Control) && ((Keyboard.ModifierKeys & Keys.Alt) == Keys.Alt) && Users.CurrentUser.AuthorizedAs == AuthorizedAs.PowerUser) 
+            {
+                Array.Resize(ref items, items.Length + 1);
+                items[items.Length - 1] = new { Name = "Kluc", Value = "Kluc" };
+            }
+            */
+            rfidCommandComboBox.DataSource = items;
+
+            stopWorkerThread = false;
+
+            OptoReceivedHandler += (EventHandler<OptoReceivedEventArgs>)((sndr, args) =>
+            {
+                if (this.InvokeRequired)
+                    this.Invoke((Delegate)new EventHandler<OptoReceivedEventArgs>(this.OnOptoReceived2), sndr, (object)args);
+                else
+                    this.OnOptoReceived2(sndr, args);
+            });
+        }
+
+        public void OnOptoReceived2(object sender, OptoReceivedEventArgs args)
+        {
+            optoListBox.Items.Insert(0,args.Data);
+        }
+
+        private void CommandTestButtonClick(object sender, MouseEventArgs e)
+        {
+            rfidOutputListBox.Items.Clear();
+
+            using (Tools.LogChecker logChecker = new Tools.LogChecker("RfidData", log4net.Core.Level.Debug))
+            {
+                ListItem rfidListItem = new ListItem();
+                rfidListItem.Attributes.Add("style", "font-weight:bold");
+                switch (rfidCommandComboBox.SelectedValue)
+                {
+                    case "ReadPCB":
+                        rfidListItem.Text = $"PCB: {OpticalHeadTest.ReadRequest_PCB(iPerlHead)}";
+                        break;
+                    case "SetTestMode":
+                        rfidListItem.Text = OpticalHeadTest.SetTestMode(iPerlHead);
+                        optoListBox.Items.Clear();
+                        stopWorkerThread = false;
+                        optoThread = new Thread(OptoWorker);
+                        if (!optoThread.IsAlive)
+                        {
+                            optoThread.Start();
+                        }
+                        break;
+                    case "SetActiveMode":
+                        rfidListItem.Text = OpticalHeadTest.SetActiveMode(iPerlHead);
+                        stopWorkerThread = true;
+                        break;
+                }
+                rfidOutputListBox.Items.Add(rfidListItem);
+                rfidOutputListBox.Items.AddRange(logChecker.Messages.ToArray());
+            }
+        }
+
+        private void OptoWorker()
+        {
+            while (!this.stopWorkerThread)
+            {
+                Thread.Sleep(250);
+                if (this.stopWorkerThread)
+                    break;
+
+                string buffer = iPerlHead.ReadOptoData();
+                if (string.IsNullOrEmpty(buffer))
+                {
+                    this.OnOptoReceived((object)this, new OptoReceivedEventArgs("."));
+                }
+                else
+                    OnOptoReceived((object)this, new OptoReceivedEventArgs(buffer));
+            }
+        }
+
+        public void OnOptoReceived(object sender, OptoReceivedEventArgs args)
+        {
+            if (this.OptoReceivedHandler == null)
+                return;
+            try
+            {
+                this.OptoReceivedHandler(sender, args);
+            }
+            catch (Exception ex)
+            {
+            }
+        }
+
+        private void UserControl_Load(object sender, EventArgs e)
+        {
+            this.ParentForm.FormClosing += new FormClosingEventHandler(ParentForm_FormClosing);
+        }
+
+        void ParentForm_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            //OnHandleDestroyed(new EventArgs());
+            stopWorkerThread = true;
+            if (optoThread != null)
+            {
+                optoThread.Abort();
+            }
+        }
+    }
+}

TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/NfcServices.cs

@@ -0,0 +1,278 @@
+using log4net;
+using Sensus.iPerl.NfcHandler;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text;
+using System.Threading;
+using static Sensus.iPerl.NfcHandler.MCI_Protocol;
+
+namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
+{
+    internal class NfcServices
+    {
+        protected static readonly ILog rfidDataLogger = LogManager.GetLogger("RfidData");
+        internal static int ReadRequest(TestMethodCfg cfg, IperlHead iperlHead, MCI_Protocol.StructName structName, int offset, int length, out byte[] buffer)
+        {
+            NfcDataHandler _nfcDataHandler = new NfcDataHandler();
+            MessageEventHandlers(_nfcDataHandler);
+            CR95HF_MessageEventHandlers(_nfcDataHandler._CR95HF_Reader);
+            ST25DV_MessageEventHandlers(_nfcDataHandler._ST25DV_Device);
+            MCI_MessageEventHandlers(_nfcDataHandler._MCI_Protocol);
+            NFCHeadConfig_MessageEventHandlers(_nfcDataHandler._NFCHead_Config);
+            try
+            {
+                rfidDataLogger.Info($"NFC COM{iperlHead.RfidComPortNr} ReadRequest : {structName}, {offset}, {length}");
+                OpenConnection(_nfcDataHandler, cfg, iperlHead);
+
+                buffer = MciRead(_nfcDataHandler, structName, (ushort)offset, length);
+
+                CloseComPort(_nfcDataHandler);
+
+                rfidDataLogger.Info($"NFC COM{iperlHead.RfidComPortNr} ReadRequest : {structName}, {offset}, {length} ; Response= {ByteArrayToHexString(buffer)} ; Error: {_nfcDataHandler.LastErrorMessage}");
+
+                return Convert.ToInt32(_nfcDataHandler.LastErrorCode); //return 0;
+            }
+            catch (Exception ex)
+            {
+                rfidDataLogger.Error($"NFC COM{iperlHead.RfidComPortNr} ReadRequest Error: {ex.Message}");
+                buffer = new byte[length];
+                return 3;
+            }
+        }
+
+        internal static int WriteRequest(TestMethodCfg cfg, IperlHead iperlHead, MCI_Protocol.StructName structName, int offset, int length, byte[] buffer)
+        {
+            NfcDataHandler _nfcDataHandler = new NfcDataHandler();
+            MessageEventHandlers(_nfcDataHandler);
+            CR95HF_MessageEventHandlers(_nfcDataHandler._CR95HF_Reader);
+            ST25DV_MessageEventHandlers(_nfcDataHandler._ST25DV_Device);
+            MCI_MessageEventHandlers(_nfcDataHandler._MCI_Protocol);
+            NFCHeadConfig_MessageEventHandlers(_nfcDataHandler._NFCHead_Config);
+            try
+            {
+                rfidDataLogger.Info($"NFC COM{iperlHead.RfidComPortNr} WriteRequest : {structName}, {offset}, {length}, {ByteArrayToHexString(buffer)}");
+                OpenConnection(_nfcDataHandler, cfg, iperlHead);
+
+                MciWrite(_nfcDataHandler, structName, (ushort)offset, length, buffer);
+
+                CloseComPort(_nfcDataHandler);
+                return 0;
+            }
+            catch (Exception ex)
+            {
+                rfidDataLogger.Error($"NFC COM{iperlHead.RfidComPortNr} WriteRequest Error: {ex.Message}");
+                return 3;
+            }
+        }
+
+        private static void OpenConnection(NfcDataHandler nfcDataHandler, TestMethodCfg cfg, IperlHead iperlHead)
+        {
+            string comPort = $"COM{iperlHead.RfidComPortNr}";
+            int retryCount = 0 ;
+            Open:
+            nfcDataHandler.Close();
+            Thread.Sleep(100);
+            if (nfcDataHandler.OpenConnection(comPort, cfg.BaudRate, cfg.DataBits, cfg.ParityBit, cfg.StopBits))
+            {
+                rfidDataLogger.Info($"NFC COM{iperlHead.RfidComPortNr} Port Open");
+
+                if (nfcDataHandler.ConnectReader())
+                {
+                    rfidDataLogger.Info($"NFC COM{iperlHead.RfidComPortNr} Reader connected");
+                    if (!nfcDataHandler.ConnectDevice())
+                    {
+                        rfidDataLogger.Error($"NFC COM{iperlHead.RfidComPortNr} Error connect device.");
+                        for (int i = 0; i < cfg.MaxCommRetries; i++)
+                        {
+                            if (nfcDataHandler.Echo()) break;
+                        }
+                    }
+                }
+                else
+                {
+                    retryCount++;
+                    rfidDataLogger.Error($"NFC COM{iperlHead.RfidComPortNr} Error connect reader. Reconnect comport {retryCount}");
+                    if (retryCount < cfg.MaxCommRetries)
+                        goto Open;
+                }
+            }
+            else
+                rfidDataLogger.Error($"Open NFC COM{iperlHead.RfidComPortNr} Port Failed");
+        }
+
+        private static void CloseComPort(NfcDataHandler nfcDataHandler)
+        {
+            nfcDataHandler.Close();
+        }
+
+        private static byte[] MciRead(NfcDataHandler nfcDataHandler, StructName structName, ushort offset, int length)
+        {
+            bool isReadValues = false;
+            try
+            {
+                isReadValues = false;
+                long num1 = (long)length;
+                int timeoutMs = 4000;
+                byte payloadlength = Convert.ToByte(num1.ToString("X2"), 16);
+                if (nfcDataHandler.MCI_Read(structName, offset, payloadlength, timeoutMs))
+                {
+                    byte[] lastData = nfcDataHandler.LastData;
+                    if ((long)lastData.Length >= num1)
+                    {
+                        rfidDataLogger.Info($"COM: MciRead ({structName},{offset},{length}) = {ByteArrayToHexString(lastData)}");
+                        return lastData;
+                    }
+                    else
+                        rfidDataLogger.Info($"COM: MciRead ({structName},{offset},{length}) = {ByteArrayToHexString(lastData)}");
+                }
+                else if (nfcDataHandler.LastErrorCode == (byte)0)
+                {
+                    rfidDataLogger.Info($"MCI Error: Unidentified");
+                }
+                else
+                {
+                    rfidDataLogger.Info("Last error message: " + nfcDataHandler.LastErrorMessage);
+                }
+            }
+            catch (Exception ex)
+            {
+                rfidDataLogger.Error("MciRead Last error message: " + ex.Message);
+            }
+            return new byte[length];
+        }
+
+        private static void MciWrite(NfcDataHandler nfcDataHandler, MCI_Protocol.StructName structName, ushort offset, int length, byte[] payload)
+        {
+            try
+            {
+                long num1 = (long)length;
+                int timeoutMs = 4000;
+                byte payloadlength = Convert.ToByte(num1);
+                if ((int)payloadlength != payload.Length)
+                    rfidDataLogger.Error("Insufficient Payload -- Payload lenth : " + (object)payload.Length);
+                else if (nfcDataHandler.MCI_Write(structName, offset, payloadlength, payload, timeoutMs))
+                {
+                    //setStatusIndicator(true);
+                }
+                else if (nfcDataHandler.LastErrorCode > (byte)0)
+                {
+                    rfidDataLogger.Error("Last error message: " + nfcDataHandler.LastErrorMessage);
+                    //int num2 = (int)MessageBox.Show(this._nfcDataHandler.LastErrorMessage);
+                }
+            }
+            catch (Exception ex)
+            {
+                rfidDataLogger.Error("MciWrite error message: " + ex.Message);
+            }
+        }
+
+        private static void MciWriteCommand(NfcDataHandler nfcDataHandler, byte commandcode)
+        {
+            try
+            {
+                ushort offset = 0;
+                int timeoutMs = 4000;
+                byte payloadlength = 1;
+                byte[] payload = new byte[1] { commandcode };
+                if (nfcDataHandler.MCI_Write(MCI_Protocol.StructName.Command, offset, payloadlength, payload, timeoutMs) || nfcDataHandler.LastErrorCode <= (byte)0)
+                    return;
+                rfidDataLogger.Error("MciWriteCommand Last error message: " + nfcDataHandler.LastErrorMessage);
+            }
+            catch (Exception ex)
+            {
+                rfidDataLogger.Error("MciWriteCommand Last error message: " + ex.Message);
+            }
+        }
+
+        public static string ByteArrayToHexString(byte[] data)
+        {
+            StringBuilder stringBuilder = new StringBuilder();
+            foreach (byte num in data)
+                stringBuilder.Append(num.ToString("X2"));
+            return stringBuilder.ToString();
+        }
+
+        private static byte[] BuildPayLoad(string strPayLoad, int length)
+        {
+            byte[] collection;
+
+            if (strPayLoad.Split(':').Length > 1)
+            {
+                uint timestamp = ConvertDateTimeToTimestamp(Convert.ToDateTime(DateTime.ParseExact(strPayLoad, "HH:mm:ss dd/MM/yyyy", (IFormatProvider)CultureInfo.InvariantCulture)));
+                byte[] bytes = BitConverter.GetBytes(timestamp);
+                return bytes;
+            }
+            else if (strPayLoad.Split(',').Length > 1)
+            {
+                string[] strArray = strPayLoad.Split(',');
+                collection = new byte[strArray.Length];
+                for (int index3 = 0; index3 < strArray.Length; ++index3)
+                    collection[index3] = Convert.ToByte(strArray[index3], 16);
+                return collection;
+            }
+            else
+            {
+                //int num = strPayLoad.Split(',').Length;
+                collection = HexStringToByteArray(strPayLoad.Substring(strPayLoad.Length - length * 2).ToUpper());
+                Array.Reverse((Array)collection);
+                return collection;
+            }
+        }
+
+        public static byte[] HexStringToByteArray(string hexString)
+        {
+            int length = hexString.Length;
+            byte[] byteArray = new byte[length / 2];
+            for (int startIndex = 0; startIndex < length; startIndex += 2)
+                byteArray[startIndex / 2] = Convert.ToByte(hexString.Substring(startIndex, 2), 16);
+            return byteArray;
+        }
+
+        private static uint ConvertDateTimeToTimestamp(DateTime datetime)
+        {
+            TimeSpan utcOffset = TimeZone.CurrentTimeZone.GetUtcOffset(DateTime.Now);
+            return (uint)((datetime - new DateTime(2000, 1, 1, 0, 0, 0).ToLocalTime()).TotalSeconds + utcOffset.TotalSeconds);
+        }
+
+        #region EventHandlers
+        public static void MCI_MessageEventHandlers(MCI_Protocol e)
+        {
+            DelNfc_MCI_MessageHandler mciMessageHandler = new DelNfc_MCI_MessageHandler(OnHandler);
+            e.MessageEvent += mciMessageHandler;
+        }
+
+        public static void ST25DV_MessageEventHandlers(ST25DV_Device e)
+        {
+            DelNfc_ST25DV_MessageHandler dvMessageHandler = new DelNfc_ST25DV_MessageHandler(OnHandler);
+            e.MessageEvent += dvMessageHandler;
+        }
+
+        public static void CR95HF_MessageEventHandlers(CR95HF_Reader e)
+        {
+            DelNfc_CR95HF_MessageHandler hfMessageHandler = new DelNfc_CR95HF_MessageHandler(OnHandler);
+            e.MessageEvent += hfMessageHandler;
+        }
+
+        public static void NFCHeadConfig_MessageEventHandlers(NFCHeadConfig e)
+        {
+            DelNfc_NFCHeadConfig_MessageHandler configMessageHandler = new DelNfc_NFCHeadConfig_MessageHandler(OnHandler);
+            e.MessageEvent += configMessageHandler;
+        }
+
+        public static void MessageEventHandlers(NfcDataHandler e)
+        {
+            DelNfcMessageHandler nfcMessageHandler = new DelNfcMessageHandler(OnHandler);
+            e.MessageEvent += nfcMessageHandler;
+        }
+
+        public static void OnHandler(object sender, NfcMessageEventArgs e)
+        {
+            if (e.Message == null)
+                return;
+            string message = e.Message.Replace("\n", " ").Replace("\r", "");
+            rfidDataLogger.Debug(message);
+        }
+        #endregion
+    }
+}

TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/ProcParams.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.IO;
@@ -18,33 +18,27 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
 
 		public MeterType MeterType;
         public float CalibTarget;                           /// Target error after calibration in [%]
-        public float CalibTargetQ2;                         /// Target error at Q2 after Q2 correction in [%]
         public int FactorLimitLo;							/// Lower limit for the calibration factor
 		public int FactorLimitHi;							/// Upper limit for the calibration factor
         public Counting Counting;                           /// Initial iPerl counting (Artbitrary, Positive or Negative)
-        public int WMType_ID;                               /// Required for Oracle DB: ID_WZTyp in table VT_PRUEFPUNKT_SOLL_SD
 
 
 		public override void InitializeAll()
 		{
 			MeterType = MeterType.AutoDetect;
             CalibTarget = 0;
-            CalibTargetQ2 = 0;
             FactorLimitLo = 1000;
 			FactorLimitHi = 8000;
             Counting = Counting.Arbitrary;
-            WMType_ID = 2;                      /// Value for iPerl DN15
 		}
 
 		string[] paramNames = new string[]
 		{
             "iPerl type",
             "Calib. target [%]",
-            "Calib. target at Q2 [%]",
 			"Calib. factor Lo",
 			"Calib. factor Hi",
             "Counting",
-            "WM type ID",
 		};
 		public override string ParamName(int i) { return paramNames[i]; }
         public override int ParamsCount() { return paramNames.Length; }
@@ -72,11 +66,9 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
 			{
 				case 0: return MeterType.ToString();
                 case 1: return CalibTarget.ToString();
-                case 2: return CalibTargetQ2.ToString();
-                case 3: return FactorLimitLo.ToString();
-				case 4: return FactorLimitHi.ToString();
-                case 5: return Counting.ToString();
-                case 6: return WMType_ID.ToString();
+                case 2: return FactorLimitLo.ToString();
+				case 3: return FactorLimitHi.ToString();
+                case 4: return Counting.ToString();
                 default: return string.Empty;
 			}
 		}
@@ -92,16 +84,14 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
 					}
 					break;
                 case 1: CalibTarget = Utils.ParseSFloat(strValue); return CfgUpdateFlags.None;
-                case 2: CalibTargetQ2 = Utils.ParseSFloat(strValue); return CfgUpdateFlags.None;
-                case 3: FactorLimitLo = int.Parse(strValue); return CfgUpdateFlags.None;
-                case 4: FactorLimitHi = int.Parse(strValue); return CfgUpdateFlags.None;
-                case 5:
+                case 2: FactorLimitLo = int.Parse(strValue); return CfgUpdateFlags.None;
+                case 3: FactorLimitHi = int.Parse(strValue); return CfgUpdateFlags.None;
+                case 4:
                     for (Counting c = 0; c < Counting.Count; c++)
                     {
                         if (c.ToString().Equals(strValue)) { Counting = c; return CfgUpdateFlags.None; }
                     }
                     break;
-                case 6: WMType_ID = int.Parse(strValue); return CfgUpdateFlags.None;
                 default: return CfgUpdateFlags.None;
 			}
 
@@ -121,18 +111,14 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
 					for (MeterType mt = 0; mt < MeterType.Count; mt++) if (mt.ToString().Equals(strValue)) return true;
 					break;
                 case 1:
-                case 2:
                     if (Utils.TryParseSFloat(strValue, out fDummy) && fDummy >= -10.0f && fDummy <= 10.0f) return true;
                     break;
+				case 2:
 				case 3:
-				case 4:
                     if (int.TryParse(strValue, out iDummy) && iDummy >= 1000 && iDummy <= 8000) return true;
                     break;
-                case 5:
+                case 4:
                     for (Counting c = 0; c < Counting.Count; c++) if (c.ToString().Equals(strValue)) return true;
-                    break;
-                case 6:    /// WMType_ID
-                    if (int.TryParse(strValue, out iDummy)) return true;
                     break;
 				default:
 					message = "Invalid index";
@@ -147,11 +133,9 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
 		{
 			prms.MeterType = this.MeterType;
             prms.CalibTarget = this.CalibTarget;
-            prms.CalibTargetQ2 = this.CalibTargetQ2;
             prms.FactorLimitLo = this.FactorLimitLo;
 			prms.FactorLimitHi = this.FactorLimitHi;
             prms.Counting = this.Counting;
-            prms.WMType_ID = this.WMType_ID;
         }
 
 		public IParamsProvider Clone()

TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/RfidServices.cs

@@ -0,0 +1,123 @@
+using Sensus.iPerl.RfidCom.Exceptions;
+using Sensus.iPerl.RfidCom.Helper;
+using Sensus.iPerl.RfidCom;
+using System;
+using System.Text.RegularExpressions;
+using System.Threading;
+using log4net;
+
+namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
+{
+    internal class RfidServices
+    {
+        protected static readonly ILog rfidDataLogger = LogManager.GetLogger("RfidData");
+        private static readonly ILog log = LogManager.GetLogger(typeof(iPerlCommunicationForm));
+
+        internal static int ReadRequest(TestMethodCfg cfg, IperlHead iperlHead, MessageID messageID, int offset, int length, out byte[] buffer)
+        {
+            for (int i = 0; i < cfg.MaxCommRetries; i++)
+            {
+                rfidDataLogger.Error($"{iperlHead.CommInterface} Start {i} reading: COM{iperlHead.RfidComPortNr}: ReadRequestPort ({messageID},{offset}, {length}... timeout {cfg.CommTimeout})");
+                using (RfidLogic writer = new RfidLogic($"COM{iperlHead.RfidComPortNr}"))
+                {
+                    try
+                    {
+                        byte[] response = writer.ReadRequest((byte)messageID, offset, length, cfg.CommTimeout);
+                        string hexString = RfidHelper.ConvertByteArrayToHexString(response);
+                        string swapHexString = RfidHelper.SwapHexcode(hexString);
+                        string decString = RfidHelper.HexLiteral2Unsigned(RfidHelper.SwapHexcode(hexString)).ToString();
+
+                        if (length > 10)
+                        {
+                            //if the result only contains "00"s we are working on the wrong COM port 
+                            // or the module just isn't connected
+                            if (Regex.IsMatch(hexString, @"^(00)\1+$"))
+                            {
+                                rfidDataLogger.Error($"COM{iperlHead.RfidComPortNr}: ReadRequestPort ({messageID},...) <- Error: No RFID signal.");
+                                throw new RfidValidationException("Error_Rfid_NoSignal");
+                            }
+
+                            //if the result only contains "03"s the meter did not answer.
+                            // Might be due to the module being positioned incorrectly.
+                            if (Regex.IsMatch(hexString, @"^(03)\1+$"))
+                            {
+                                rfidDataLogger.Error($"COM{iperlHead.RfidComPortNr}: ReadRequestPort ({messageID},...) <- Error: No meter signal.");
+                                throw new RfidValidationException("Error_Rfid_NoAnswerFromMeter");
+                            }
+                        }
+
+                        writer.ClosePort();
+                        buffer = response;
+                        rfidDataLogger.Info($"{iperlHead.Name} ({iperlHead.SerialNr}): ReadRequestPort(COM{iperlHead.RfidComPortNr},...) returned HEX: {hexString}; SwapHexCodeToDecimal: {decString}");
+                        return 0;
+                    }
+                    catch (RfidDataNotAvailableException)
+                    {
+                        if (/*RfidHelper.IsPassThrough(messageID)*/ messageID == MessageID.ASICRegisterReadTest || messageID == MessageID.RadioPassthrough)
+                        {
+                            rfidDataLogger.Info($"COM{iperlHead.RfidComPortNr}: ReadRequestPort ({messageID},...) {(i > 0 ? "<- Error: Invalid Pass-Through data." : "<- Info: Wait for Pass-Through data.")}");
+                            Thread.Sleep(cfg.PassThroughWaitTime);
+                        }
+                        else
+                        {
+                            Thread.Sleep(cfg.WaitTimeAfterFailure);
+                        }
+                    }
+                    catch (RfidValidationException)
+                    {
+                        Thread.Sleep(cfg.WaitTimeAfterFailure);
+                    }
+                    catch (Exception ex)
+                    {
+                        rfidDataLogger.Error($"COM{iperlHead.RfidComPortNr}: ReadRequestPort ({messageID},...) {ex.Message}");
+                        Thread.Sleep(cfg.WaitTimeAfterFailure);
+                    }
+                }
+            }
+            rfidDataLogger.Error($"{iperlHead.CommInterface} reading failed after {cfg.MaxCommRetries} retries: COM{iperlHead.RfidComPortNr}: ReadRequestPort ({messageID},...)");
+            log.Error($"{iperlHead.CommInterface} reading failed after {cfg.MaxCommRetries} retries: COM{iperlHead.RfidComPortNr}: ReadRequestPort ({messageID},...)");
+            buffer = new byte[length];
+            return 3;
+        }
+
+        internal static int WriteRequest(TestMethodCfg cfg, IperlHead iperlHead, MessageID messageID, int offset, int length, byte[] buffer)
+        {
+            RfidLogic writer = new RfidLogic($"COM{iperlHead.RfidComPortNr}");
+            string payload = RfidHelper.ConvertByteArrayToHexString(buffer);
+
+            for (var i = 0; i < cfg.MaxCommRetries; i++)
+            {
+                rfidDataLogger.Error($"{iperlHead.CommInterface} Start {i} writting: COM{iperlHead.RfidComPortNr}: WriteRequest ({messageID},{offset}, {length}, {payload}... timeout {cfg.CommTimeout})");
+                try
+                {
+                    if (writer.ClosePort()) writer.OpenPort();
+                    writer.WriteRequest((byte)messageID, offset, length, buffer, cfg.CommTimeout, false);
+                    writer.ClosePort();
+                    rfidDataLogger.InfoFormat($"{iperlHead.Name}({iperlHead.SerialNr},COM{iperlHead.RfidComPortNr}): WriteRequestPort({messageID}, {offset}, {length}, {payload})");
+                    return 0;
+                }
+                catch (Exception ex)
+                {
+                    if (messageID == MessageID.RadioPassthrough || messageID == MessageID.ASICRegisterReadTest)
+                    {
+                        Thread.Sleep(1500);
+                    }
+                    else
+                    {
+                        rfidDataLogger.Error($"COM{iperlHead.RfidComPortNr}: Error: {ex.Message}");
+                        Thread.Sleep(cfg.WaitTimeAfterFailure);
+                        if (i > 1)
+                        {
+                            rfidDataLogger.Error($"COM{iperlHead.RfidComPortNr}: Reopen the com port.");
+                            writer.ClosePort();
+                        }
+                    }
+                }
+            }
+            writer.ClosePort();
+            rfidDataLogger.Error($"RFID writing failed after {cfg.MaxCommRetries} retries: COM{iperlHead.RfidComPortNr}: WriteRequestPort ({messageID},...) {System.Text.Encoding.UTF8.GetString(buffer)}");
+            log.Error($"RFID writing failed after {cfg.MaxCommRetries} retries: COM{iperlHead.RfidComPortNr}: WriteRequestPort ({messageID},...) {System.Text.Encoding.UTF8.GetString(buffer)}");
+            return 2;
+        }
+    }
+}

TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/SimulationServices.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Linq;
+
+namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
+{
+    internal class SimulationServices
+    {
+        const int Q2CorrFactorsAddr = 0x1878;
+
+        internal static int ReadRequest(TestMethodCfg cfg, IperlHead iperlHead, MessageID messageID, int offset, int length, out byte[] buffer)
+        {
+            byte[] configurationBuffer = new byte[ConfigStruct.Length] { 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 160, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+            byte[] calibrationBuffer = new byte[CalibrationStructV4.Length] { 3, 0, 150, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 0, 0, 150, 10 };
+            buffer = new byte[length];
+
+            if (messageID == MessageID.Configuration)
+            {
+                Array.Copy(GetPCB(iperlHead), 0, configurationBuffer, 16, 5); // set PCB Number according to iPerlHead configuration
+                Array.Copy(configurationBuffer,offset,buffer,0,length);
+            }
+            else if (messageID == MessageID.Calibration)
+            {
+                Array.Copy(calibrationBuffer, offset, buffer, 0, length);
+            }
+            else if ((messageID == MessageID.MetrologyMemory) && (offset == Q2CorrFactorsAddr) && (length == 2))
+            {
+                buffer = new byte[2] { 0, 0 };
+            }
+            else
+            {
+                buffer = new byte[length];
+            }
+
+            return iperlHead.Name.Equals("iPerl13") ? 2 : 0;   /// Simulates an error on position  13
+        }
+
+        internal static int WriteRequest(TestMethodCfg cfg, IperlHead iperlHead, MessageID messageID, int offset, int length, byte[] buffer)
+        {
+            return 0;
+        }
+
+        private static Array GetPCB(IperlHead iperlHead)
+        {
+            string pcbStr = iperlHead.RfidComPortNr.ToString().PadRight(10,'0') + iperlHead.Position.ToString("D2");
+            long decVal = Convert.ToInt64(pcbStr);
+            string nHexStr = decVal.ToString("X4");
+
+            string hexStr = "";
+            for (int a = nHexStr.Length; a >= 1; a = a - 2)
+            {
+                hexStr = hexStr + nHexStr.Substring(a - 2, 2);
+            }
+
+            return Enumerable.Range(0, hexStr.Length)
+                     .Where(x => x % 2 == 0)
+                     .Select(x => Convert.ToByte(hexStr.Substring(x, 2), 16))
+                     .ToArray();
+
+        }
+    }
+}

TBF/Rig/Various/ErrorFlags/Errors.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2017-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2017-2023 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -192,8 +192,17 @@ namespace TBF.Rig.Various.ErrorFlags
             {
                 /// No error indicator;
             }
+#if IPERL
+            else if ((mtrQ3.Error > 0 && mtrQ2.Error > 0 && mtrQ1.Error > 0 && (mtrQ3.Error > 1 ||
+                                                                                mtrQ2.Error > mtrQ2.ErrLimHi() / 2 ||
+                                                                                mtrQ1.Error > mtrQ1.ErrLimHi() / 2))
+                  || (mtrQ3.Error < 0 && mtrQ2.Error < 0 && mtrQ1.Error < 0 && (mtrQ3.Error < -1 ||
+                                                                                mtrQ2.Error < mtrQ2.ErrLimLo() / 2 ||
+                                                                                mtrQ1.Error < mtrQ1.ErrLimLo() / 2)))
+#else
             else if (((mtrQ3.Error > mtrQ3.ErrLimHi() / 2) && (mtrQ2.Error > mtrQ2.ErrLimHi() / 2) && (mtrQ1.Error > mtrQ1.ErrLimHi() / 2)) ||
                      ((mtrQ3.Error < mtrQ3.ErrLimLo() / 2) && (mtrQ2.Error < mtrQ2.ErrLimLo() / 2) && (mtrQ1.Error < mtrQ1.ErrLimLo() / 2)))
+#endif
             {
                 if (errorsCfg.TestParams.E15 == (sbyte)ErrorFlagsMode.Info)
                 {

TBF/TBF.csproj

@@ -39,7 +39,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;KRAKOW_50;LANG_PL;STABLE_MASS_EXTRAS;TEST_PROFILES</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;IPERL;MANAGED;ORACLE_DB;STABLE_MASS_EXTRAS;TURA_IPERL_NEW;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -50,7 +50,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;KRAKOW_50;LANG_PL;STABLE_MASS_EXTRAS;TEST_PROFILES</DefineConstants>
+    <DefineConstants>TRACE;IPERL;MANAGED;ORACLE_DB;STABLE_MASS_EXTRAS;TURA_IPERL_NEW;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -60,7 +60,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;KRAKOW_50;LANG_PL;STABLE_MASS_EXTRAS;TEST_PROFILES</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;IPERL;MANAGED;ORACLE_DB;STABLE_MASS_EXTRAS;TURA_IPERL_NEW;LANG_SK</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
@@ -70,7 +70,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;KRAKOW_50;LANG_PL;STABLE_MASS_EXTRAS;TEST_PROFILES</DefineConstants>
+    <DefineConstants>TRACE;IPERL;MANAGED;ORACLE_DB;STABLE_MASS_EXTRAS;TURA_IPERL_NEW;LANG_SK</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -101,8 +101,9 @@
     <SignManifests>false</SignManifests>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ControlComponent3U">
-      <HintPath>..\packages\ControlBoard\Krakow50\ControlComponent3U.dll</HintPath>
+    <Reference Include="ControlComponent3U, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ControlBoard\iPerlST-new\ControlComponent3U.dll</HintPath>
     </Reference>
     <Reference Include="FluentNHibernate">
       <HintPath>..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll</HintPath>
@@ -145,6 +146,7 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Deployment" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Management" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Numerics" />
     <Reference Include="System.Security" />
@@ -187,6 +189,7 @@
     <Compile Include="Rig\Configs\ParamsProvider\ComponentCfgCtrl.designer.cs">
       <DependentUpon>ComponentCfgCtrl.cs</DependentUpon>
     </Compile>
+    <Compile Include="Rig\DataChangeArgs.cs" />
     <Compile Include="Rig\DataContainers\BackupAndSecurityOptions\Component.cs" />
     <Compile Include="Rig\DataContainers\BackupAndSecurityOptions\ComponentCfg.cs" />
     <Compile Include="Rig\DataContainers\BackupAndSecurityOptions\ComponentFactory.cs" />
@@ -1188,6 +1191,7 @@
     <Compile Include="Rig\Output\Printers\OnePerMeter\PrinterCfgCtrl.designer.cs">
       <DependentUpon>PrinterCfgCtrl.cs</DependentUpon>
     </Compile>
+    <Compile Include="Rig\Output\Printers\PrinterStatus.cs" />
     <Compile Include="Rig\Output\Printers\Zapiska\FactoryCompound.cs" />
     <Compile Include="Rig\Output\Printers\Zapiska\FactoryHeatMeters.cs" />
     <Compile Include="Rig\Output\Printers\Zapiska\FactorySingle.cs" />
@@ -1632,8 +1636,17 @@
       <DependentUpon>IperlHeadCfgCtrl.cs</DependentUpon>
     </Compile>
     <Compile Include="Rig\TestMethods\iPerlCommunication\iPerlHead\FlowDirectionDetection.cs" />
+    <Compile Include="Rig\TestMethods\iPerlCommunication\iPerlHead\IperlHeadTestCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Rig\TestMethods\iPerlCommunication\iPerlHead\IperlHeadTestCtrl.Designer.cs">
+      <DependentUpon>IperlHeadTestCtrl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rig\TestMethods\iPerlCommunication\iPerlHead\NfcServices.cs" />
     <Compile Include="Rig\TestMethods\iPerlCommunication\iPerlHead\OptoReceivedEventArgs.cs" />
     <Compile Include="Rig\TestMethods\iPerlCommunication\iPerlHead\ProcParams.cs" />
+    <Compile Include="Rig\TestMethods\iPerlCommunication\iPerlHead\RfidServices.cs" />
+    <Compile Include="Rig\TestMethods\iPerlCommunication\iPerlHead\SimulationServices.cs" />
     <Compile Include="Rig\TestMethods\iPerlCommunication\iPerlHead\StatusStruct.cs" />
     <Compile Include="Rig\TestMethods\iPerlCommunication\OpticalHeadTest.cs" />
     <Compile Include="Rig\TestMethods\iPerlCommunication\SequenceConditionOp.cs" />
@@ -2181,6 +2194,7 @@
     <Compile Include="Strings.Designer.cs" />
     <Compile Include="Tools\ByteFormatter.cs" />
     <Compile Include="Tools\IniUtil.cs" />
+    <Compile Include="Tools\LogChecker.cs" />
     <Compile Include="Tools\XmlTools.cs" />
     <Compile Include="UiBridge\ActivityEventArgs.cs" />
     <Compile Include="UiBridge\AdjustmentInProgressEventArgs.cs" />
@@ -2219,6 +2233,12 @@
     <Compile Include="UI\Bench\Components\SelectComponentClassDlg.designer.cs">
       <DependentUpon>SelectComponentClassDlg.cs</DependentUpon>
     </Compile>
+    <Compile Include="UI\Bench\Metrology\CalibCertificateCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="UI\Bench\Metrology\CalibCertificateCtrl.Designer.cs">
+      <DependentUpon>CalibCertificateCtrl.cs</DependentUpon>
+    </Compile>
     <Compile Include="UI\Bench\Metrology\IMetrologyDlgTab.cs" />
     <Compile Include="UI\Bench\Metrology\MetrologyDlg.cs">
       <SubType>Form</SubType>
@@ -2226,11 +2246,11 @@
     <Compile Include="UI\Bench\Metrology\MetrologyDlg.designer.cs">
       <DependentUpon>MetrologyDlg.cs</DependentUpon>
     </Compile>
-    <Compile Include="UI\Bench\Metrology\MetrologyDlgBalanceTab.cs">
+    <Compile Include="UI\Bench\Metrology\MetrologyDlgScaleTab.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="UI\Bench\Metrology\MetrologyDlgBalanceTab.designer.cs">
-      <DependentUpon>MetrologyDlgBalanceTab.cs</DependentUpon>
+    <Compile Include="UI\Bench\Metrology\MetrologyDlgScaleTab.designer.cs">
+      <DependentUpon>MetrologyDlgScaleTab.cs</DependentUpon>
     </Compile>
     <Compile Include="UI\Bench\Metrology\MetrologyDlgBuoyancyTab.cs">
       <SubType>UserControl</SubType>
@@ -3296,6 +3316,9 @@
     <EmbeddedResource Include="Rig\TestMethods\iPerlCommunication\iPerlHead\IperlHeadCfgCtrl.resx">
       <DependentUpon>IperlHeadCfgCtrl.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Rig\TestMethods\iPerlCommunication\iPerlHead\IperlHeadTestCtrl.resx">
+      <DependentUpon>IperlHeadTestCtrl.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Rig\TestMethods\LiveStream\CfgCtrl.resx">
       <DependentUpon>CfgCtrl.cs</DependentUpon>
     </EmbeddedResource>
@@ -3431,11 +3454,14 @@
     <EmbeddedResource Include="UI\Bench\Components\SelectComponentClassDlg.resx">
       <DependentUpon>SelectComponentClassDlg.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="UI\Bench\Metrology\CalibCertificateCtrl.resx">
+      <DependentUpon>CalibCertificateCtrl.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="UI\Bench\Metrology\MetrologyDlg.resx">
       <DependentUpon>MetrologyDlg.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="UI\Bench\Metrology\MetrologyDlgBalanceTab.resx">
-      <DependentUpon>MetrologyDlgBalanceTab.cs</DependentUpon>
+    <EmbeddedResource Include="UI\Bench\Metrology\MetrologyDlgScaleTab.resx">
+      <DependentUpon>MetrologyDlgScaleTab.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="UI\Bench\Metrology\MetrologyDlgBuoyancyTab.resx">
       <DependentUpon>MetrologyDlgBuoyancyTab.cs</DependentUpon>
@@ -3813,6 +3839,10 @@
       <Project>{a3e14180-7f00-42e5-94a9-8db62ead6ee8}</Project>
       <Name>Sensus.iPerl.RfidCom</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\NfcS5_DLL\NfcS5_DLL.csproj">
+      <Project>{34F6AA20-3BEC-44B4-9D18-DC66BAB79A83}</Project>
+      <Name>NfcS5_DLL</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Common\Common.csproj">
       <Project>{c8939821-ba5c-4988-a3d0-bf53b74865c7}</Project>
       <Name>Common</Name>

TBF/Tools/LogChecker.cs

@@ -0,0 +1,50 @@
+using log4net.Appender;
+using log4net.Core;
+using log4net.Repository.Hierarchy;
+using log4net;
+using System;
+using System.Collections.Generic;
+
+namespace TBF.Tools
+{
+    public class LogChecker : IDisposable
+    {
+        readonly Logger _logger;
+        readonly Level _previousLevel;
+        readonly MemoryAppender _appender = new MemoryAppender();
+
+        public LogChecker(string logName, Level levelToCheck)
+        {
+            _logger = (Logger)LogManager.GetLogger(logName).Logger;
+            _logger.AddAppender(_appender);
+            _previousLevel = _logger.Level;
+            _logger.Level = levelToCheck;
+        }
+
+        public List<string> Messages
+        {
+            get
+            {
+                return new List<log4net.Core.LoggingEvent>(_appender.GetEvents())
+                      .ConvertAll(x => x.RenderedMessage);
+            }
+        }
+
+        public void Dispose()
+        {
+            _logger.Level = _previousLevel;
+            _logger.RemoveAppender(_appender);
+        }
+    }
+}
+
+// Example of use
+// 
+// using (Tools.LogChecker logChecker = new Tools.LogChecker("RfidData", log4net.Core.Level.Debug))
+// {
+//    Execute query using NHibernate
+//    ....
+//
+//    MessageBox.Show(String.Join(Environment.NewLine,logChecker.Messages));
+// }
+//

TBF/UI/Bench/Metrology/CalibCertificateCtrl.Designer.cs

@@ -0,0 +1,162 @@
+namespace TBF.UI.Bench.Metrology
+{
+    partial class CalibCertificateCtrl
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.groupBox = new System.Windows.Forms.GroupBox();
+            this.openCertificateButton = new System.Windows.Forms.Button();
+            this.showCertificateButton = new System.Windows.Forms.Button();
+            this.calibExpirationDateTimePicker = new System.Windows.Forms.DateTimePicker();
+            this.calibDateTimePicker = new System.Windows.Forms.DateTimePicker();
+            this.calibValidDateLabel = new System.Windows.Forms.Label();
+            this.calibDateLabel = new System.Windows.Forms.Label();
+            this.calibCertificateNrTextBox = new System.Windows.Forms.TextBox();
+            this.certIdLabel = new System.Windows.Forms.Label();
+            this.groupBox.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // groupBox
+            // 
+            this.groupBox.Controls.Add(this.certIdLabel);
+            this.groupBox.Controls.Add(this.openCertificateButton);
+            this.groupBox.Controls.Add(this.showCertificateButton);
+            this.groupBox.Controls.Add(this.calibExpirationDateTimePicker);
+            this.groupBox.Controls.Add(this.calibDateTimePicker);
+            this.groupBox.Controls.Add(this.calibValidDateLabel);
+            this.groupBox.Controls.Add(this.calibDateLabel);
+            this.groupBox.Controls.Add(this.calibCertificateNrTextBox);
+            this.groupBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.groupBox.Location = new System.Drawing.Point(0, 0);
+            this.groupBox.Name = "groupBox";
+            this.groupBox.Size = new System.Drawing.Size(240, 100);
+            this.groupBox.TabIndex = 0;
+            this.groupBox.TabStop = false;
+            this.groupBox.Text = "Calibration certificate";
+            // 
+            // openCertificateButton
+            // 
+            this.openCertificateButton.Enabled = false;
+            this.openCertificateButton.Location = new System.Drawing.Point(177, 22);
+            this.openCertificateButton.Name = "openCertificateButton";
+            this.openCertificateButton.Size = new System.Drawing.Size(56, 26);
+            this.openCertificateButton.TabIndex = 28;
+            this.openCertificateButton.Text = "Path";
+            this.openCertificateButton.UseVisualStyleBackColor = true;
+            this.openCertificateButton.Click += new System.EventHandler(this.openCertificateButton_Click);
+            // 
+            // showCertificateButton
+            // 
+            this.showCertificateButton.Location = new System.Drawing.Point(177, 48);
+            this.showCertificateButton.Name = "showCertificateButton";
+            this.showCertificateButton.Size = new System.Drawing.Size(56, 39);
+            this.showCertificateButton.TabIndex = 27;
+            this.showCertificateButton.Text = "Show";
+            this.showCertificateButton.UseVisualStyleBackColor = true;
+            this.showCertificateButton.Click += new System.EventHandler(this.showCertificateButton_Click);
+            // 
+            // calibExpirationDateTimePicker
+            // 
+            this.calibExpirationDateTimePicker.CustomFormat = "dd.MM.yyyy";
+            this.calibExpirationDateTimePicker.Enabled = false;
+            this.calibExpirationDateTimePicker.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.calibExpirationDateTimePicker.Location = new System.Drawing.Point(74, 67);
+            this.calibExpirationDateTimePicker.Name = "calibExpirationDateTimePicker";
+            this.calibExpirationDateTimePicker.Size = new System.Drawing.Size(97, 20);
+            this.calibExpirationDateTimePicker.TabIndex = 26;
+            // 
+            // calibDateTimePicker
+            // 
+            this.calibDateTimePicker.CustomFormat = "dd.MM.yyyy";
+            this.calibDateTimePicker.Enabled = false;
+            this.calibDateTimePicker.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+            this.calibDateTimePicker.Location = new System.Drawing.Point(74, 45);
+            this.calibDateTimePicker.Name = "calibDateTimePicker";
+            this.calibDateTimePicker.Size = new System.Drawing.Size(97, 20);
+            this.calibDateTimePicker.TabIndex = 25;
+            // 
+            // calibValidDateLabel
+            // 
+            this.calibValidDateLabel.AutoSize = true;
+            this.calibValidDateLabel.Location = new System.Drawing.Point(9, 70);
+            this.calibValidDateLabel.Name = "calibValidDateLabel";
+            this.calibValidDateLabel.Size = new System.Drawing.Size(52, 13);
+            this.calibValidDateLabel.TabIndex = 24;
+            this.calibValidDateLabel.Text = "Valid until";
+            // 
+            // calibDateLabel
+            // 
+            this.calibDateLabel.AutoSize = true;
+            this.calibDateLabel.Location = new System.Drawing.Point(9, 48);
+            this.calibDateLabel.Name = "calibDateLabel";
+            this.calibDateLabel.Size = new System.Drawing.Size(30, 13);
+            this.calibDateLabel.TabIndex = 23;
+            this.calibDateLabel.Text = "Date";
+            // 
+            // calibCertificateNrTextBox
+            // 
+            this.calibCertificateNrTextBox.Enabled = false;
+            this.calibCertificateNrTextBox.Location = new System.Drawing.Point(74, 23);
+            this.calibCertificateNrTextBox.Name = "calibCertificateNrTextBox";
+            this.calibCertificateNrTextBox.Size = new System.Drawing.Size(97, 20);
+            this.calibCertificateNrTextBox.TabIndex = 22;
+            // 
+            // certIdLabel
+            // 
+            this.certIdLabel.AutoSize = true;
+            this.certIdLabel.Location = new System.Drawing.Point(9, 26);
+            this.certIdLabel.Name = "certIdLabel";
+            this.certIdLabel.Size = new System.Drawing.Size(18, 13);
+            this.certIdLabel.TabIndex = 29;
+            this.certIdLabel.Text = "ID";
+            // 
+            // CalibCertificateCtrl
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.groupBox);
+            this.Name = "CalibCertificateCtrl";
+            this.Size = new System.Drawing.Size(240, 100);
+            this.groupBox.ResumeLayout(false);
+            this.groupBox.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.GroupBox groupBox;
+        private System.Windows.Forms.Button openCertificateButton;
+        private System.Windows.Forms.Button showCertificateButton;
+        private System.Windows.Forms.DateTimePicker calibExpirationDateTimePicker;
+        private System.Windows.Forms.DateTimePicker calibDateTimePicker;
+        private System.Windows.Forms.Label calibValidDateLabel;
+        private System.Windows.Forms.Label calibDateLabel;
+        private System.Windows.Forms.TextBox calibCertificateNrTextBox;
+        private System.Windows.Forms.Label certIdLabel;
+    }
+}

TBF/UI/Bench/Metrology/CalibCertificateCtrl.cs

@@ -0,0 +1,140 @@
+///
+/// Copyright (c) 2023 Sensus Slovensko a.s.
+///
+using System;
+using System.IO;
+using System.Windows.Forms;
+using TBF.Resources;
+using TBF.Rig.GenericDevices;
+
+namespace TBF.UI.Bench.Metrology
+{
+    public partial class CalibCertificateCtrl : UserControl
+    {
+        string certPath;        /// Path to a calibration certificate PDF document
+        ToolTip toolTip;
+
+        public CalibCertificateCtrl()
+        {
+            InitializeComponent();
+            Localize();
+
+            certPath = string.Empty;          
+            calibDateTimePicker.CustomFormat = Constants.DateFormat;
+            calibDateTimePicker.MinDate = Constants.MinDate;
+            calibExpirationDateTimePicker.CustomFormat = Constants.DateFormat;
+            calibExpirationDateTimePicker.MinDate = Constants.MinDate;
+
+            toolTip = new ToolTip();
+            toolTip.UseFading = true;
+            toolTip.UseAnimation = true;
+            toolTip.IsBalloon = true;
+            toolTip.ShowAlways = true;
+            toolTip.AutoPopDelay = 1000;
+            toolTip.InitialDelay = 1000;
+            toolTip.ReshowDelay = 500;
+            toolTip.SetToolTip(showCertificateButton, certPath);
+        }
+
+        void Localize()
+        {
+            groupBox.Text = Strings.Calibration_certificate;
+            calibDateLabel.Text = Strings.Date;
+            calibValidDateLabel.Text = Strings.Valid_until;
+            showCertificateButton.Text = Strings.Show;
+        }
+
+        public void Unlock()
+        {
+            calibCertificateNrTextBox.Enabled = true;
+            calibDateTimePicker.Enabled = true;
+            calibExpirationDateTimePicker.Enabled = true;
+            openCertificateButton.Enabled = true;
+            showCertificateButton.Enabled = true;
+        }
+
+        public void Refresh(ICalibInfoCfg calibInfoCfg)
+        {
+            calibCertificateNrTextBox.Text = calibInfoCfg.CalibCertificateNr;
+            certPath = calibInfoCfg.CertPath;
+            calibDateTimePicker.Value = (calibInfoCfg.CalibDate < Constants.MinDate) ? Constants.MinDate : calibInfoCfg.CalibDate;
+            calibExpirationDateTimePicker.Value = (calibInfoCfg.CalibValidDate < Constants.MinDate) ? Constants.MinDate : calibInfoCfg.CalibValidDate;
+
+            toolTip.SetToolTip(showCertificateButton, certPath);
+        }
+
+        public void Update(ICalibInfoCfg calibInfoCfg)
+        {
+            calibInfoCfg.CalibCertificateNr = calibCertificateNrTextBox.Text;
+            calibInfoCfg.CertPath = certPath;
+            calibInfoCfg.CalibDate = calibDateTimePicker.Value;
+            calibInfoCfg.CalibValidDate = calibExpirationDateTimePicker.Value;
+        }
+
+        public void Refresh(ICalibRangesCfg calibRangesCfg, int rngIx)
+        {
+            calibCertificateNrTextBox.Text = calibRangesCfg.GetCalibCertificate(rngIx);
+            certPath = calibRangesCfg.GetCertPath(rngIx);
+            calibDateTimePicker.Value = (calibRangesCfg.GetCalibDate(rngIx) < Constants.MinDate) ? Constants.MinDate : calibRangesCfg.GetCalibDate(rngIx);
+            calibExpirationDateTimePicker.Value = (calibRangesCfg.GetCalibValidDate(rngIx) < Constants.MinDate) ? Constants.MinDate : calibRangesCfg.GetCalibValidDate(rngIx);
+
+            toolTip.SetToolTip(showCertificateButton, certPath);
+        }
+
+        public void Update(ICalibRangesCfg calibRangesCfg, int rngIx)
+        {
+            calibRangesCfg.SetCalibCertificate(rngIx, calibCertificateNrTextBox.Text);
+            calibRangesCfg.SetCertPath(rngIx, certPath);
+            calibRangesCfg.SetCalibDate(rngIx, calibDateTimePicker.Value);
+            calibRangesCfg.SetCalibValidDate(rngIx, calibExpirationDateTimePicker.Value);
+
+        }
+
+        private void openCertificateButton_Click(object sender, EventArgs e)
+        {
+            var openFileDialog = new OpenFileDialog()
+            {
+                CheckFileExists = true,
+                InitialDirectory = @"C:\TBF\Certificates",
+                Filter = string.Format("{0} (*.pdf)|*.pdf|{1} (*.*)|*.*", Strings.PDF_files, Strings.All_files),
+            };
+
+            if (openFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                certPath = openFileDialog.FileName;
+                toolTip.SetToolTip(showCertificateButton, certPath);
+            }
+        }
+
+        private void showCertificateButton_Click(object sender, EventArgs e)
+        {
+            var apps = new string[] { @"C:\Program Files\Microsoft\Edge\Application\msedge.exe",
+                                      @"C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe",
+                                      @"C:\Program Files\Mozilla Firefox\firefox.exe",
+                                      @"C:\Program Files (x86)\Mozilla Firefox\firefox.exe",
+                                      @"C:\Program Files\Google\Chrome\Application\chrome.exe",
+                                      @"C:\Program Files (x86)\Google\Chrome\Application\chrome.exe" };
+
+            if (!string.IsNullOrEmpty(certPath) && File.Exists(certPath))
+            {
+                foreach (var app in apps)
+                {
+                    if (File.Exists(app))
+                    {
+                        using (var process = new System.Diagnostics.Process())
+                        {
+                            process.StartInfo.FileName = app;
+                            process.StartInfo.Arguments = certPath.Replace(" ", "%20");  ///argument
+                            process.StartInfo.UseShellExecute = false;
+                            process.StartInfo.RedirectStandardOutput = true;
+                            process.StartInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Normal;
+                            process.Start();
+                        }
+
+                        break;
+                    }
+                }
+            }
+        }
+    }
+}

TBF/UI/Bench/Metrology/CalibCertificateCtrl.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

TBF/UI/Bench/Metrology/MetrologyDlg.cs

@@ -105,7 +105,7 @@ namespace TBF.UI.Bench.Metrology
 				{
 					balancesCount++;
                     TabPage tabPage = new TabPage("  " + cmpnt.Name + "  ");
-					MetrologyDlgBalanceTab uiControl = new MetrologyDlgBalanceTab();
+					MetrologyDlgScaleTab uiControl = new MetrologyDlgScaleTab();
 					uiControl.MeterEntity = cmpnt;
                     uiControl.BalanceCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as Rig.GenericDevices.IScaleCfg;
 					uiControl.Dock = DockStyle.Fill;

TBF/UI/Bench/Metrology/MetrologyDlgBuoyancyTab.Designer.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2015 Senus Slovensko a.s.
+/// Copyright (c) 2013-2023 Senus Slovensko a.s.
 ///
 namespace TBF.UI.Bench.Metrology
 {