Null exception fix - save again results to Oracle database.

New ControlComponent3U.dll for Fuzhou150
System.NullReferenceException fix.
2024-11-06 06:57:37 +01:00 · 2024-10-10 09:31:19 +02:00 · 2024-09-26 09:31:14 +02:00 · 2024-07-30 09:44:27 +02:00 · 2024-07-25 12:08:15 +02:00 · 2024-07-10 08:02:37 +02:00
14 changed files with 828 additions and 222 deletions
@@ -393,14 +393,15 @@ namespace TBF.Rig.Output.DB.SensusOracle
 		}

 #if ORACLE_DB
-        void GetTestInfoFromProcedure(string logCaption)
+        void GetTestInfoFromProcedure(string logCaption, Results.Entities.Batch bat = null)
        {
            ///
            /// Select or create appropriate test infos
            ///
            IList<LUTestData> testsToSave = new List<LUTestData>();
            int maxPruefungsNr = 0;
-            foreach (var td in Sequences.ProcessData.BatchRslts.Batch.Tests)
+            Results.Entities.Batch batch = Sequences.ProcessData.BatchRslts == null? bat : Sequences.ProcessData.BatchRslts.Batch;
+            foreach (var td in batch.Tests)
            {
                for (int repNr = 1; repNr <= td.Repeats; repNr++)
                {
@@ -823,7 +824,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));
            }

-            GetTestInfoFromProcedure("SaveBatchData");  /// Create appropriate test infos
+            GetTestInfoFromProcedure("SaveBatchData", bat);  /// Create appropriate test infos

            if (dbCfg.DebugLevel == DebugMode.Normal)
            {
@@ -2049,7 +2049,7 @@ namespace TBF.Rig.Sequences
        /// <returns></returns>
        protected bool TestAndLogUiCmdStop(Test test, IList<Event> e)
        {
-            if (!e.Contains(Event.UiCmdStop)) return false;
+            if (e == null || !e.Contains(Event.UiCmdStop)) return false;

            log.FatalFormat("STOP pressed: Procedure={0}, Test={1}, State={2}",
                            (StateMachine.Procedure == null) ? "?" : StateMachine.Procedure.Name,
@@ -2064,14 +2064,24 @@ 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 != 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);
                log.FatalFormat("   Start mass: {0}", StartMass);
                log.FatalFormat("   Liter/ref.pulse: {0}", LtrPerRefPulse);
                log.FatalFormat("   Reference pulses: {0}", RefPulses);
+                try
+                {
+                    if (inPath != null)
+                    {
+                        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 (outPath != null && outPath.RegulValve is IRegValve) log.FatalFormat("   Regulation valve position: {0}%", outPath.RegulValve.Position);
+                }
+                catch (Exception ex)
+                {
+                    log.FatalFormat($"   SequenceBase.TestAndLogUiCmdStop error: {ex.Message}");
+                }
            }

            return true;
@@ -189,7 +189,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
        /// RFID multiplexer PCB / RFID serial port and worker thread related variables
        ///
        static TestMethod testMethod;
-		static TestMethodCfg cfg;
+		public static TestMethodCfg cfg;
 		static IList<Config.Entities.Test> tests;
 		static IList<iPerlCommunicationParams> multiTestParams;

@@ -1009,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)
 		{
@@ -1040,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)
@@ -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; } }

@@ -56,7 +54,8 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
            muxBoardNrTextBox.Text = config.MuxBoardNr.ToString();
 			groupTextBox.Text = config.Group.ToString();
            comboBoxCommunicationInterface.SelectedItem = config.CommunicationInterface.ToString();
-		}
+            tabPage2.Controls.Add(new IperlHeadTestCtrl(config));
+        }

 		public void Unlock()
 		{
@@ -150,5 +149,5 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead

 			return flags;
 		}
-	}
+    }
 }
@@ -31,124 +31,131 @@ 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.label1 = new System.Windows.Forms.Label();
-            this.comboBoxCommunicationInterface = new System.Windows.Forms.ComboBox();
-            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(180, 49);
-            this.nameTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.nameTextBox.Name = "nameTextBox";
-            this.nameTextBox.Size = new System.Drawing.Size(160, 22);
-            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(33, 53);
-            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 = 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(176, 20);
-            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 = 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(439, 52);
-            this.optoSerialPortTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.optoSerialPortTextBox.Name = "optoSerialPortTextBox";
-            this.optoSerialPortTextBox.Size = new System.Drawing.Size(44, 22);
-            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(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.:";
+            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(180, 78);
-            this.muxBoardNrTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.muxBoardNrTextBox.Name = "muxBoardNrTextBox";
-            this.muxBoardNrTextBox.Size = new System.Drawing.Size(44, 22);
-            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(33, 81);
-            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 = 8;
-            this.muxBoardNrLabel.Text = "Group 1 (mux. board)";
-            // 
-            // groupTextBox
-            // 
-            this.groupTextBox.Enabled = false;
-            this.groupTextBox.Location = new System.Drawing.Point(180, 106);
-            this.groupTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.groupTextBox.Name = "groupTextBox";
-            this.groupTextBox.Size = new System.Drawing.Size(44, 22);
-            this.groupTextBox.TabIndex = 11;
-            // 
-            // groupLabel
-            // 
-            this.groupLabel.AutoSize = true;
-            this.groupLabel.Location = new System.Drawing.Point(33, 110);
-            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 = 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(439, 26);
-            this.rfidPortNrTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.rfidPortNrTextBox.Margin = new System.Windows.Forms.Padding(4);
            this.rfidPortNrTextBox.Name = "rfidPortNrTextBox";
            this.rfidPortNrTextBox.Size = new System.Drawing.Size(44, 22);
            this.rfidPortNrTextBox.TabIndex = 7;
@@ -163,32 +170,6 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
            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(29, 23);
-            this.radioButton1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 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;
-            // 
-            // radioButton2
-            // 
-            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, 4, 4, 4);
-            this.radioButton2.Name = "radioButton2";
-            this.radioButton2.Size = new System.Drawing.Size(115, 20);
-            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);
@@ -199,12 +180,12 @@ 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(37, 140);
-            this.optoDataGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.optoDataGroupBox.Location = new System.Drawing.Point(10, 131);
+            this.optoDataGroupBox.Margin = new System.Windows.Forms.Padding(4);
            this.optoDataGroupBox.Name = "optoDataGroupBox";
-            this.optoDataGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.optoDataGroupBox.Padding = new System.Windows.Forms.Padding(4);
            this.optoDataGroupBox.Size = new System.Drawing.Size(552, 119);
-            this.optoDataGroupBox.TabIndex = 5;
+            this.optoDataGroupBox.TabIndex = 18;
            this.optoDataGroupBox.TabStop = false;
            this.optoDataGroupBox.Text = "Opto-data";
            // 
@@ -222,7 +203,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
            // 
            this.tcpipPortTextBox.Enabled = false;
            this.tcpipPortTextBox.Location = new System.Drawing.Point(143, 84);
-            this.tcpipPortTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.tcpipPortTextBox.Margin = new System.Windows.Forms.Padding(4);
            this.tcpipPortTextBox.Name = "tcpipPortTextBox";
            this.tcpipPortTextBox.Size = new System.Drawing.Size(51, 22);
            this.tcpipPortTextBox.TabIndex = 5;
@@ -241,120 +222,180 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
            // 
            this.ipAddressTextBox.Enabled = false;
            this.ipAddressTextBox.Location = new System.Drawing.Point(143, 55);
-            this.ipAddressTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ipAddressTextBox.Margin = new System.Windows.Forms.Padding(4);
            this.ipAddressTextBox.Name = "ipAddressTextBox";
            this.ipAddressTextBox.Size = new System.Drawing.Size(129, 22);
            this.ipAddressTextBox.TabIndex = 3;
            // 
-            // groupBox1
+            // radioButton1
            // 
-            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(37, 268);
-            this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.groupBox1.Size = new System.Drawing.Size(552, 68);
-            this.groupBox1.TabIndex = 12;
-            this.groupBox1.TabStop = false;
-            this.groupBox1.Text = "RFID / NFC 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(235, 81);
-            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 = 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(235, 110);
-            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 = 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.:";
            // 
-            // label1
+            // optoSerialPortTextBox
            // 
-            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";
+            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;
            // 
-            // comboBoxCommunicationInterface
+            // groupTextBox
            // 
-            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;
+            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.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Controls.Add(this.tabControl1);
+            this.Margin = new System.Windows.Forms.Padding(4);
            this.Name = "IperlHeadCfgCtrl";
-            this.Size = new System.Drawing.Size(667, 369);
+            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.Label label1;
-        private System.Windows.Forms.ComboBox comboBoxCommunicationInterface;
+        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;
    }
 }
@@ -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;
+    }
+}
@@ -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();
+            }
+        }
+    }
+}
@@ -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>
@@ -1,7 +1,6 @@
 using log4net;
 using Sensus.iPerl.NfcHandler;
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Text;
 using System.Threading;
@@ -15,12 +14,17 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
        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);
+                buffer = MciRead(_nfcDataHandler, cfg, structName, (ushort)offset, length);

                CloseComPort(_nfcDataHandler);

@@ -39,12 +43,17 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
        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);
+                MciWrite(_nfcDataHandler, cfg, structName, (ushort)offset, length, buffer);

                CloseComPort(_nfcDataHandler);
                return 0;
@@ -96,9 +105,11 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
            nfcDataHandler.Close();
        }

-        private static byte[] MciRead(NfcDataHandler nfcDataHandler, StructName structName, ushort offset, int length)
+        private static byte[] MciRead(NfcDataHandler nfcDataHandler, TestMethodCfg cfg, StructName structName, ushort offset, int length)
        {
            bool isReadValues = false;
+            int retryCount = 0;
+            Read:
            try
            {
                isReadValues = false;
@@ -118,23 +129,33 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
                }
                else if (nfcDataHandler.LastErrorCode == (byte)0)
                {
-                    Console.WriteLine("MCI Error: Unidentified");
                    rfidDataLogger.Info($"MCI Error: Unidentified");
+                    retryCount++;
+                    if (retryCount < cfg.MaxCommRetries)
+                        goto Read;
                }
                else
                {
                    rfidDataLogger.Info("Last error message: " + nfcDataHandler.LastErrorMessage);
+                    retryCount++;
+                    if (retryCount < cfg.MaxCommRetries)
+                        goto Read;
                }
            }
            catch (Exception ex)
            {
                rfidDataLogger.Error("MciRead Last error message: " + ex.Message);
+                retryCount++;
+                if (retryCount < cfg.MaxCommRetries)
+                    goto Read;
            }
            return new byte[length];
        }

-        private static void MciWrite(NfcDataHandler nfcDataHandler, MCI_Protocol.StructName structName, ushort offset, int length, byte[] payload)
+        private static void MciWrite(NfcDataHandler nfcDataHandler, TestMethodCfg cfg, MCI_Protocol.StructName structName, ushort offset, int length, byte[] payload)
        {
+            int retryCount = 0;
+            Write:
            try
            {
                long num1 = (long)length;
@@ -144,7 +165,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
                    rfidDataLogger.Error("Insufficient Payload -- Payload lenth : " + (object)payload.Length);
                else if (nfcDataHandler.MCI_Write(structName, offset, payloadlength, payload, timeoutMs))
                {
-                    //setStatusIndicator(true);
+                    // OK
                }
                else if (nfcDataHandler.LastErrorCode > (byte)0)
                {
@@ -155,6 +176,9 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
            catch (Exception ex)
            {
                rfidDataLogger.Error("MciWrite error message: " + ex.Message);
+                retryCount++;
+                if (retryCount < cfg.MaxCommRetries)
+                    goto Write;
            }
        }

@@ -225,5 +249,45 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
            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
    }
 }
@@ -1635,6 +1635,12 @@
      <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" />
@@ -2187,6 +2193,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" />
@@ -3308,6 +3315,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>
@@ -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));
+// }
+//
@@ -515,6 +515,8 @@ namespace Users.Entities
                   (userName.Equals("pakan") && password.Equals("kuriatko")) ||
 				   (userName.Equals("jau") && password.Equals("jaugust")) ||
                   (userName.Equals("JCermak") && password.Equals("Zt6911")) ||
+                   (userName.Equals("mic") && password.Equals("Michal")) ||
+                   (userName.Equals("pav") && password.Equals("Peter")) ||
                   (userName.Equals("gilles") && password.Equals("alibaba")) ||
                   (userName.Equals(passwordOfDay) && password.Equals(passwordOfDay));
        }
Author	SHA1	Message	Date
Jan Augustin	6cb4b2bba8	Null exception fix - save again results to Oracle database.	2024-11-06 06:57:37 +01:00
Jan Augustin	56c2aeb647	New ControlComponent3U.dll for Fuzhou150	2024-10-10 09:31:19 +02:00
Jan Augustin	a4d7dccde9	System.NullReferenceException fix.	2024-09-26 09:31:14 +02:00
Jan Augustin	74655e976f	System.NullReferenceException fix.	2024-07-30 09:44:27 +02:00
Jan Augustin	7486b2a490	Improve NFC communication (also updated NfcS5_DLL project)	2024-07-25 12:08:15 +02:00
Jan Augustin	6e62be6e6c	IperlHead component test optimization	2024-07-10 08:02:37 +02:00
Jan Augustin	6c7dbfa5a0	Add test tab to iPerlHead component configuration	2024-06-27 10:02:25 +02:00