Add IntelliJ config and gitignore files for projects

Introduce `.idea` configuration files and `.gitignore` entries for `NfcS5_DLL` and `TBF` projects. These changes include settings for encodings, VCS mappings, and index layout configurations. Helps streamline project setup and improve tooling compatibility.
Fix project references and add new dependencies
2024-12-22 12:32:35 +01:00 · 2024-12-22 12:31:27 +01:00 · 2024-10-10 09:29:59 +02:00 · 2024-06-13 09:36:03 +02:00 · 2024-06-13 09:35:10 +02:00 · 2024-06-07 09:47:01 +02:00
54 changed files with 49669 additions and 881 deletions
@@ -76,6 +76,8 @@ WorkflowConfigurator/bin/
 WorkflowConfigurator/obj/
 Workplace/bin/
 Workplace/obj/
+MonitoringDB/bin/
+MonitoringDB/obj/
 .vs/
 *.suo
 *.bak
@@ -0,0 +1,13 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Rider ignored files
+/modules.xml
+/projectSettingsUpdater.xml
+/contentModel.xml
+/.idea.TBF.iml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
@@ -0,0 +1 @@
+TBF
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="UserContentModel">
+    <attachedFolders />
+    <explicitIncludes />
+    <explicitExcludes />
+  </component>
+</project>
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../NfcS5_DLL" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
@@ -19,7 +19,7 @@
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;FUZHOU_150</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;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;FUZHOU_150</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <Prefer32Bit>false</Prefer32Bit>
@@ -19,7 +19,7 @@
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;FUZHOU_150</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</DefineConstants>
+    <DefineConstants>TRACE;FUZHOU_150</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <Prefer32Bit>false</Prefer32Bit>
@@ -21,7 +21,7 @@
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;FUZHOU_150</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</DefineConstants>
+    <DefineConstants>TRACE;FUZHOU_150</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <Prefer32Bit>false</Prefer32Bit>
@@ -32,17 +32,17 @@
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="FluentNHibernate">
-      <HintPath>..\..\Production-Monitoring\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll</HintPath>
+    <Reference Include="FluentNHibernate, Version=2.0.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll</HintPath>
    </Reference>
-    <Reference Include="Iesi.Collections">
+    <Reference Include="Iesi.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
      <HintPath>..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll</HintPath>
    </Reference>
    <Reference Include="MySql.Data">
      <HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
    </Reference>
-    <Reference Include="NHibernate">
-      <HintPath>..\packages\NHibernate.4.0.4.4000\lib\net40\NHibernate.dll</HintPath>
+    <Reference Include="NHibernate, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <HintPath>..\packages\NHibernate.4.0.0.4000\lib\net40\NHibernate.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Core" />
@@ -58,6 +58,7 @@
  </ItemGroup>
  <ItemGroup>
    <None Include="App.config" />
+    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Common\Common.csproj">
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="FluentNHibernate" version="2.0.3.0" targetFramework="net472" />
+  <package id="Iesi.Collections" version="4.0.0.4000" targetFramework="net472" />
+  <package id="NHibernate" version="4.0.0.4000" targetFramework="net472" />
+</packages>
@@ -94,9 +94,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FeatureVectorCalculator", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResultsParser", "ResultsParser\ResultsParser.csproj", "{2E08C19B-C0A9-4056-8564-E5B74477959D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sensus.iPerl.RfidCom", "..\iPerlHead\Sensus.iPerl.RfidCom\Sensus.iPerl.RfidCom.csproj", "{A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NfcS5_DLL", "..\NfcS5_DLL\NfcS5_DLL.csproj", "{5954D496-CAAB-4F7A-BDE2-BDC8F47DAB19}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NfcS5_DLL", "..\NfcS5_DLL\NfcS5_DLL.csproj", "{34F6AA20-3BEC-44B4-9D18-DC66BAB79A83}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sensus.iPerl.TestConsole", "..\iPerlHead\Sensus.iPerl.TestConsole\Sensus.iPerl.TestConsole.csproj", "{5025ED8B-A94F-4E58-8BE0-68481B061609}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sensus.iPerl.RfidCom", "..\iPerlHead\Sensus.iPerl.RfidCom\Sensus.iPerl.RfidCom.csproj", "{A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -128,6 +130,8 @@ Global
 		{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}.Release|x86.ActiveCfg = Release|Any CPU
+		{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{743DF7DB-C7B6-42EB-986D-0F485E5588E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{743DF7DB-C7B6-42EB-986D-0F485E5588E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{743DF7DB-C7B6-42EB-986D-0F485E5588E4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -148,6 +152,8 @@ Global
 		{07BA543A-54CA-4A59-9AD9-DDE7038E1BF9}.Release|Mixed Platforms.Build.0 = Release|x86
 		{07BA543A-54CA-4A59-9AD9-DDE7038E1BF9}.Release|x86.ActiveCfg = Release|x86
 		{07BA543A-54CA-4A59-9AD9-DDE7038E1BF9}.Release|x86.Build.0 = Release|x86
+		{07BA543A-54CA-4A59-9AD9-DDE7038E1BF9}.Debug|Any CPU.Build.0 = Debug|x86
+		{07BA543A-54CA-4A59-9AD9-DDE7038E1BF9}.Release|Any CPU.Build.0 = Release|x86
 		{6D3384DC-4638-4A92-91A8-F39D900377C6}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{6D3384DC-4638-4A92-91A8-F39D900377C6}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{6D3384DC-4638-4A92-91A8-F39D900377C6}.Debug|Mixed Platforms.Build.0 = Debug|x86
@@ -158,6 +164,8 @@ Global
 		{6D3384DC-4638-4A92-91A8-F39D900377C6}.Release|Mixed Platforms.Build.0 = Release|x86
 		{6D3384DC-4638-4A92-91A8-F39D900377C6}.Release|x86.ActiveCfg = Release|x86
 		{6D3384DC-4638-4A92-91A8-F39D900377C6}.Release|x86.Build.0 = Release|x86
+		{6D3384DC-4638-4A92-91A8-F39D900377C6}.Debug|Any CPU.Build.0 = Debug|x86
+		{6D3384DC-4638-4A92-91A8-F39D900377C6}.Release|Any CPU.Build.0 = Release|x86
 		{439D0878-C76E-452B-B17D-209A89E91D36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{439D0878-C76E-452B-B17D-209A89E91D36}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{439D0878-C76E-452B-B17D-209A89E91D36}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -188,6 +196,8 @@ Global
 		{B2CD81B3-AF09-4978-996C-02EDB5F819B7}.Release|Mixed Platforms.Build.0 = Release|x86
 		{B2CD81B3-AF09-4978-996C-02EDB5F819B7}.Release|x86.ActiveCfg = Release|x86
 		{B2CD81B3-AF09-4978-996C-02EDB5F819B7}.Release|x86.Build.0 = Release|x86
+		{B2CD81B3-AF09-4978-996C-02EDB5F819B7}.Debug|Any CPU.Build.0 = Debug|x86
+		{B2CD81B3-AF09-4978-996C-02EDB5F819B7}.Release|Any CPU.Build.0 = Release|x86
 		{0C0A1F4D-1363-4544-A7C5-196C76D26CCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0C0A1F4D-1363-4544-A7C5-196C76D26CCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0C0A1F4D-1363-4544-A7C5-196C76D26CCA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -230,6 +240,8 @@ Global
 		{36755E1D-6FC3-4D9C-8DD3-0250D51532E0}.Release|Mixed Platforms.Build.0 = Release|x86
 		{36755E1D-6FC3-4D9C-8DD3-0250D51532E0}.Release|x86.ActiveCfg = Release|x86
 		{36755E1D-6FC3-4D9C-8DD3-0250D51532E0}.Release|x86.Build.0 = Release|x86
+		{36755E1D-6FC3-4D9C-8DD3-0250D51532E0}.Debug|Any CPU.Build.0 = Debug|x86
+		{36755E1D-6FC3-4D9C-8DD3-0250D51532E0}.Release|Any CPU.Build.0 = Release|x86
 		{D476ABBE-A455-4476-8A8D-3F6151217B51}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{D476ABBE-A455-4476-8A8D-3F6151217B51}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{D476ABBE-A455-4476-8A8D-3F6151217B51}.Debug|Mixed Platforms.Build.0 = Debug|x86
@@ -240,6 +252,8 @@ Global
 		{D476ABBE-A455-4476-8A8D-3F6151217B51}.Release|Mixed Platforms.Build.0 = Release|x86
 		{D476ABBE-A455-4476-8A8D-3F6151217B51}.Release|x86.ActiveCfg = Release|x86
 		{D476ABBE-A455-4476-8A8D-3F6151217B51}.Release|x86.Build.0 = Release|x86
+		{D476ABBE-A455-4476-8A8D-3F6151217B51}.Debug|Any CPU.Build.0 = Debug|x86
+		{D476ABBE-A455-4476-8A8D-3F6151217B51}.Release|Any CPU.Build.0 = Release|x86
 		{DA9B09F3-A99D-4883-A954-537560453674}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{DA9B09F3-A99D-4883-A954-537560453674}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{DA9B09F3-A99D-4883-A954-537560453674}.Debug|Mixed Platforms.Build.0 = Debug|x86
@@ -250,6 +264,8 @@ Global
 		{DA9B09F3-A99D-4883-A954-537560453674}.Release|Mixed Platforms.Build.0 = Release|x86
 		{DA9B09F3-A99D-4883-A954-537560453674}.Release|x86.ActiveCfg = Release|x86
 		{DA9B09F3-A99D-4883-A954-537560453674}.Release|x86.Build.0 = Release|x86
+		{DA9B09F3-A99D-4883-A954-537560453674}.Debug|Any CPU.Build.0 = Debug|x86
+		{DA9B09F3-A99D-4883-A954-537560453674}.Release|Any CPU.Build.0 = Release|x86
 		{46E3B0E1-209F-4550-B0DD-D7E2C039B3CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{46E3B0E1-209F-4550-B0DD-D7E2C039B3CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{46E3B0E1-209F-4550-B0DD-D7E2C039B3CE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -392,6 +408,30 @@ Global
 		{2E08C19B-C0A9-4056-8564-E5B74477959D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2E08C19B-C0A9-4056-8564-E5B74477959D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2E08C19B-C0A9-4056-8564-E5B74477959D}.Release|x86.ActiveCfg = Release|Any CPU
+		{5954D496-CAAB-4F7A-BDE2-BDC8F47DAB19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5954D496-CAAB-4F7A-BDE2-BDC8F47DAB19}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5954D496-CAAB-4F7A-BDE2-BDC8F47DAB19}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5954D496-CAAB-4F7A-BDE2-BDC8F47DAB19}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5954D496-CAAB-4F7A-BDE2-BDC8F47DAB19}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5954D496-CAAB-4F7A-BDE2-BDC8F47DAB19}.Debug|x86.Build.0 = Debug|Any CPU
+		{5954D496-CAAB-4F7A-BDE2-BDC8F47DAB19}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5954D496-CAAB-4F7A-BDE2-BDC8F47DAB19}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5954D496-CAAB-4F7A-BDE2-BDC8F47DAB19}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{5954D496-CAAB-4F7A-BDE2-BDC8F47DAB19}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{5954D496-CAAB-4F7A-BDE2-BDC8F47DAB19}.Release|x86.ActiveCfg = Release|Any CPU
+		{5954D496-CAAB-4F7A-BDE2-BDC8F47DAB19}.Release|x86.Build.0 = Release|Any CPU
+		{5025ED8B-A94F-4E58-8BE0-68481B061609}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5025ED8B-A94F-4E58-8BE0-68481B061609}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5025ED8B-A94F-4E58-8BE0-68481B061609}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{5025ED8B-A94F-4E58-8BE0-68481B061609}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{5025ED8B-A94F-4E58-8BE0-68481B061609}.Debug|x86.ActiveCfg = Debug|x86
+		{5025ED8B-A94F-4E58-8BE0-68481B061609}.Debug|x86.Build.0 = Debug|x86
+		{5025ED8B-A94F-4E58-8BE0-68481B061609}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5025ED8B-A94F-4E58-8BE0-68481B061609}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5025ED8B-A94F-4E58-8BE0-68481B061609}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{5025ED8B-A94F-4E58-8BE0-68481B061609}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{5025ED8B-A94F-4E58-8BE0-68481B061609}.Release|x86.ActiveCfg = Release|x86
+		{5025ED8B-A94F-4E58-8BE0-68481B061609}.Release|x86.Build.0 = Release|x86
 		{A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -404,18 +444,6 @@ 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
@@ -0,0 +1,4 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/Environment/AssemblyExplorer/XmlDocument/@EntryValue">&lt;AssemblyExplorer&gt;&#xD;
+  &lt;Assembly Path="C:\Users\micha\git\tbf\packages\ControlBoard\Fuzhou150\ControlComponent3U.dll" /&gt;&#xD;
+&lt;/AssemblyExplorer&gt;</s:String></wpf:ResourceDictionary>
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.33.2140.0")]
-[assembly: AssemblyFileVersion("2.33.2140.0")]
+[assembly: AssemblyVersion("2.33.2145.0")]
+[assembly: AssemblyFileVersion("2.33.2145.0")]
@@ -7,11 +7,7 @@ using System.Windows.Forms;
 using log4net;
 using TBF.Rig.Sequences;
 using TBF.Resources;
-#if MANAGED
 using Oracle.ManagedDataAccess.Client;
-#else
-using Oracle.DataAccess.Client;
-#endif
 using System.Diagnostics;
 using System.Drawing;

@@ -7,11 +7,7 @@ using System.Drawing;
 using System.Windows.Forms;
 using log4net;
 using NHibernate;
-#if MANAGED
 using Oracle.ManagedDataAccess.Client;
-#else
-using Oracle.DataAccess.Client;
-#endif
 using TracingDB;
 using TracingDB.Entities;
 using TBF.Rig.Sequences;
@@ -90,7 +90,7 @@ namespace TBF.Rig.Elde
            ctrlBrdComponent.DIVLimit[divNo, 1] = limHiPct;
        }
 #else
-        public uint DivTime(int id) { return ctrlBrdComponent.divTime; }
+        public uint DivTime(int id) { return ctrlBrdComponent.divTime[id]; }
        public void SetDivLimit(int divNo, uint limLoPct, uint limHiPct) { }
 #endif

@@ -393,15 +393,14 @@ namespace TBF.Rig.Output.DB.SensusOracle
 		}

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

-            GetTestInfoFromProcedure("SaveBatchData", bat);  /// Create appropriate test infos
+            GetTestInfoFromProcedure("SaveBatchData");  /// 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 == null || !e.Contains(Event.UiCmdStop)) return false;
+            if (!e.Contains(Event.UiCmdStop)) return false;

            log.FatalFormat("STOP pressed: Procedure={0}, Test={1}, State={2}",
                            (StateMachine.Procedure == null) ? "?" : StateMachine.Procedure.Name,
@@ -2064,24 +2064,14 @@ 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;
-		public static TestMethodCfg cfg;
+		static TestMethodCfg cfg;
 		static IList<Config.Entities.Test> tests;
 		static IList<iPerlCommunicationParams> multiTestParams;

@@ -1009,22 +1009,6 @@ 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)
 		{
@@ -1056,7 +1040,6 @@ 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,14 +3,16 @@
 ///
 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; } }

@@ -54,8 +56,7 @@ 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()
 		{
@@ -149,5 +150,5 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead

 			return flags;
 		}
-    }
+	}
 }
@@ -31,131 +31,124 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
 		/// </summary>
 		private void InitializeComponent()
 		{
-            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.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.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.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.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.groupBox1.SuspendLayout();
            this.SuspendLayout();
            // 
-            // tabControl1
+            // nameTextBox
            // 
-            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;
+            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;
            // 
-            // tabPage1
+            // nameLabel
            // 
-            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;
+            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";
            // 
-            // label4
+            // classNameLabel
            // 
-            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";
+            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";
            // 
-            // label3
+            // optoSerialPortTextBox
            // 
-            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";
+            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;
            // 
-            // groupBox1
+            // optoSerialPortLabel
            // 
-            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)";
+            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.:";
            // 
-            // comboBoxCommunicationInterface
+            // muxBoardNrTextBox
            // 
-            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.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;
            // 
-            // label1
+            // muxBoardNrLabel
            // 
-            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.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";
            // 
            // rfidPortNrTextBox
            // 
            this.rfidPortNrTextBox.Enabled = false;
            this.rfidPortNrTextBox.Location = new System.Drawing.Point(439, 26);
-            this.rfidPortNrTextBox.Margin = new System.Windows.Forms.Padding(4);
+            this.rfidPortNrTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.rfidPortNrTextBox.Name = "rfidPortNrTextBox";
            this.rfidPortNrTextBox.Size = new System.Drawing.Size(44, 22);
            this.rfidPortNrTextBox.TabIndex = 7;
@@ -170,6 +163,32 @@ 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);
@@ -180,12 +199,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(10, 131);
-            this.optoDataGroupBox.Margin = new System.Windows.Forms.Padding(4);
+            this.optoDataGroupBox.Location = new System.Drawing.Point(37, 140);
+            this.optoDataGroupBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.optoDataGroupBox.Name = "optoDataGroupBox";
-            this.optoDataGroupBox.Padding = new System.Windows.Forms.Padding(4);
+            this.optoDataGroupBox.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.optoDataGroupBox.Size = new System.Drawing.Size(552, 119);
-            this.optoDataGroupBox.TabIndex = 18;
+            this.optoDataGroupBox.TabIndex = 5;
            this.optoDataGroupBox.TabStop = false;
            this.optoDataGroupBox.Text = "Opto-data";
            // 
@@ -203,7 +222,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);
+            this.tcpipPortTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.tcpipPortTextBox.Name = "tcpipPortTextBox";
            this.tcpipPortTextBox.Size = new System.Drawing.Size(51, 22);
            this.tcpipPortTextBox.TabIndex = 5;
@@ -222,180 +241,120 @@ 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);
+            this.ipAddressTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.ipAddressTextBox.Name = "ipAddressTextBox";
            this.ipAddressTextBox.Size = new System.Drawing.Size(129, 22);
            this.ipAddressTextBox.TabIndex = 3;
            // 
-            // radioButton1
+            // groupBox1
            // 
-            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;
+            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)";
            // 
-            // radioButton2
+            // label3
            // 
-            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;
+            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";
            // 
-            // optoSerialPortLabel
+            // label4
            // 
-            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.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";
            // 
-            // optoSerialPortTextBox
+            // label1
            // 
-            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;
+            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";
            // 
-            // groupTextBox
+            // comboBoxCommunicationInterface
            // 
-            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;
+            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;
            // 
            // IperlHeadCfgCtrl
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.tabControl1);
-            this.Margin = new System.Windows.Forms.Padding(4);
+            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.Name = "IperlHeadCfgCtrl";
-            this.Size = new System.Drawing.Size(617, 438);
+            this.Size = new System.Drawing.Size(667, 369);
            this.Load += new System.EventHandler(this.WaterMeterCfgCtrl_Load);
-            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.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
            this.ResumeLayout(false);
+            this.PerformLayout();

 		}

-        #endregion
+		#endregion

-        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 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.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.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;
+        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;
    }
 }
@@ -1,137 +0,0 @@
-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;
-    }
-}
@@ -1,155 +0,0 @@
-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();
-            }
-        }
-    }
-}
@@ -1,120 +0,0 @@
-<?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,6 +1,7 @@
 using log4net;
 using Sensus.iPerl.NfcHandler;
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Text;
 using System.Threading;
@@ -14,17 +15,12 @@ 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, cfg, structName, (ushort)offset, length);
+                buffer = MciRead(_nfcDataHandler, structName, (ushort)offset, length);

                CloseComPort(_nfcDataHandler);

@@ -43,17 +39,12 @@ 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, cfg, structName, (ushort)offset, length, buffer);
+                MciWrite(_nfcDataHandler, structName, (ushort)offset, length, buffer);

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

-        private static byte[] MciRead(NfcDataHandler nfcDataHandler, TestMethodCfg cfg, StructName structName, ushort offset, int length)
+        private static byte[] MciRead(NfcDataHandler nfcDataHandler, StructName structName, ushort offset, int length)
        {
            bool isReadValues = false;
-            int retryCount = 0;
-            Read:
            try
            {
                isReadValues = false;
@@ -129,33 +118,23 @@ 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, TestMethodCfg cfg, MCI_Protocol.StructName structName, ushort offset, int length, byte[] payload)
+        private static void MciWrite(NfcDataHandler nfcDataHandler, MCI_Protocol.StructName structName, ushort offset, int length, byte[] payload)
        {
-            int retryCount = 0;
-            Write:
            try
            {
                long num1 = (long)length;
@@ -165,7 +144,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))
                {
-                    // OK
+                    //setStatusIndicator(true);
                }
                else if (nfcDataHandler.LastErrorCode > (byte)0)
                {
@@ -176,9 +155,6 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
            catch (Exception ex)
            {
                rfidDataLogger.Error("MciWrite error message: " + ex.Message);
-                retryCount++;
-                if (retryCount < cfg.MaxCommRetries)
-                    goto Write;
            }
        }

@@ -249,45 +225,5 @@ 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
    }
 }
@@ -39,7 +39,7 @@
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH;CAMERA</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;FUZHOU_150;CAMERA;STABLE_MASS_EXTRAS</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;MUNICH;CAMERA</DefineConstants>
+    <DefineConstants>TRACE;FUZHOU_150;CAMERA;STABLE_MASS_EXTRAS</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;MUNICH;CAMERA</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;FUZHOU_150;CAMERA;STABLE_MASS_EXTRAS</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;MUNICH;CAMERA</DefineConstants>
+    <DefineConstants>TRACE;FUZHOU_150;CAMERA;STABLE_MASS_EXTRAS</DefineConstants>
    <Optimize>true</Optimize>
    <DebugType>pdbonly</DebugType>
    <PlatformTarget>AnyCPU</PlatformTarget>
@@ -101,8 +101,8 @@
    <SignManifests>false</SignManifests>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="ControlComponent3Munich">
-      <HintPath>..\packages\ControlBoard\Munich\ControlComponent3Munich.dll</HintPath>
+    <Reference Include="ControlComponent3U">
+      <HintPath>..\packages\ControlBoard\Fuzhou150\ControlComponent3U.dll</HintPath>
    </Reference>
    <Reference Include="FluentNHibernate">
      <HintPath>..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll</HintPath>
@@ -118,8 +118,11 @@
      <HintPath>..\packages\log4net.2.0.2\lib\net40-full\log4net.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.VisualBasic">
-      <Private>True</Private>
+    <Reference Include="Microsoft.VisualBasic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\VisualBasic.PowerPacks.Vs.1.0.0\lib\Microsoft.VisualBasic.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualBasic.PowerPacks.Vs, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\VisualBasic.PowerPacks.Vs.1.0.0\lib\Microsoft.VisualBasic.PowerPacks.Vs.dll</HintPath>
    </Reference>
    <Reference Include="MySql.Data">
      <HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
@@ -1635,12 +1638,6 @@
      <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" />
@@ -2193,7 +2190,6 @@
    <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" />
@@ -3315,9 +3311,6 @@
    <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>
@@ -3839,7 +3832,15 @@
      <Name>Sensus.iPerl.RfidCom</Name>
    </ProjectReference>
    <ProjectReference Include="..\..\NfcS5_DLL\NfcS5_DLL.csproj">
-      <Project>{34F6AA20-3BEC-44B4-9D18-DC66BAB79A83}</Project>
+      <Project>{5954d496-caab-4f7a-bde2-bdc8f47dab19}</Project>
+      <Name>NfcS5_DLL</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\iPerlHead\Sensus.iPerl.RfidCom\Sensus.iPerl.RfidCom.csproj">
+      <Project>{a3e14180-7f00-42e5-94a9-8db62ead6ee8}</Project>
+      <Name>Sensus.iPerl.RfidCom</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NfcS5_DLL\NfcS5_DLL.csproj">
+      <Project>{5954d496-caab-4f7a-bde2-bdc8f47dab19}</Project>
      <Name>NfcS5_DLL</Name>
    </ProjectReference>
    <ProjectReference Include="..\Common\Common.csproj">
@@ -1,50 +0,0 @@
-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));
-// }
-//
@@ -6,11 +6,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Windows.Forms;
 using log4net;
-#if MANAGED
 using Oracle.ManagedDataAccess.Client;
-#else
-using Oracle.DataAccess.Client;
-#endif
 using Common;
 using Common.Forms;
 using Config.Entities;
@@ -3,11 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Windows.Forms;
 using NHibernate;
-#if MANAGED
 using Oracle.ManagedDataAccess.Client;
-#else
-using Oracle.DataAccess.Client;
-#endif
 using Common;
 using TBF.Resources;
 using TBF.Rig.Output.DB.SensusOracle;
@@ -2,6 +2,7 @@
 <packages>
  <package id="FluentNHibernate" version="2.0.3.0" targetFramework="net40" />
  <package id="Iesi.Collections" version="4.0.0.4000" targetFramework="net40" />
+  <package id="VisualBasic.PowerPacks.Vs" version="1.0.0" targetFramework="net472" />
  <package id="log4net" version="2.0.2" targetFramework="net40" />
  <package id="MySql.Data" version="6.6.5" targetFramework="net20" />
  <package id="NHibernate" version="4.0.4.4000" targetFramework="net40" />
@@ -515,8 +515,6 @@ 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));
        }
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+To work with FireBird you must add the assembly binding for FirebirdClient ADO.NET 2.0 DataProvider
+to your App.config.
+Example:
+<runtime>
+<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+	<qualifyAssembly partialName="FirebirdSql.Data.FirebirdClient" fullName="FirebirdSql.Data.FirebirdClient, Version=2.0.1.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c" />
+</assemblyBinding>
+</runtime>
+-->
+<!-- 
+This template was written to work with NHibernate.Test.
+Copy the template to your NHibernate.Test project folder and rename it in hibernate.cfg.xml and change it 
+for your own use before compile tests in VisualStudio.
+-->
+<hibernate-configuration  xmlns="urn:nhibernate-configuration-2.2" >
+	<session-factory name="NHibernate.Test">
+		<property name="connection.driver_class">NHibernate.Driver.FirebirdClientDriver</property>
+		<property name="connection.connection_string">
+			Server=localhost;
+			Database=C:\nhibernate.fdb;
+			User=SYSDBA;Password=masterkey
+		</property>
+		<property name="show_sql">false</property>
+		<property name="dialect">NHibernate.Dialect.FirebirdDialect</property>
+		<property name="command_timeout">60</property>
+		<property name="query.substitutions">true 1, false 0, yes 1, no 0</property>
+	</session-factory>
+</hibernate-configuration>
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+This template was written to work with NHibernate.Test.
+Copy the template to your NHibernate.Test project folder and rename it in hibernate.cfg.xml and change it 
+for your own use before compile tests in VisualStudio.
+-->
+<!-- This is the System.Data.dll provider for SQL Server -->
+<hibernate-configuration  xmlns="urn:nhibernate-configuration-2.2" >
+	<session-factory name="NHibernate.Test">
+		<property name="connection.driver_class">NHibernate.Driver.SqlClientDriver</property>
+		<property name="connection.connection_string">
+			Server=(local);initial catalog=nhibernate;Integrated Security=SSPI
+		</property>
+		<property name="dialect">NHibernate.Dialect.MsSql2008Dialect</property>
+	</session-factory>
+</hibernate-configuration>
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+This template was written to work with NHibernate.Test.
+Copy the template to your NHibernate.Test project folder and rename it in hibernate.cfg.xml and change it 
+for your own use before compile tests in VisualStudio.
+-->
+<!-- This is the ByteFX.Data.dll provider for MySql -->
+<hibernate-configuration  xmlns="urn:nhibernate-configuration-2.2" >
+	<session-factory name="NHibernate.Test">
+		<property name="connection.driver_class">NHibernate.Driver.MySqlDataDriver</property>
+		<property name="connection.connection_string">
+			Database=test;Data Source=someip;User Id=blah;Password=blah
+		</property>
+		<property name="dialect">NHibernate.Dialect.MySQLDialect</property>
+	</session-factory>
+</hibernate-configuration>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+This template was written to work with NHibernate.Test.
+Copy the template to your NHibernate.Test project folder and rename it in hibernate.cfg.xml and change it 
+for your own use before compile tests in VisualStudio.
+-->
+<!-- This is the System.Data.OracleClient.dll provider for Oracle from MS -->
+<hibernate-configuration  xmlns="urn:nhibernate-configuration-2.2" >
+	<session-factory name="NHibernate.Test">
+		<property name="connection.driver_class">NHibernate.Driver.OracleClientDriver</property>
+		<property name="connection.connection_string">
+			User ID=nhibernate;Password=nhibernate;Data Source=localhost
+		</property>
+		<property name="show_sql">false</property>
+		<property name="dialect">NHibernate.Dialect.OracleDialect</property>
+		<property name="query.substitutions">true 1, false 0, yes 'Y', no 'N'</property>
+	</session-factory>
+</hibernate-configuration>
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+This template was written to work with NHibernate.Test.
+Copy the template to your NHibernate.Test project folder and rename it in hibernate.cfg.xml and change it 
+for your own use before compile tests in VisualStudio.
+-->
+<hibernate-configuration  xmlns="urn:nhibernate-configuration-2.2" >
+	<session-factory name="NHibernate.Test">
+		<property name="connection.driver_class">NHibernate.Driver.NpgsqlDriver</property>
+		<property name="connection.connection_string">
+			Server=localhost;Database=nhibernate;User ID=nhibernate;Password=nhibernate;
+		</property>
+		<property name="dialect">NHibernate.Dialect.PostgreSQL82Dialect</property>
+	</session-factory>
+</hibernate-configuration>
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+This template was written to work with NHibernate.Test.
+Copy the template to your NHibernate.Test project folder and rename it in hibernate.cfg.xml and change it 
+for your own use before compile tests in VisualStudio.
+-->
+<hibernate-configuration  xmlns="urn:nhibernate-configuration-2.2" >
+	<session-factory name="NHibernate.Test">
+		<property name="connection.driver_class">NHibernate.Driver.SQLite20Driver</property>
+		<property name="connection.connection_string">
+			Data Source=nhibernate.db
+		</property>
+		<property name="dialect">NHibernate.Dialect.SQLiteDialect</property>
+	</session-factory>
+</hibernate-configuration>
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+This template was written to work with NHibernate.Test.
+Copy the template to your NHibernate.Test project folder and rename it hibernate.cfg.xml. Change it 
+for your own use before compiling tests in Visual Studio.
+-->
+<hibernate-configuration xmlns="urn:nhibernate-configuration-2.2">
+	<session-factory name="NHibernate.Test">
+		<property name="connection.driver_class">NHibernate.Driver.SybaseAseClientDriver</property>
+		<property name="connection.connection_string">
+			Data Source=10.0.0.1;Port=5000;Database=nhibernate;User ID=nhibernate;Password=password
+		</property>
+		<property name="dialect">NHibernate.Dialect.SybaseASE15Dialect</property>
+		<property name="query.substitutions">true=1;false=0</property>
+	</session-factory>
+</hibernate-configuration>
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+This template was written to work with NHibernate.Test.
+Copy the template to your NHibernate.Test project folder and rename it hibernate.cfg.xml. Change it 
+for your own use before compiling tests in Visual Studio.
+-->
+<hibernate-configuration xmlns="urn:nhibernate-configuration-2.2">
+	<session-factory name="NHibernate.Test">
+		<property name="connection.driver_class">NHibernate.Driver.SybaseSQLAnywhereDriver</property>
+		<property name="connection.connection_string">
+			UID=DBA;PWD=sql;Server=localhost;DBN=nhibernate;DBF=c:\nhibernate.db;ASTOP=No
+		</property>
+		<property name="dialect">NHibernate.Dialect.SybaseSQLAnywhere12Dialect</property>
+		<property name="query.substitutions">true=1;false=0</property>
+	</session-factory>
+</hibernate-configuration>
@@ -0,0 +1,460 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                     Version 2.1, February 1999
+
+       Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+     Everyone is permitted to copy and distribute verbatim copies
+       of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
@@ -0,0 +1,54 @@
+<h1 id="welcometonhibernate">Welcome to NHibernate</h1>
+
+<p>NHibernate is a mature, open source object-relational mapper for the .NET framework. It is actively developed,
+fully featured and used in thousands of successful projects.</p>
+
+<p>The NHibernate community website - <a href="http://www.nhforge.org">http://www.nhforge.org</a> - has a range of resources to help you get started,
+including <a href="http://nhforge.org/wikis">wikis</a>, <a href="http://nhforge.org/blogs/nhibernate">blogs</a> and <a href="http://nhforge.org/doc/nh/en/index.html">reference documentation</a>.</p>
+
+<h2 id="latestversion">Latest Version</h2>
+
+<p>The quickest way to get the latest release of NHibernate is to add it to your project using 
+NuGet (<a href="http://nuget.org/List/Packages/NHibernate">http://nuget.org/List/Packages/NHibernate</a>).</p>
+
+<p>Alternatively binaries are available from SourceForge at <a href="http://sourceforge.net/projects/nhibernate">http://sourceforge.net/projects/nhibernate</a>.</p>
+
+<p>You are encouraged to review the release notes (releasenotes.txt), particularly when upgrading to a 
+later version. The release notes will generally document any breaking changes.</p>
+
+<h2 id="communityforums">Community Forums</h2>
+
+<p>There are two official NHibernate community forums:</p>
+
+<ul>
+<li><a href="http://groups.google.com/group/nhusers">NHibernate Users</a> - a forum for users to find help using NHibernate</li>
+<li><a href="http://groups.google.com/group/nhibernate-development">NHibernate Development</a> - a forum for the developers of NHibernate</li>
+</ul>
+
+<h2 id="bugreports">Bug Reports</h2>
+
+<p>If you find any bugs, please report them using the <a href="http://nhibernate.jira.com">JIRA bug tracker</a>. A
+test-case that demonstrates the issue is usually required. Instructions on providing a test-case
+can be found <a href="http://nhforge.org/blogs/nhibernate/archive/2008/10/04/the-best-way-to-solve-nhibernate-bugs-submit-good-unit-test.aspx">here</a>.</p>
+
+<h2 id="licenses">Licenses</h2>
+
+<p>This software is distributed under the terms of the Free Software Foundation <a href="http://www.gnu.org/licenses/lgpl-2.1-standalone.html">Lesser GNU Public License (LGPL), version 2.1</a> (see lgpl.txt).</p>
+
+<h2 id="credits">Credits</h2>
+
+<p>Many thanks to the following individuals, organisations and projects whose work is so important to the success
+of NHibernate (in no particular order):</p>
+
+<ul>
+<li><a href="http://www.nunit.org">NUnit</a> - unit-testing</li>
+<li><a href="http://nant.sourceforge.net">Nant</a> - build automation</li>
+<li><a href="http://www.codebetter.com">CodeBetter</a> - <a href="http://www.jetbrains.com/teamcity">TeamCity</a> continuous integration and build management server hosting</li>
+<li><a href="http://www.github.com">GitHub</a> and <a href="http://www.sourceforge.net">SourceForge</a> - source code hosting</li>
+<li><a href="http://www.atlassian.com">Atlassian</a> - JIRA bug tracker licence and hosting</li>
+<li><a href="http://logging.apache.org/log4net">Log4net</a> - logging, by the <a href="http://www.apache.org">Apache Software Foundation</a></li>
+<li><a href="http://www.jetbrains.com">JetBrains</a> - <a href="http://www.jetbrains.com/resharper">ReSharper</a> licences for NHibernate developers</li>
+<li><a href="http://code.google.com/p/linfu">LinFu</a> - proxy implementation (Philip Laureano)</li>
+<li>Iesi.Collections - source code taken from an <a href="http://www.codeproject.com/KB/recipes/sets.aspx" title="Add Support for &quot;Set&quot; Collections to .NET">article</a> written by Jason Smith</li>
+<li><a href="http://relinq.codeplex.com/" title="re-linq: Generic LINQ provider">Relinq</a> - Linq provider for NHibernate</li>
+</ul>
@@ -0,0 +1,228 @@
+<xs:schema targetNamespace="urn:nhibernate-configuration-2.2" xmlns="urn:nhibernate-configuration-2.2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:NS="urn:nhibernate-configuration-2.2">
+	<xs:annotation>
+		<xs:documentation>
+			-- This schema was automatically generated by Syntext Dtd2Schema and changed for NH use --
+			-- conversion tool (from file: hibernate-configuration-3.0.dtd) --
+			-- Copyright (C) 2002, 2003 Syntext Inc. See http://www.syntext.com for updates. --
+		</xs:documentation>
+	</xs:annotation>
+	<!-- Type definitions -->
+	<xs:element name="hibernate-configuration">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="bytecode-provider" minOccurs="0" maxOccurs="1" >
+					<xs:annotation>
+						<xs:documentation>
+							There are 3 default short-cut values
+							- lcg     : default for .NET2.0 and higher.
+							- codedom : CodeDOM-based bytecode provider (mostly for .NET1.1).
+							- null    : Disable the reflection optimization completely.
+							In addition you can specify the AssemblyQualifiedName of your custom bytecode-provider (implementation of IBytecodeProvider).
+							Note: the bytecode-provider will be tooks in account only when specified in the app.config or web.config.
+						</xs:documentation>
+					</xs:annotation>
+				</xs:element>
+				<xs:element ref="reflection-optimizer" maxOccurs="1" minOccurs="0" />
+				<xs:element ref="session-factory" minOccurs="0" maxOccurs="1" />
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="class-cache">
+		<xs:complexType>
+			<xs:sequence>
+			</xs:sequence>
+			<xs:attribute name="class" type="xs:string" use="required" />
+			<xs:attributeGroup ref="cacheSpecification" />
+			<xs:attribute name="include">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="all" />
+						<xs:enumeration value="non-lazy" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="collection-cache">
+		<xs:complexType>
+			<xs:sequence />
+			<xs:attribute name="collection" type="xs:string" use="required" />
+			<xs:attributeGroup ref="cacheSpecification" />
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="mapping">
+		<xs:annotation>
+			<xs:documentation>
+				There are 3 possible combinations of mapping attributes
+				1 - resource &amp; assembly:  NHibernate will read the mapping resource from the specified assembly
+				2 - file only: NHibernate will read the mapping from the file.
+				3 - assembly only: NHibernate will find all the resources ending in hbm.xml from the assembly.
+			</xs:documentation>
+		</xs:annotation>
+		<xs:complexType>
+			<xs:attribute name="resource" />
+			<xs:attribute name="file" />
+			<xs:attribute name="assembly" />
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="property">
+		<xs:complexType>
+			<xs:simpleContent>
+				<xs:extension base="xs:string">
+					<xs:attribute name="name" use="required">
+						<xs:simpleType>
+							<xs:restriction base="xs:string">
+								<xs:enumeration value="connection.provider" />
+								<xs:enumeration value="connection.driver_class" />
+								<xs:enumeration value="connection.connection_string" />
+								<xs:enumeration value="connection.isolation" />
+								<xs:enumeration value="connection.release_mode" />
+								<xs:enumeration value="connection.connection_string_name" />
+								<xs:enumeration value="dialect" />
+								<xs:enumeration value="default_schema" />
+								<xs:enumeration value="show_sql" />
+								<xs:enumeration value="max_fetch_depth" />
+								<xs:enumeration value="current_session_context_class" />
+								<xs:enumeration value="transaction.factory_class" />
+								<xs:enumeration value="cache.provider_class" />
+								<xs:enumeration value="cache.use_query_cache" />
+								<xs:enumeration value="cache.query_cache_factory" />
+								<xs:enumeration value="cache.use_second_level_cache" />
+								<xs:enumeration value="cache.region_prefix" />
+								<xs:enumeration value="cache.use_minimal_puts" />
+								<xs:enumeration value="cache.default_expiration" />
+								<xs:enumeration value="query.substitutions" />
+								<xs:enumeration value="query.factory_class" />
+								<xs:enumeration value="query.imports" />
+								<xs:enumeration value="hbm2ddl.auto" />
+								<xs:enumeration value="hbm2ddl.keywords" />
+								<xs:enumeration value="sql_exception_converter" />
+								<xs:enumeration value="adonet.wrap_result_sets" />
+								<xs:enumeration value="prepare_sql" />
+								<xs:enumeration value="command_timeout" />
+								<xs:enumeration value="adonet.batch_size" />
+								<xs:enumeration value="use_proxy_validator" />
+								<xs:enumeration value="xml.output_stylesheet" />
+								<xs:enumeration value="generate_statistics" />
+								<xs:enumeration value="query.startup_check" />
+								<xs:enumeration value="default_catalog" />
+								<xs:enumeration value="proxyfactory.factory_class" />
+								<xs:enumeration value="adonet.factory_class" />
+								<xs:enumeration value="default_batch_fetch_size" />
+								<xs:enumeration value="default_entity_mode" />
+								<xs:enumeration value="use_sql_comments" />
+								<xs:enumeration value="format_sql" />
+								<xs:enumeration value="collectiontype.factory_class" />
+								<xs:enumeration value="interceptors.beforetransactioncompletion_ignore_exceptions" />
+								<xs:enumeration value="order_inserts" />
+								<xs:enumeration value="linqtohql.generatorsregistry" />
+							</xs:restriction>
+						</xs:simpleType>
+					</xs:attribute>
+				</xs:extension>
+			</xs:simpleContent>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="session-factory">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="property" minOccurs="0" maxOccurs="unbounded" />
+				<xs:element ref="mapping" minOccurs="0" maxOccurs="unbounded" />
+				<xs:choice minOccurs="0" maxOccurs="unbounded">
+					<xs:element ref="class-cache" />
+					<xs:element ref="collection-cache" />
+				</xs:choice>
+				<xs:element ref="event" minOccurs="0" maxOccurs="unbounded" />
+				<xs:element ref="listener" minOccurs="0" maxOccurs="unbounded" />
+			</xs:sequence>
+			<xs:attribute name="name" use="optional" />
+		</xs:complexType>
+	</xs:element>
+	<xs:attributeGroup name="cacheSpecification">
+		<xs:attribute name="region" type="xs:string" use="optional" />
+		<xs:attribute name="usage" use="required">
+			<xs:simpleType>
+				<xs:restriction base="xs:string">
+					<xs:enumeration value="read-only" />
+					<xs:enumeration value="read-write" />
+					<xs:enumeration value="nonstrict-read-write" />
+					<xs:enumeration value="transactional" />
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:attribute>
+	</xs:attributeGroup>
+	<xs:element name="event">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="listener" minOccurs="1" maxOccurs="unbounded" />
+			</xs:sequence>
+			<xs:attribute name="type" type="listenerType" use="required" />
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="listener">
+		<xs:complexType>
+			<xs:sequence />
+			<xs:attribute name="class" type="xs:string" use="required" />
+			<xs:attribute name="type" type="listenerType" use="optional" />
+		</xs:complexType>
+	</xs:element>
+	<xs:simpleType name="listenerType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="auto-flush" />
+			<xs:enumeration value="merge" />
+			<xs:enumeration value="create" />
+			<xs:enumeration value="create-onflush" />
+			<xs:enumeration value="delete" />
+			<xs:enumeration value="dirty-check" />
+			<xs:enumeration value="evict" />
+			<xs:enumeration value="flush" />
+			<xs:enumeration value="flush-entity" />
+			<xs:enumeration value="load" />
+			<xs:enumeration value="load-collection" />
+			<xs:enumeration value="lock" />
+			<xs:enumeration value="refresh" />
+			<xs:enumeration value="replicate" />
+			<xs:enumeration value="save-update" />
+			<xs:enumeration value="save" />
+			<xs:enumeration value="pre-update" />
+			<xs:enumeration value="update" />
+			<xs:enumeration value="pre-load" />
+			<xs:enumeration value="pre-delete" />
+			<xs:enumeration value="pre-insert" />
+			<xs:enumeration value="post-load" />
+			<xs:enumeration value="post-insert" />
+			<xs:enumeration value="post-update" />
+			<xs:enumeration value="post-delete" />
+			<xs:enumeration value="post-commit-update" />
+			<xs:enumeration value="post-commit-insert" />
+			<xs:enumeration value="post-commit-delete" />
+			<xs:enumeration value="pre-collection-recreate" />
+			<xs:enumeration value="pre-collection-remove" />
+			<xs:enumeration value="pre-collection-update" />
+			<xs:enumeration value="post-collection-recreate" />
+			<xs:enumeration value="post-collection-remove" />
+			<xs:enumeration value="post-collection-update" />
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:element name="bytecode-provider">
+		<xs:complexType>
+			<xs:sequence>
+			</xs:sequence>
+			<xs:attribute name="type" default="lcg">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="codedom" />
+						<xs:enumeration value="lcg" />
+						<xs:enumeration value="null" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="reflection-optimizer">
+		<xs:complexType>
+			<xs:sequence />
+			<xs:attribute name="use" type="xs:boolean" />
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
Author	SHA1	Message	Date
michal	27ecc88c9d	Add IntelliJ config and gitignore files for projects Introduce `.idea` configuration files and `.gitignore` entries for `NfcS5_DLL` and `TBF` projects. These changes include settings for encodings, VCS mappings, and index layout configurations. Helps streamline project setup and improve tooling compatibility.	2024-12-22 12:32:35 +01:00
michal	e06a9977c3	Fix project references and add new dependencies Updated project references to use relative paths and added new dependency `VisualBasic.PowerPacks.Vs`. Corrected array usage in `ControlComWrap.cs` to avoid potential runtime errors. These changes enhance project structure and fix issues with component interactions.	2024-12-22 12:31:27 +01:00
Jan Augustin	a92cd3efd1	New ControlComponent3U.dll	2024-10-10 09:29:59 +02:00
Jan Augustin	24f62c4546	Reconfigured for Fuzhou PT150	2024-06-13 09:36:03 +02:00
Jan Augustin	c0872e7376	Rebase with master-2 Remove unmanaged oracle client	2024-06-13 09:35:10 +02:00
Jan Augustin	1815f962e7	Merge branch 'master-2' of 10.42.130.13:/srv/git/tbf into master-2	2024-06-07 09:47:01 +02:00
Jan Augustin	41978869d1	Update gitignore	2024-06-07 09:46:28 +02:00