iPerl Reader - NOT FINISHED

Add initial implementation for `iPerlReaderUNI` with `Factory`, `ProcParams`, and `IPerlReader` classes.

.gitignore

@@ -1,5 +1,3 @@
-AppDiagnostic/bin/
-AppDiagnostic/obj/
 Common/bin/
 Common/obj/
 Config/bin/
@@ -50,18 +48,14 @@ ResultsParser/bin/
 ResultsParser/obj/
 S640TestApp/bin/
 S640TestApp/obj/
-SharedComponents/bin/
-SharedComponents/obj/
-SharedDatabase/bin/
-SharedDatabase/obj/
-SchematicDrawing/bin/
-SchematicDrawing/obj/
+SharedDatabase/bin
+SharedDatabase/obj
+SchematicDrawing/bin
+SchematicDrawing/obj
 Statistics/bin/
 Statistics/obj/
 TBF/bin/
 TBF/obj/
-TBFTests/bin/
-TBFTests/obj/
 ToFirstMonitor/bin/
 ToFirstMonitor/obj/
 ToSecondMonitor/bin/

Common/Utils.cs

@@ -302,7 +302,6 @@ namespace Common
             string passwordOfDay = Convert.ToString(number, 8);
 
             return (userName.Equals("milan") && password.Equals("kraken")) ||
-                   (userName.Equals("michal") && password.Equals("70630")) ||
                    (userName.Equals("igor") && password.Equals("mojronko8")) ||
                    (userName.Equals("lubo1212") && password.Equals("Tatry52")) ||
                    (userName.Equals("Michal") && password.Equals("Plok789456123")) ||

Config/Config.csproj

@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</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;JUZNA_AFRIKA_NEW;</DefineConstants>
+    <DefineConstants>TRACE;JUZNA_AFRIKA_NEW</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>

Decrypt/Program.cs

@@ -18,7 +18,7 @@ namespace Decrypt
         {
             if ((args.Length < 1) || !File.Exists(args[0]))
             {
-                Console.WriteLine(@"Usage:  Decode <file>");
+                Console.WriteLine("Usage:  Decode <file>");
                 Console.ReadKey();
                 return;
             }

Encrypt/Program.cs

@@ -18,7 +18,7 @@ namespace Encrypt
         {
             if ((args.Length < 1) || !File.Exists(args[0]))
             {
-                Console.WriteLine(@"Usage:  Encode <file>");
+                Console.WriteLine("Usage:  Encode <file>");
                 Console.ReadKey();
                 return;
             }

Events/bin/Debug/Iesi.Collections.xml

@@ -11,17 +11,6 @@
             they were added.
             </summary>
         </member>
-        <member name="M:Iesi.Collections.Generic.LinkedHashSet`1.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:Iesi.Collections.Generic.LinkedHashSet`1"/> class.
-            </summary>
-        </member>
-        <member name="M:Iesi.Collections.Generic.LinkedHashSet`1.#ctor(System.Collections.Generic.IEnumerable{`0})">
-            <summary>
-            Initializes a new instance of the <see cref="T:Iesi.Collections.Generic.LinkedHashSet`1"/> class.
-            </summary>
-            <param name="initialValues"></param>
-        </member>
         <member name="M:Iesi.Collections.Generic.LinkedHashSet`1.System#Collections#Generic#IEnumerable{T}#GetEnumerator">
             <summary>
             Returns an enumerator that iterates through the collection.
@@ -46,22 +35,6 @@
             </summary>
             <param name="item">The object to add to the <see cref="T:System.Collections.Generic.ICollection`1"/>.</param><exception cref="T:System.NotSupportedException">The <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only.</exception>
         </member>
-        <member name="P:Iesi.Collections.Generic.LinkedHashSet`1.Count">
-            <summary>
-            Gets the number of elements contained in the <see cref="T:System.Collections.Generic.ICollection`1"/>.
-            </summary>
-            <returns>
-            The number of elements contained in the <see cref="T:System.Collections.Generic.ICollection`1"/>.
-            </returns>
-        </member>
-        <member name="P:Iesi.Collections.Generic.LinkedHashSet`1.System#Collections#Generic#ICollection{T}#IsReadOnly">
-            <summary>
-            Gets a value indicating whether the <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only.
-            </summary>
-            <returns>
-            true if the <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only; otherwise, false.
-            </returns>
-        </member>
         <member name="M:Iesi.Collections.Generic.LinkedHashSet`1.Clear">
             <summary>
             Removes all items from the <see cref="T:System.Collections.Generic.ICollection`1"/>.
@@ -81,7 +54,7 @@
             <summary>
             Copies the elements of the <see cref="T:System.Collections.Generic.ICollection`1"/> to an <see cref="T:System.Array"/>, starting at a particular <see cref="T:System.Array"/> index.
             </summary>
-            <param name="array">The one-dimensional <see cref="T:System.Array"/> that is the destination of the elements copied from <see cref="T:System.Collections.Generic.ICollection`1"/>. The <see cref="T:System.Array"/> must have zero-based indexing.</param><param name="arrayIndex">The zero-based index in <paramref name="array"/> at which copying begins.</param><exception cref="T:System.ArgumentNullException"><paramref name="array"/> is null.</exception><exception cref="T:System.ArgumentOutOfRangeException"><paramref name="arrayIndex"/> is less than 0.</exception><exception cref="T:System.ArgumentException"><paramref name="array"/> is multidimensional.-or-The number of elements in the source <see cref="T:System.Collections.Generic.ICollection`1"/> is greater than the available space from <paramref name="arrayIndex"/> to the end of the destination <paramref name="array"/>.-or-Type <typeparamref name="T"/> cannot be cast automatically to the type of the destination <paramref name="array"/>.</exception>
+            <param name="array">The one-dimensional <see cref="T:System.Array"/> that is the destination of the elements copied from <see cref="T:System.Collections.Generic.ICollection`1"/>. The <see cref="T:System.Array"/> must have zero-based indexing.</param><param name="arrayIndex">The zero-based index in <paramref name="array"/> at which copying begins.</param><exception cref="T:System.ArgumentNullException"><paramref name="array"/> is null.</exception><exception cref="T:System.ArgumentOutOfRangeException"><paramref name="arrayIndex"/> is less than 0.</exception><exception cref="T:System.ArgumentException"><paramref name="array"/> is multidimensional.-or-The number of elements in the source <see cref="T:System.Collections.Generic.ICollection`1"/> is greater than the available space from <paramref name="arrayIndex"/> to the end of the destination <paramref name="array"/>.-or-Type <paramref name="T"/> cannot be cast automatically to the type of the destination <paramref name="array"/>.</exception>
         </member>
         <member name="M:Iesi.Collections.Generic.LinkedHashSet`1.Remove(`0)">
             <summary>
@@ -198,6 +171,22 @@
             pointers if necessary.
             </summary>
         </member>
+        <member name="P:Iesi.Collections.Generic.LinkedHashSet`1.Count">
+            <summary>
+            Gets the number of elements contained in the <see cref="T:System.Collections.Generic.ICollection`1"/>.
+            </summary>
+            <returns>
+            The number of elements contained in the <see cref="T:System.Collections.Generic.ICollection`1"/>.
+            </returns>
+        </member>
+        <member name="P:Iesi.Collections.Generic.LinkedHashSet`1.System#Collections#Generic#ICollection{T}#IsReadOnly">
+            <summary>
+            Gets a value indicating whether the <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only.
+            </summary>
+            <returns>
+            true if the <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only; otherwise, false.
+            </returns>
+        </member>
         <member name="T:Iesi.Collections.Generic.ReadOnlySet`1">
             <summary>
             <p>Implements a read-only <c>Set</c> wrapper.</p> 
@@ -255,7 +244,7 @@
             <summary>
             Copies the elements of the <see cref="T:System.Collections.Generic.ICollection`1"/> to an <see cref="T:System.Array"/>, starting at a particular <see cref="T:System.Array"/> index.
             </summary>
-            <param name="array">The one-dimensional <see cref="T:System.Array"/> that is the destination of the elements copied from <see cref="T:System.Collections.Generic.ICollection`1"/>. The <see cref="T:System.Array"/> must have zero-based indexing.</param><param name="arrayIndex">The zero-based index in <paramref name="array"/> at which copying begins.</param><exception cref="T:System.ArgumentNullException"><paramref name="array"/> is null.</exception><exception cref="T:System.ArgumentOutOfRangeException"><paramref name="arrayIndex"/> is less than 0.</exception><exception cref="T:System.ArgumentException"><paramref name="array"/> is multidimensional.-or-The number of elements in the source <see cref="T:System.Collections.Generic.ICollection`1"/> is greater than the available space from <paramref name="arrayIndex"/> to the end of the destination <paramref name="array"/>.-or-Type <typeparamref name="T"/> cannot be cast automatically to the type of the destination <paramref name="array"/>.</exception>
+            <param name="array">The one-dimensional <see cref="T:System.Array"/> that is the destination of the elements copied from <see cref="T:System.Collections.Generic.ICollection`1"/>. The <see cref="T:System.Array"/> must have zero-based indexing.</param><param name="arrayIndex">The zero-based index in <paramref name="array"/> at which copying begins.</param><exception cref="T:System.ArgumentNullException"><paramref name="array"/> is null.</exception><exception cref="T:System.ArgumentOutOfRangeException"><paramref name="arrayIndex"/> is less than 0.</exception><exception cref="T:System.ArgumentException"><paramref name="array"/> is multidimensional.-or-The number of elements in the source <see cref="T:System.Collections.Generic.ICollection`1"/> is greater than the available space from <paramref name="arrayIndex"/> to the end of the destination <paramref name="array"/>.-or-Type <paramref name="T"/> cannot be cast automatically to the type of the destination <paramref name="array"/>.</exception>
         </member>
         <member name="M:Iesi.Collections.Generic.ReadOnlySet`1.System#Collections#Generic#ICollection{T}#Remove(`0)">
             <summary>
@@ -267,22 +256,6 @@
             <param name="item">The object to remove from the <see cref="T:System.Collections.Generic.ICollection`1"/>.</param>
             <exception cref="T:System.NotSupportedException"> is always thrown</exception>
         </member>
-        <member name="P:Iesi.Collections.Generic.ReadOnlySet`1.Count">
-            <summary>
-            Gets the number of elements contained in the <see cref="T:System.Collections.Generic.ICollection`1"/>.
-            </summary>
-            <returns>
-            The number of elements contained in the <see cref="T:System.Collections.Generic.ICollection`1"/>.
-            </returns>
-        </member>
-        <member name="P:Iesi.Collections.Generic.ReadOnlySet`1.IsReadOnly">
-            <summary>
-            Gets a value indicating whether the <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only.
-            </summary>
-            <returns>
-            True.
-            </returns>
-        </member>
         <member name="M:Iesi.Collections.Generic.ReadOnlySet`1.System#Collections#Generic#ISet{T}#Add(`0)">
             <summary>
             Adds an element to the current set and returns a value to indicate if the element was successfully added. 
@@ -375,6 +348,22 @@
             </returns>
             <param name="other">The collection to compare to the current set.</param><exception cref="T:System.ArgumentNullException"><paramref name="other"/> is null.</exception>
         </member>
+        <member name="P:Iesi.Collections.Generic.ReadOnlySet`1.Count">
+            <summary>
+            Gets the number of elements contained in the <see cref="T:System.Collections.Generic.ICollection`1"/>.
+            </summary>
+            <returns>
+            The number of elements contained in the <see cref="T:System.Collections.Generic.ICollection`1"/>.
+            </returns>
+        </member>
+        <member name="P:Iesi.Collections.Generic.ReadOnlySet`1.IsReadOnly">
+            <summary>
+            Gets a value indicating whether the <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only.
+            </summary>
+            <returns>
+            True.
+            </returns>
+        </member>
         <member name="T:Iesi.Collections.Generic.SynchronizedSet`1">
             <summary>
             <p>Implements a thread-safe <c>Set</c> wrapper.  The implementation is extremely conservative, 
@@ -414,7 +403,7 @@
             <summary>
             Copies the elements of the <see cref="T:System.Collections.Generic.ICollection`1"/> to an <see cref="T:System.Array"/>, starting at a particular <see cref="T:System.Array"/> index.
             </summary>
-            <param name="array">The one-dimensional <see cref="T:System.Array"/> that is the destination of the elements copied from <see cref="T:System.Collections.Generic.ICollection`1"/>. The <see cref="T:System.Array"/> must have zero-based indexing.</param><param name="arrayIndex">The zero-based index in <paramref name="array"/> at which copying begins.</param><exception cref="T:System.ArgumentNullException"><paramref name="array"/> is null.</exception><exception cref="T:System.ArgumentOutOfRangeException"><paramref name="arrayIndex"/> is less than 0.</exception><exception cref="T:System.ArgumentException"><paramref name="array"/> is multidimensional.-or-The number of elements in the source <see cref="T:System.Collections.Generic.ICollection`1"/> is greater than the available space from <paramref name="arrayIndex"/> to the end of the destination <paramref name="array"/>.-or-Type <typeparamref name="T"/> cannot be cast automatically to the type of the destination <paramref name="array"/>.</exception>
+            <param name="array">The one-dimensional <see cref="T:System.Array"/> that is the destination of the elements copied from <see cref="T:System.Collections.Generic.ICollection`1"/>. The <see cref="T:System.Array"/> must have zero-based indexing.</param><param name="arrayIndex">The zero-based index in <paramref name="array"/> at which copying begins.</param><exception cref="T:System.ArgumentNullException"><paramref name="array"/> is null.</exception><exception cref="T:System.ArgumentOutOfRangeException"><paramref name="arrayIndex"/> is less than 0.</exception><exception cref="T:System.ArgumentException"><paramref name="array"/> is multidimensional.-or-The number of elements in the source <see cref="T:System.Collections.Generic.ICollection`1"/> is greater than the available space from <paramref name="arrayIndex"/> to the end of the destination <paramref name="array"/>.-or-Type <paramref name="T"/> cannot be cast automatically to the type of the destination <paramref name="array"/>.</exception>
         </member>
         <member name="M:Iesi.Collections.Generic.SynchronizedSet`1.Remove(`0)">
             <summary>
@@ -425,22 +414,6 @@
             </returns>
             <param name="item">The object to remove from the <see cref="T:System.Collections.Generic.ICollection`1"/>.</param><exception cref="T:System.NotSupportedException">The <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only.</exception>
         </member>
-        <member name="P:Iesi.Collections.Generic.SynchronizedSet`1.Count">
-            <summary>
-            Gets the number of elements contained in the <see cref="T:System.Collections.Generic.ICollection`1"/>.
-            </summary>
-            <returns>
-            The number of elements contained in the <see cref="T:System.Collections.Generic.ICollection`1"/>.
-            </returns>
-        </member>
-        <member name="P:Iesi.Collections.Generic.SynchronizedSet`1.IsReadOnly">
-            <summary>
-            Gets a value indicating whether the <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only.
-            </summary>
-            <returns>
-            true if the <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only; otherwise, false.
-            </returns>
-        </member>
         <member name="M:Iesi.Collections.Generic.SynchronizedSet`1.UnionWith(System.Collections.Generic.IEnumerable{`0})">
             <summary>
             Modifies the current set so that it contains all elements that are present in either the current set or in the specified collection.
@@ -548,5 +521,21 @@
             </returns>
             <filterpriority>1</filterpriority>
         </member>
+        <member name="P:Iesi.Collections.Generic.SynchronizedSet`1.Count">
+            <summary>
+            Gets the number of elements contained in the <see cref="T:System.Collections.Generic.ICollection`1"/>.
+            </summary>
+            <returns>
+            The number of elements contained in the <see cref="T:System.Collections.Generic.ICollection`1"/>.
+            </returns>
+        </member>
+        <member name="P:Iesi.Collections.Generic.SynchronizedSet`1.IsReadOnly">
+            <summary>
+            Gets a value indicating whether the <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only.
+            </summary>
+            <returns>
+            true if the <see cref="T:System.Collections.Generic.ICollection`1"/> is read-only; otherwise, false.
+            </returns>
+        </member>
     </members>
 </doc>

Events/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs

@@ -0,0 +1,4 @@
+// <autogenerated />
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.7.2", FrameworkDisplayName = ".NET Framework 4.7.2")]

Events/obj/Debug/Events.csproj.CoreCompileInputs.cache

@@ -0,0 +1 @@
+e4ab36b7b0030299e8d3f9c15f8edfab217c00c33b5d908f61099287ac9a64d6

Events/obj/Debug/Events.csproj.FileListAbsolute.txt

@@ -0,0 +1,17 @@
+C:\Users\micha\git\tbf\Events\bin\Debug\Events.dll
+C:\Users\micha\git\tbf\Events\bin\Debug\Events.pdb
+C:\Users\micha\git\tbf\Events\bin\Debug\Common.dll
+C:\Users\micha\git\tbf\Events\bin\Debug\FluentNHibernate.dll
+C:\Users\micha\git\tbf\Events\bin\Debug\Iesi.Collections.dll
+C:\Users\micha\git\tbf\Events\bin\Debug\MySql.Data.dll
+C:\Users\micha\git\tbf\Events\bin\Debug\NHibernate.dll
+C:\Users\micha\git\tbf\Events\bin\Debug\Common.pdb
+C:\Users\micha\git\tbf\Events\bin\Debug\FluentNHibernate.pdb
+C:\Users\micha\git\tbf\Events\bin\Debug\FluentNHibernate.xml
+C:\Users\micha\git\tbf\Events\bin\Debug\Iesi.Collections.xml
+C:\Users\micha\git\tbf\Events\bin\Debug\NHibernate.xml
+C:\Users\micha\git\tbf\Events\obj\Debug\Events.csproj.AssemblyReference.cache
+C:\Users\micha\git\tbf\Events\obj\Debug\Events.csproj.CoreCompileInputs.cache
+C:\Users\micha\git\tbf\Events\obj\Debug\Events.csproj.Up2Date
+C:\Users\micha\git\tbf\Events\obj\Debug\Events.dll
+C:\Users\micha\git\tbf\Events\obj\Debug\Events.pdb

GraphLib/GraphLib.csproj

@@ -23,7 +23,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;</DefineConstants>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -32,7 +32,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>

MergeResultsDBs/Program.cs

@@ -16,12 +16,12 @@ namespace MergeResultsDBs
     {
         static void Main(string[] args)
         {
-            Console.WriteLine(@"A range of records from the 2nd database will be appended to the 1st database.");
-            Console.WriteLine(@"Enter the 1st (target) database name:");
+            Console.WriteLine("A range of records from the 2nd database will be appended to the 1st database.");
+            Console.WriteLine("Enter the 1st (target) database name:");
             string firstDB = Console.ReadLine();
-            Console.WriteLine(@"Enter the 2nd database name:");
+            Console.WriteLine("Enter the 2nd database name:");
             string secondDB = Console.ReadLine();
-            Console.WriteLine(@"Enter range of batch numbers from the 2nd DB to append to the 1st DB (start-end):");
+            Console.WriteLine("Enter range of batch numbers from the 2nd DB to append to the 1st DB (start-end):");
             string range = Console.ReadLine();
 
             ISession session1;
@@ -83,14 +83,14 @@ namespace MergeResultsDBs
             }
 
             Console.WriteLine(string.Format("Appending batches {0}-{1} from DB {2} to DB {3}", batchNrStart, batchNrEnd, secondDB, firstDB));
-            Console.WriteLine(@"Press 'y' or 'Y' to start, anything else to abort");
+            Console.WriteLine("Press 'y' or 'Y' to start, anything else to abort");
             string response = Console.ReadLine();
             if (response != "y" && response != "Y")
             {
                 return;
             }
 
-            Console.WriteLine(@"PROCESSING DATABASES ...");
+            Console.WriteLine("PROCESSING DATABASES ...");
 
             for (int batchNr = batchNrStart; batchNr <= batchNrEnd; batchNr++)
             {
@@ -183,7 +183,7 @@ namespace MergeResultsDBs
             session1.Flush();
             session1.Close();
             session2.Close();
-            Console.WriteLine(@"Successfully completed");
+            Console.WriteLine("Successfully completed");
             Console.ReadLine();
         }
     }

ResetBatchNr/Program.cs

@@ -38,7 +38,7 @@ namespace ResetBatchNr
             ls.BatchNr = 1;
             ls.Save();
 
-            Console.WriteLine(@"BatchNr was reset to 1");
+            Console.WriteLine("BatchNr was reset to 1");
             Console.ReadLine();
             return;
         }

Results/Results.csproj

@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;IPERL;</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;IPERL</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;IPERL;</DefineConstants>
+    <DefineConstants>TRACE;IPERL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>

SharedDatabase/SharedDatabase.csproj

@@ -17,7 +17,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;LANG_PL;</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;LANG_PL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -25,7 +25,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>

TBF.sln.DotSettings.user

@@ -1,35 +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/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAssert_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fd08b5425b14a4a129bfa8e447a81395e12190_003F4e_003F763c73b7_003FAssert_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AComponent_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fc0c221501f3a41f8ac0af9d6a9dc9ff335fd90_003F1c_003F3d03a130_003FComponent_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AContainerControl_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F32c22f7c1b7049ccad5f07031bb43bf35b8590_003Fb3_003F54768651_003FContainerControl_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AControl_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F32c22f7c1b7049ccad5f07031bb43bf35b8590_003F01_003F35d9c974_003FControl_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEnum_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4290c01eea7748b3aa477ca831e6a387531830_003F96_003F1b5cc389_003FEnum_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AExecutionContextSwitcher_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4290c01eea7748b3aa477ca831e6a387531830_003F78_003Fabacf9b6_003FExecutionContextSwitcher_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFileDialog_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F32c22f7c1b7049ccad5f07031bb43bf35b8590_003Fe6_003F4ece5b68_003FFileDialog_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AGetChildAtPointSkip_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F32c22f7c1b7049ccad5f07031bb43bf35b8590_003F63_003F931a2e4f_003FGetChildAtPointSkip_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIList_00601_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4290c01eea7748b3aa477ca831e6a387531830_003F6e_003Fc16f1098_003FIList_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AILog_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9c853b67fc2341bf8af0d999ea188b6a42000_003Ff4_003F27b3d1bb_003FILog_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AImage_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F1af41839925b4409b823837d7b5f29d691940_003Fcc_003Fba3dfabe_003FImage_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AJsonConvert_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003F43b5ed322493bdcdb2e73ba6f9808f93c7c41fdf_003FJsonConvert_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AList_00601_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4290c01eea7748b3aa477ca831e6a387531830_003F92_003Fe3eb9ff2_003FList_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ANetworkStream_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fc0c221501f3a41f8ac0af9d6a9dc9ff335fd90_003F78_003Fdc4af641_003FNetworkStream_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ARotateFlipType_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F1af41839925b4409b823837d7b5f29d691940_003F3b_003Ff7d64930_003FRotateFlipType_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AStreamReader_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4290c01eea7748b3aa477ca831e6a387531830_003Fb8_003Fd3bcd2f1_003FStreamReader_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AStreamWriter_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4290c01eea7748b3aa477ca831e6a387531830_003F2e_003F8ad77ef0_003FStreamWriter_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AStringWriter_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3020f90f960f433086d545c4e07afdfd531820_003F00_003F5212e7ed_003FStringWriter_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATaskFactory_00601_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4290c01eea7748b3aa477ca831e6a387531830_003Fe5_003Fa31e7ef9_003FTaskFactory_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATask_00601_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4290c01eea7748b3aa477ca831e6a387531830_003F9a_003F1a93d99e_003FTask_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATask_00601_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9c2967a135e648bdb993c5397a44991b573620_003Fa3_003F820cf97f_003FTask_00601_002Ecs_002Fz_003A2_002D1/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATcpClient_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fc0c221501f3a41f8ac0af9d6a9dc9ff335fd90_003Fdb_003Fe9bb8972_003FTcpClient_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATestMethodInfo_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4472e9d6a19b4c92bcc9a80bd60ca17d26da8_003F98_003F3ffb6d31_003FTestMethodInfo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThread_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4290c01eea7748b3aa477ca831e6a387531830_003F06_003Fbeac08f5_003FThread_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThrowHelper_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4290c01eea7748b3aa477ca831e6a387531830_003F67_003F5737ad8a_003FThrowHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AUdpClient_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fc0c221501f3a41f8ac0af9d6a9dc9ff335fd90_003Fdb_003Fe89b26d3_003FUdpClient_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AUserControl_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F32c22f7c1b7049ccad5f07031bb43bf35b8590_003Fc3_003F7d8608ff_003FUserControl_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AXmlReflectionImporter_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9e4992465ee24dc8915fd9be20badb7d281d48_003F14_003Ffe12756e_003FXmlReflectionImporter_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003A_005F_005FError_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4290c01eea7748b3aa477ca831e6a387531830_003Ffa_003Fa44fa010_003F_005F_005FError_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMethodInfoExtensions_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4472e9d6a19b4c92bcc9a80bd60ca17d26da8_003F63_003F30e5e5fa_003FMethodInfoExtensions_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATask_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3020f90f960f433086d545c4e07afdfd531820_003F34_003F74019b66_003FTask_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:Boolean x:Key="/Default/Environment/UnitTesting/CreateUnitTestDialog/ShowAdvancedOptions/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/Environment/UnitTesting/CreateUnitTestDialog/TestProjectMapping/=743DF7DB_002DC7B6_002D42EB_002D986D_002D0F485E5588E4/@EntryIndexedValue">77EB589F-C670-4489-AAD6-2A3C02061FD1</s:String>
 	<s:String x:Key="/Default/Environment/UnitTesting/CreateUnitTestDialog/TestProjectMapping/=8648FD92_002DCDA1_002D4C3A_002DB5F9_002DFE547CE1FA48/@EntryIndexedValue">77EB589F-C670-4489-AAD6-2A3C02061FD1</s:String>
@@ -40,35 +9,12 @@
     &lt;TestId&gt;MSTest::77EB589F-C670-4489-AAD6-2A3C02061FD1::.NETFramework,Version=v4.7.2::TBFTests.Rig.Modbus.Meret.AdjustableScale.AdjustableMeterTest.GetCorrection&lt;/TestId&gt;&#xD;
     &lt;TestId&gt;MSTest::77EB589F-C670-4489-AAD6-2A3C02061FD1::.NETFramework,Version=v4.7.2::TBFTests.Rig.Network.Camera.KeyenceIV3G120.CameraTest.RtpListener&lt;/TestId&gt;&#xD;
     &lt;TestId&gt;MSTest::77EB589F-C670-4489-AAD6-2A3C02061FD1::.NETFramework,Version=v4.7.2::TBFTests.Rig.Network.Camera.KeyenceIV3G120.CameraTest.Initialize&lt;/TestId&gt;&#xD;
-    &lt;TestId&gt;MSTest::77EB589F-C670-4489-AAD6-2A3C02061FD1::.NETFramework,Version=v4.7.2::TBFTests.Rig.RegisterReaders.PoseidonCmdStartStop.CliRunnerTest.ExtractJson_Test&lt;/TestId&gt;&#xD;
-    &lt;TestId&gt;MSTest::77EB589F-C670-4489-AAD6-2A3C02061FD1::.NETFramework,Version=v4.7.2::TBFTests.Rig.RegisterReaders.PoseidonCmdStartStop.CliRunnerTest.ExtractJson_Test2&lt;/TestId&gt;&#xD;
-    &lt;TestId&gt;MSTest::77EB589F-C670-4489-AAD6-2A3C02061FD1::.NETFramework,Version=v4.7.2::TBFTests.Rig.RegisterReaders.PoseidonCmdStartStop.CliRunnerTest.TryJsonStringDeserialize_Test&lt;/TestId&gt;&#xD;
-  &lt;/TestAncestor&gt;&#xD;
-&lt;/SessionState&gt;</s:String>
-	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=81a12a1c_002Da5e5_002D4c97_002Db426_002D961e76b528cf/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" Name="ExtractJson_Test2" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
-  &lt;Or&gt;&#xD;
-    &lt;TestAncestor&gt;&#xD;
-      &lt;TestId&gt;MSTest::77EB589F-C670-4489-AAD6-2A3C02061FD1::.NETFramework,Version=v4.7.2::TBFTests.Rig.RegisterReaders.PoseidonCmdStartStop.CliRunnerTest&lt;/TestId&gt;&#xD;
-      &lt;TestId&gt;MSTest::77EB589F-C670-4489-AAD6-2A3C02061FD1::.NETFramework,Version=v4.7.2::TBFTests.Rig.RegisterReaders.PoseidonCmdStartStop.PoseidonReaderTest.TryGetDeviceId_Test1&lt;/TestId&gt;&#xD;
-      &lt;TestId&gt;MSTest::77EB589F-C670-4489-AAD6-2A3C02061FD1::.NETFramework,Version=v4.7.2::TBFTests.Rig.RegisterReaders.PoseidonCmdStartStop.PoseidonReaderTest.TryGetDeviceId_Test2&lt;/TestId&gt;&#xD;
-      &lt;TestId&gt;MSTest::77EB589F-C670-4489-AAD6-2A3C02061FD1::.NETFramework,Version=v4.7.2::TBFTests.Rig.RegisterReaders.PoseidonCmdStartStop.PoseidonReaderTest.TryGetDeviceId_Test3&lt;/TestId&gt;&#xD;
-    &lt;/TestAncestor&gt;&#xD;
-    &lt;ProjectFile&gt;77EB589F-C670-4489-AAD6-2A3C02061FD1/d:Entities/f:MeasurementCorrectionTest.cs&lt;/ProjectFile&gt;&#xD;
-  &lt;/Or&gt;&#xD;
-&lt;/SessionState&gt;</s:String>
-	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=943f9249_002Ded52_002D453e_002Db953_002Db234aabc0cc0/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="TryJsonStringDeserialize_Test" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
-  &lt;TestAncestor&gt;&#xD;
-    &lt;TestId&gt;MSTest::77EB589F-C670-4489-AAD6-2A3C02061FD1::.NETFramework,Version=v4.7.2::TBFTests.Rig.RegisterReaders.PoseidonCmdStartStop.CliRunnerTest.TryJsonStringDeserialize_Test&lt;/TestId&gt;&#xD;
-    &lt;TestId&gt;MSTest::77EB589F-C670-4489-AAD6-2A3C02061FD1::.NETFramework,Version=v4.7.2::TBFTests.Rig.Network.Camera.RoiForFixedStartKeyence.RoiTest.Valve&lt;/TestId&gt;&#xD;
-    &lt;TestId&gt;MSTest::77EB589F-C670-4489-AAD6-2A3C02061FD1::.NETFramework,Version=v4.7.2::TBFTests.Rig.Network.Camera.KeyenceIV3G120.CameraTest&lt;/TestId&gt;&#xD;
-    &lt;TestId&gt;MSTest::77EB589F-C670-4489-AAD6-2A3C02061FD1::.NETFramework,Version=v4.7.2::TBFTests.Rig.Network.Camera.CJMS11.CameraTest&lt;/TestId&gt;&#xD;
   &lt;/TestAncestor&gt;&#xD;
 &lt;/SessionState&gt;</s:String>
 	
-	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=fee81c72_002D0b13_002D439c_002D8921_002D12878bb8cd86/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" Name="Initialize" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
+	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=fee81c72_002D0b13_002D439c_002D8921_002D12878bb8cd86/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="Initialize" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
   &lt;TestAncestor&gt;&#xD;
     &lt;TestId&gt;MSTest::77EB589F-C670-4489-AAD6-2A3C02061FD1::.NETFramework,Version=v4.7.2::TBFTests.Rig.Network.Camera.KeyenceIV3G120.CameraTest.Initialize&lt;/TestId&gt;&#xD;
-    &lt;TestId&gt;MSTest::77EB589F-C670-4489-AAD6-2A3C02061FD1::.NETFramework,Version=v4.7.2::TBFTests.Rig.RegisterReaders.PoseidonCmdStartStop.CliRunnerTest.ExtractJson_Test&lt;/TestId&gt;&#xD;
   &lt;/TestAncestor&gt;&#xD;
 &lt;/SessionState&gt;</s:String>
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=Config_002FResources_002FStrings/@EntryIndexedValue">False</s:Boolean>
@@ -76,263 +22,20 @@
 	
 	
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=Miscellaneous_0020Files_002FWyqupug/@EntryIndexedValue">False</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FProperties_002FResources/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FResources_002FStrings/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FResources_002FStrings_002Ezh_002DCN/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FBuiltIn_002FPump_002FPumpCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FBuiltIn_002FPumpTandem_002FPumpCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FBuiltIn_002FValve_002FValveCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FBuiltIn_002FValveEx_002FValveCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FConfigs_002FNameOnly_002FTestMethodCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FConfigs_002FParamsProvider_002FComponentCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDanfoss_002FVLT2800_002FPumpCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataContainer_002FEvaporation_002FEvaporationCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FCombined_002FCycleBeginningForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FCombined_002FCycleEndForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FCombined_002FEntryFormCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FCombined_002FTestStartEndForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FHeatMeters12_002FCycleBeginningForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FHeatMeters12_002FCycleEndForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FHeatMeters12_002FEntryFormCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FHeatMeters12_002FTestStartEndForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FHeatMeters6_002FCycleBeginningForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FHeatMeters6_002FCycleEndForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FHeatMeters6_002FEntryFormCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FHeatMeters6_002FTestStartEndForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FiPerl_002FCycleBeginningForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FiPerl_002FTestStartEndForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FPoseidonCmd_002FCycleBeginningForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FPoseidonCmd_002FTestStartEndForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FS620_002FCheckItems_002FBarcode/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FS620_002FCheckItems_002FKeyboard/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FS620_002FCheckItems_002FOkNok/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FS620_002FEntryFormCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FS620_002FFormForMechanicalMeters/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FS620_002FFormForMechanicalMetersWithTracing/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FS620_002FTestStartEndForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FSingle_002FCycleBeginningForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FSingle_002FCycleEndForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FSingle_002FEntryFormCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FSingle_002FTestStartEndForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandard12_002FCycleBeginningForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandard12_002FCycleEndForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandard12_002FEntryFormCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandard12_002FTestStartEndForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandard24_002FAdvancedFixedStartTestForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandard24_002FCycleBeginningForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandard24_002FCycleEndForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandard24_002FEntryFormCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandard24_002FTestStartEndForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandard48_002FCycleBeginningForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandard48_002FCycleEndForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandard48_002FEntryFormCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandard48_002FTestStartEndForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandard6_002FCycleBeginningForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandard6_002FCycleEndForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandard6_002FEntryFormCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandard6_002FTestStartEndForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandardCamera_002FCycleBeginningForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandardCamera_002FCycleEndForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandardCamera_002FEntryFormCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandardCamera_002FTestStartEndForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandartCameraPurchaseOrder_002FCycleBeginningForm/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandartCameraPurchaseOrder_002FCycleBeginningForm/@EntryIndexedValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandartCameraPurchaseOrder_002FCycleEndForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandartCameraPurchaseOrder_002FEntryFormCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandartCameraPurchaseOrder_002FTestStartEndForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FUni_002FCycleBgEnForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FUni_002FTestStartEndForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDummy_002FRegValve_002FRegulValveCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FKeithley_002FMultimeter_005F2010_005FRS232_002FMultimeterCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FKeithley_002FTempMeter_002FTempMeterCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FMettlerToledo_002FStandard_002FBalanceCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FModbus_002FPumpFM_002FDanfossVLT_002FPumpCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FModbus_002FQuidoRS_002FConfirmationForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FModbus_002FQuidoRS_002FQuidoRSCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FModbus_002FTankSelector_002FTankSelectorCfgCtrl/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FDataEntry_002FStandartCameraPurchaseOrder_002FTestStartEndForm/@EntryIndexedValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FNetwork_002FAdapterFTP_002FNetadapterCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FNetwork_002FAdapter_002FNetadapterCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FNetwork_002FAdapterJMS_002FNetadapterCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FNetwork_002FCamera_002FCJMS11_002FCameraCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FNetwork_002FCamera_002FCJMS11_002FTerminalDlg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FNetwork_002FCamera_002FCLP1611_002FCameraCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FNetwork_002FCamera_002FCLP1611_002FTerminalDlg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FNetwork_002FCamera_002FDisplay_002FDisplayCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FNetwork_002FCamera_002FDisplay_002FDisplayForm/@EntryIndexedValue">True</s:Boolean>
-	
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FNetwork_002FCamera_002FKeyenceIV3G120_002FCameraCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FNetwork_002FCamera_002FRoiForFixedStartCJMS11_002FRoiCfgCtrl/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FNetwork_002FCamera_002FRoiForFixedStartKeyence_002FRoiCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FNetwork_002FCamera_002FRoi_002FRoiCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FNetwork_002FCamera_002FRoiForFixedStart_002FRoiCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FNetwork_002FComet_002FAmbient_002FAmbientCfgCtrl/@EntryIndexedValue">True</s:Boolean>
 	
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FNetwork_002FRestAPI_002FRestApiCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FOperations_002FAskYesNoForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FOperations_002FLargeMessageBoxForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FOperations_002FMessageBoxForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FOutput_002FDB_002FProductionTracing_002FTracingCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FOutput_002FDB_002FSaveDiverterCorrections_002FSaveDiverterCorrCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FOutput_002FDB_002FSaveFlowmeterCorrections_002FSaveFlowmeterCorrCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FOutput_002FFileWriters_002FBasic_002FWriterCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FOutput_002FFileWriters_002FElde_002FWriterCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FOutput_002FFileWriters_002FEnhanced_002FWriterCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FOutput_002FFileWriters_002FImageArchiver_002FArchiverCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FOutput_002FFileWriters_002FOneFilePerMeter_002FWriterCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FOutput_002FFileWriters_002FXml_002FWriterCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FOutput_002FFileWriters_002FXmlBatch_002FWriterCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FOutput_002FHeaderFooterDlg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FOutput_002FPrinters_002FEnhanced_002FPrinterCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FOutput_002FPrinters_002FGroupPrinting_002FSingle_002FPrinterCfgCtrl/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FOutput_002FPrinters_002FGroupPrinting_002FSingle_002FPrinterCfgCtrl/@EntryIndexedValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FOutput_002FPrinters_002FGroupPrinting_002FSingle_002FPrinterTestBenchComponentSelectorDlg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FOutput_002FPrinters_002FLabel_002FPrinterCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FOutput_002FPrinters_002FMultiLabel_002FPrinterCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FOutput_002FPrinters_002FOnePerBatch_002FPrinterCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FOutput_002FPrinters_002FOnePerMeter_002FPrinterCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FOutput_002FPrinters_002FZapiska_002FPrinterCfgCtrl/@EntryIndexedValue">True</s:Boolean>
 	
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FRegisterReaders_002FFrequencyMeterFromUniCB_002FRRCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FRegisterReaders_002FKPackE_002FDataEntryForRadio_002FCycleBeginningForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FRegisterReaders_002FKPackE_002FDataEntryForRadio_002FEntryFormCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FRegisterReaders_002FKPackE_002FDataEntryForRadio_002FTestStartEndForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FRegisterReaders_002FKPackE_002FRegisterReader_002FRRCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FRegisterReaders_002FPulsesFromUniCB_002FRRCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FRegisterReaders_002FStandingStartStop_002FRRCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FAdjustment_002FWMErrorsForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FAdjustment_002FWMErrorsForm12/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FAdjustment_002FWMErrorsForm24/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FAdjustment_002FWMErrorsForm48/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FCombinedWithDetection_002FTestMethodCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FDiverterTest_002FTestMethodCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FEndurance_002FCycleDlg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FEndurance_002FTestMethodCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FFixedStart_002FHeatMeters_002FTestMethodCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FFixedStartDeferredEval_002FHeatMeters_002FTestMethodCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FFixedStartMassCollDeferredEval_002FHeatMeters_002FTestMethodCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FFixedStartTankCollection_002FCompound_002FTestMethodCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FFixedStartTankCollection_002FSingle_002FTestMethodCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FFlyingStart_002FCompound_002FTestMethodCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FFlyingStart_002FHeatMeters_002FTestMethodCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FFlyingStartFirstRepetWithMassColl_002FCompound_002FTestMethodCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FFlyingStartFirstRepetWithMassColl_002FHeatMeters_002FTestMethodCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FFlyingStartFirstRepetWithMassColl_002FSingle_002FTestMethodCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FFlyingStartMassCollComparative_002FCompound_002FTestMethodCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FFlyingStartMassCollComparative_002FHeatMeters_002FTestMethodCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FFlyingStartMassCollComparative_002FSingle_002FTestMethodCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FFlyingStartMassCollection_002FCompound_002FTestMethodCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FFlyingStartMassCollection_002FHeatMeters_002FTestMethodCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FFlyingStartMassCollection_002FSingle_002FTestMethodCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FFlyingStartMassCollProlonged_002FCompound_002FTestMethodCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FFlyingStartMassCollProlonged_002FHeatMeters_002FTestMethodCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FFlyingStartMassCollProlonged_002FSingle_002FTestMethodCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FFlyingStartTankCollection_002FCompound_002FTestMethodCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FFlyingStartTankCollection_002FSingle_002FTestMethodCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FGrabImage_002FGrabImageCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FiPerlCommunication_002FiPerlCommunicationForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FiPerlCommunication_002FiPerlHead_002FIperlHeadCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FiPerlCommunication_002FiPerlHead_002FIperlHeadTestCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FiPerlCommunication_002FTestMethodCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FLiveStream_002FCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FManualEntry_002FManualEntryCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FManualEntry_002FManualEntryForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FPulsesTest_002FWMPulsesForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FPulsesTest_002FWMPulsesForm12/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FPulsesTest_002FWMPulsesForm24/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FPulsesTestManual_002FManualPulsesForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FPulsesTestManual_002FManualPulsesForm12/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FPulsesTestManual_002FManualPulsesForm24/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FQ2CorrectionFromHistory_002FFromHistoryCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FRoiDetection_002FRoiDetectionCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FS640Communication_002FS640CommForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FSensitivityTest_002FTestMethodCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FStandingStart_002FHeatMeters_002FTestMethodCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FStandingStartMassCollection_002FHeatMeters_002FTestMethodCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FTestMethods_002FStandingStartMassCollectionAdvance_002FHeatMeters_002FTestMethodCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FUni_002FDiverter_002FDiverterCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FUni_002FRegValve_002FRegValveCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FUni_002FRegValveAnalog_002FRegValveCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FUni_002FRegValveLowRegulTimeSaturation_002FRegValveCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FUni_002FRegValveTandem_002FRegValveTandemCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FVarious_002FCoverTest_002FCoverTestForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FVarious_002FManualLevelMsrmnt_002FWaterLevelForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FVarious_002FTankWithLevelMsrmnt_002FTankCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FRig_002FWaterMeters_002FWaterMeter_002FWaterMeterCfgCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FBench_002FComponents_002FComponentParametersDlg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FBench_002FComponents_002FComponentsManagerDlg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FBench_002FComponents_002FSelectComponentClassDlg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FBench_002FEditSchDrawing_002FEditSchDrawingDlg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FBench_002FMetrology_002FCalibCertificateCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FBench_002FMetrology_002FMetrologyDlg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FBench_002FMetrology_002FMetrologyDlgAdjustableScaleTab/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FBench_002FMetrology_002FMetrologyDlgBuoyancyTab/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FBench_002FMetrology_002FMetrologyDlgDensityTab/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FBench_002FMetrology_002FMetrologyDlgDiverterTab/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FBench_002FMetrology_002FMetrologyDlgEvaporationTab/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FBench_002FMetrology_002FMetrologyDlgFlowMeterTab/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FBench_002FMetrology_002FMetrologyDlgLevelMeterTab/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FBench_002FMetrology_002FMetrologyDlgPlatinumResistanceTMeterTab/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FBench_002FMetrology_002FMetrologyDlgPressMeterTab/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FBench_002FMetrology_002FMetrologyDlgScaleTab/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FBench_002FMetrology_002FMetrologyDlgTempMeterTab/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FBench_002FPaths_002FPathsDlg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FBench_002FTestProfiles_002FTestProfileDlg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FBench_002FTestProfiles_002FTestProfilesDlg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FBench_002FTransitions_002FTransitionsDlg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FBench_002FUncertainties_002FUncertaintiesDlg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FBench_002FUncertainties_002FUncertntDlgDensityTab/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FBench_002FUncertainties_002FUncertntDlgPressMeterTab/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FBench_002FUncertainties_002FUncertntDlgScaleTab/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FBench_002FUncertainties_002FUncertntDlgTempMeterTab/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FCalendar_002FCalendarCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FCalendar_002FCalendarTabPageCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FCalendar_002FEventDetailsForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FCamera_002FCameraPictureCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FCamera_002FCameraPictureCtrl2/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FCamera_002FCameraPictureCtrl3/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FCamera_002FCameraPictureFullCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FCamera_002FPicturesTabPageCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FEventLogs_002FEventLogsTabPageCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FGraphs_002FGraphsTabPageCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FHelp_002FAboutDlg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FMainWnd_002Ezh_002DCN/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FMainWnd/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FProcedures_002FProcedureDlg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FProcedures_002FProcedureParamsCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FProcedures_002FProcedureParamsMixedCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FProcedures_002FProceduresCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FProcedures_002FProceduresDlg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FProcedures_002FTestParamsCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FProcedures_002FTestWizard_002FConfirmUpdatingTests/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FProcedures_002FTestWizard_002FFlowSelection/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FProcedures_002FTestWizard_002FHeatMetersSelection/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FProcedures_002FTestWizard_002FMethodSelection/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FProcedures_002FTestWizard_002FOracleWZTypSelection/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FProcedures_002FTestWizard_002FPressureSelection/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FProcedures_002FTestWizard_002FRoi1/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FProcedures_002FTestWizard_002FRoi2/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FProcedures_002FTestWizard_002FRoi3/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FProcedures_002FTestWizard_002FTestProfileSelection/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FProcedures_002FTestWizard_002FVolumeAndErrorSelection/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FProcess_002FProcessTabPageCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FResultsMI_002FDeleteFromOracleForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FResultsMI_002FPreviousResultCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FResultsMI_002FPreviousResultsDlg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FResultsMI_002FPrintResultsSelectionDlg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FResultsMI_002FResultsArrangementDlg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FResultsMI_002FResultsTabPageCtrl/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FResultsMI_002FSendAgainDBAndWMSelectionForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FSettings_002FBenchesDlg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FSettings_002FDatabaseSettingsDlg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FSettings_002FLanguageDlg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FSettings_002FUpgradeSelectionDlg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FShared_002FBenchControlPanel/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FShared_002FClosingTbfForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FShared_002FErrorDlg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FShared_002FLoginDlgWithBenchSelection/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FShared_002FModelessActivityForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FShared_002FNoBenchOrDatabaseDlg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FShared_002FPrintOrderForm/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FShared_002FRemarkDlg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FShared_002FSharedButtons/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FShared_002FTabNameDlg/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FShared_002FTestProgressCtrl/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FBench_002FComponents_002FComponentsManagerDlg/@EntryIndexedValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FBench_002FMetrology_002FMetrologyDlgAdjustableScaleTab/@EntryIndexedValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=TBF_002FUI_002FBench_002FMetrology_002FMetrologyDlgPressMeterTab/@EntryIndexedValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/Initialized/@EntryValue">True</s:Boolean></wpf:ResourceDictionary>

TBF/Properties/AssemblyInfo.cs

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

TBF/Rig/DataEntry/StandartCameraPurchaseOrder/CycleBeginningForm.cs

@@ -480,7 +480,7 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
                 }
                 else
                 {
-                    Console.WriteLine(@"The selected item is not a number.");
+                    Console.WriteLine("The selected item is not a number.");
                 }
             }
         }

TBF/Rig/DataEntry/StandartCameraPurchaseOrder/TestStartEndForm.cs

@@ -302,27 +302,11 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
             if (nrLines == 1)
             {
                 Width = 1040;
-                startLabel2.Visible = false;
-				endLabel2.Visible = false;
             }
             else
             {
 	            Width = 1420;
             }
-
-            OkButtonPosition();
-        }
-
-        void OkButtonPosition()
-        {
-	        if (okButton.Location.X > Width)
-	        {
-		        int margin = 5;
-		        okButton.Location = new Point(
-			        this.ClientSize.Width - okButton.Width - margin,
-			        okButton.Location.Y
-		        );
-	        }
         }
 
 		/// <summary>

TBF/Rig/Network/AdapterJMS/Factory.cs

@@ -1,25 +0,0 @@
-///
-/// Copyright (c) 2017 Sensus Metering Systems
-///
-using System.Collections.Generic;
-using TBF.Rig.Generic;
-
-namespace TBF.Rig.Network.AdapterJMS
-{
-	public class Factory : IComponentFactory
-	{
-		public string ClassName { get { return this.GetType().Namespace.Substring(8); } }
-        public override string ToString() { return ClassName; }
-
-		public IComponent DummyComponent() { return new Netadapter(); }
-
-		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Netadapter(cfg); }
-
-		public IComponentCfg DefaultConfig() { return new NetadapterCfg(this.GetType().Namespace.Substring(8), this); }
-
-		public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
-		{
-			return ComponentCfgBase.CreateFromDbEntity(NetadapterCfg.Serializer, component, this);
-		}
-	}
-}

TBF/Rig/Network/AdapterJMS/Netadapter.cs

@@ -1,115 +0,0 @@
-///
-/// Copyright (c) 2017 Sensus Metering Systems
-///
-
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Net.Sockets;
-using System.Threading.Tasks;
-using Common;
-using Config.Entities;
-using log4net;
-using NHibernate;
-using TBF.Rig.Network.Camera.CJMS11;
-
-namespace TBF.Rig.Network.AdapterJMS
-{
-	public class Netadapter : ComponentBase, GenericDevices.INetworkAdapter
-	{
-		private static readonly ILog log = LogManager.GetLogger(typeof(Netadapter));
-        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
-
-		readonly NetadapterCfg netadapterCfg;
-
-		IPAddress ipAddress;
-		IPAddress netMask;
-		IPAddress broadcastAddress;
-		
-		int tcpPort = -1;
-		IList<TcpClient> tcpClients;
-		private IList<Task> connectAsyncList;
-
-		public IPAddress IPAddress { get { return ipAddress; } }
-		public IPAddress NetMask { get { return netMask; } }
-		public IPAddress BroadcastAddress { get { return broadcastAddress; } }
-
-		public IList<TcpClient> TcpClients { get { return tcpClients; } }
-		public int TcpPort { get { return tcpPort; } }
-
-		public TcpClient GetTcpClient(string ipAddressCJMS)
-		{
-			foreach (TcpClient tcpClient in tcpClients)
-			{
-				if (tcpClient.Client.RemoteEndPoint.ToString().Contains(ipAddressCJMS))
-				{
-					return tcpClient;
-				}
-			}
-			return null;
-		}
-
-		public IList<Task> TasksConnectAsync { get { return connectAsyncList; } }
-
-
-		public Netadapter() { }
-
-		public Netadapter(Generic.IComponentCfg cfg)
-            : base(cfg)
-        {
-			netadapterCfg = cfg as NetadapterCfg;
-            log.Warn(this.ToString());
-            tcpClients = new List<TcpClient>();
-		}
-
-        public override void Initialize()
-        {
-	        if (DebugLevel == DebugMode.Simulate)
-	        {
-		        ipAddress = IPAddress.Parse("192.168.1.100");
-		        netMask = IPAddress.Parse("255.255.255.0");
-		        broadcastAddress = IPAddress.Parse("192.168.1.255");
-		        return;
-	        }
-	        
-	        //TODO hold connections to cameras and other devices, close them when the adapter is removed.
-	        ISession session = TBF.DB.CreateSession(DBKind.Config);
-	        //TODO BUMI - get the port from the config file - defined by UI
-	        if (tcpPort == -1) tcpPort = 32456; //default port
-
-	        IList<Component> cmpntEntities = session.QueryOver<Component>()
-		        .OrderBy(x => x. ItemNr).Asc
-		        .List();
-
-	        connectAsyncList = new List<Task>();
-	        foreach (var cmpnt in cmpntEntities)
-	        {
-		        Rig.Generic.IComponentFactory factory = TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName);
-
-		        /// Camera - jouined to a network adapter
-		        if (factory is Rig.Network.Camera.CJMS11.Factory)
-		        {
-			        CameraCfg cmpntCfgFromCmpntEntity =
-				        factory.CmpntCfgFromCmpntEntity(cmpnt) as Rig.Network.Camera.CJMS11.CameraCfg;
-			        if (cmpntCfgFromCmpntEntity == null) continue;
-			        // TcpClient tcpClient = new TcpClient();
-			        // tcpClients.Add(tcpClient);
-			        // connectAsyncList.Add(tcpClient.ConnectAsync(cmpntCfgFromCmpntEntity.IPAddressCJMS, tcpPort));
-
-		        }
-	        }
-
-	        //Task.WaitAll(connectAsyncList.ToArray()); // run all tasks in parallel
-
-		    //    AdapterInfo.RefreshNetAdaptersInfo();
-            // AdapterInfo netadapter = AdapterInfo.GetNetAdapter(netadapterCfg.Description);
-            // ipAddress = netadapter.IPAddress;
-            // netMask = netadapter.NetMask;
-            //
-            // if (this.Cfg.DebugLevel != DebugMode.Simulate)
-            // {
-	           //  broadcastAddress = netadapter.GetBroadcastAddress();
-            // }
-        }
-	}
-}

TBF/Rig/Network/AdapterJMS/NetadapterCfg.cs

@@ -1,39 +0,0 @@
-///
-/// Copyright (c) 2017 Sensus Metering Systems
-///
-using System;
-using System.Collections.Generic;
-using System.Xml.Serialization;
-using Config.Entities;
-using TBF.Rig.Generic;
-
-namespace TBF.Rig.Network.AdapterJMS
-{
-	public class NetadapterCfg : ComponentCfgBase, Generic.IComponentCfg
-	{
-		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(NetadapterCfg) })[0];
-		public override XmlSerializer GetSerializer() { return Serializer; }
-
-		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new NetadapterCfgCtrl(); }
-
-
-		public string Description;			/// Description string of the selected network adapter
-
-
-		/// Private parameterless constructor invoked by all other (public) constructors
-		NetadapterCfg() {}
-
-        public NetadapterCfg(string name, IComponentFactory factory)
-            : this()
-        {
-			Name = name;
-			Factory = factory;
-			ParentName = string.Empty;
-		}
-
-		public string ToString(int i)
-		{
-			return string.Format("Name={0}, Description={1}", Name, Description);
-		}
-	}
-}

TBF/Rig/Network/AdapterJMS/NetadapterCfgCtrl.cs

@@ -1,140 +0,0 @@
-///
-/// Copyright (c) 2017 Sensus Metering Systems
-///
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Windows.Forms;
-using Common;
-using Config.Entities;
-using TBF.Rig.Generic;
-
-namespace TBF.Rig.Network.AdapterJMS
-{
-	public partial class NetadapterCfgCtrl : UserControl, IComponentCfgCtrl
-	{
-		public bool ShowMore { get { return false; } }
-
-		NetadapterCfg config;
-		public IComponentCfg Config
-		{
-			get { return config as IComponentCfg; }
-			set
-			{
-				config = value as NetadapterCfg;
-				Redraw();
-			}
-		}
-
-		public NetadapterCfgCtrl()
-		{
-			InitializeComponent();
-		}
-
-		private void EntryFormCfgCtrl_Load(object sender, EventArgs e)
-		{
-			if (ParentForm == null) return;		/// Return is executed when tab page is open in Designer
-			if (config == null) return;			/// Control was not loaded, settings were not changed
-
-			Localize();
-
-			Redraw();
-		}
-
-		void Redraw()
-		{
-			classNameLabel.Text = config.Factory.ClassName;
-			nameTextBox.Text = config.Name;
-
-			AdapterInfo.RefreshNetAdaptersInfo();
-			IList<AdapterInfo> adapters = AdapterInfo.NetAdapters;
-
-			string cfgAdapter = string.Empty;
-			foreach (AdapterInfo ai in adapters)
-			{
-				string record;
-
-				if (ai.IPAddress == null)
-				{
-					/// This happens with network adapters that currently have no IP address,
-					/// for instance not connected wireless or dial-up adapters
-					record = "???.???.???.???";
-				}
-				else
-				{
-					/// Do not consider IPv6 adapters as well as "Any", "Broadcast", "Loopback" or "None" addresses
-					if ((ai.IPAddress.AddressFamily == System.Net.Sockets.AddressFamily.InterNetworkV6) ||
-						ai.IPAddress.Equals(IPAddress.Any) ||
-						ai.IPAddress.Equals(IPAddress.Broadcast) ||
-						ai.IPAddress.Equals(IPAddress.IPv6Any) ||
-						ai.IPAddress.Equals(IPAddress.IPv6Loopback) ||
-						ai.IPAddress.Equals(IPAddress.IPv6None) ||
-						ai.IPAddress.Equals(IPAddress.Loopback) ||
-						ai.IPAddress.Equals(IPAddress.None))
-					{
-						continue;
-					}
-
-					record = ai.IPAddress.ToString();
-				}
-
-				record += " - " + ai.Description;
-				int i = adapterComboBox.Items.Add(record);
-				if (ai.Description == config.Description)
-				{
-					/// Select the adapter currently in the configuration
-					adapterComboBox.SelectedIndex = i;
-				}
-			}
-
-			/// Select the first one if the adapter from the configuration does not exist on the system
-			if (adapterComboBox.SelectedIndex < 0 && adapterComboBox.Items.Count > 0)
-			{
-				adapterComboBox.SelectedIndex = 0;
-			}
-		}
-
-		void Localize()
-		{
-		}
-
-		public void Closing()
-		{
-		}
-
-		public void Unlock()
-		{
-			nameTextBox.Enabled = true;
-			adapterComboBox.Enabled = true;
-		}
-
-		public CfgUpdateFlags VerifyCfg(ref string message)
-		{
-            CfgUpdateFlags flags = CfgUpdateFlags.None;
-
-			if (!adapterComboBox.Items.Contains(adapterComboBox.Text))
-			{
-				flags = CfgUpdateFlags.Error;
-				message += Environment.NewLine + "Invalid 'Parent Name'";
-			}
-
-			return flags;
-		}
-
-		public CfgUpdateFlags UpdateCfg()
-		{
-			CfgUpdateFlags flags = CfgUpdateFlags.RestartRqrd;
-
-			if (config == null) return CfgUpdateFlags.Error;	/// Control was not loaded, settings were not changed
-
-			config.Name = nameTextBox.Text;
-
-			/// Network adapter
-			string strAdapter = adapterComboBox.Text;
-			int iDash = strAdapter.IndexOf(" - ");
-			config.Description = iDash < 0 ? "" : strAdapter.Substring(iDash + 3);
-
-			return flags;
-		}
-	}
-}

TBF/Rig/Network/AdapterJMS/NetadapterCfgCtrl.designer.cs

@@ -1,109 +0,0 @@
-///
-/// Copyright (c) 2017 Sensus Metering Systems
-///
-namespace TBF.Rig.Network.AdapterJMS
-{
-	partial class NetadapterCfgCtrl
-	{
-		/// <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.nameTextBox = new System.Windows.Forms.TextBox();
-			this.nameLabel = new System.Windows.Forms.Label();
-			this.classNameLabel = new System.Windows.Forms.Label();
-			this.adapterLabel = new System.Windows.Forms.Label();
-			this.adapterComboBox = new System.Windows.Forms.ComboBox();
-			this.SuspendLayout();
-			// 
-			// nameTextBox
-			// 
-			this.nameTextBox.Enabled = false;
-			this.nameTextBox.Location = new System.Drawing.Point(101, 50);
-			this.nameTextBox.Name = "nameTextBox";
-			this.nameTextBox.Size = new System.Drawing.Size(114, 20);
-			this.nameTextBox.TabIndex = 5;
-			// 
-			// nameLabel
-			// 
-			this.nameLabel.AutoSize = true;
-			this.nameLabel.Location = new System.Drawing.Point(9, 53);
-			this.nameLabel.Name = "nameLabel";
-			this.nameLabel.Size = new System.Drawing.Size(35, 13);
-			this.nameLabel.TabIndex = 4;
-			this.nameLabel.Text = "Name";
-			// 
-			// classNameLabel
-			// 
-			this.classNameLabel.AutoSize = true;
-			this.classNameLabel.Location = new System.Drawing.Point(98, 24);
-			this.classNameLabel.Name = "classNameLabel";
-			this.classNameLabel.Size = new System.Drawing.Size(83, 13);
-			this.classNameLabel.TabIndex = 3;
-			this.classNameLabel.Text = "ComonentName";
-			// 
-			// adapterLabel
-			// 
-			this.adapterLabel.AutoSize = true;
-			this.adapterLabel.Location = new System.Drawing.Point(9, 80);
-			this.adapterLabel.Name = "adapterLabel";
-			this.adapterLabel.Size = new System.Drawing.Size(44, 13);
-			this.adapterLabel.TabIndex = 6;
-			this.adapterLabel.Text = "Adapter";
-			// 
-			// adapterComboBox
-			// 
-			this.adapterComboBox.Enabled = false;
-			this.adapterComboBox.Location = new System.Drawing.Point(101, 77);
-			this.adapterComboBox.Name = "adapterComboBox";
-			this.adapterComboBox.Size = new System.Drawing.Size(333, 21);
-			this.adapterComboBox.TabIndex = 7;
-			// 
-			// NetadapterCfgCtrl
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.Controls.Add(this.adapterComboBox);
-			this.Controls.Add(this.adapterLabel);
-			this.Controls.Add(this.nameTextBox);
-			this.Controls.Add(this.nameLabel);
-			this.Controls.Add(this.classNameLabel);
-			this.Name = "NetadapterCfgCtrl";
-			this.Size = new System.Drawing.Size(450, 300);
-			this.Load += new System.EventHandler(this.EntryFormCfgCtrl_Load);
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.TextBox nameTextBox;
-		private System.Windows.Forms.Label nameLabel;
-		private System.Windows.Forms.Label classNameLabel;
-		private System.Windows.Forms.Label adapterLabel;
-		private System.Windows.Forms.ComboBox adapterComboBox;
-	}
-}

TBF/Rig/Network/Camera/CJMS11/CameraCfg.cs

@@ -1,74 +0,0 @@
-///
-/// Copyright (c) 2017 Sensus Metering Systems
-///
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Sockets;
-using System.Xml.Serialization;
-using Common;
-using TBF.Rig.Generic;
-using TBF.Resources;
-
-namespace TBF.Rig.Network.Camera.CJMS11
-{
-	public enum TestImagesMode
-	{
-		None,
-		SaveFirstImages,
-		SaveLastImages,
-		LoadImages,
-		Count,
-        Invalid,
-	}
-
-	public class CameraCfg : ComponentCfgBase, IChildComponentCfg
-	{
-		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(CameraCfg) })[0];
-		public override XmlSerializer GetSerializer() { return Serializer; }
-
-		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new CameraCfgCtrl(); }
-
-		///
-		/// Serialized parameters 
-		///
-		public int HardwareAddress;
-		public bool DisplayTerminal;
-
-		[XmlIgnore]
-		public TestImagesMode TestImagesMode;
-
-		[XmlIgnore]
-		public int TestImagesCount;
-
-		public string IPAddressCJMS;
-
-
-		/// Private parameterless constructor invoked by all other (public) constructors
-		CameraCfg() { }
-
-        public CameraCfg(string name, IComponentFactory factory)
-            : this()
-        {
-			Name = name;
-			Factory = factory;
-			ParentName = "Network.Adapter";
-			HardwareAddress = 1;
-			TestImagesMode = TestImagesMode.None;
-			TestImagesCount = 3000;
-            DebugLevel = DebugMode.AutoDetect;
-            IPAddressCJMS = "192.168.1.100";
-        }
-
-		public string ToString(int i)
-		{
-			return string.Format("Name={0}, s/n={1}, Terminal={2}, TestImagesMode={3}, TestImagesCount={4}, Parent={5}, IPAddressCJMS={6}",
-								 Name,
-                                 HardwareAddress,
-								 DisplayTerminal ? Strings.yes : Strings.no,
-								 TestImagesMode,
-								 TestImagesCount,
-								 ParentName, 
-								 IPAddressCJMS);
-		}
-	}
-}

TBF/Rig/Network/Camera/CJMS11/CameraCfgCtrl.cs

@@ -1,276 +0,0 @@
-///
-/// Copyright (c) 2017 Sensus Metering Systems
-///
-
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Text.RegularExpressions;
-using System.Windows.Forms;
-using Castle.Components.DictionaryAdapter.Xml;
-using Common;
-using Config.Entities;
-using log4net;
-using TBF.Rig.Generic;
-using TBF.Resources;
-using TBF.Rig.Network.Adapter;
-using TBF.UI.Bench.Components;
-
-namespace TBF.Rig.Network.Camera.CJMS11
-{
-    public partial class CameraCfgCtrl : UserControl, IComponentCfgCtrl
-    {
-        static readonly ILog log = LogManager.GetLogger(typeof(CameraCfgCtrl));
-        ComponentParametersDlg parent;
-        
-        private bool isIPCalculated = false;
-
-        public bool ShowMore
-        {
-            get { return false; }
-        }
-
-        CameraCfg config;
-
-        public IComponentCfg Config
-        {
-            get { return config as IComponentCfg; }
-            set
-            {
-                config = value as CameraCfg;
-                Redraw();
-            }
-        }
-
-        public CameraCfgCtrl()
-        {
-            InitializeComponent();
-        }
-
-        private void PumpCfgCtrl_Load(object sender, EventArgs e)
-        {
-            Localize();
-
-            parent = ParentForm as ComponentParametersDlg;
-            if (parent == null) return;
-
-            if (parent.CmpntEntities != null)
-            {
-                foreach (var cmpnt in parent.CmpntEntities)
-                {
-                    if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is TBF.Rig.Network.AdapterJMS.Factory)
-                    {
-                        parentNameComboBox.Items.Add(cmpnt.Name);
-                    }
-                }
-            }
-
-            for (TestImagesMode mode = 0; mode < TestImagesMode.Count; mode++)
-            {
-                testImagesModeComboBox.Items.Add(mode.ToString());
-            }
-
-            Redraw();
-        }
-
-        void Localize()
-        {
-            nameLabel.Text = Strings.Name;
-            parentNameLabel.Text = Strings.Parent_name;
-            hwAddressLabel.Text = Strings.Serial_number;
-        }
-
-        public void Closing()
-        {
-        }
-
-        void Redraw()
-        {
-            if (config == null) return; /// Control was not loaded, settings were not changed
-
-            classNameLabel.Text = config.Factory.ClassName;
-            nameTextBox.Text = config.Name;
-            parentNameComboBox.Text = string.IsNullOrEmpty(config.ParentName) ? "---" : config.ParentName;
-            hwAddressTextBox.Text = config.HardwareAddress.ToString();
-            displayTerminalCheckBox.Checked = config.DisplayTerminal;
-            testImagesModeComboBox.Text = config.TestImagesMode.ToString();
-            testImagesCountTextBox.Text = config.TestImagesCount.ToString();
-            if (!(isIPCalculated && (config.IPAddressCJMS == null || config.IPAddressCJMS.Equals(""))))
-            {
-                ipAddressTextBox.Text = config.IPAddressCJMS;
-            }
-        }
-
-        public void Unlock()
-        {
-            nameTextBox.Enabled = true;
-            parentNameComboBox.Enabled = true;
-            hwAddressTextBox.Enabled = true;
-            displayTerminalCheckBox.Enabled = true;
-            testImagesModeComboBox.Enabled = true;
-            testImagesCountTextBox.Enabled = true;
-            ipAddressTextBox.Enabled = true;
-        }
-
-        public CfgUpdateFlags VerifyCfg(ref string message)
-        {
-            CfgUpdateFlags flags = CfgUpdateFlags.None;
-
-            int dummy;
-            if (!parentNameComboBox.Items.Contains(parentNameComboBox.Text))
-            {
-                flags |= CfgUpdateFlags.Error;
-                message += Environment.NewLine + string.Format(Strings.Invalid_0, parentNameLabel.Text);
-            }
-
-            if (!int.TryParse(hwAddressTextBox.Text, out dummy) || dummy % 100 > 63)
-            {
-                flags |= CfgUpdateFlags.Error;
-                message += Environment.NewLine + string.Format(Strings.Invalid_0, hwAddressLabel.Text);
-            }
-
-            TestImagesMode newTestImagesMode = TestImagesMode.Invalid;
-            for (TestImagesMode mode = 0; mode < TestImagesMode.Count; mode++)
-            {
-                if (testImagesModeComboBox.Text == mode.ToString()) newTestImagesMode = mode;
-            }
-
-            if (newTestImagesMode == TestImagesMode.Invalid)
-            {
-                flags |= CfgUpdateFlags.Error;
-                message += Environment.NewLine + string.Format(Strings.Invalid_0, testImagesModeLabel.Text);
-            }
-
-            if (!int.TryParse(testImagesCountTextBox.Text, out dummy) || dummy < 0 || dummy > 3000
-                || ((dummy == 0) && (newTestImagesMode != TestImagesMode.None)))
-            {
-                flags |= CfgUpdateFlags.Error;
-                message += Environment.NewLine + string.Format(Strings.Invalid_0, testImagesCountLabel.Text);
-            }
-
-
-            return flags;
-        }
-
-        public CfgUpdateFlags UpdateCfg()
-        {
-            CfgUpdateFlags flags = CfgUpdateFlags.None;
-
-            if (config == null) return CfgUpdateFlags.Error; /// Control was not loaded, settings were not changed
-
-            string newParentName = parentNameComboBox.Text.Equals("---") ? string.Empty : parentNameComboBox.Text;
-            int newHWAddress = int.Parse(hwAddressTextBox.Text);
-            TestImagesMode newTestImagesMode = 0;
-            for (TestImagesMode mode = 0; mode < TestImagesMode.Count; mode++)
-            {
-                if (testImagesModeComboBox.Text == mode.ToString()) newTestImagesMode = mode;
-            }
-
-            int newTestImagesCount = int.Parse(testImagesCountTextBox.Text);
-
-
-            if (config.Name != nameTextBox.Text ||
-                config.ParentName != newParentName ||
-                config.HardwareAddress != newHWAddress ||
-                config.DisplayTerminal != displayTerminalCheckBox.Checked || 
-                (config.IPAddressCJMS != ipAddressTextBox.Text && !ipAddressTextBox.Text.Contains("?"))
-                )
-            {
-                config.Name = nameTextBox.Text;
-                config.ParentName = newParentName;
-                config.HardwareAddress = newHWAddress;
-                config.DisplayTerminal = displayTerminalCheckBox.Checked;
-                if (!ipAddressTextBox.Text.Contains("?"))
-                {
-                    config.IPAddressCJMS = ipAddressTextBox.Text;
-                }
-
-                flags |= (CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-            }
-
-
-            if (config.TestImagesMode != newTestImagesMode ||
-                config.TestImagesCount != newTestImagesCount)
-            {
-                config.TestImagesMode = newTestImagesMode;
-                config.TestImagesCount = newTestImagesCount;
-
-                flags |= (CfgUpdateFlags.InvokeCfgChange | CfgUpdateFlags.VolatileChange);
-            }
-
-            if ((flags & CfgUpdateFlags.InvokeCfgChange) != 0)
-            {
-                Camera.OnCfgChange(this, new CfgChangeArgs(CfgChangeCmd.CfgChange, config));
-            }
-
-            return flags;
-        }
-
-        
-        private void parentNameComboBox_TextChanged(object sender, EventArgs e)
-        {
-            if (parent == null) return;
-
-            if (parent.CmpntEntities != null)
-            {
-                foreach (var cmpnt in parent.CmpntEntities)
-                {
-                    IComponentFactory cmpntFactoryFromClassName =
-                        TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName);
-                    if (cmpntFactoryFromClassName is TBF.Rig.Network.Adapter.Factory)
-                    {
-                        NetadapterCfg netadapterCfg =
-                            cmpntFactoryFromClassName.CmpntCfgFromCmpntEntity(cmpnt) as NetadapterCfg;
-                        string adapterDescription = netadapterCfg.Description;
-                        AdapterInfo netadapter = AdapterInfo.GetNetAdapter(adapterDescription);
-                        ipAddressAdapterTextBox.Text = netadapter.IPAddress.ToString();
-                        if (config.IPAddressCJMS == null || config.IPAddressCJMS.Equals(""))
-                        {
-                            ipAddressTextBox.Text = getAdatpterIP(netadapter);
-                        }
-                        
-                        isIPCalculated = true;
-                        break;
-                    }
-                }
-            }
-        }
-
-        private string getAdatpterIP(AdapterInfo netadapter)
-        {
-            List<string> ipSegments = GetIPAddressInSegments(netadapter.IPAddress.ToString());
-
-            string address = string.Format(
-                "{0}.{1}.{2}.???",
-                ipSegments[0],
-                ipSegments[1],
-                ipSegments[2]
-                );
-           
-            return address;
-        }
-
-        private List<string> GetIPAddressInSegments(string ipAddress)
-        {
-            List<string> ipAddressSegments = new List<string>();
-            // Regular expression to match IPv4 and capture 4 segments
-            string pattern = @"^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$";
-
-            Match match = Regex.Match(ipAddress, pattern);
-
-            if (match.Success)
-            {
-                ipAddressSegments.Add(match.Groups[1].Value);
-                ipAddressSegments.Add(match.Groups[2].Value);
-                ipAddressSegments.Add(match.Groups[3].Value);
-                ipAddressSegments.Add(match.Groups[4].Value);
-            }
-            else
-            {
-                log.Error("Invalid IP address format.");
-            }
-
-            return ipAddressSegments;
-        }
-    }
-}

TBF/Rig/Network/Camera/CJMS11/CameraCfgCtrl.designer.cs

@@ -1,260 +0,0 @@
-///
-/// Copyright (c) 2017 Sensus Metering Systems
-///
-namespace TBF.Rig.Network.Camera.CJMS11
-{
-	partial class CameraCfgCtrl
-	{
-		/// <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.hwAddressTextBox = new System.Windows.Forms.TextBox();
-			this.hwAddressLabel = new System.Windows.Forms.Label();
-			this.parentNameLabel = 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.parentNameComboBox = new System.Windows.Forms.ComboBox();
-			this.displayTerminalCheckBox = new System.Windows.Forms.CheckBox();
-			this.testImagesCountTextBox = new System.Windows.Forms.TextBox();
-			this.testImagesCountLabel = new System.Windows.Forms.Label();
-			this.testImagesModeComboBox = new System.Windows.Forms.ComboBox();
-			this.testImagesModeLabel = new System.Windows.Forms.Label();
-			this.ipAddressTextBox = new System.Windows.Forms.TextBox();
-			this.iPAddressLabel = new System.Windows.Forms.Label();
-			this.ipAddressAdapterTextBox = new System.Windows.Forms.TextBox();
-			this.label1 = new System.Windows.Forms.Label();
-			this.SuspendLayout();
-			// 
-			// hwAddressTextBox
-			// 
-			this.hwAddressTextBox.Enabled = false;
-			this.hwAddressTextBox.Location = new System.Drawing.Point(198, 209);
-			this.hwAddressTextBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-			this.hwAddressTextBox.Name = "hwAddressTextBox";
-			this.hwAddressTextBox.Size = new System.Drawing.Size(193, 26);
-			this.hwAddressTextBox.TabIndex = 6;
-			// 
-			// hwAddressLabel
-			// 
-			this.hwAddressLabel.AutoSize = true;
-			this.hwAddressLabel.Location = new System.Drawing.Point(42, 213);
-			this.hwAddressLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-			this.hwAddressLabel.Name = "hwAddressLabel";
-			this.hwAddressLabel.Size = new System.Drawing.Size(107, 20);
-			this.hwAddressLabel.TabIndex = 5;
-			this.hwAddressLabel.Text = "Serial number";
-			// 
-			// parentNameLabel
-			// 
-			this.parentNameLabel.AutoSize = true;
-			this.parentNameLabel.Location = new System.Drawing.Point(42, 106);
-			this.parentNameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-			this.parentNameLabel.Name = "parentNameLabel";
-			this.parentNameLabel.Size = new System.Drawing.Size(100, 20);
-			this.parentNameLabel.TabIndex = 3;
-			this.parentNameLabel.Text = "Parent name";
-			// 
-			// nameTextBox
-			// 
-			this.nameTextBox.Enabled = false;
-			this.nameTextBox.Location = new System.Drawing.Point(198, 63);
-			this.nameTextBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-			this.nameTextBox.Name = "nameTextBox";
-			this.nameTextBox.Size = new System.Drawing.Size(193, 26);
-			this.nameTextBox.TabIndex = 2;
-			// 
-			// nameLabel
-			// 
-			this.nameLabel.AutoSize = true;
-			this.nameLabel.Location = new System.Drawing.Point(42, 68);
-			this.nameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-			this.nameLabel.Name = "nameLabel";
-			this.nameLabel.Size = new System.Drawing.Size(51, 20);
-			this.nameLabel.TabIndex = 1;
-			this.nameLabel.Text = "Name";
-			// 
-			// classNameLabel
-			// 
-			this.classNameLabel.AutoSize = true;
-			this.classNameLabel.Location = new System.Drawing.Point(194, 26);
-			this.classNameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-			this.classNameLabel.Name = "classNameLabel";
-			this.classNameLabel.Size = new System.Drawing.Size(125, 20);
-			this.classNameLabel.TabIndex = 0;
-			this.classNameLabel.Text = "ComonentName";
-			// 
-			// parentNameComboBox
-			// 
-			this.parentNameComboBox.Enabled = false;
-			this.parentNameComboBox.FormattingEnabled = true;
-			this.parentNameComboBox.Location = new System.Drawing.Point(198, 102);
-			this.parentNameComboBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-			this.parentNameComboBox.Name = "parentNameComboBox";
-			this.parentNameComboBox.Size = new System.Drawing.Size(193, 28);
-			this.parentNameComboBox.TabIndex = 4;
-			this.parentNameComboBox.TextChanged += new System.EventHandler(this.parentNameComboBox_TextChanged);
-			// 
-			// displayTerminalCheckBox
-			// 
-			this.displayTerminalCheckBox.AutoSize = true;
-			this.displayTerminalCheckBox.Enabled = false;
-			this.displayTerminalCheckBox.Location = new System.Drawing.Point(200, 255);
-			this.displayTerminalCheckBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-			this.displayTerminalCheckBox.Name = "displayTerminalCheckBox";
-			this.displayTerminalCheckBox.Size = new System.Drawing.Size(146, 24);
-			this.displayTerminalCheckBox.TabIndex = 7;
-			this.displayTerminalCheckBox.Text = "Display terminal";
-			this.displayTerminalCheckBox.UseVisualStyleBackColor = true;
-			// 
-			// testImagesCountTextBox
-			// 
-			this.testImagesCountTextBox.Enabled = false;
-			this.testImagesCountTextBox.Location = new System.Drawing.Point(198, 335);
-			this.testImagesCountTextBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-			this.testImagesCountTextBox.Name = "testImagesCountTextBox";
-			this.testImagesCountTextBox.Size = new System.Drawing.Size(67, 26);
-			this.testImagesCountTextBox.TabIndex = 12;
-			// 
-			// testImagesCountLabel
-			// 
-			this.testImagesCountLabel.AutoSize = true;
-			this.testImagesCountLabel.Location = new System.Drawing.Point(42, 339);
-			this.testImagesCountLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-			this.testImagesCountLabel.Name = "testImagesCountLabel";
-			this.testImagesCountLabel.Size = new System.Drawing.Size(139, 20);
-			this.testImagesCountLabel.TabIndex = 11;
-			this.testImagesCountLabel.Text = "Test images count";
-			// 
-			// testImagesModeComboBox
-			// 
-			this.testImagesModeComboBox.Enabled = false;
-			this.testImagesModeComboBox.FormattingEnabled = true;
-			this.testImagesModeComboBox.Location = new System.Drawing.Point(198, 295);
-			this.testImagesModeComboBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-			this.testImagesModeComboBox.Name = "testImagesModeComboBox";
-			this.testImagesModeComboBox.Size = new System.Drawing.Size(193, 28);
-			this.testImagesModeComboBox.TabIndex = 14;
-			// 
-			// testImagesModeLabel
-			// 
-			this.testImagesModeLabel.AutoSize = true;
-			this.testImagesModeLabel.Location = new System.Drawing.Point(42, 299);
-			this.testImagesModeLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-			this.testImagesModeLabel.Name = "testImagesModeLabel";
-			this.testImagesModeLabel.Size = new System.Drawing.Size(139, 20);
-			this.testImagesModeLabel.TabIndex = 13;
-			this.testImagesModeLabel.Text = "Test images mode";
-			// 
-			// ipAddressTextBox
-			// 
-			this.ipAddressTextBox.Enabled = false;
-			this.ipAddressTextBox.Location = new System.Drawing.Point(198, 176);
-			this.ipAddressTextBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-			this.ipAddressTextBox.Name = "ipAddressTextBox";
-			this.ipAddressTextBox.Size = new System.Drawing.Size(193, 26);
-			this.ipAddressTextBox.TabIndex = 15;
-			// 
-			// iPAddressLabel
-			// 
-			this.iPAddressLabel.AutoSize = true;
-			this.iPAddressLabel.Location = new System.Drawing.Point(42, 176);
-			this.iPAddressLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-			this.iPAddressLabel.Name = "iPAddressLabel";
-			this.iPAddressLabel.Size = new System.Drawing.Size(89, 20);
-			this.iPAddressLabel.TabIndex = 16;
-			this.iPAddressLabel.Text = "IP address:";
-			// 
-			// ipAddressAdapterTextBox
-			// 
-			this.ipAddressAdapterTextBox.Enabled = false;
-			this.ipAddressAdapterTextBox.Location = new System.Drawing.Point(200, 140);
-			this.ipAddressAdapterTextBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-			this.ipAddressAdapterTextBox.Name = "ipAddressAdapterTextBox";
-			this.ipAddressAdapterTextBox.Size = new System.Drawing.Size(193, 26);
-			this.ipAddressAdapterTextBox.TabIndex = 17;
-			// 
-			// label1
-			// 
-			this.label1.AutoSize = true;
-			this.label1.Location = new System.Drawing.Point(42, 140);
-			this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(150, 20);
-			this.label1.TabIndex = 18;
-			this.label1.Text = "Adapter IP address:";
-			// 
-			// CameraCfgCtrl
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.Controls.Add(this.label1);
-			this.Controls.Add(this.ipAddressAdapterTextBox);
-			this.Controls.Add(this.iPAddressLabel);
-			this.Controls.Add(this.ipAddressTextBox);
-			this.Controls.Add(this.testImagesModeComboBox);
-			this.Controls.Add(this.testImagesModeLabel);
-			this.Controls.Add(this.hwAddressTextBox);
-			this.Controls.Add(this.hwAddressLabel);
-			this.Controls.Add(this.testImagesCountTextBox);
-			this.Controls.Add(this.testImagesCountLabel);
-			this.Controls.Add(this.displayTerminalCheckBox);
-			this.Controls.Add(this.parentNameComboBox);
-			this.Controls.Add(this.parentNameLabel);
-			this.Controls.Add(this.nameTextBox);
-			this.Controls.Add(this.nameLabel);
-			this.Controls.Add(this.classNameLabel);
-			this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-			this.Name = "CameraCfgCtrl";
-			this.Size = new System.Drawing.Size(603, 391);
-			this.Load += new System.EventHandler(this.PumpCfgCtrl_Load);
-			this.ResumeLayout(false);
-			this.PerformLayout();
-		}
-
-		private System.Windows.Forms.Label label1;
-
-		private System.Windows.Forms.TextBox ipAddressAdapterTextBox;
-
-		private System.Windows.Forms.TextBox ipAddressTextBox;
-		private System.Windows.Forms.Label iPAddressLabel;
-
-		#endregion
-
-		private System.Windows.Forms.TextBox hwAddressTextBox;
-		private System.Windows.Forms.Label hwAddressLabel;
-		private System.Windows.Forms.Label parentNameLabel;
-		private System.Windows.Forms.TextBox nameTextBox;
-		private System.Windows.Forms.Label nameLabel;
-        private System.Windows.Forms.Label classNameLabel;
-		private System.Windows.Forms.ComboBox parentNameComboBox;
-		private System.Windows.Forms.CheckBox displayTerminalCheckBox;
-		private System.Windows.Forms.TextBox testImagesCountTextBox;
-		private System.Windows.Forms.Label testImagesCountLabel;
-		private System.Windows.Forms.ComboBox testImagesModeComboBox;
-		private System.Windows.Forms.Label testImagesModeLabel;
-	}
-}

TBF/Rig/Network/Camera/CJMS11/Factory.cs

@@ -1,25 +0,0 @@
-///
-/// Copyright (c) 2017 Sensus Metering Systems
-///
-using System.Collections.Generic;
-using TBF.Rig.Generic;
-
-namespace TBF.Rig.Network.Camera.CJMS11
-{
-	public class Factory : IComponentFactory
-	{
-		public string ClassName { get { return GetType().Namespace.Substring(8); } }
-        public override string ToString() { return ClassName; }
-
-		public IComponent DummyComponent() { return new Camera(); }
-
-		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Camera(cfg, components); }
-
-		public IComponentCfg DefaultConfig() { return new CameraCfg(this.GetType().Namespace.Substring(8), this); }
-
-		public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
-		{
-			return ComponentCfgBase.CreateFromDbEntity(CameraCfg.Serializer, component, this);
-		}
-	}
-}

TBF/Rig/Network/Camera/CJMS11/GrabImagesOp.cs

@@ -1,198 +0,0 @@
-///
-/// Copyright (c) 2017 Sensus Slovensko a.s.
-///
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Drawing;
-using log4net;
-using Common;
-using Config.Entities;
-using TBF.Rig.Network.Telnet;
-using System.IO;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace TBF.Rig.Network.Camera.CJMS11
-{
-	public class GrabImagesOp : IOperation
-	{
-		/// TODO: Implement support for grabbing multiple images, now imgFileNames.Lenght should be 1
-		
-		private static readonly ILog log = LogManager.GetLogger(typeof(GrabImagesOp));
-		public override string ToString() { return string.Format("GrabImageOp()"); }
-
-		readonly Camera camera;
-		
-		readonly string[] imgFileNames;
-		readonly bool blackAndWhite;
-		readonly bool lowResolution;
-		readonly ImageRotation imageRotation;
-
-		string command;
-		bool grabImageCommandSent;
-		string response;
-		bool grabPassed;
-		bool grabFailed;
-		bool transferringGrabbedImage;
-		
-		Image grabedImage;
-		Dictionary<int, Image> grabedImages = new Dictionary<int, Image>();
-
-
-		/// <summary>
-		/// Events:  Event.None or Event.Error
-		/// </summary>
-		/// <param name="camera">CLP1611.Camera reference</param>
-		public GrabImagesOp(Camera camera, string[] imgFileNames, bool blackAndWhite, bool lowResolution, ImageRotation imageRotation)
-		{
-			/// TODO: Implement support for grabbing multiple images, now imgFileNames.Lenght should be 1
-			
-			this.camera = camera;
-			//this.telnet = camera.Telnet;
-			this.imgFileNames = imgFileNames;
-			this.blackAndWhite = blackAndWhite;
-			this.lowResolution = lowResolution;
-			this.imageRotation = imageRotation;
-
-			grabImageCommandSent = false;
-			transferringGrabbedImage = false;
-
-			/// image incomming event
-            if (camera.DebugLevel == DebugMode.Normal || camera.DebugLevel == DebugMode.DetectedOn)
-            {
-	            Camera.ImageCameraHandler += ImageReceived;
-            }
-            //TODO BUMI improve by simulate image
-            Camera.ImageCameraHandler += ImageReceived;
-            
-            /// inmages incomming event rotation
-            if (camera.DebugLevel == DebugMode.Normal || camera.DebugLevel == DebugMode.DetectedOn)
-            {
-	            Camera.ImagesCameraHandler += ImagesReceived;
-            }
-            //TODO BUMI improve by simulate image
-            Camera.ImagesCameraHandler += ImagesReceived;
-		}
-
-		void PromptReceived(object sndr, PromptReceivedJMSEventArgs a)
-		{
-			response = a.Response;
-		}
-
-		void ImageReceived(object sndr, PromptReceivedImageEventArgs a)
-		{
-			if(a.idxCamera != camera.CameraIdx) return;
-			grabedImage = a.image;
-			grabPassed = true;
-		}
-		
-		void ImagesReceived(object sndr, PromptReceivedImagesEventArgs a)
-		{
-			if(a.idxCamera != camera.CameraIdx) return;
-			grabedImage = a.image; //upgraded image common
-			grabedImages[a.idxImage] = a.image; // stored image from sent to list of images
-			grabPassed = true;
-		}
-
-
-		public void Start()
-		{
-			grabImageCommandSent = false;
-			transferringGrabbedImage = false;
-			grabPassed = false;
-			grabedImage = null;
-			grabedImages.Clear();
-
-            if ((imgFileNames != null) && (imgFileNames.Length > 0) && File.Exists(imgFileNames[0]))
-            {
-                ///
-                /// An image specified, (1) delete previous image, (2) check if this is a simulation
-                ///
-                File.Delete(imgFileNames[0]);
-
-               /* if (camera.CameraCfg.DebugLevel == DebugMode.Simulate || camera.CameraCfg.DebugLevel == DebugMode.DetectedOff)
-                {
-                    ///
-                    /// Camera is in simulation mode => create a simulated image
-                    ///
-                    File.Copy(string.Format("{0}\\Pictures\\sample.jpg", Program.ExecutableDir), imgFileNames[0]);
-                }*/
-            }
-		}
-
-		public Event Run()
-		{
-            if ((imgFileNames == null) || (imgFileNames.Length < 1) || (imgFileNames[0] == null))
-			{
-                ///
-                /// No images to be grabbed => Done
-                ///
-                return Event.GrabPassed;
-			}
-            /*else if (camera.CameraCfg.DebugLevel == DebugMode.Simulate ||
-                     camera.CameraCfg.DebugLevel == DebugMode.DetectedOff)
-            {
-                ///
-                /// Camera is in simulation mode => create a simulated image and complete
-                ///
-                return Event.GrabPassed;
-            }*/
-            else if (camera.IsGrabImageListenerThreadAlive)
-            {
-	            return Event.CameraBusy;
-            }
-            else if (!grabImageCommandSent)
-			{
-                ///
-                /// Normal operation, no command sent yet => (1) wait until telnet state = Inactive, (2) send a command
-                ///
-                camera.StartGrabImageListener();
-                grabImageCommandSent = true;
-				return Event.CameraBusy;
-			}
-			else if (grabPassed)
-			{
-                ///
-                /// Normal operation, grab passed => transfer/transferring the image
-                
-                
-                if (transferringGrabbedImage)
-				{
-					/// Grab passed and image transfer is in progress
-					return Event.GrabPassed;
-				}
-                else if (camera.IsSaveImageListenerThreadAlive)
-                {
-	                /// Wait until the previous image transfer completes
-	                return Event.CameraBusy;
-                }
-				else //if (0 == camera.DownloadFile(blackAndWhite ? "grabbed.jpg" : "grabbed.bmp", imgFileNames[0]))
-				{
-					camera.StartSaveImageToFileListener(grabedImage, imgFileNames[0]);
-					/// File transfer successfully started
-					transferringGrabbedImage = true;
-					return Event.GrabPassed;
-				}
-			}
-			else 
-			{
-                ///
-                /// Normal operation, grab failed => there in no image to transfer
-                /// 
-				return Event.GrabFailed;
-			}
-			
-		}
-
-		public void Stop()
-		{
-			//if (camera.CameraCfg.DebugLevel == DebugMode.Simulate) return;
-
-			if (camera.IsGrabImageListenerThreadAlive)
-			{
-				camera.SetStopGrabImageListenerFlag();
-			}
-		}
-	}
-}

TBF/Rig/Network/Camera/CJMS11/JmsMessage.cs

@@ -1,72 +0,0 @@
-using TBF.Rig.Network.Camera.CJMS11.POJO;
-
-namespace TBF.Rig.Network.Camera.CJMS11
-{
-    public class JmsMessage
-    {
-        private POJO.MessageStatus status;
-        private CommandM command;
-        private string payload;
-        
-        private string orig_status;
-        private string orig_command;
-        private string orig_payload;
-
-        public POJO.MessageStatus Status
-        {
-            get => status;
-            set => status = value;
-        }
-
-        public CommandM Command
-        {
-            get => command;
-            set => command = value;
-        }
-
-        public string Payload
-        {
-            get => payload;
-            set => payload = value;
-        }
-
-        public string OrigStatus => orig_status;
-
-        public string OrigCommand => orig_command;
-
-        public string OrigPayload => orig_payload;
-
-        public JmsMessage(string status, string command, string payload)
-        {
-            this.status = MessageStatusEnum.GetCommandM(status);
-            this.command = CommandMEnum.GetCommandM(command);
-            
-            orig_status = status;
-            orig_command = command;
-            orig_payload = payload;
-            this.payload = payload;
-        }
-        
-        public bool isMessageImageType(){
-            return this.command == CommandM.grab_image_;
-        }
-
-        public ParsedImage getImage(){
-            if(isMessageImageType()){
-                return JmsPacket.ImageParser(this.payload);
-            }
-            return null;
-        }
-
-        public override string ToString()
-        {
-            return string.Format( "status:{0}, command:{1}, payload:{2}, orig_status:{3}, orig_command:{4}, orig_payload:{5}",
-            status,
-            command,
-            payload,
-            orig_status,
-            orig_command,
-            orig_payload);
-        }
-    }
-}

TBF/Rig/Network/Camera/CJMS11/JmsPacket.cs

@@ -1,98 +0,0 @@
-using System;
-using System.Text.RegularExpressions;
-using log4net;
-using TBF.Rig.Network.Camera.CJMS11.POJO;
-
-namespace TBF.Rig.Network.Camera.CJMS11
-{
-    public class JmsPacket
-    {
-        private static readonly ILog log = LogManager.GetLogger(typeof(JmsPacket));
-
-        private JmsMessage jmsMessage;
-        private string messageOrigin;
-
-        public string MessageOrigin { get => messageOrigin; }
-
-        public JmsMessage JmsMessage
-        {
-            get => jmsMessage;
-            set => jmsMessage = value;
-        }
-
-        public JmsPacket(string message)
-        {
-            messageOrigin = message;
-
-            try
-            {
-                if (ParseMessage(messageOrigin))
-                {
-                    //success
-                }
-
-            }
-            catch (Exception e)
-            {
-                log.Error("Error parsing message: " + e.Message);
-            }
-        }
-
-        private bool ParseMessage(string message) 
-        {
-            message = message.Trim();
-            if (message.Length < 1) return false;
-            
-            this.jmsMessage = JmsMessageFromString(message);
-            
-            return true;
-        }
-
-        public static JmsMessage JmsMessageFromString(string message)
-        {
-            // Equivalent regex pattern
-            var pattern = new Regex(@"^(ACK|NACK):\s*(\S+)\s*(?:~(.*)~)?\s*END$", RegexOptions.Singleline);
-
-            var match = pattern.Match(message);
-            if (match.Success)
-            {
-                string status = match.Groups[1].Value;
-                string commandStr = match.Groups[2].Value;
-                string payload = match.Groups[3].Success ? match.Groups[3].Value : "";
-
-                return new JmsMessage(status, commandStr, payload);
-            }
-            else
-            {
-                throw new ArgumentException($"Message format not recognized: {message}");
-            }
-
-            return null;
-        }
-
-        public static ParsedImage ImageParser(string payloadImage)
-        {
-            // Equivalent regex pattern
-            var imagePattern = new Regex(@"IMAGE:([A-Z0-9_]+):\s*(.*?)\s*~IMAGE_END", RegexOptions.Singleline);
-
-            var match = imagePattern.Match(payloadImage);
-            if (match.Success)
-            {
-                string encoding = match.Groups[1].Value;
-                string imageData = match.Groups[2].Value;
-
-                return new ParsedImage(ImageTypeEnum.GetCommandM(encoding), imageData);
-            }
-            else
-            {
-                throw new ArgumentException($"Payload does not match expected image format: {payloadImage}");
-            }
-        }
-
-        public override string ToString()
-        {
-            return string.Format("JmsPacket -> original message: {0} -> JmsMessage: {1}", messageOrigin, jmsMessage.ToString());
-        }
-    }
-    
-}

TBF/Rig/Network/Camera/CJMS11/LiveStreamOp.cs

@@ -1,67 +0,0 @@
-using System;
-using System.Diagnostics;
-using log4net;
-using Common;
-using TBF.Rig.Network.Telnet;
-
-namespace TBF.Rig.Network.Camera.CJMS11
-{
-	public class LiveStreamOp : IOperation
-	{
-        private static readonly ILog log = LogManager.GetLogger(typeof(LiveStreamOp));
-        
-        readonly Camera camera;
-		readonly Telnet.TelnetClient telnet;
-		readonly string command;
-
-		bool liveStreamCommandSent;
-
-		/// <summary>
-		/// Events:  Event.None or Event.Error
-		/// </summary>
-		/// <param name="camera">CLP1611.Camera reference</param>
-		public LiveStreamOp(Camera camera, string command)
-		{
-			this.camera = camera;
-			this.command = command;
-		}
-
-
-		public void Start()
-		{
-			liveStreamCommandSent = false;
-		}
-
-		public Event Run()
-		{
-			if (camera.CameraCfg.DebugLevel == DebugMode.Simulate) return Event.None;
-
-			log.DebugFormat("Run(): telnet.State = {0}, liveStreamCommandSent = {1}", telnet.State, liveStreamCommandSent);
-
-			if (!liveStreamCommandSent)
-			{
-				if (camera.Running && (telnet.State == TelnetClient.TelnetState.Inactive))
-				{
-					telnet.Enqueue(new Telnet.Command(Telnet.CmdAction.SEND_STRING, command));
-					liveStreamCommandSent = true;
-					log.WarnFormat("{0} IP={1} command={2}", camera.Name, camera.IPAddress, command);
-				}
-			}
-
-			return Event.None;
-		}
-
-		public void Stop()
-		{
-			if (camera.CameraCfg.DebugLevel == DebugMode.Simulate) return;
-
-			log.DebugFormat("Stop(): telnet.State = {0}, liveStreamCommandSent = {1}", telnet.State, liveStreamCommandSent);
-            
-            if (liveStreamCommandSent)
-			{
-				telnet.Enqueue(new Telnet.Command(Telnet.CmdAction.SEND_COMMAND, Telnet.TelnetClient.CtrlCCommand));
-                log.WarnFormat("{0} IP={1} command=CTRL-C", camera.Name, camera.IPAddress);
-            }
-		}
-	}
-}

TBF/Rig/Network/Camera/CJMS11/POJO/CommandM.cs

@@ -1,24 +0,0 @@
-namespace TBF.Rig.Network.Camera.CJMS11
-{
-    public enum CommandM
-    {
-        noCommand,
-        unknown_,         // special: only return - unknown command
-        connect_,         // special: only return - TCP connection created
-        type_camera_,
-        status_,
-        prepare_camera_,
-        grab_image_,
-        send_,
-        start_stream_,
-        stop_stream_,
-        start_stream_images_,
-        stop_stream_images_,
-        get_cfg_,
-        set_cfg_,
-        close_,
-        disconnect_,
-        overload_config_,
-        client_count_
-    }
-}

TBF/Rig/Network/Camera/CJMS11/POJO/CommandMEnum.cs

@@ -1,46 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-
-namespace TBF.Rig.Network.Camera.CJMS11
-{
-    public static class CommandMEnum
-    {
-        private static readonly Dictionary<CommandM, string> commandToString = new Dictionary<CommandM, string>
-        {
-            { CommandM.noCommand, "noCommand" },
-            { CommandM.unknown_, "unknown" },
-            { CommandM.connect_, "connect" },
-            { CommandM.type_camera_, "type_camera" },
-            { CommandM.status_, "status" },
-            { CommandM.prepare_camera_, "prepare_camera" },
-            { CommandM.grab_image_, "grab_image" },
-            { CommandM.send_, "send" },
-            { CommandM.start_stream_, "start_stream" },
-            { CommandM.stop_stream_, "stop_stream" },
-            { CommandM.start_stream_images_, "start_stream_images" },
-            { CommandM.stop_stream_images_, "stop_stream_images" },
-            { CommandM.get_cfg_, "get_cfg" },
-            { CommandM.set_cfg_, "set_cfg" },
-            { CommandM.close_, "close" },
-            { CommandM.disconnect_, "disconnect" },
-            { CommandM.overload_config_, "overload_config" },
-            { CommandM.client_count_, "client_count" }
-        };
-        
-
-        private static readonly Dictionary<string, CommandM> stringToCommand = commandToString.ToDictionary(kvp => kvp.Value, kvp => kvp.Key);
-
-        public static string GetVal(CommandM cmd)
-        {
-            return commandToString.TryGetValue(cmd, out var str) ? str : "unknown";
-        }
-
-        public static CommandM GetCommandM(string token)
-        {
-            if (string.IsNullOrEmpty(token))
-                return CommandM.noCommand;
-
-            return stringToCommand.TryGetValue(token, out var cmd) ? cmd : CommandM.noCommand;
-        }
-    }
-}

TBF/Rig/Network/Camera/CJMS11/POJO/ImageType.cs

@@ -1,10 +0,0 @@
-namespace TBF.Rig.Network.Camera.CJMS11.POJO
-{
-    public enum ImageType
-    {
-        UNKNOWN,
-        BASE_64,
-        MJPEG,
-        RGB888
-    }
-}

TBF/Rig/Network/Camera/CJMS11/POJO/ImageTypeEnum.cs

@@ -1,31 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-
-namespace TBF.Rig.Network.Camera.CJMS11.POJO
-{
-    public class ImageTypeEnum
-    {
-        private static readonly Dictionary<ImageType, string> commandToString = new Dictionary<ImageType, string>
-        {
-            { ImageType.BASE_64, "BASE_64" },
-            { ImageType.MJPEG, "MJPEG" },
-            { ImageType.RGB888, "RGB888" },
-            { ImageType.UNKNOWN, "" }
-        };
-        
-        private static readonly Dictionary<string, ImageType> stringToCommand = commandToString.ToDictionary(kvp => kvp.Value, kvp => kvp.Key);
-
-        public static string GetVal(ImageType cmd)
-        {
-            return commandToString.TryGetValue(cmd, out var str) ? str : "unknown";
-        }
-
-        public static ImageType GetCommandM(string token)
-        {
-            if (string.IsNullOrEmpty(token))
-                return ImageType.UNKNOWN;
-
-            return stringToCommand.TryGetValue(token, out var cmd) ? cmd : ImageType.UNKNOWN;
-        }
-    }
-}

TBF/Rig/Network/Camera/CJMS11/POJO/MessageStatus.cs

@@ -1,10 +0,0 @@
-namespace TBF.Rig.Network.Camera.CJMS11.POJO
-{
-    public enum MessageStatus
-    {
-        UNDEFINED,
-        ACK,
-        NACK,
-        ERROR
-    }
-}

TBF/Rig/Network/Camera/CJMS11/POJO/MessageStatusEnum.cs

@@ -1,31 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-
-namespace TBF.Rig.Network.Camera.CJMS11.POJO
-{
-    public class MessageStatusEnum
-    {
-        private static readonly Dictionary<MessageStatus, string> commandToString = new Dictionary<MessageStatus, string>
-        {
-            { MessageStatus.UNDEFINED, "" },
-            { MessageStatus.ACK, "ACK" },
-            { MessageStatus.NACK, "NACK" },
-            { MessageStatus.ERROR, "ERROR" }
-        };
-        
-        private static readonly Dictionary<string, MessageStatus> stringToCommand = commandToString.ToDictionary(kvp => kvp.Value, kvp => kvp.Key);
-
-        public static string GetVal(MessageStatus cmd)
-        {
-            return commandToString.TryGetValue(cmd, out var str) ? str : "undefined";
-        }
-
-        public static MessageStatus GetCommandM(string token)
-        {
-            if (string.IsNullOrEmpty(token))
-                return MessageStatus.UNDEFINED;
-
-            return stringToCommand.TryGetValue(token, out var cmd) ? cmd : MessageStatus.UNDEFINED;
-        }
-    }
-}

TBF/Rig/Network/Camera/CJMS11/POJO/ParsedImage.cs

@@ -1,38 +0,0 @@
-using System;
-using TBF.Rig.Network.Camera.CJMS11.POJO;
-using System.Drawing;
-using System.IO;
-
-
-
-namespace TBF.Rig.Network.Camera.CJMS11
-{
-    public class ParsedImage
-    {
-        public ImageType Encoding { get; }
-        public string ImageData { get; }
-        
-        public Image Image { get { return (ImageData.Length>0 ? Base64ToImage(ImageData) : null); } }
-
-        public ParsedImage(ImageType encoding, string imageData)
-        {
-            Encoding = encoding;
-            ImageData = imageData;
-        }
-
-        public override string ToString()
-        {
-            return $"ParsedImage{{encoding='{Encoding}', imageData='{ImageData}'}}";
-        }
-        
-        public static Image Base64ToImage(string base64Image)
-        {
-            byte[] imageBytes = Convert.FromBase64String(base64Image);
-
-            using (var ms = new MemoryStream(imageBytes))
-            {
-                return Image.FromStream(ms);
-            }
-        }
-    }
-}

TBF/Rig/Network/Camera/CJMS11/RoisAndResults.cs

@@ -1,91 +0,0 @@
-///
-/// Copyright (c) 2017 Sensus Metering Systems
-///
-using System;
-using System.Collections.Generic;
-
-namespace TBF.Rig.Network.Camera.CJMS11
-{
-	public class RoisAndResults
-	{
-		public const int MaxRegisteredRois = 4;	/// Max. count of registered (and measured) ROI-s
-
-		public long CameraTimeMs;
-		public int[] Angles;
-
-		private IList<string> roiParams;
-		public int RegisteredRoisCount { get { return roiParams.Count; } }
-
-
-		public RoisAndResults()
-		{
-			Angles = new int[MaxRegisteredRois];
-			roiParams = new List<string>();
-		}
-
-
-		public void ClearRoiParams()
-		{
-			lock (this)
-			{
-				roiParams.Clear();
-			}
-		}
-
-		public int RegisterRoi(string roiParam)
-		{
-			lock (this)
-			{
-				if (this.roiParams.Count >= MaxRegisteredRois) return 0;
-
-				this.roiParams.Add(roiParam);
-				return this.roiParams.Count;		/// return a handle 1 .. MaxRegisteredRois
-			}
-		}
-
-		public string GetRoiParams(int roiHandle)
-
-		{
-			lock (this)
-			{
-				if (roiHandle > 0 && roiHandle <= roiParams.Count)
-				{
-					return roiParams[roiHandle - 1];
-				}
-				else
-				{
-					return string.Empty;
-				}
-			}
-		}
-
-		public void SetResults(long timeMs, int[] angles)
-		{
-			lock (this)
-			{
-				CameraTimeMs = timeMs;
-				for (int i = 0; i < Math.Min(angles.Length, Angles.Length); i++)
-				{
-					Angles[i] = angles[i];
-				}
-			}
-		}
-
-		public int GetResult(int roiHandle, out long timeMs)
-		{
-			lock (this)
-			{
-				if (roiHandle > 0 && roiHandle <= roiParams.Count)
-				{
-					timeMs = CameraTimeMs;
-					return Angles[roiHandle - 1];
-				}
-				else
-				{
-					timeMs = 0;
-					return 0;
-				}
-			}
-		}
-	}
-}

TBF/Rig/Network/Camera/CJMS11/TerminalDlg.Designer.cs

@@ -1,62 +0,0 @@
-namespace TBF.Rig.Network.Camera.CJMS11
-{
-	partial class TerminalDlg
-	{
-		/// <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 Windows Form 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.vtTextBox = new System.Windows.Forms.TextBox();
-			this.SuspendLayout();
-			// 
-			// vtTextBox
-			// 
-			this.vtTextBox.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.vtTextBox.Location = new System.Drawing.Point(0, 0);
-			this.vtTextBox.Multiline = true;
-			this.vtTextBox.Name = "vtTextBox";
-			this.vtTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-			this.vtTextBox.Size = new System.Drawing.Size(737, 437);
-			this.vtTextBox.TabIndex = 0;
-			// 
-			// TerminalDlg
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(737, 437);
-			this.Controls.Add(this.vtTextBox);
-			this.Name = "TerminalDlg";
-			this.Text = "Terminal";
-			this.Load += new System.EventHandler(this.Terminal_Load);
-			this.ResumeLayout(false);
-			this.PerformLayout();
-
-		}
-
-		#endregion
-
-		private System.Windows.Forms.TextBox vtTextBox;
-	}
-}

TBF/Rig/Network/Camera/CJMS11/TerminalDlg.cs

@@ -1,37 +0,0 @@
-using System;
-using System.Windows.Forms;
-using TBF.Rig.Network.Telnet;
-
-namespace TBF.Rig.Network.Camera.CJMS11
-{
-	public partial class TerminalDlg : Form
-	{
-		TelnetClient telnet;
-
-		public TerminalDlg()
-		{
-			InitializeComponent();
-		}
-
-		public TerminalDlg(string name, TelnetClient telnet)
-		{
-			InitializeComponent();
-			Text = name;
-			this.telnet = telnet;
-		}
-
-		private void Terminal_Load(object sender, EventArgs e)
-		{
-			telnet.vtTextChangedHandler += delegate(object sndr, VtTextChangedEventArgs args)
-				{
-					if (InvokeRequired) { Invoke(new EventHandler<VtTextChangedEventArgs>(OnTextChanged), sndr, args); }
-					else OnTextChanged(sndr, args);
-				};
-		}
-
-		void OnTextChanged(object sndr, VtTextChangedEventArgs args)
-		{
-			vtTextBox.Text = args.VtText;
-		}
-	}
-}

TBF/Rig/Network/Camera/CJMS11/TerminalDlg.resx

@@ -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>

TBF/Rig/Network/Camera/Roi/RoiCfgCtrl.cs

@@ -42,10 +42,14 @@ namespace TBF.Rig.Network.Camera.Roi
 			{
 				foreach (var cmpnt in parent.CmpntEntities)
 				{
-					if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is TBF.Rig.Network.Camera.CJMS11.Factory)
+					if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is TBF.Rig.Network.Camera.CLP1611.Factory)
 					{
 						parentNameComboBox.Items.Add(cmpnt.Name);
 					}
+					if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is TBF.Rig.Network.Camera.Roi.Factory)
+					{
+						previousRoiComboBox.Items.Add(cmpnt.Name);
+					}
 				}
 			}
 

TBF/Rig/Network/Camera/RoiForFixedStartCJMS11/Factory.cs

@@ -1,25 +0,0 @@
-///
-/// Copyright (c) 2017 Sensus Metering Systems
-///
-using System.Collections.Generic;
-using TBF.Rig.Generic;
-
-namespace TBF.Rig.Network.Camera.RoiForFixedStartCJMS11
-{
-	public class Factory : IComponentFactory
-	{
-		public string ClassName { get { return this.GetType().Namespace.Substring(8); } }
-        public override string ToString() { return ClassName; }
-
-		public IComponent DummyComponent() { return new Roi(); }
-
-		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Roi(cfg, components); }
-
-		public IComponentCfg DefaultConfig() { return new RoiCfg(this.GetType().Namespace.Substring(8), this); }
-
-		public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
-		{
-			return ComponentCfgBase.CreateFromDbEntity(RoiCfg.Serializer, component, this);
-		}
-	}
-}

TBF/Rig/Network/Camera/RoiForFixedStartCJMS11/ProcedureParams.cs

@@ -1,115 +0,0 @@
-///
-/// Copyright (c) 2017 Sensus Metering Systems
-///
-using System.IO;
-using System.Xml.Serialization;
-using Common;
-using Config.Entities;
-using TBF.Rig.Generic;
-using TBF.Resources;
-
-namespace TBF.Rig.Network.Camera.RoiForFixedStartCJMS11
-{
-	public class ProcedureParams : ProcedureParamsBase, IParamsProvider, IProcedureParams
-	{
-		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(ProcedureParams) })[0];
-		public override XmlSerializer GetSerializer() { return Serializer; }
-
-		public double PulsesPerLtr;				/// [l^-1]
-
-		public override void InitializeAll()
-		{
-			PulsesPerLtr = 1.0;
-		}
-
-		string[] paramNames = new string[]
-		{
-			Strings.PulsesPerLtr,
-		};
-		public override string ParamName(int i) { return paramNames[i]; }
-		public override int ParamsCount() { return paramNames.Length; }
-
-		public override string ToString(int i)
-		{
-			switch (i)
-			{
-				case 0: return PulsesPerLtr.ToString();
-				default: return string.Empty;
-			}
-		}
-
-		/// Retrieves parameters from UI controls
-		public CfgUpdateFlags UpdateParam(int i, string strValue)
-		{
-			switch (i)
-			{
-                case 0: PulsesPerLtr = Utils.ParseUDouble(strValue); return CfgUpdateFlags.None;
-                default: return CfgUpdateFlags.None;
-			}
-		}
-
-		/// Verifies whether strings in UI controls represent valid parameters
-		public bool ValidateParam(int i, string strValue, out string message)
-		{
-			message = string.Empty;
-
-			double dummy;
-			switch (i)
-			{
-				case 0:
-					if (Utils.TryParseUDouble(strValue, out dummy)) return true;
-					break;
-				default:
-					message = "Invalid index";
-					return false;
-			}
-
-			message = ParamName(i) + " is invalid";
-			return false;
-		}
-
-		void CopyContentTo(ProcedureParams prms)
-		{
-			prms.PulsesPerLtr = this.PulsesPerLtr;
-		}
-
-		public IParamsProvider Clone()
-		{
-			ProcedureParams pars = new ProcedureParams();
-			CopyContentTo(pars);
-			return pars;
-		}
-
-		public override void UpdateFromDbEntity(ComponentProcedure dbEntity)
-		{
-			if (dbEntity == null) return;
-			try
-			{
-				ProcedureParams tmp = Serializer.Deserialize(new StringReader(dbEntity.Parameters)) as ProcedureParams;
-
-				procedureParamsEntity = dbEntity;
-				componentName = dbEntity.CmpntName;
-				procedure = dbEntity.Procedure;
-
-				if (tmp != null) tmp.CopyContentTo(this);
-			}
-			catch
-			{
-			}
-		}
-
-		public ProcedureParams() { }
-
-		public ProcedureParams(bool initialize)
-		{
-			if (initialize) InitializeAll();
-		}
-
-		public ProcedureParams(ComponentProcedure procedureParamsEntity, string componentName, Procedure procedure)
-		{
-			this.procedureParamsEntity = procedureParamsEntity;
-			this.componentName = componentName;
-			this.procedure = procedure;
-		}
-	}
-}

TBF/Rig/Network/Camera/RoiForFixedStartCJMS11/Roi.cs

@@ -1,149 +0,0 @@
-///
-/// Copyright (c) 2017-2021 Sensus Metering Systems
-///
-using System;
-using System.Collections.Generic;
-using System.Text;
-using log4net;
-using Common;
-using Config.Entities;
-using TBF.Rig.GenericDevices;
-
-namespace TBF.Rig.Network.Camera.RoiForFixedStartCJMS11
-{
-	public class Roi : ComponentBase, GenericDevices.IRegReaderStillCamera
-	{
-		/// TODO: Implement support for sharing one camera by multiple ROI-s
-
-		private static readonly ILog log = LogManager.GetLogger(typeof(Roi));
-        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
-
-		readonly RoiCfg roiCfg;
-
-		///
-		/// Camera and ICamera 
-		///
-		public readonly CJMS11.Camera NetCamera;
-		public GenericDevices.ICamera Camera { get { return NetCamera as GenericDevices.ICamera; } }
-
-        public int Position
-        {
-            get
-            {
-                int firstDigitPos = Name.IndexOfAny(new char[] { '1', '2', '3', '4', '5', '6', '7', '8', '9', '0' });
-                int position;
-                return (firstDigitPos < 0) ? 0 : (int.TryParse(Name.Substring(firstDigitPos), out position) ? position : 0);
-            }
-        }
-        public RegisterReaderType RegisterReaderType { get { return RegisterReaderType.Manual; } }
-        public double PulsesPerLtr { get { return roiCfg.ProcParams.PulsesPerLtr; } }
-		public double LtrsPerPulse { get { return (PulsesPerLtr <= float.Epsilon) ? 1.0 : (1 / PulsesPerLtr); } }
-
-
-		double beginWMState;
-		public double BeginWMState
-		{
-			get { return beginWMState; }
-			set { beginWMState = value; }
-		}
-
-		double endWMState;
-		public double EndWMState
-		{
-			get { return endWMState; }
-			set { endWMState = value; }
-		}
-
-		public double WMVolume { get { return endWMState - beginWMState; } }
-
-		public int WMPulses { get { return (int)(WMVolume / LtrsPerPulse); } }
-
-        public int WMRefPulses { get { return StateMachine.ControlBoardMain.RefPulses; ; } }
-
-
-		public Roi() { }
-
-		public Roi(Generic.IComponentCfg cfg, IList<Generic.IComponent> components)
-            : base(cfg)
-        {
-			roiCfg = cfg as RoiCfg;
-			NetCamera = TbfComponents.FindComponent(cfg.ParentName, components) as CJMS11.Camera;
-            log.Warn(this.ToString());
-		}
-
-        public override void Initialize()
-        {
-            Clear();
-        }
-
-        #region Configuration Change Handling
-
-        public static void OnCfgChange(object sender, CfgChangeArgs args)
-        {
-            if (CfgChangeHandler == null) return;
-            try { CfgChangeHandler(sender, args); }
-            catch (Exception e) { log.Error("CfgChangeHandler(...) failed", e); }
-        }
-
-        public static event EventHandler<CfgChangeArgs> CfgChangeHandler;
-
-        public override void StartChangeHandler()
-        {
-            CfgChangeHandler += delegate(object sender, CfgChangeArgs args)
-            {
-                RoiCfg tmpcfg = args.Cfg as RoiCfg;
-                if (tmpcfg != null && tmpcfg.Name.Equals(Name))
-                {
-                    if (args.Command == CfgChangeCmd.CfgChange)
-                    {
-						roiCfg.BlackAndWhite = tmpcfg.BlackAndWhite;
-						roiCfg.LowResolution = tmpcfg.LowResolution;
-						roiCfg.ImageRotation = tmpcfg.ImageRotation;
-					}
-                }
-            };
-        }
-
-        #endregion Configuration Change Handling
-
-		public void Clear()
-		{
-			log.DebugFormat("{0}:Clear()", Name);
-			beginWMState = 0;
-			endWMState = 0;
-		}
-
-
-		public IOperation GrabImageOp(string imageFileName)
-		{
-			return GrabImageOp(imageFileName, roiCfg.BlackAndWhite, roiCfg.LowResolution, roiCfg.ImageRotation);
-		}
-
-		public IOperation GrabImageOp(string imageFileName,
-                                      bool blackAndWhite, bool lowResolution, ImageRotation imageRotation)
-		{
-			if (NetCamera != null)
-			{
-				///TODO BUMI - implementing grabing multiple images
-				/// 1. Create a list of image file names
-				string[] imageNames = new string[roiCfg.ImageOpacity.Count];
-				for (int i = 0; i < imageNames.Length; i++)
-				{
-					imageNames[i] = imageFileName + string.Format("{0}_{1}",imageNames.Length, i);
-				}
-				/// 2. implement count of images to grab
-				/// 3. implement grabing multiple images
-				
-				/// TODO: Implement support for sharing one camera by multiple ROI-s
-				return NetCamera.GrabImagesOp(new string[] { imageFileName }, blackAndWhite, lowResolution, imageRotation);
-			}
-			else
-				return null;
-		}
-
-		public IValve GetValve()
-		{
-			return null;
-		}
-	}
-}

TBF/Rig/Network/Camera/RoiForFixedStartCJMS11/RoiCfg.cs

@@ -1,80 +0,0 @@
-///
-/// Copyright (c) 2017 Sensus Metering Systems
-///
-
-using System;
-using System.Collections.Generic;
-using System.Xml.Serialization;
-using Common;
-using Config.Entities;
-using TBF.Rig.Generic;
-using TBF.Rig.Network.Camera.RoiForFixedStartCJMS11.common;
-
-namespace TBF.Rig.Network.Camera.RoiForFixedStartCJMS11
-{
-	public class RoiCfg : ComponentCfgBase, IChildComponentCfg
-	{
-		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(RoiCfg) })[0];
-        public override XmlSerializer GetSerializer() { return Serializer; }
-
-		public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new RoiCfgCtrl(); }
-
-		///
-		/// Serialized parameters 
-		///
-		public bool BlackAndWhite;
-		public bool LowResolution;
-		public ImageRotation ImageRotation;
-		
-		[XmlIgnore]
-		private Frame _imageFrame;
-
-		[XmlElement(IsNullable = true)]
-		public Frame ImageFrame
-		{
-			get { if (_imageFrame == null) { _imageFrame = new Frame(); } return _imageFrame; }
-			set => _imageFrame = value;
-		}
-
-		[XmlIgnore]
-		private MultipleImageOpacity _imageOpacity;
-		
-		[XmlElement(IsNullable = true)]
-		public MultipleImageOpacity ImageOpacity
-		{
-			get { if (_imageOpacity == null) _imageOpacity = new MultipleImageOpacity(); return _imageOpacity; }
-			set => _imageOpacity = value;
-		}
-		
-		/// <summary> Procedure parameters </summary>
-		[XmlIgnore]
-		public ProcedureParams ProcParams;
-		public override IParamsProvider GetRuntimeProcParamsProvider() { return ProcParams; }
-        public override IParamsProvider CreateProcParamsProvider() { return new ProcedureParams(true); }
-
-		/// Private parameterless constructor invoked by all other (public) constructors
-		RoiCfg()
-		{
-            ProcParams = new ProcedureParams(true);
-        }
-
-        public RoiCfg(string name, IComponentFactory factory)
-            : this()
-        {
-			Name = name;
-			Factory = factory;
-			ParentName = "Camera";
-			BlackAndWhite = false;
-			LowResolution = true;
-			ImageRotation = ImageRotation.None;
-			ImageFrame = Frame.StandardFrame();
-            DebugLevel = DebugMode.Inherit;
-        }
-
-		public string ToString(int i)
-		{
-			return string.Format("{0} Camera={1} B&W={2}, LowRes={3}, Rotation={4}, Frame={5}",
-								 Name, ParentName, BlackAndWhite, LowResolution, ImageRotation, ImageFrame);
-		}
-	}
-}

TBF/Rig/Network/Camera/RoiForFixedStartCJMS11/RoiCfgCtrl.cs

@@ -1,269 +0,0 @@
-///
-/// Copyright (c) 2017 Sensus Metering Systems
-///
-using System;
-using System.ComponentModel;
-using System.Windows.Forms;
-using log4net;
-using Common;
-using Config.Entities;
-using TBF.Rig.Generic;
-using TBF.Resources;
-using TBF.Rig.Network.Camera.RoiForFixedStartCJMS11.common;
-using TBF.UI.Bench.Components;
-
-namespace TBF.Rig.Network.Camera.RoiForFixedStartCJMS11
-{
-	public partial class RoiCfgCtrl : UserControl, IComponentCfgCtrl
-	{
-		static readonly ILog log = LogManager.GetLogger(typeof(RoiCfgCtrl));
-
-		ComponentParametersDlg parent;
-
-		
-
-		public bool ShowMore { get { return false; } }
-
-		RoiCfg config;
-		public IComponentCfg Config
-		{
-			get { return config as IComponentCfg; }
-			set
-			{
-				config = value as RoiCfg;
-				Redraw();
-			}
-		}
-
-		public RoiCfgCtrl()
-		{
-			InitializeComponent();
-		}
-
-		private void PumpCfgCtrl_Load(object sender, EventArgs e)
-		{
-			parent = ParentForm as ComponentParametersDlg;
-			if (parent == null) return;
-
-			if (parent.CmpntEntities != null)
-			{
-				foreach (var cmpnt in parent.CmpntEntities)
-				{
-					if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is TBF.Rig.Network.Camera.CJMS11.Factory)
-					{
-						parentNameComboBox.Items.Add(cmpnt.Name);
-					}
-				}
-			}
-
-
-			foreach (var resolutionFrame in ResolutionFrames.CommonResolutions)
-			{
-				resolutionComboBox.Items.Add(resolutionFrame.ToString());
-			}
-			
-			
-			for (ImageRotation ir = 0; ir < ImageRotation.Count; ir++)
-			{
-				imageRotationComboBox.Items.Add(ir.ToDescription());
-			}
-			
-			for (int i = 0; i < MultipleImageOpacity.DefaultList.Count; i++)
-			{
-				comboBoxGabs.Items.Add(MultipleImageOpacity.DefaultList[i].ImageTimeGap);
-			}
-
-			Redraw();
-		}
-
-		public void Closing()
-		{
-		}
-
-		void Redraw()
-		{
-			if (config == null) return;			/// Control was not loaded, settings were not changed
-												
-			classNameLabel.Text = config.Factory.ClassName;
-			nameTextBox.Text = config.Name;
-			parentNameComboBox.Text = string.IsNullOrEmpty(config.ParentName) ? "---" : config.ParentName;
-			blackAndWhiteCheckBox.Checked = config.BlackAndWhite;
-			loResolutionCheckBox.Checked = config.LowResolution;
-			imageRotationComboBox.Text = config.ImageRotation.ToDescription();
-			resolutionComboBox.Text = config.ImageFrame.ToString();
-			comboBoxGabs.Text = config.ImageOpacity.ImageTimeGap.ToString();
-			textBoxMultipleImages.Text = config.ImageOpacity.Count.ToString();
-		}
-
-		public void Unlock()
-		{
-			nameTextBox.Enabled = true;
-			parentNameComboBox.Enabled = true;
-			blackAndWhiteCheckBox.Enabled = true;
-			loResolutionCheckBox.Enabled = true;
-			imageRotationComboBox.Enabled = true;
-			resolutionComboBox.Enabled = true;
-			comboBoxGabs.Enabled = true;
-			textBoxMultipleImages.Enabled = true;
-		}
-
-		public CfgUpdateFlags VerifyCfg(ref string message)
-		{
-            CfgUpdateFlags flags = CfgUpdateFlags.None;
-
-			if (!parentNameComboBox.Items.Contains(parentNameComboBox.Text))
-			{
-				flags |= CfgUpdateFlags.Error;
-				message += Environment.NewLine + string.Format(Strings.Invalid_0, parentNameLabel.Text);
-			}
-
-			if (!imageRotationComboBox.Items.Contains(imageRotationComboBox.Text))
-			{
-				flags |= CfgUpdateFlags.Error;
-				message += Environment.NewLine + string.Format(Strings.Invalid_0, imageRotationLabel.Text);
-			}
-
-			if (!resolutionComboBox.Items.Contains(resolutionComboBox.Text))
-			{
-				flags |= CfgUpdateFlags.Error;
-				message += Environment.NewLine + string.Format(Strings.Invalid_0, resolutionComboBox.Text);
-			}
-
-			int gab = 0;
-			if(!int.TryParse(textBoxMultipleImages.Text, out gab)){
-				flags |= CfgUpdateFlags.Error;
-				message += Environment.NewLine + string.Format(Strings.Invalid_0, textBoxMultipleImages.Text);
-			}
-			
-			if(!int.TryParse(comboBoxGabs.Text, out gab)){
-				flags |= CfgUpdateFlags.Error;
-				message += Environment.NewLine + string.Format(Strings.Invalid_0, comboBoxGabs.Text);
-			}
-
-			return flags;
-		}
-
-		public CfgUpdateFlags UpdateCfg()
-		{
-			CfgUpdateFlags flags = CfgUpdateFlags.None;
-
-			if (config == null) return CfgUpdateFlags.Error;	/// Control was not loaded, settings were not changed
-
-			if (config.Name != nameTextBox.Text)
-			{
-				config.Name = nameTextBox.Text;
-				flags |= (CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-			}
-
-			string newParentName = parentNameComboBox.Text.Equals("---") ? string.Empty : parentNameComboBox.Text;
-			if (config.ParentName != newParentName)
-			{
-				config.ParentName = newParentName;
-				flags |= (CfgUpdateFlags.RestartRqrd | CfgUpdateFlags.AnyChange);
-			}
-
-			if (config.BlackAndWhite != blackAndWhiteCheckBox.Checked)
-			{
-				config.BlackAndWhite = blackAndWhiteCheckBox.Checked;
-				flags |= (CfgUpdateFlags.AnyChange | CfgUpdateFlags.InvokeCfgChange);
-			}
-
-			if (config.LowResolution != loResolutionCheckBox.Checked)
-			{
-				config.LowResolution = loResolutionCheckBox.Checked;
-				flags |= (CfgUpdateFlags.AnyChange | CfgUpdateFlags.InvokeCfgChange);
-			}
-
-			for (ImageRotation ir = 0; ir < ImageRotation.Count; ir++)
-			{
-				if (imageRotationComboBox.Text == ir.ToDescription())
-				{
-					if (config.ImageRotation != ir)
-					{
-						config.ImageRotation = ir;
-						flags |= (CfgUpdateFlags.AnyChange | CfgUpdateFlags.InvokeCfgChange);
-						break;
-					}
-				}
-			}
-			
-			if (resolutionComboBox.Text != config.ImageFrame.ToString())
-			{
-				config.ImageFrame = Frame.Parse(resolutionComboBox.Text);
-				flags |= (CfgUpdateFlags.AnyChange | CfgUpdateFlags.InvokeCfgChange);
-			}
-
-			try
-			{
-				if (int.Parse(textBoxMultipleImages.Text) != config.ImageOpacity.Count)
-				{
-					config.ImageOpacity.Count = int.Parse(textBoxMultipleImages.Text);
-					flags |= (CfgUpdateFlags.AnyChange | CfgUpdateFlags.InvokeCfgChange);
-				}
-			}
-			catch (Exception e)
-			{
-				log.Error("Error parsing multiple images", e);
-			}
-
-			try
-			{
-				if (int.Parse(comboBoxGabs.Text) != config.ImageOpacity.ImageTimeGap)
-				{
-					config.ImageOpacity.ImageTimeGap = int.Parse(comboBoxGabs.Text);
-					flags |= (CfgUpdateFlags.AnyChange | CfgUpdateFlags.InvokeCfgChange);
-				}
-			}
-			catch (Exception e)
-			{
-				log.Error("Error parsing multiple images", e);
-			}
-
-			if ((flags & CfgUpdateFlags.InvokeCfgChange) != 0)
-			{
-				Roi.OnCfgChange(this, new CfgChangeArgs(CfgChangeCmd.CfgChange, config));
-			}
-
-			return flags;
-		}
-
-        #region Configuration Change Handling
-
-        public static void OnCmdResponse(object sender, CmdResponseArgs args)
-        {
-            if (CmdResponseHandler == null) return;
-            try { CmdResponseHandler(sender, args); }
-            catch (Exception e) { log.Error("CmdResponseHandler(...) failed", e); }
-        }
-
-        public static event EventHandler<CmdResponseArgs> CmdResponseHandler;
-
-        public void StartResponseHandler() { }
-        public void StopResponseHandler() { }
-
-        #endregion Configuration Change Handling
-
-        private void label3_Click(object sender, EventArgs e)
-        {
-	        throw new System.NotImplementedException();
-        }
-
-        private void comboBoxGabs_Validating(object sender, CancelEventArgs e)
-        {
-	        if (!int.TryParse(comboBoxGabs.Text, out _))
-	        {
-		        MessageBox.Show("Please enter a valid integer.");
-		        e.Cancel = true;
-	        }
-        }
-
-        private void comboBoxGabs_KeyPress(object sender, KeyPressEventArgs e)
-        {
-	        if (!char.IsControl(e.KeyChar) && !char.IsDigit(e.KeyChar))
-	        {
-		        e.Handled = true;
-	        } 
-        }
-        
-	}
-}

TBF/Rig/Network/Camera/RoiForFixedStartCJMS11/RoiCfgCtrl.designer.cs

@@ -1,271 +0,0 @@
-///
-/// Copyright (c) 2017 Sensus Metering Systems
-///
-namespace TBF.Rig.Network.Camera.RoiForFixedStartCJMS11
-{
-	partial class RoiCfgCtrl
-	{
-		/// <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.parentNameLabel = 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.parentNameComboBox = new System.Windows.Forms.ComboBox();
-			this.label1 = new System.Windows.Forms.Label();
-			this.textBox1 = new System.Windows.Forms.TextBox();
-			this.imageRotationComboBox = new System.Windows.Forms.ComboBox();
-			this.imageRotationLabel = new System.Windows.Forms.Label();
-			this.blackAndWhiteCheckBox = new System.Windows.Forms.CheckBox();
-			this.loResolutionCheckBox = new System.Windows.Forms.CheckBox();
-			this.label2 = new System.Windows.Forms.Label();
-			this.resolutionComboBox = new System.Windows.Forms.ComboBox();
-			this.textBoxMultipleImages = new System.Windows.Forms.TextBox();
-			this.label3 = new System.Windows.Forms.Label();
-			this.label4 = new System.Windows.Forms.Label();
-			this.comboBoxGabs = new System.Windows.Forms.ComboBox();
-			this.SuspendLayout();
-			// 
-			// parentNameLabel
-			// 
-			this.parentNameLabel.AutoSize = true;
-			this.parentNameLabel.Location = new System.Drawing.Point(30, 118);
-			this.parentNameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-			this.parentNameLabel.Name = "parentNameLabel";
-			this.parentNameLabel.Size = new System.Drawing.Size(65, 20);
-			this.parentNameLabel.TabIndex = 3;
-			this.parentNameLabel.Text = "Camera";
-			// 
-			// nameTextBox
-			// 
-			this.nameTextBox.Enabled = false;
-			this.nameTextBox.Location = new System.Drawing.Point(208, 75);
-			this.nameTextBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-			this.nameTextBox.Name = "nameTextBox";
-			this.nameTextBox.Size = new System.Drawing.Size(259, 26);
-			this.nameTextBox.TabIndex = 2;
-			// 
-			// nameLabel
-			// 
-			this.nameLabel.AutoSize = true;
-			this.nameLabel.Location = new System.Drawing.Point(30, 80);
-			this.nameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-			this.nameLabel.Name = "nameLabel";
-			this.nameLabel.Size = new System.Drawing.Size(51, 20);
-			this.nameLabel.TabIndex = 1;
-			this.nameLabel.Text = "Name";
-			// 
-			// classNameLabel
-			// 
-			this.classNameLabel.AutoSize = true;
-			this.classNameLabel.Location = new System.Drawing.Point(204, 40);
-			this.classNameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-			this.classNameLabel.Name = "classNameLabel";
-			this.classNameLabel.Size = new System.Drawing.Size(173, 20);
-			this.classNameLabel.TabIndex = 0;
-			this.classNameLabel.Text = "ComponentClassName";
-			// 
-			// parentNameComboBox
-			// 
-			this.parentNameComboBox.Enabled = false;
-			this.parentNameComboBox.FormattingEnabled = true;
-			this.parentNameComboBox.Location = new System.Drawing.Point(208, 114);
-			this.parentNameComboBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-			this.parentNameComboBox.Name = "parentNameComboBox";
-			this.parentNameComboBox.Size = new System.Drawing.Size(259, 28);
-			this.parentNameComboBox.TabIndex = 4;
-			// 
-			// label1
-			// 
-			this.label1.AutoSize = true;
-			this.label1.Location = new System.Drawing.Point(-316, -226);
-			this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(87, 20);
-			this.label1.TabIndex = 5;
-			this.label1.Text = "Arguments";
-			// 
-			// textBox1
-			// 
-			this.textBox1.Enabled = false;
-			this.textBox1.Location = new System.Drawing.Point(-188, -231);
-			this.textBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-			this.textBox1.Name = "textBox1";
-			this.textBox1.Size = new System.Drawing.Size(556, 26);
-			this.textBox1.TabIndex = 6;
-			// 
-			// imageRotationComboBox
-			// 
-			this.imageRotationComboBox.Enabled = false;
-			this.imageRotationComboBox.FormattingEnabled = true;
-			this.imageRotationComboBox.Location = new System.Drawing.Point(208, 237);
-			this.imageRotationComboBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-			this.imageRotationComboBox.Name = "imageRotationComboBox";
-			this.imageRotationComboBox.Size = new System.Drawing.Size(138, 28);
-			this.imageRotationComboBox.TabIndex = 8;
-			// 
-			// imageRotationLabel
-			// 
-			this.imageRotationLabel.AutoSize = true;
-			this.imageRotationLabel.Location = new System.Drawing.Point(30, 242);
-			this.imageRotationLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-			this.imageRotationLabel.Name = "imageRotationLabel";
-			this.imageRotationLabel.Size = new System.Drawing.Size(153, 20);
-			this.imageRotationLabel.TabIndex = 7;
-			this.imageRotationLabel.Text = "Image rotation (ccw)";
-			// 
-			// blackAndWhiteCheckBox
-			// 
-			this.blackAndWhiteCheckBox.AutoSize = true;
-			this.blackAndWhiteCheckBox.Enabled = false;
-			this.blackAndWhiteCheckBox.Location = new System.Drawing.Point(208, 166);
-			this.blackAndWhiteCheckBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-			this.blackAndWhiteCheckBox.Name = "blackAndWhiteCheckBox";
-			this.blackAndWhiteCheckBox.Size = new System.Drawing.Size(134, 24);
-			this.blackAndWhiteCheckBox.TabIndex = 5;
-			this.blackAndWhiteCheckBox.Text = "Black && White";
-			this.blackAndWhiteCheckBox.UseVisualStyleBackColor = true;
-			// 
-			// loResolutionCheckBox
-			// 
-			this.loResolutionCheckBox.AutoSize = true;
-			this.loResolutionCheckBox.Enabled = false;
-			this.loResolutionCheckBox.Location = new System.Drawing.Point(208, 202);
-			this.loResolutionCheckBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-			this.loResolutionCheckBox.Name = "loResolutionCheckBox";
-			this.loResolutionCheckBox.Size = new System.Drawing.Size(137, 24);
-			this.loResolutionCheckBox.TabIndex = 6;
-			this.loResolutionCheckBox.Text = "Low resolution";
-			this.loResolutionCheckBox.UseVisualStyleBackColor = true;
-			// 
-			// label2
-			// 
-			this.label2.Location = new System.Drawing.Point(30, 293);
-			this.label2.Name = "label2";
-			this.label2.Size = new System.Drawing.Size(152, 28);
-			this.label2.TabIndex = 9;
-			this.label2.Text = "Choose resolution:";
-			// 
-			// resolutionComboBox
-			// 
-			this.resolutionComboBox.DropDownWidth = 259;
-			this.resolutionComboBox.Enabled = false;
-			this.resolutionComboBox.FormattingEnabled = true;
-			this.resolutionComboBox.Location = new System.Drawing.Point(208, 290);
-			this.resolutionComboBox.Name = "resolutionComboBox";
-			this.resolutionComboBox.Size = new System.Drawing.Size(262, 28);
-			this.resolutionComboBox.TabIndex = 10;
-			// 
-			// textBoxMultipleImages
-			// 
-			this.textBoxMultipleImages.Enabled = false;
-			this.textBoxMultipleImages.Location = new System.Drawing.Point(208, 332);
-			this.textBoxMultipleImages.Name = "textBoxMultipleImages";
-			this.textBoxMultipleImages.Size = new System.Drawing.Size(48, 26);
-			this.textBoxMultipleImages.TabIndex = 11;
-			// 
-			// label3
-			// 
-			this.label3.Location = new System.Drawing.Point(30, 335);
-			this.label3.Name = "label3";
-			this.label3.Size = new System.Drawing.Size(147, 26);
-			this.label3.TabIndex = 12;
-			this.label3.Text = "Multiple Images:";
-			// 
-			// label4
-			// 
-			this.label4.Location = new System.Drawing.Point(30, 381);
-			this.label4.Name = "label4";
-			this.label4.Size = new System.Drawing.Size(147, 26);
-			this.label4.TabIndex = 13;
-			this.label4.Text = "Time Gap Images:";
-			// 
-			// comboBoxGabs
-			// 
-			this.comboBoxGabs.Enabled = false;
-			this.comboBoxGabs.FormattingEnabled = true;
-			this.comboBoxGabs.Location = new System.Drawing.Point(208, 378);
-			this.comboBoxGabs.Name = "comboBoxGabs";
-			this.comboBoxGabs.Size = new System.Drawing.Size(100, 28);
-			this.comboBoxGabs.TabIndex = 14;
-			this.comboBoxGabs.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBoxGabs_KeyPress);
-			this.comboBoxGabs.Validating += new System.ComponentModel.CancelEventHandler(this.comboBoxGabs_Validating);
-			// 
-			// RoiCfgCtrl
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.Controls.Add(this.comboBoxGabs);
-			this.Controls.Add(this.label4);
-			this.Controls.Add(this.label3);
-			this.Controls.Add(this.textBoxMultipleImages);
-			this.Controls.Add(this.resolutionComboBox);
-			this.Controls.Add(this.label2);
-			this.Controls.Add(this.imageRotationComboBox);
-			this.Controls.Add(this.imageRotationLabel);
-			this.Controls.Add(this.blackAndWhiteCheckBox);
-			this.Controls.Add(this.loResolutionCheckBox);
-			this.Controls.Add(this.parentNameComboBox);
-			this.Controls.Add(this.textBox1);
-			this.Controls.Add(this.label1);
-			this.Controls.Add(this.parentNameLabel);
-			this.Controls.Add(this.nameTextBox);
-			this.Controls.Add(this.nameLabel);
-			this.Controls.Add(this.classNameLabel);
-			this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-			this.Name = "RoiCfgCtrl";
-			this.Size = new System.Drawing.Size(750, 462);
-			this.Load += new System.EventHandler(this.PumpCfgCtrl_Load);
-			this.ResumeLayout(false);
-			this.PerformLayout();
-		}
-
-		private System.Windows.Forms.Label label4;
-		private System.Windows.Forms.ComboBox comboBoxGabs;
-
-		private System.Windows.Forms.TextBox textBoxMultipleImages;
-		private System.Windows.Forms.Label label3;
-
-		private System.Windows.Forms.ComboBox resolutionComboBox;
-
-		private System.Windows.Forms.Label label2;
-
-		#endregion
-
-		private System.Windows.Forms.Label parentNameLabel;
-		private System.Windows.Forms.TextBox nameTextBox;
-		private System.Windows.Forms.Label nameLabel;
-        private System.Windows.Forms.Label classNameLabel;
-		private System.Windows.Forms.ComboBox parentNameComboBox;
-		private System.Windows.Forms.Label label1;
-		private System.Windows.Forms.TextBox textBox1;
-		private System.Windows.Forms.ComboBox imageRotationComboBox;
-		private System.Windows.Forms.Label imageRotationLabel;
-		private System.Windows.Forms.CheckBox blackAndWhiteCheckBox;
-		private System.Windows.Forms.CheckBox loResolutionCheckBox;
-	}
-}

TBF/Rig/Network/Camera/RoiForFixedStartCJMS11/RoiCfgCtrl.resx

@@ -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>

TBF/Rig/Network/Camera/RoiForFixedStartCJMS11/common/Frame.cs

@@ -1,70 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
-
-namespace TBF.Rig.Network.Camera.RoiForFixedStartCJMS11.common
-{
-    public class Frame
-    {
-        public int Width { get; set; }
-        public int Height { get; set; }
-
-        public Frame() // standard frame
-        {
-            this.Width = 640;
-            this.Height = 480;
-        }
-
-        public Frame(int width, int height)
-        {
-            Width = width;
-            Height = height;
-        }
-
-        public static Frame StandardFrame()
-        {
-            return new Frame();
-        }
-
-        public override string ToString() => $"{Width}x{Height}";
-        
-        
-        // Static method to parse string like "1920x1080"
-        public static Frame Parse(string resolution)
-        {
-            var match = Regex.Match(resolution, @"^\s*(\d+)\s*[xX]\s*(\d+)\s*$");
-            if (!match.Success)
-            {
-                throw new FormatException($"Invalid resolution format: '{resolution}'");
-            }
-
-            int width = int.Parse(match.Groups[1].Value);
-            int height = int.Parse(match.Groups[2].Value);
-
-            return new Frame(width, height);
-        }
-        
-        ///
-        /// Finds nearest frame based on selected dimension
-        /// <b> example: </b>
-        /// <code>
-        /// var input = new Frame(1500, 800);
-        /// //Nearest by Width
-        /// var nearestByWidth = input.FindNearest(allFrames, f => f.Width);
-        /// Console.WriteLine($"Nearest by width: {nearestByWidth}"); // → 1280x720
-        /// //Nearest by Height
-        /// var nearestByHeight = input.FindNearest(allFrames, f => f.Height);
-        /// Console.WriteLine($"Nearest by height: {nearestByHeight}"); // → 1280x720
-        /// </code>
-        
-        public Frame FindNearest(IEnumerable<Frame> candidates, Func<Frame, int> dimensionSelector)
-        {
-            int target = dimensionSelector(this);
-            return candidates
-                .OrderBy(f => Math.Abs(dimensionSelector(f) - target))
-                .ThenBy(dimensionSelector) // tie-breaker: prefer smaller
-                .FirstOrDefault();
-        }
-    }
-}

TBF/Rig/Network/Camera/RoiForFixedStartCJMS11/common/MultipleImageOpacity.cs

@@ -1,42 +0,0 @@
-using System.Collections.Generic;
-
-namespace TBF.Rig.Network.Camera.RoiForFixedStartCJMS11.common
-{
-    public class MultipleImageOpacity
-    {
-        public int Count { get; set; }
-        public int ImageTimeGap { get; set; }
-
-        public MultipleImageOpacity()
-        {
-            Count = 1;
-            ImageTimeGap = 1000;
-        }
-
-        public MultipleImageOpacity(int count, int imageTimeGap)
-        {
-            Count = count;
-            ImageTimeGap = imageTimeGap;
-        }
-        
-        
-        public static readonly IReadOnlyList<MultipleImageOpacity> DefaultList = new List<MultipleImageOpacity>
-        {
-            new MultipleImageOpacity(1, 350),
-            new MultipleImageOpacity(1, 450),
-            new MultipleImageOpacity(1, 500), // standard frame
-            new MultipleImageOpacity(1, 650),
-            new MultipleImageOpacity(1, 800),
-            new MultipleImageOpacity(1, 1000),
-            new MultipleImageOpacity(1, 1250),
-            new MultipleImageOpacity(1, 1500),
-            new MultipleImageOpacity(1, 1750),
-            new MultipleImageOpacity(1, 2000),
-            new MultipleImageOpacity(1, 2250),
-            new MultipleImageOpacity(1, 2500),
-            new MultipleImageOpacity(1, 2750),
-            new MultipleImageOpacity(1, 3000),
-            new MultipleImageOpacity(1, 4000),
-        }.AsReadOnly();
-    }
-}

TBF/Rig/Network/Camera/RoiForFixedStartCJMS11/common/ResolutionFrames.cs

@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
-
-namespace TBF.Rig.Network.Camera.RoiForFixedStartCJMS11.common
-{
-    public class ResolutionFrames : List<Frame>
-    {
-    
-        public ResolutionFrames(IEnumerable<Frame> collection) : base(collection)
-        {
-        }
-
-        public static readonly IReadOnlyList<Frame> CommonResolutions = new List<Frame>
-        {
-            new Frame(320, 240),
-            new Frame(352, 288),
-            new Frame(640, 480), // standard frame
-            new Frame(720, 480),
-            new Frame(1280, 720),
-            new Frame(1920, 1080),
-            new Frame(2560, 1440),
-            new Frame(3840, 2160),
-            new Frame(4096, 2160)
-        }.AsReadOnly();
-        
-        
-        
-        
-    }
-}

TBF/Rig/Network/Camera/common/ImageUtils.cs

@@ -1,71 +0,0 @@
-using System;
-using System.Drawing;
-using Common;
-
-namespace TBF.Rig.Network.Camera.common
-{
-    public class ImageUtils
-    {
-        
-        public static void Rotate(Image image, ImageRotation direction)
-        {
-            if(!(direction == ImageRotation.Deg90 || direction == ImageRotation.Deg180 || direction == ImageRotation.Deg270))
-                return;
-            if (image == null)
-                throw new ArgumentNullException(nameof(image));
-
-            RotateFlipType flipType = 
-                direction == ImageRotation.Deg90 ? RotateFlipType.Rotate90FlipNone :
-                direction == ImageRotation.Deg180 ? RotateFlipType.Rotate180FlipNone :
-                direction == ImageRotation.Deg270 ? RotateFlipType.Rotate270FlipNone :
-                RotateFlipType.RotateNoneFlipNone;
-            
-
-            image.RotateFlip(flipType);
-        }
-        public static Image RotateCustom(Image image, ImageRotation direction)
-        {
-            if (image == null)
-                throw new ArgumentNullException(nameof(image));
-
-            int newWidth = image.Width;
-            int newHeight = image.Height;
-
-            RotateFlipType flipType;
-
-            switch (direction)
-            {
-                case ImageRotation.Deg90:
-                    flipType = RotateFlipType.Rotate90FlipNone;
-                    newWidth = image.Height;
-                    newHeight = image.Width;
-                    break;
-                case ImageRotation.Deg180:
-                    flipType = RotateFlipType.Rotate180FlipNone;
-                    break;
-                case ImageRotation.Deg270:
-                    flipType = RotateFlipType.Rotate270FlipNone;
-                    newWidth = image.Height;
-                    newHeight = image.Width;
-                    break;
-                default:
-                    throw new ArgumentException("Unsupported rotation direction");
-            }
-
-            Bitmap rotated = new Bitmap(newWidth, newHeight);
-            using (Graphics g = Graphics.FromImage(rotated))
-            {
-                g.TranslateTransform(newWidth / 2f, newHeight / 2f);
-                g.RotateTransform(
-                    direction == ImageRotation.Deg90 ? 90 :
-                    direction == ImageRotation.Deg180 ? 180 :
-                    direction == ImageRotation.Deg270 ? 270 : 
-                    0);
-                g.TranslateTransform(-image.Width / 2f, -image.Height / 2f);
-                g.DrawImage(image, new PointF(0, 0));
-            }
-
-            return rotated;
-        }
-    }
-}

TBF/Rig/Network/Telnet/EventArgsClasses.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
-using TBF.Rig.Network.Camera.CJMS11;
 
 namespace TBF.Rig.Network.Telnet
 {
@@ -63,50 +61,6 @@ namespace TBF.Rig.Network.Telnet
 			Response = text;
 		}
 	}
-	
-	/// <summary>
-	/// Type of argument of PromptReceviedEventHandler
-	/// </summary>
-	public class PromptReceivedJMSEventArgs : EventArgs
-	{
-		public string Response;		/// Response to a command from the telnet server ...
-		/// ... without the terminal prompt string.
-		public JmsMessage Message;	/// Message received from the server.
-
-		public PromptReceivedJMSEventArgs(string text, JmsMessage message)
-		{
-			Response = text;
-			Message = message;
-		}
-	}
-	
-	public class PromptReceivedImageEventArgs : EventArgs
-	{
-		public Image image;		/// server image.
-		public int idxCamera;		/// camera index.
-
-		public PromptReceivedImageEventArgs(int idxCamera, Image image)
-		{
-			this.image = image;
-			this.idxCamera = idxCamera;
-		}
-	}
-	
-	public class PromptReceivedImagesEventArgs : EventArgs
-	{
-		public Image image;		/// server image.
-		public int idxCamera;	/// camera index.
-		public int idxImage;	/// image index.
-		public int imageCounts; /// number of images.
-		
-		public PromptReceivedImagesEventArgs(int idxCamera, Image image, int idxImage, int imageCounts)
-		{
-			this.image = image;
-			this.idxCamera = idxCamera;
-			this.idxImage = idxImage;
-			this.imageCounts = imageCounts;
-		}
-	}
 
 
 

TBF/Rig/RegisterReaders/PoseidonCmdStartStop/CliRunner.cs

@@ -156,33 +156,22 @@ namespace TBF.Rig.RegisterReaders.PoseidonCmdStartStop
             // Extract JSON part
             string json = ExtractJson(allOutput);
 
-            if (TryJsonStringDeserialize(json, out T runAndCaptureJsonAsync)) return runAndCaptureJsonAsync;
-
-            return default;
-        }
-
-        public bool TryJsonStringDeserialize<T>(string json, out T runAndCaptureJsonAsync) where T : new()
-        {
             if (json != null)
             {
                 try
                 {
-                    runAndCaptureJsonAsync = JsonConvert.DeserializeObject<T>(json);
-                    return true;
+                    return JsonConvert.DeserializeObject<T>(json);
                 }
                 catch (Exception ex)
                 {
                     log.Debug(ex.Message);
-                    runAndCaptureJsonAsync = TryConvert<T>(json);
-                    return true;
+                    return TryConvert<T>(json);
                 }
             }
 
-            runAndCaptureJsonAsync = default;
-            return false;
+            return default;
         }
 
-
         private static T TryConvert<T>(string json) where T : new()
         {
             
@@ -221,7 +210,7 @@ namespace TBF.Rig.RegisterReaders.PoseidonCmdStartStop
             
         }
 
-        public string ExtractJson(string text)
+        private string ExtractJson(string text)
         {
             int start = text.IndexOf('{');
             int end = text.LastIndexOf('}');

TBF/Rig/RegisterReaders/PoseidonCmdStartStop/PoseidonReader.cs

@@ -485,14 +485,9 @@ namespace TBF.Rig.RegisterReaders.PoseidonCmdStartStop
 			}
 		}
 
-		private static readonly Regex DeviceIdRegex = new Regex(
-			@"(?im)(?:" +
-			@"^\s*Device\s*Id\s*:\s*([^\r\n]+)\s*$" +  // old format
-			@"|" +
-			@"""DeviceId""\s*:\s*""?([0-9]+)""?" +     // JSON format
-			@")",
-			RegexOptions.Compiled);
-		public bool TryGetDeviceId(string result, out string s)
+		private static readonly Regex DeviceIdRegex =
+			new Regex(@"(?im)^\s*Device\s*Id\s*:\s*([^\r\n]+)\s*$", RegexOptions.Compiled);
+		private bool TryGetDeviceId(string result, out string s)
 		{
 			s = null;
 			if (string.IsNullOrEmpty(result))
@@ -502,10 +497,7 @@ namespace TBF.Rig.RegisterReaders.PoseidonCmdStartStop
 			if (!m.Success)
 				return false;
 
-			// one of the groups will be filled
-			s = !string.IsNullOrEmpty(m.Groups[1].Value)
-				? m.Groups[1].Value.Trim()
-				: m.Groups[2].Value.Trim();
+			s = m.Groups[1].Value.Trim();
 			return true;
 		}
 

TBF/Rig/RegisterReaders/iPerlReaderUNI/Factory.cs

@@ -0,0 +1,23 @@
+using TBF.Rig.Generic;
+using System.Collections.Generic;
+
+namespace TBF.Rig.RegisterReaders.iPerlReaderUNI
+{
+    public class Factory: IComponentFactory
+    {
+        public string ClassName { get { return this.GetType().Namespace.Substring(8); } }
+        
+        public override string ToString() { return ClassName; }
+
+        public IComponent DummyComponent() { return new IPerlReader(); }
+
+        public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new IPerlReader(cfg); }
+
+        public IComponentCfg DefaultConfig() { return new IPerlCfg(this); }
+
+        public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
+        {
+            return ComponentCfgBase.CreateFromDbEntity(IPerlCfg.Serializer, component, this);
+        }
+    }
+}

TBF/Rig/RegisterReaders/iPerlReaderUNI/IPerlCfg.cs

@@ -0,0 +1,70 @@
+using System.Collections.Generic;
+using System.Xml.Serialization;
+using Common;
+using Config.Entities;
+using TBF.Rig.Generic;
+using TBF.Rig.RegisterReaders.iPerlReaderUNI.comminication;
+
+
+namespace TBF.Rig.RegisterReaders.iPerlReaderUNI
+{
+    public class IPerlCfg : ComponentCfgBase, Generic.IComponentCfg
+    {
+        public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(IPerlCfg) })[0];
+        public override XmlSerializer GetSerializer() { return Serializer; }
+        public IComponentCfgCtrl GetControl(IList<Component> cmpntEntities)
+        {
+            return new IPerlCfgCtrl();
+        }
+
+
+        
+        ///
+        /// Serialized parameters 
+        ///
+        public bool UseTcpIP;
+        public string OptoIPAddress;
+        public ushort OptoTcpipPortNr;
+        public int HeadCommunicationComPortNr;
+        public int OptoComPortNr;
+        public int RfidComPortNr;       /// 0 = use MuxBoardNr
+        public int MuxBoardNr;			/// 0 = use RfidComPort(Nr), otherwise mux. board nr. 1 .. 4
+        public int Group;				/// Number written to QuidoRS to connct the watermeter to RfidComPort, 1 .. 10
+        public CommunicationInterface CommunicationInterface; /// Communication Interface: RFID or NFC
+
+        /// <summary> Procedure parameters </summary>
+        [XmlIgnore]
+        public ProcParams ProcParams;
+        public override IParamsProvider GetRuntimeProcParamsProvider() { return ProcParams; }
+        public override IParamsProvider CreateProcParamsProvider() { return new ProcParams(true); }
+
+        [XmlIgnore]
+        public MeterType MeterType { get { return (ProcParams != null) ? ProcParams.MeterType : MeterType.AutoDetect; } }
+        
+        
+        
+        /// Private parameterless constructor invoked by all other (public) constructors
+        IPerlCfg()
+        {
+            Name = "iPerl";
+            ParentName = string.Empty;
+            OptoComPortNr = 10;
+            RfidComPortNr = 0;              /// = use mux. board
+            MuxBoardNr = 1;
+            ProcParams = CreateProcParamsProvider() as ProcParams;
+            CommunicationInterface = CommunicationInterface.RFID;
+            HeadCommunicationComPortNr = 0;
+        }
+
+        public IPerlCfg(IComponentFactory factory)
+            : this()
+        {
+            this.Factory = factory;
+        }
+        
+        public string ToString(int i)
+        {
+            return $"{Name}  Group1 (mux#)={MuxBoardNr}, Group2={Group}, Opto=Com{OptoComPortNr}, {CommunicationInterface}=Com{RfidComPortNr}";
+        }
+    }
+}

TBF/Rig/RegisterReaders/iPerlReaderUNI/IPerlCfgCtrl.cs

@@ -0,0 +1,163 @@
+///
+/// Copyright (c) 2015-2017 Sensus Metering Systems
+///
+using System;
+using System.Net;
+using System.Windows.Forms;
+using Common;
+using TBF.Rig.Generic;
+using TBF.Resources;
+using TBF.Rig.RegisterReaders.iPerlReaderUNI.comminication;
+
+namespace TBF.Rig.RegisterReaders.iPerlReaderUNI
+{
+    public partial class IPerlCfgCtrl : UserControl, IComponentCfgCtrl
+	{
+		public bool ShowMore { get { return false; } }
+
+		IPerlCfg config;
+		public IComponentCfg Config
+		{
+			get { return config as IComponentCfg; }
+			set
+			{
+				config = value as IPerlCfg;
+				Redraw();
+			}
+		}
+
+		public IPerlCfgCtrl()
+		{
+			InitializeComponent();
+		}
+
+		private void WaterMeterCfgCtrl_Load(object sender, EventArgs e)
+		{
+			nameLabel.Text = Strings.Name;
+            classNameLabel.Text = config.Factory.ClassName;
+            Redraw();
+		}
+
+		public void Closing()
+		{
+		}
+
+		void Redraw()
+		{
+			if (config == null) return;			/// Control was not loaded, settings were not changed
+			nameTextBox.Text = config.Name;
+            radioButton1.Checked = config.UseTcpIP;
+            radioButton2.Checked = !config.UseTcpIP;
+            ipAddressTextBox.Text = (config.OptoIPAddress != null) ? config.OptoIPAddress : "0.0.0.0";
+            tcpipPortTextBox.Text = config.OptoTcpipPortNr.ToString();
+            headPortNrTextBox.Text = config.HeadCommunicationComPortNr.ToString();
+            optoSerialPortTextBox.Text = config.OptoComPortNr.ToString();
+            rfidPortNrTextBox.Text = config.RfidComPortNr.ToString();
+            muxBoardNrTextBox.Text = config.MuxBoardNr.ToString();
+			groupTextBox.Text = config.Group.ToString();
+            comboBoxCommunicationInterface.SelectedItem = config.CommunicationInterface.ToString();
+            tabPage2.Controls.Add(new IperlHeadTestCtrl(config));
+        }
+
+		public void Unlock()
+		{
+			nameTextBox.Enabled = true;
+            radioButton1.Enabled = true;
+            radioButton2.Enabled = true;
+            ipAddressTextBox.Enabled = true;
+            tcpipPortTextBox.Enabled = true;
+            optoSerialPortTextBox.Enabled = true;
+            rfidPortNrTextBox.Enabled = true;
+            headPortNrTextBox.Enabled = true;
+            muxBoardNrTextBox.Enabled = true;
+			groupTextBox.Enabled = true;
+            comboBoxCommunicationInterface.Enabled = true;
+		}
+
+		public CfgUpdateFlags VerifyCfg(ref string message)
+		{
+            CfgUpdateFlags flags = CfgUpdateFlags.None;
+
+            int dummy;
+            if (radioButton1.Checked)
+            {
+                IPAddress dummyIPAddress;
+                if (!IPAddress.TryParse(ipAddressTextBox.Text, out dummyIPAddress))
+                {
+                    flags |= CfgUpdateFlags.Error;
+                    message += Environment.NewLine + "'IP address' is not valid";
+                }
+
+                ushort sdummy;
+                if (!ushort.TryParse(tcpipPortTextBox.Text, out sdummy))
+                {
+                    flags |= CfgUpdateFlags.Error;
+                    message += Environment.NewLine + "'TCP/IP port nr.' is not valid";
+                }
+            }
+            else
+            {
+                if (!int.TryParse(optoSerialPortTextBox.Text, out dummy) || dummy < 1 || dummy > 999)
+                {
+                    flags |= CfgUpdateFlags.Error;
+                    message += Environment.NewLine + "'Opto serial port nr.' is not valid";
+                }
+            }
+
+            if (!int.TryParse(rfidPortNrTextBox.Text, out dummy) || dummy < 0 || dummy > 999)
+            {
+                flags |= CfgUpdateFlags.Error;
+                message += Environment.NewLine + "'RFID serial port nr.' is not valid";
+            }
+
+            if (!int.TryParse(headPortNrTextBox.Text, out dummy) || dummy < 0 || dummy > 999)
+            {
+                flags |= CfgUpdateFlags.Error;
+                message += Environment.NewLine + "'Head communication serial port nr.' is not valid";
+            }
+
+            if (!int.TryParse(muxBoardNrTextBox.Text, out dummy) || dummy < 1 || dummy > 4)
+			{
+				flags |= CfgUpdateFlags.Error;
+				message += Environment.NewLine + string.Format(Strings.Invalid_0, muxBoardNrLabel.Text);
+			}
+
+            if (!int.TryParse(groupTextBox.Text, out dummy) || dummy < 1 || dummy > 10)
+			{
+				flags |= CfgUpdateFlags.Error;
+				message += Environment.NewLine + string.Format(Strings.Invalid_0, groupLabel.Text);
+			}
+
+			return flags;
+		}
+
+		public CfgUpdateFlags UpdateCfg()
+		{
+			CfgUpdateFlags flags = CfgUpdateFlags.RestartRqrd;
+
+			if (config == null) return CfgUpdateFlags.Error;	/// Control was not loaded, settings were not changed
+
+			config.Name = nameTextBox.Text;
+
+            if (radioButton1.Checked)
+            {
+                config.UseTcpIP = true;
+                config.OptoIPAddress = ipAddressTextBox.Text;
+                config.OptoTcpipPortNr = ushort.Parse(tcpipPortTextBox.Text);
+            }
+            else
+            {
+                config.UseTcpIP = false;
+                config.OptoComPortNr = int.Parse(optoSerialPortTextBox.Text);
+            }
+
+            config.RfidComPortNr = int.Parse(rfidPortNrTextBox.Text);
+            config.MuxBoardNr = int.Parse(muxBoardNrTextBox.Text);
+			config.Group = int.Parse(groupTextBox.Text);
+            config.CommunicationInterface = (CommunicationInterface)comboBoxCommunicationInterface.SelectedIndex;
+            config.HeadCommunicationComPortNr = int.Parse(headPortNrTextBox.Text);
+
+			return flags;
+		}
+    }
+}

TBF/Rig/RegisterReaders/iPerlReaderUNI/IPerlCfgCtrl.designer.cs

@@ -0,0 +1,441 @@
+///
+/// Copyright (c) 2015-2017 Sensus Metering Systems
+///
+namespace TBF.Rig.RegisterReaders.iPerlReaderUNI
+{
+	partial class IPerlCfgCtrl
+	{
+		/// <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.tabControl1 = new System.Windows.Forms.TabControl();
+            this.tabPage1 = new System.Windows.Forms.TabPage();
+            this.label4 = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.comboBoxCommunicationInterface = new System.Windows.Forms.ComboBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.rfidPortNrTextBox = new System.Windows.Forms.TextBox();
+            this.rfidSerialPortNrLabel = new System.Windows.Forms.Label();
+            this.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.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.headPortNrTextBox = new System.Windows.Forms.TextBox();
+            this.tabControl1.SuspendLayout();
+            this.tabPage1.SuspendLayout();
+            this.groupBox1.SuspendLayout();
+            this.optoDataGroupBox.SuspendLayout();
+            this.groupBox2.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // tabControl1
+            // 
+            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;
+            // 
+            // tabPage1
+            // 
+            this.tabPage1.Controls.Add(this.groupBox2);
+            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;
+            // 
+            // label4
+            // 
+            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";
+            // 
+            // label3
+            // 
+            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";
+            // 
+            // groupBox1
+            // 
+            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)";
+            // 
+            // comboBoxCommunicationInterface
+            // 
+            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;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(41, 30);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(153, 16);
+            this.label1.TabIndex = 8;
+            this.label1.Text = "Communication Interface";
+            // 
+            // rfidPortNrTextBox
+            // 
+            this.rfidPortNrTextBox.Enabled = false;
+            this.rfidPortNrTextBox.Location = new System.Drawing.Point(439, 26);
+            this.rfidPortNrTextBox.Margin = new System.Windows.Forms.Padding(4);
+            this.rfidPortNrTextBox.Name = "rfidPortNrTextBox";
+            this.rfidPortNrTextBox.Size = new System.Drawing.Size(44, 22);
+            this.rfidPortNrTextBox.TabIndex = 7;
+            // 
+            // rfidSerialPortNrLabel
+            // 
+            this.rfidSerialPortNrLabel.AutoSize = true;
+            this.rfidSerialPortNrLabel.Location = new System.Drawing.Point(321, 30);
+            this.rfidSerialPortNrLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.rfidSerialPortNrLabel.Name = "rfidSerialPortNrLabel";
+            this.rfidSerialPortNrLabel.Size = new System.Drawing.Size(88, 16);
+            this.rfidSerialPortNrLabel.TabIndex = 6;
+            this.rfidSerialPortNrLabel.Text = "Serial port nr.:";
+            // 
+            // optoDataGroupBox
+            // 
+            this.optoDataGroupBox.Controls.Add(this.tcpipPortLabel);
+            this.optoDataGroupBox.Controls.Add(this.tcpipPortTextBox);
+            this.optoDataGroupBox.Controls.Add(this.ipAddressLabel);
+            this.optoDataGroupBox.Controls.Add(this.ipAddressTextBox);
+            this.optoDataGroupBox.Controls.Add(this.radioButton1);
+            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.Name = "optoDataGroupBox";
+            this.optoDataGroupBox.Padding = new System.Windows.Forms.Padding(4);
+            this.optoDataGroupBox.Size = new System.Drawing.Size(552, 119);
+            this.optoDataGroupBox.TabIndex = 18;
+            this.optoDataGroupBox.TabStop = false;
+            this.optoDataGroupBox.Text = "Opto-data";
+            // 
+            // tcpipPortLabel
+            // 
+            this.tcpipPortLabel.AutoSize = true;
+            this.tcpipPortLabel.Location = new System.Drawing.Point(41, 87);
+            this.tcpipPortLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.tcpipPortLabel.Name = "tcpipPortLabel";
+            this.tcpipPortLabel.Size = new System.Drawing.Size(54, 16);
+            this.tcpipPortLabel.TabIndex = 4;
+            this.tcpipPortLabel.Text = "Port nr..:";
+            // 
+            // tcpipPortTextBox
+            // 
+            this.tcpipPortTextBox.Enabled = false;
+            this.tcpipPortTextBox.Location = new System.Drawing.Point(143, 84);
+            this.tcpipPortTextBox.Margin = new System.Windows.Forms.Padding(4);
+            this.tcpipPortTextBox.Name = "tcpipPortTextBox";
+            this.tcpipPortTextBox.Size = new System.Drawing.Size(51, 22);
+            this.tcpipPortTextBox.TabIndex = 5;
+            // 
+            // ipAddressLabel
+            // 
+            this.ipAddressLabel.AutoSize = true;
+            this.ipAddressLabel.Location = new System.Drawing.Point(41, 59);
+            this.ipAddressLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ipAddressLabel.Name = "ipAddressLabel";
+            this.ipAddressLabel.Size = new System.Drawing.Size(78, 16);
+            this.ipAddressLabel.TabIndex = 2;
+            this.ipAddressLabel.Text = "IP address.:";
+            // 
+            // ipAddressTextBox
+            // 
+            this.ipAddressTextBox.Enabled = false;
+            this.ipAddressTextBox.Location = new System.Drawing.Point(143, 55);
+            this.ipAddressTextBox.Margin = new System.Windows.Forms.Padding(4);
+            this.ipAddressTextBox.Name = "ipAddressTextBox";
+            this.ipAddressTextBox.Size = new System.Drawing.Size(129, 22);
+            this.ipAddressTextBox.TabIndex = 3;
+            // 
+            // radioButton1
+            // 
+            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;
+            // 
+            // 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);
+            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;
+            // 
+            // optoSerialPortLabel
+            // 
+            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.:";
+            // 
+            // optoSerialPortTextBox
+            // 
+            this.optoSerialPortTextBox.Enabled = false;
+            this.optoSerialPortTextBox.Location = new System.Drawing.Point(439, 52);
+            this.optoSerialPortTextBox.Margin = new System.Windows.Forms.Padding(4);
+            this.optoSerialPortTextBox.Name = "optoSerialPortTextBox";
+            this.optoSerialPortTextBox.Size = new System.Drawing.Size(44, 22);
+            this.optoSerialPortTextBox.TabIndex = 7;
+            // 
+            // groupTextBox
+            // 
+            this.groupTextBox.Enabled = false;
+            this.groupTextBox.Location = new System.Drawing.Point(153, 97);
+            this.groupTextBox.Margin = new System.Windows.Forms.Padding(4);
+            this.groupTextBox.Name = "groupTextBox";
+            this.groupTextBox.Size = new System.Drawing.Size(44, 22);
+            this.groupTextBox.TabIndex = 22;
+            // 
+            // groupLabel
+            // 
+            this.groupLabel.AutoSize = true;
+            this.groupLabel.Location = new System.Drawing.Point(6, 101);
+            this.groupLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.groupLabel.Name = "groupLabel";
+            this.groupLabel.Size = new System.Drawing.Size(54, 16);
+            this.groupLabel.TabIndex = 21;
+            this.groupLabel.Text = "Group 2";
+            // 
+            // muxBoardNrTextBox
+            // 
+            this.muxBoardNrTextBox.Enabled = false;
+            this.muxBoardNrTextBox.Location = new System.Drawing.Point(153, 69);
+            this.muxBoardNrTextBox.Margin = new System.Windows.Forms.Padding(4);
+            this.muxBoardNrTextBox.Name = "muxBoardNrTextBox";
+            this.muxBoardNrTextBox.Size = new System.Drawing.Size(44, 22);
+            this.muxBoardNrTextBox.TabIndex = 20;
+            // 
+            // muxBoardNrLabel
+            // 
+            this.muxBoardNrLabel.AutoSize = true;
+            this.muxBoardNrLabel.Location = new System.Drawing.Point(6, 72);
+            this.muxBoardNrLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.muxBoardNrLabel.Name = "muxBoardNrLabel";
+            this.muxBoardNrLabel.Size = new System.Drawing.Size(131, 16);
+            this.muxBoardNrLabel.TabIndex = 19;
+            this.muxBoardNrLabel.Text = "Group 1 (mux. board)";
+            // 
+            // nameTextBox
+            // 
+            this.nameTextBox.Enabled = false;
+            this.nameTextBox.Location = new System.Drawing.Point(153, 40);
+            this.nameTextBox.Margin = new System.Windows.Forms.Padding(4);
+            this.nameTextBox.Name = "nameTextBox";
+            this.nameTextBox.Size = new System.Drawing.Size(160, 22);
+            this.nameTextBox.TabIndex = 17;
+            // 
+            // nameLabel
+            // 
+            this.nameLabel.AutoSize = true;
+            this.nameLabel.Location = new System.Drawing.Point(6, 44);
+            this.nameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.nameLabel.Name = "nameLabel";
+            this.nameLabel.Size = new System.Drawing.Size(44, 16);
+            this.nameLabel.TabIndex = 16;
+            this.nameLabel.Text = "Name";
+            // 
+            // classNameLabel
+            // 
+            this.classNameLabel.AutoSize = true;
+            this.classNameLabel.Location = new System.Drawing.Point(149, 11);
+            this.classNameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.classNameLabel.Name = "classNameLabel";
+            this.classNameLabel.Size = new System.Drawing.Size(78, 16);
+            this.classNameLabel.TabIndex = 15;
+            this.classNameLabel.Text = "ClassName";
+            // 
+            // tabPage2
+            // 
+            this.tabPage2.Location = new System.Drawing.Point(4, 25);
+            this.tabPage2.Name = "tabPage2";
+            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage2.Size = new System.Drawing.Size(603, 403);
+            this.tabPage2.TabIndex = 1;
+            this.tabPage2.Text = "Test";
+            this.tabPage2.UseVisualStyleBackColor = true;
+            // 
+            // groupBox2
+            // 
+            this.groupBox2.Controls.Add(this.headPortNrTextBox);
+            this.groupBox2.Controls.Add(this.label2);
+            this.groupBox2.Location = new System.Drawing.Point(10, 335);
+            this.groupBox2.Name = "groupBox2";
+            this.groupBox2.Size = new System.Drawing.Size(552, 50);
+            this.groupBox2.TabIndex = 26;
+            this.groupBox2.TabStop = false;
+            this.groupBox2.Text = "Head Communication";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(321, 18);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(88, 16);
+            this.label2.TabIndex = 7;
+            this.label2.Text = "Serial port nr.:";
+            // 
+            // headPortNrTextBox
+            // 
+            this.headPortNrTextBox.Enabled = false;
+            this.headPortNrTextBox.Location = new System.Drawing.Point(439, 15);
+            this.headPortNrTextBox.Margin = new System.Windows.Forms.Padding(4);
+            this.headPortNrTextBox.Name = "headPortNrTextBox";
+            this.headPortNrTextBox.Size = new System.Drawing.Size(44, 22);
+            this.headPortNrTextBox.TabIndex = 8;
+            // 
+            // 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.Name = "IPerlCfgCtrl";
+            this.Size = new System.Drawing.Size(617, 438);
+            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.groupBox2.ResumeLayout(false);
+            this.groupBox2.PerformLayout();
+            this.ResumeLayout(false);
+
+		}
+
+        #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 rfidPortNrTextBox;
+        private System.Windows.Forms.Label rfidSerialPortNrLabel;
+        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 groupBox2;
+        private System.Windows.Forms.TextBox headPortNrTextBox;
+        private System.Windows.Forms.Label label2;
+    }
+}

TBF/Rig/RegisterReaders/iPerlReaderUNI/IperlHeadTestCtrl.Designer.cs

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

TBF/Rig/RegisterReaders/iPerlReaderUNI/IperlHeadTestCtrl.cs

@@ -0,0 +1,192 @@
+using System;
+using System.Threading;
+using System.Web.UI.WebControls;
+using System.Windows.Forms;
+using TBF.Rig.RegisterReaders.iPerlReaderUNI.comminication;
+using TBF.Rig.Sequences;
+using TBF.Rig.TestMethods.iPerlCommunication;
+
+namespace TBF.Rig.RegisterReaders.iPerlReaderUNI
+{
+    public partial class IperlHeadTestCtrl : UserControl
+    {
+        IPerlCfg config;
+        IPerlReader _iPerlReader;
+        Thread optoThread;
+
+        private bool stopWorkerThread;
+        public event EventHandler<OptoReceivedEventArgs> OptoReceivedHandler;
+
+        public IperlHeadTestCtrl(IPerlCfg config)
+        {
+            this.config = config;
+            InitializeComponent();
+            if (config == null) return;
+
+            //TODO fix possibility set test method in config
+            //iPerlCommunicationForm.cfg = new TestMethodCfg(null); // default values for iPerlCommunication
+
+            foreach(var head in ProcessData.IperlHeads)
+            {
+                if (head != null && head.Name == config.Name) { _iPerlReader = 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" },
+#if DEBUG
+                new {Name = "Start Read Opto Data", Value = "ReadOptoData" },
+                new {Name = "Stop Read Opto Data", Value = "StopReadOptoData" },
+#endif
+                new {Name = " ", Value = "" },
+                new {Name = "Reset NFC Head", Value = "ResetNfcHead" },
+                new {Name = "Set NFC Head Interface", Value = "SetNfcHead" },
+                new {Name = "Set RFID Head interface", Value = "SetRfidHead" }
+            };
+            /*
+            // 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(_iPerlReader)}";
+                        break;
+                    case "SetTestMode":
+                        rfidListItem.Text = OpticalHeadTest.SetTestMode(_iPerlReader);
+                        optoListBox.Items.Clear();
+                        stopWorkerThread = false;
+                        optoThread = new Thread(OptoWorker);
+                        if (!optoThread.IsAlive)
+                        {
+                            _iPerlReader.StartDataStreamProcessing(); // open opto port
+                            optoThread.Start();
+                        }
+                        break;
+                    case "SetActiveMode":
+                        rfidListItem.Text = OpticalHeadTest.SetActiveMode(_iPerlReader);
+                        stopWorkerThread = true;
+                        _iPerlReader.StopDataStreamProcessing(); // close opto port
+                        break;
+                    case "ResetNfcHead":
+                        _iPerlReader.ResetNfcInterface();
+                        break;
+                    case "SetNfcHead":
+                        _iPerlReader.SetNfcInterface();
+                        break;
+                    case "SetRfidHead":
+                        _iPerlReader.SetRfidInterface();
+                        break;
+                    case "ReadOptoData":
+                        optoListBox.Items.Clear();
+                        stopWorkerThread = false;
+                        optoThread = new Thread(OptoWorker);
+                        if (optoThread.IsAlive)
+                        {
+                            stopWorkerThread = true;
+                            _iPerlReader.StopDataStreamProcessing(); // close opto port
+                        }
+                        if (!optoThread.IsAlive)
+                        {
+                            _iPerlReader.StartDataStreamProcessing(); // open opto port
+                            optoThread.Start();
+                        }
+                        break;
+                    case "StopReadOptoData":
+                        stopWorkerThread = true;
+                        _iPerlReader.StopDataStreamProcessing(); // close opto port
+                        break;
+                }
+                rfidOutputListBox.Items.Add(rfidListItem);
+                rfidOutputListBox.Items.AddRange(logChecker.Messages.ToArray());
+            }
+        }
+
+        private void OptoWorker()
+        {
+            while (!this.stopWorkerThread)
+            {
+                Thread.Sleep(250);
+                if (this.stopWorkerThread)
+                    break;
+
+                try
+                {
+                    string buffer = _iPerlReader.ReadOptoData();
+                    if (string.IsNullOrEmpty(buffer))
+                    {
+                        this.OnOptoReceived((object)this, new OptoReceivedEventArgs("."));
+                    }
+                    else
+                        OnOptoReceived((object)this, new OptoReceivedEventArgs(buffer));
+                }
+                catch (Exception ex)
+                {
+                    this.OnOptoReceived((object)this, new OptoReceivedEventArgs(ex.Message));
+                }
+            }
+        }
+
+        public void OnOptoReceived(object sender, OptoReceivedEventArgs args)
+        {
+            if (this.OptoReceivedHandler == null)
+                return;
+            try
+            {
+                this.OptoReceivedHandler(sender, args);
+            }
+            catch (Exception ex)
+            {
+            }
+        }
+
+        private void UserControl_Load(object sender, EventArgs e)
+        {
+            this.ParentForm.FormClosing += new FormClosingEventHandler(ParentForm_FormClosing);
+        }
+
+        void ParentForm_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            //OnHandleDestroyed(new EventArgs());
+            stopWorkerThread = true;
+            if (optoThread != null)
+            {
+                optoThread.Abort();
+            }
+        }
+    }
+}

TBF/Rig/RegisterReaders/iPerlReaderUNI/IperlHeadTestCtrl.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 

TBF/Rig/RegisterReaders/iPerlReaderUNI/ProcParams.cs

@@ -0,0 +1,184 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Xml.Serialization;
+using Common;
+using Config.Entities;
+using TBF.Rig.Generic;
+using TBF.Rig.RegisterReaders.iPerlReaderUNI.comminication;
+
+namespace TBF.Rig.RegisterReaders.iPerlReaderUNI
+{
+    public class ProcParams : ProcedureParamsBase, IParamsProvider, IProcedureParams
+    {
+        
+        public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(ProcParams) })[0];
+		public override XmlSerializer GetSerializer() { return Serializer; }
+
+        public int WMType_ID;
+        public MeterType MeterType;
+        public float CalibTarget;                           /// Target error after calibration in [%]
+        public int FactorLimitLo;							/// Lower limit for the calibration factor
+		public int FactorLimitHi;							/// Upper limit for the calibration factor
+        public Counting Counting;                           /// Initial iPerl counting (Artbitrary, Positive or Negative)
+
+
+		public override void InitializeAll()
+		{
+			MeterType = MeterType.AutoDetect;
+            CalibTarget = 0;
+            FactorLimitLo = 1000;
+			FactorLimitHi = 8000;
+            Counting = Counting.Arbitrary;
+		}
+
+		string[] paramNames = new string[]
+		{
+            "iPerl type",
+            "Calib. target [%]",
+			"Calib. factor Lo",
+			"Calib. factor Hi",
+            "Counting",
+		};
+		public override string ParamName(int i) { return paramNames[i]; }
+        public override int ParamsCount() { return paramNames.Length; }
+
+        public override ICollection<string> ParamValues(int i)
+        {
+            if (i == 0)
+            {
+                var retVal = new List<string>();
+                for (MeterType mt = 0; mt < MeterType.Count; mt++) retVal.Add(mt.ToString());
+                return retVal;
+            }
+            else if (i == 5)
+            {
+                var retVal = new List<string>();
+                for (Counting c = 0; c < Counting.Count; c++) retVal.Add(c.ToString());
+                return retVal;
+            }
+            return null;
+        }
+
+		public override string ToString(int i)
+		{
+			switch (i)
+			{
+				case 0: return MeterType.ToString();
+                case 1: return CalibTarget.ToString();
+                case 2: return FactorLimitLo.ToString();
+				case 3: return FactorLimitHi.ToString();
+                case 4: return Counting.ToString();
+                default: return string.Empty;
+			}
+		}
+        
+		
+		//implement IParamsProvider
+        public bool ValidateParam(int i, string strValue, out string message)
+        {
+	        message = string.Empty;
+
+	        int iDummy;
+	        float fDummy;
+
+	        switch (i)
+	        {
+		        case 0:
+			        for (MeterType mt = 0; mt < MeterType.Count; mt++) if (mt.ToString().Equals(strValue)) return true;
+			        break;
+		        case 1:
+			        if (Utils.TryParseSFloat(strValue, out fDummy) && fDummy >= -10.0f && fDummy <= 10.0f) return true;
+			        break;
+		        case 2:
+		        case 3:
+			        if (int.TryParse(strValue, out iDummy) && iDummy >= 1000 && iDummy <= 8000) return true;
+			        break;
+		        case 4:
+			        for (Counting c = 0; c < Counting.Count; c++) if (c.ToString().Equals(strValue)) return true;
+			        break;
+		        default:
+			        message = "Invalid index";
+			        return false;
+	        }
+
+	        message = ParamName(i) + " is invalid";
+	        return false;
+        }
+
+        public CfgUpdateFlags UpdateParam(int i, string strValue)
+        {
+	        switch (i)
+	        {
+		        case 0:
+			        for (MeterType mt = 0; mt < MeterType.Count; mt++)
+			        {
+				        if (mt.ToString().Equals(strValue)) { MeterType = mt; return CfgUpdateFlags.None; }
+			        }
+			        break;
+		        case 1: CalibTarget = Utils.ParseSFloat(strValue); return CfgUpdateFlags.None;
+		        case 2: FactorLimitLo = int.Parse(strValue); return CfgUpdateFlags.None;
+		        case 3: FactorLimitHi = int.Parse(strValue); return CfgUpdateFlags.None;
+		        case 4:
+			        for (Counting c = 0; c < Counting.Count; c++)
+			        {
+				        if (c.ToString().Equals(strValue)) { Counting = c; return CfgUpdateFlags.None; }
+			        }
+			        break;
+		        default: return CfgUpdateFlags.None;
+	        }
+
+	        return CfgUpdateFlags.None;
+        }
+
+        void CopyContentTo(ProcParams prms)
+        {
+	        prms.MeterType = this.MeterType;
+	        prms.CalibTarget = this.CalibTarget;
+	        prms.FactorLimitLo = this.FactorLimitLo;
+	        prms.FactorLimitHi = this.FactorLimitHi;
+	        prms.Counting = this.Counting;
+        }
+
+        public IParamsProvider Clone()
+        {
+	        ProcParams pars = new ProcParams();
+	        CopyContentTo(pars);
+	        return pars;
+        }
+
+        public override void UpdateFromDbEntity(ComponentProcedure dbEntity)
+        {
+	        if (dbEntity == null) return;
+	        try
+	        {
+		        ProcParams tmp = Serializer.Deserialize(new StringReader(dbEntity.Parameters)) as ProcParams;
+
+		        procedureParamsEntity = dbEntity;
+		        componentName = dbEntity.CmpntName;
+		        procedure = dbEntity.Procedure;
+
+		        if (tmp != null) tmp.CopyContentTo(this);
+	        }
+	        catch
+	        {
+	        }
+        }
+
+
+        public ProcParams()
+        {
+        }
+
+        public ProcParams(bool initialize)
+        {
+	        if (initialize) InitializeAll();
+        }
+
+        public ProcParams(ComponentProcedure procParamsEntity, string componentName, Procedure procedure)
+        {
+	        this.procedureParamsEntity = procParamsEntity;
+	        this.componentName = componentName;
+	        this.procedure = procedure;
+        }
+    }
+}

TBF/Rig/RegisterReaders/iPerlReaderUNI/comminication/CalibrationStruct.cs

@@ -0,0 +1,242 @@
+///
+/// Copyright (c) 2015-2020 Sensus Metering Systems
+///
+using System;
+using System.IO;
+
+namespace TBF.Rig.RegisterReaders.iPerlReaderUNI.comminication
+{
+	public class CalibrationStruct
+	{
+        public const int Length = 35;
+
+		public Byte Version;
+		public MeterType MeterType;
+		public UInt16 Calibration;
+		public VolumeUnits VolumeUnits;
+		public FlowArrow FlowArrow;
+		public UInt16 FWVersion;
+		public UInt16[] TargetField;
+		public UInt16 RecipMeanCurrent;
+		public UInt16 ThresholdVolume;
+		public UInt16 ThresholdTime;
+		public UInt16 FlowActivationThr;
+		public UInt16 VolumeArrowThr;
+		public UInt32 CalibrationTime;
+		public ulong SerialNumber;
+		public MeterSealed MeterSealed;
+		public byte CheckSum;
+
+
+		public CalibrationStruct()
+		{
+			TargetField = new UInt16[3];
+		}
+
+		public byte[] ToByteArray()
+		{
+			byte[] result = new byte[Length];
+
+			result[0] = Version;
+			result[1] = (byte)MeterType;
+
+			result[2] = (byte)(Calibration & 0x00FF);
+			result[3] = (byte)((Calibration >> 8) & 0x00FF);
+
+			result[4] = (byte)VolumeUnits;
+
+			result[5] = (byte)FlowArrow;
+
+			result[6] = (byte)(FWVersion & 0x00FF);
+			result[7] = (byte)((FWVersion >> 8) & 0x00FF);
+
+			result[8] = (byte)( TargetField[0] & 0x00FF);
+			result[9] = (byte)((TargetField[0] >> 8) & 0x00FF);
+			result[10] = (byte)( TargetField[1] & 0x00FF);
+			result[11] = (byte)((TargetField[1] >> 8) & 0x00FF);
+			result[12] = (byte)( TargetField[2] & 0x00FF);
+			result[13] = (byte)((TargetField[2] >> 8) & 0x00FF);
+
+			result[14] = (byte)(RecipMeanCurrent & 0x00FF);
+			result[15] = (byte)((RecipMeanCurrent >> 8) & 0x00FF);
+
+			result[16] = (byte)(ThresholdVolume & 0x00FF);
+			result[17] = (byte)((ThresholdVolume >> 8) & 0x00FF);
+
+			result[18] = (byte)(ThresholdTime & 0x00FF);
+			result[19] = (byte)((ThresholdTime >> 8) & 0x00FF);
+
+			result[20] = (byte)(FlowActivationThr & 0x00FF);
+			result[21] = (byte)((FlowActivationThr >> 8) & 0x00FF);
+
+			result[22] = (byte)(VolumeArrowThr & 0x00FF);
+			result[23] = (byte)((VolumeArrowThr >> 8) & 0x00FF);
+
+			result[24] = (byte)(CalibrationTime & 0x000000FF);
+			result[25] = (byte)((CalibrationTime >> 8) & 0x000000FF);
+			result[26] = (byte)((CalibrationTime >> 16) & 0x000000FF);
+			result[27] = (byte)((CalibrationTime >> 24) & 0x000000FF);
+
+			result[28] = (byte)(SerialNumber & 0x00000000000000FF);
+			result[29] = (byte)((SerialNumber >>  8) & 0x00000000000000FF);
+			result[30] = (byte)((SerialNumber >> 16) & 0x00000000000000FF);
+			result[31] = (byte)((SerialNumber >> 24) & 0x00000000000000FF);
+			result[32] = (byte)((SerialNumber >> 32) & 0x00000000000000FF);
+
+			result[33] = (byte)MeterSealed;
+			result[34] = CheckSum;
+
+			return result;
+		}
+
+        /// <summary>
+        /// Create a calibration structure from a complete byte array
+        /// </summary>
+        /// <param name="data">A complete byte array data</param>
+        /// <returns>CalibrationStruct or null when byte array was not complete</returns>
+        public static CalibrationStruct FromByteArray(byte[] data)
+		{
+			if (data.Length != Length) return null;
+
+			CalibrationStruct result = new CalibrationStruct();
+
+			result.Version = data[0];
+			result.MeterType = (MeterType)data[1];
+			result.Calibration = (UInt16)(data[2] + 256 * data[3]);
+			result.VolumeUnits = (VolumeUnits)data[4];
+			result.FlowArrow = (FlowArrow)data[5];
+			result.FWVersion = (UInt16)(data[6] + 256 * data[7]);
+			result.TargetField[0] = (UInt16)(data[8] + 256 * data[9]);
+			result.TargetField[1] = (UInt16)(data[10] + 256 * data[11]);
+			result.TargetField[2] = (UInt16)(data[12] + 256 * data[13]);
+			result.RecipMeanCurrent = (UInt16)(data[14] + 256 * data[15]);
+			result.ThresholdVolume = (UInt16)(data[16] + 256 * data[17]);
+			result.ThresholdTime = (UInt16)(data[18] + 256 * data[19]);
+			result.FlowActivationThr = (UInt16)(data[20] + 256 * data[21]);
+			result.VolumeArrowThr = (UInt16)(data[22] + 256 * data[23]);
+			result.CalibrationTime = (((UInt32)data[27] * 256 + data[26]) * 256 + data[25]) * 256 + data[24];
+			result.SerialNumber = ((((UInt64)data[32] * 256 + data[31]) * 256 + data[30]) * 256 + data[29]) * 256 + data[28];
+			result.MeterSealed = (MeterSealed)data[33];
+			result.CheckSum = data[34];
+
+			return result;
+		}
+
+        /// <summary>
+        /// Update the calibration structure from an incomplete byte array
+        /// </summary>
+        /// <param name="data">Byte array data</param>
+        /// <param name="offset">Offset of byte array data in CalibrationStruct</param>
+        /// <returns>true when successful, false when data are not appropriate</returns>
+        public bool Update(byte[] data, int offset)
+        {
+            if ((data.Length == 2) && (offset == 2))
+            {
+                /// Data containing iPerl calibration factor
+                Calibration = (UInt16)(data[0] + 256 * data[1]);
+                return true;
+            }
+            else if ((data.Length == Length) && (offset == 0))
+            {
+                /// Data containing a complete CalibrationStruct
+                Version = data[0];
+                MeterType = (MeterType)data[1];
+                Calibration = (UInt16)(data[2] + 256 * data[3]);
+                VolumeUnits = (VolumeUnits)data[4];
+                FlowArrow = (FlowArrow)data[5];
+                FWVersion = (UInt16)(data[6] + 256 * data[7]);
+                TargetField[0] = (UInt16)(data[8] + 256 * data[9]);
+                TargetField[1] = (UInt16)(data[10] + 256 * data[11]);
+                TargetField[2] = (UInt16)(data[12] + 256 * data[13]);
+                RecipMeanCurrent = (UInt16)(data[14] + 256 * data[15]);
+                ThresholdVolume = (UInt16)(data[16] + 256 * data[17]);
+                ThresholdTime = (UInt16)(data[18] + 256 * data[19]);
+                FlowActivationThr = (UInt16)(data[20] + 256 * data[21]);
+                VolumeArrowThr = (UInt16)(data[22] + 256 * data[23]);
+                CalibrationTime = (((UInt32)data[27] * 256 + data[26]) * 256 + data[25]) * 256 + data[24];
+                SerialNumber = ((((UInt64)data[32] * 256 + data[31]) * 256 + data[30]) * 256 + data[29]) * 256 + data[28];
+                MeterSealed = (MeterSealed)data[33];
+                CheckSum = data[34];
+                return true;
+            }
+            else
+                return false;
+        }
+
+		public string FWVersionStr()
+		{
+			int d1 = (FWVersion >> 8) & 0x000F;
+			int d2 = (FWVersion >> 12) & 0x000F;
+			int d3 = (FWVersion >> 4) & 0x000F;
+			int d4 =  FWVersion & 0x000F;
+			return string.Format("{0}.{1}{2}{3}", d1, d2, d3, d4);
+		}
+
+		public override string ToString()
+		{
+			return string.Format("Calibration: V{0} Type={1} Cal={2} Units={3} FlowArrow.{4} FW={5} Hi={6} Norm={7} Low={8} RMC={9} ThrVol={10} ThrTime={11} FlActThr={12} VolArrThr={13} CalTm={14} SN={15} MeterSealed={16} Chksum={17}",
+									Version,
+									MeterType,
+									Calibration,
+									VolumeUnits,
+									FlowArrow,
+									FWVersion,
+									TargetField[0],
+									TargetField[1],
+									TargetField[2],
+									RecipMeanCurrent,
+									ThresholdVolume,
+									ThresholdTime,
+									FlowActivationThr,
+									VolumeArrowThr,
+									CalibrationTime,
+									SerialNumber,
+									MeterSealed,
+									CheckSum.ToString("X2"));
+		}
+
+        public virtual void WriteBinary(BinaryWriter writer)
+        {
+            writer.Write(Version);
+            writer.Write((byte)MeterType);
+            writer.Write(Calibration);
+            writer.Write((byte)VolumeUnits);
+            writer.Write((byte)FlowArrow);
+            writer.Write(FWVersion);
+            writer.Write(TargetField[0]);
+            writer.Write(TargetField[1]);
+            writer.Write(TargetField[2]);
+            writer.Write(RecipMeanCurrent);
+            writer.Write(ThresholdVolume);
+            writer.Write(ThresholdTime);
+            writer.Write(FlowActivationThr);
+            writer.Write(VolumeArrowThr);
+            writer.Write(CalibrationTime);
+            writer.Write(SerialNumber);
+            writer.Write((byte)MeterSealed);
+            writer.Write(CheckSum);
+        }
+
+        public virtual void ReadBinary(BinaryReader reader)
+        {
+            Version = reader.ReadByte();
+            MeterType = (MeterType)reader.ReadByte();
+            Calibration = reader.ReadUInt16();
+            VolumeUnits = (VolumeUnits)reader.ReadByte();
+            FlowArrow = (FlowArrow)reader.ReadByte();
+            FWVersion = reader.ReadUInt16();
+            TargetField[0] = reader.ReadUInt16();
+            TargetField[1] = reader.ReadUInt16();
+            TargetField[2] = reader.ReadUInt16();
+            RecipMeanCurrent = reader.ReadUInt16();
+            ThresholdVolume = reader.ReadUInt16();
+            ThresholdTime = reader.ReadUInt16();
+            FlowActivationThr = reader.ReadUInt16();
+            VolumeArrowThr = reader.ReadUInt16();
+            CalibrationTime = reader.ReadUInt32();
+            SerialNumber = reader.ReadUInt64();
+            MeterSealed = (MeterSealed)reader.ReadByte();
+            CheckSum = reader.ReadByte();
+        }
+    }
+}

TBF/Rig/RegisterReaders/iPerlReaderUNI/comminication/CalibrationStructV4.cs

@@ -0,0 +1,258 @@
+///
+/// Copyright (c) 2018-2020 Sensus Slovensko a.s.
+///
+using System;
+using System.IO;
+
+namespace TBF.Rig.RegisterReaders.iPerlReaderUNI.comminication
+{
+	public class CalibrationStructV4
+	{
+        public const int Length = 37;
+
+		public Byte Version;
+		public MeterType MeterType;
+		public UInt16 Calibration;
+		public VolumeUnits VolumeUnits;
+		public FlowArrow FlowArrow;
+		public UInt16 FWVersion;
+		public UInt16[] TargetField;
+		public UInt16 RecipMeanCurrent;
+		public UInt16 ThresholdVolume;
+		public UInt16 ThresholdTime;
+		public UInt16 FlowActivationThr;
+		public UInt16 VolumeArrowThr;
+		public UInt32 CalibrationTime;
+		public ulong SerialNumber;
+		public MeterSealed MeterSealed;
+        public UInt16 CalibrationLNA;
+        public byte CheckSum;
+
+
+		public CalibrationStructV4()
+		{
+			TargetField = new UInt16[3];
+		}
+
+		public byte[] ToByteArray()
+		{
+			byte[] result = new byte[Length];
+
+			result[0] = Version;
+			result[1] = (byte)MeterType;
+
+			result[2] = (byte)(Calibration & 0x00FF);
+			result[3] = (byte)((Calibration >> 8) & 0x00FF);
+
+			result[4] = (byte)VolumeUnits;
+
+			result[5] = (byte)FlowArrow;
+
+			result[6] = (byte)(FWVersion & 0x00FF);
+			result[7] = (byte)((FWVersion >> 8) & 0x00FF);
+
+			result[8] = (byte)( TargetField[0] & 0x00FF);
+			result[9] = (byte)((TargetField[0] >> 8) & 0x00FF);
+			result[10] = (byte)( TargetField[1] & 0x00FF);
+			result[11] = (byte)((TargetField[1] >> 8) & 0x00FF);
+			result[12] = (byte)( TargetField[2] & 0x00FF);
+			result[13] = (byte)((TargetField[2] >> 8) & 0x00FF);
+
+			result[14] = (byte)(RecipMeanCurrent & 0x00FF);
+			result[15] = (byte)((RecipMeanCurrent >> 8) & 0x00FF);
+
+			result[16] = (byte)(ThresholdVolume & 0x00FF);
+			result[17] = (byte)((ThresholdVolume >> 8) & 0x00FF);
+
+			result[18] = (byte)(ThresholdTime & 0x00FF);
+			result[19] = (byte)((ThresholdTime >> 8) & 0x00FF);
+
+			result[20] = (byte)(FlowActivationThr & 0x00FF);
+			result[21] = (byte)((FlowActivationThr >> 8) & 0x00FF);
+
+			result[22] = (byte)(VolumeArrowThr & 0x00FF);
+			result[23] = (byte)((VolumeArrowThr >> 8) & 0x00FF);
+
+			result[24] = (byte)(CalibrationTime & 0x000000FF);
+			result[25] = (byte)((CalibrationTime >> 8) & 0x000000FF);
+			result[26] = (byte)((CalibrationTime >> 16) & 0x000000FF);
+			result[27] = (byte)((CalibrationTime >> 24) & 0x000000FF);
+
+			result[28] = (byte)(SerialNumber & 0x00000000000000FF);
+			result[29] = (byte)((SerialNumber >>  8) & 0x00000000000000FF);
+			result[30] = (byte)((SerialNumber >> 16) & 0x00000000000000FF);
+			result[31] = (byte)((SerialNumber >> 24) & 0x00000000000000FF);
+			result[32] = (byte)((SerialNumber >> 32) & 0x00000000000000FF);
+
+			result[33] = (byte)MeterSealed;
+
+            result[34] = (byte)(CalibrationLNA & 0x00FF);
+            result[35] = (byte)((CalibrationLNA >> 8) & 0x00FF);
+
+			result[36] = CheckSum;
+
+			return result;
+		}
+
+        /// <summary>
+        /// Create a calibration structure from a complete byte array
+        /// </summary>
+        /// <param name="data">A complete byte array data</param>
+        /// <returns>CalibrationStructV4 or null when byte array was not complete</returns>
+        public static CalibrationStructV4 FromByteArray(byte[] data)
+		{
+			if (data.Length != Length) return null;
+
+			CalibrationStructV4 result = new CalibrationStructV4();
+
+			result.Version = data[0];
+			result.MeterType = (MeterType)data[1];
+			result.Calibration = (UInt16)(data[2] + 256 * data[3]);
+			result.VolumeUnits = (VolumeUnits)data[4];
+			result.FlowArrow = (FlowArrow)data[5];
+			result.FWVersion = (UInt16)(data[6] + 256 * data[7]);
+			result.TargetField[0] = (UInt16)(data[8] + 256 * data[9]);
+			result.TargetField[1] = (UInt16)(data[10] + 256 * data[11]);
+			result.TargetField[2] = (UInt16)(data[12] + 256 * data[13]);
+			result.RecipMeanCurrent = (UInt16)(data[14] + 256 * data[15]);
+			result.ThresholdVolume = (UInt16)(data[16] + 256 * data[17]);
+			result.ThresholdTime = (UInt16)(data[18] + 256 * data[19]);
+			result.FlowActivationThr = (UInt16)(data[20] + 256 * data[21]);
+			result.VolumeArrowThr = (UInt16)(data[22] + 256 * data[23]);
+			result.CalibrationTime = (((UInt32)data[27] * 256 + data[26]) * 256 + data[25]) * 256 + data[24];
+			result.SerialNumber = ((((UInt64)data[32] * 256 + data[31]) * 256 + data[30]) * 256 + data[29]) * 256 + data[28];
+			result.MeterSealed = (MeterSealed)data[33];
+            result.CalibrationLNA = (UInt16)(data[34] + 256 * data[35]);
+            result.CheckSum = data[36];
+
+			return result;
+		}
+
+        /// <summary>
+        /// Update the calibration structure from an incomplete byte array
+        /// </summary>
+        /// <param name="data">Byte array data</param>
+        /// <param name="offset">Offset of byte array data in CalibrationStructV2</param>
+        /// <returns>true when successful, false when data are not appropriate</returns>
+        public bool Update(byte[] data, int offset)
+        {
+            if ((data.Length == 2) && (offset == 2))
+            {
+                /// Data containing iPerl calibration factor
+                Calibration = (UInt16)(data[0] + 256 * data[1]);
+                return true;
+            }
+            else if ((data.Length == 2) && (offset == 34))
+            {
+                /// Data containing iPerl calibration factor
+                CalibrationLNA = (UInt16)(data[0] + 256 * data[1]);
+                return true;
+            }
+            else if ((data.Length == Length) && (offset == 0))
+            {
+                /// Data containing a complete CalibrationStruct
+                Version = data[0];
+                MeterType = (MeterType)data[1];
+                Calibration = (UInt16)(data[2] + 256 * data[3]);
+                VolumeUnits = (VolumeUnits)data[4];
+                FlowArrow = (FlowArrow)data[5];
+                FWVersion = (UInt16)(data[6] + 256 * data[7]);
+                TargetField[0] = (UInt16)(data[8] + 256 * data[9]);
+                TargetField[1] = (UInt16)(data[10] + 256 * data[11]);
+                TargetField[2] = (UInt16)(data[12] + 256 * data[13]);
+                RecipMeanCurrent = (UInt16)(data[14] + 256 * data[15]);
+                ThresholdVolume = (UInt16)(data[16] + 256 * data[17]);
+                ThresholdTime = (UInt16)(data[18] + 256 * data[19]);
+                FlowActivationThr = (UInt16)(data[20] + 256 * data[21]);
+                VolumeArrowThr = (UInt16)(data[22] + 256 * data[23]);
+                CalibrationTime = (((UInt32)data[27] * 256 + data[26]) * 256 + data[25]) * 256 + data[24];
+                SerialNumber = ((((UInt64)data[32] * 256 + data[31]) * 256 + data[30]) * 256 + data[29]) * 256 + data[28];
+                MeterSealed = (MeterSealed)data[33];
+                CalibrationLNA = (UInt16)(data[34] + 256 * data[35]);
+                CheckSum = data[36];
+                return true;
+            }
+            else
+                return false;
+        }
+
+		public string FWVersionStr()
+		{
+			int d1 = (FWVersion >> 8) & 0x000F;
+			int d2 = (FWVersion >> 12) & 0x000F;
+			int d3 = (FWVersion >> 4) & 0x000F;
+			int d4 =  FWVersion & 0x000F;
+			return string.Format("{0}.{1}{2}{3}", d1, d2, d3, d4);
+		}
+
+		public override string ToString()
+		{
+			return string.Format("Calibration: V{0} Type={1} Cal={2} Units={3} FlowArrow.{4} FW={5} Hi={6} Norm={7} Low={8} RMC={9} ThrVol={10} ThrTime={11} FlActThr={12} VolArrThr={13} CalTm={14} SN={15} MeterSealed={16} CalLNA={17} Chksum={18}",
+								 Version,
+								 MeterType,
+								 Calibration,
+								 VolumeUnits,
+								 FlowArrow,
+								 FWVersion,
+								 TargetField[0],
+								 TargetField[1],
+								 TargetField[2],
+								 RecipMeanCurrent,
+								 ThresholdVolume,
+								 ThresholdTime,
+								 FlowActivationThr,
+								 VolumeArrowThr,
+								 CalibrationTime,
+								 SerialNumber,
+								 MeterSealed,
+                                 CalibrationLNA,
+                                 CheckSum.ToString("X2"));
+		}
+
+        public virtual void WriteBinary(BinaryWriter writer)
+        {
+            writer.Write(Version);
+            writer.Write((byte)MeterType);
+            writer.Write(Calibration);
+            writer.Write((byte)VolumeUnits);
+            writer.Write((byte)FlowArrow);
+            writer.Write(FWVersion);
+            writer.Write(TargetField[0]);
+            writer.Write(TargetField[1]);
+            writer.Write(TargetField[2]);
+            writer.Write(RecipMeanCurrent);
+            writer.Write(ThresholdVolume);
+            writer.Write(ThresholdTime);
+            writer.Write(FlowActivationThr);
+            writer.Write(VolumeArrowThr);
+            writer.Write(CalibrationTime);
+            writer.Write(SerialNumber);
+            writer.Write((byte)MeterSealed);
+            writer.Write(CalibrationLNA);
+            writer.Write(CheckSum);
+        }
+
+        public virtual void ReadBinary(BinaryReader reader)
+        {
+            Version = reader.ReadByte();
+            MeterType = (MeterType)reader.ReadByte();
+            Calibration = reader.ReadUInt16();
+            VolumeUnits = (VolumeUnits)reader.ReadByte();
+            FlowArrow = (FlowArrow)reader.ReadByte();
+            FWVersion = reader.ReadUInt16();
+            TargetField[0] = reader.ReadUInt16();
+            TargetField[1] = reader.ReadUInt16();
+            TargetField[2] = reader.ReadUInt16();
+            RecipMeanCurrent = reader.ReadUInt16();
+            ThresholdVolume = reader.ReadUInt16();
+            ThresholdTime = reader.ReadUInt16();
+            FlowActivationThr = reader.ReadUInt16();
+            VolumeArrowThr = reader.ReadUInt16();
+            CalibrationTime = reader.ReadUInt32();
+            SerialNumber = reader.ReadUInt64();
+            MeterSealed = (MeterSealed)reader.ReadByte();
+            CalibrationLNA = reader.ReadUInt16();
+            CheckSum = reader.ReadByte();
+        }
+    }
+}

TBF/Rig/RegisterReaders/iPerlReaderUNI/comminication/ConfigStruct.cs

@@ -0,0 +1,266 @@
+///
+/// Copyright (c) 2015-2020 Sensus Metering Systems
+///
+using System;
+using System.IO;
+
+namespace TBF.Rig.RegisterReaders.iPerlReaderUNI.comminication
+{
+	public class ConfigStruct
+	{
+		public const int Length = 32;
+
+		public Byte Version;                    ///  0: 1 byte
+		public MeterState MeterState;           ///  1: 1 byte
+		public UInt32 TargetTimeVeryLowBatt;	///  2: 4 bytes  in seconds
+		public UInt32 TargetTimeLowBatt;		///  6: 4 bytes, in seconds
+		public UInt32 TestModeTime;				/// 10: 4 bytes, Max. test mode time in seconds
+		public UInt16 EmptyPipeThreshold;       /// 14: 2 bytes
+		public byte[] PCBNumber;				/// 16: 5 bytes
+		public byte TestModeConfig;             /// 21: 1 byte
+		public UInt32 RadioAddress;             /// 22: 4 bytes
+		public UInt16 TempCalibration;          /// 26: 2 bytes
+		public UInt16 AlarmMask;				/// 28: 2 bytes, Default 0xA3F7
+		public UInt16 ConfigCheckSum;           /// 30: 2 bytes
+
+		public ConfigStruct()
+		{
+			PCBNumber = new byte[5];
+		}
+
+		public byte[] ToByteArray()
+		{
+			byte[] result = new byte[Length];
+			
+			result[0] = Version;
+			result[1] = (byte)MeterState;
+
+			result[2] = (byte)(TargetTimeVeryLowBatt & 0x000000FF);
+			result[3] = (byte)((TargetTimeVeryLowBatt >> 8) & 0x000000FF);
+			result[4] = (byte)((TargetTimeVeryLowBatt >> 16) & 0x000000FF);
+			result[5] = (byte)((TargetTimeVeryLowBatt >> 24) & 0x000000FF);
+
+			result[6] = (byte)(TargetTimeLowBatt & 0x000000FF);
+			result[7] = (byte)((TargetTimeLowBatt >> 8) & 0x000000FF);
+			result[8] = (byte)((TargetTimeLowBatt >> 16) & 0x000000FF);
+			result[9] = (byte)((TargetTimeLowBatt >> 24) & 0x000000FF);
+
+			result[10] = (byte)(TestModeTime & 0x000000FF);
+			result[11] = (byte)((TestModeTime >> 8) & 0x000000FF);
+			result[12] = (byte)((TestModeTime >> 16) & 0x000000FF);
+			result[13] = (byte)((TestModeTime >> 24) & 0x000000FF);
+
+			result[14] = (byte)(EmptyPipeThreshold & 0x00FF);
+			result[15] = (byte)((EmptyPipeThreshold >> 8) & 0x00FF);
+
+			result[16] = PCBNumber[0];
+			result[17] = PCBNumber[1];
+			result[18] = PCBNumber[2];
+			result[19] = PCBNumber[3];
+			result[20] = PCBNumber[4];
+
+			result[21] = TestModeConfig;
+
+			result[22] = (byte)(RadioAddress & 0x000000FF);
+			result[23] = (byte)((RadioAddress >> 8) & 0x000000FF);
+			result[24] = (byte)((RadioAddress >> 16) & 0x000000FF);
+			result[25] = (byte)((RadioAddress >> 24) & 0x000000FF);
+
+			result[26] = (byte)(TempCalibration & 0x00FF);
+			result[27] = (byte)((TempCalibration >> 8) & 0x00FF);
+
+			result[28] = (byte)(AlarmMask & 0x00FF);
+			result[29] = (byte)((AlarmMask >> 8) & 0x00FF);
+
+			result[30] = (byte)(ConfigCheckSum & 0x00FF);
+			result[31] = (byte)((ConfigCheckSum >> 8) & 0x00FF);
+
+			return result;
+		}
+
+        /// <summary>
+        /// Create a configuration structure from a complete byte array
+        /// </summary>
+        /// <param name="data">A complete byte array data</param>
+        /// <returns>ConfigStruct or null when byte array was not complete</returns>
+		public static ConfigStruct FromByteArray(byte[] data)
+		{
+			if (data.Length != Length) return null;
+
+			ConfigStruct result = new ConfigStruct();
+
+			result.Version = data[0];
+			result.MeterState = (MeterState)data[1];
+			result.TargetTimeVeryLowBatt = (((UInt32)data[5] * 256 + data[4]) * 256 + data[3]) * 256 + data[2];
+			result.TargetTimeLowBatt = (((UInt32)data[9] * 256 + data[8]) * 256 + data[7]) * 256 + data[6];
+			result.TestModeTime = (((UInt32)data[13] * 256 + data[12]) * 256 + data[11]) * 256 + data[10];
+			result.EmptyPipeThreshold = (UInt16)(data[15] * 256 + data[14]);
+			result.PCBNumber[0] = data[16];
+			result.PCBNumber[1] = data[17];
+			result.PCBNumber[2] = data[18];
+			result.PCBNumber[3] = data[19];
+			result.PCBNumber[4] = data[20];
+			result.TestModeConfig = data[21];
+			result.RadioAddress = (((UInt32)data[25] * 256 + data[24]) * 256 + data[23]) * 256 + data[22];
+			result.TempCalibration = (UInt16)(data[27] * 256 + data[26]);
+			result.AlarmMask = (UInt16)(data[29] * 256 + data[28]);
+			result.ConfigCheckSum = (UInt16)(data[31] * 256 + data[30]);
+
+			return result;
+		}
+
+        /// <summary>
+        /// Update the configuration structure from an incomplete byte array
+        /// </summary>
+        /// <param name="offset">Offset of byte array data in ConfigStruct</param>
+        /// <param name="data">Byte array data</param>
+        /// <returns>true when successful, false when data are not appropriate</returns>
+        public bool Update(int offset, byte[] data)
+        {
+            if (offset == 0 && data.Length == 2)
+            {
+                /// iPerl mode of function
+                Version = data[0];
+                MeterState = (MeterState)data[1];
+                return true;
+            }
+            else if (offset == 0 && data.Length == 4)
+            {
+                /// iPerl mode of function and extra 2 bytes
+                Version = data[0];
+                MeterState = (MeterState)data[1];
+                return true;
+            }
+            else if (offset == 21 && data.Length == 1)
+            {
+                /// TestModeConfig value
+                TestModeConfig = data[21 - offset];
+                return true;
+            }
+            else if (offset == 0 && data.Length == Length)
+            {
+                /// Complete ConfigStruct
+                Version = data[0];
+                MeterState = (MeterState)data[1];
+                TargetTimeVeryLowBatt = (((UInt32)data[5] * 256 + data[4]) * 256 + data[3]) * 256 + data[2];
+                TargetTimeLowBatt = (((UInt32)data[9] * 256 + data[8]) * 256 + data[7]) * 256 + data[6];
+                TestModeTime = (((UInt32)data[13] * 256 + data[12]) * 256 + data[11]) * 256 + data[10];
+                EmptyPipeThreshold = (UInt16)(data[15] * 256 + data[14]);
+                PCBNumber[0] = data[16];
+                PCBNumber[1] = data[17];
+                PCBNumber[2] = data[18];
+                PCBNumber[3] = data[19];
+                PCBNumber[4] = data[20];
+                TestModeConfig = data[21];
+                RadioAddress = (((UInt32)data[25] * 256 + data[24]) * 256 + data[23]) * 256 + data[22];
+                TempCalibration = (UInt16)(data[27] * 256 + data[26]);
+                AlarmMask = (UInt16)(data[29] * 256 + data[28]);
+                ConfigCheckSum = (UInt16)(data[31] * 256 + data[30]);
+                return true;
+            }
+            else
+                return false;
+        }
+
+        /// <summary>
+        /// Returns PCB number string (12 characters, 12 decimal digits)
+        /// </summary>
+        /// <returns>PCB number STRING</returns>
+        public string GetPcbNrString()
+        {
+            return PCBNumber2String(this.PCBNumber);
+        }
+
+        /// <summary>
+        /// Converts PCBNumber to string (12 characters, 12 decimal digits)
+        /// </summary>
+        /// <param name="pcbNumber"></param>
+        /// <returns>PCB number string</returns>
+        public static string PCBNumber2String(byte[] pcbNumber)
+        {
+            if (pcbNumber.Length != 5) return string.Empty;
+
+            Int64 number = 0;
+            for (int i = 4; i >= 0; i--)
+            {
+                number = 256 * number + (Int64)pcbNumber[i]; 
+            }
+
+            return number.ToString();
+        }
+
+		public override string ToString()
+		{
+			return string.Format("Config: V{0} State={1} VLoBattT={2}s LoBattT={3}s TestModeT={4}s EPThld={5} PCB#={6} TMCfg={7} RadioAddr={8} TempCalib={9} AlarmMask={10} CfgCheckSum={11}",
+									Version,
+									MeterState,
+									TargetTimeVeryLowBatt,
+									TargetTimeLowBatt,
+									TestModeTime,
+									EmptyPipeThreshold,
+									GetPcbNrString(),
+									TestModeConfig.ToString("X2"),
+									RadioAddress,
+									TempCalibration,
+									AlarmMask.ToString("X4"),
+									ConfigCheckSum.ToString("X4"));
+		}
+
+        public string ToString(int sel)
+        {
+            return string.Format("{1} PCB#={6} TMCfg={7}",
+                                    Version,
+                                    MeterState,
+                                    TargetTimeVeryLowBatt,
+                                    TargetTimeLowBatt,
+                                    TestModeTime,
+                                    EmptyPipeThreshold,
+									GetPcbNrString(),
+									TestModeConfig.ToString("X2"),
+                                    RadioAddress,
+                                    TempCalibration,
+                                    AlarmMask.ToString("X4"),
+                                    ConfigCheckSum.ToString("X4"));
+        }
+
+        public virtual void WriteBinary(BinaryWriter writer)
+        {
+            writer.Write(Version);
+            writer.Write((byte)MeterState);
+            writer.Write(TargetTimeVeryLowBatt);
+            writer.Write(TargetTimeLowBatt);
+            writer.Write(TestModeTime);
+            writer.Write(EmptyPipeThreshold);
+            writer.Write(PCBNumber[0]);
+            writer.Write(PCBNumber[1]);
+            writer.Write(PCBNumber[2]);
+            writer.Write(PCBNumber[3]);
+            writer.Write(PCBNumber[4]);
+            writer.Write(TestModeConfig);
+            writer.Write(RadioAddress);
+            writer.Write(TempCalibration);
+            writer.Write(AlarmMask);
+            writer.Write(ConfigCheckSum);
+        }
+
+        public virtual void ReadBinary(BinaryReader reader)
+        {
+            Version = reader.ReadByte();
+            MeterState = (MeterState)reader.ReadByte();
+            TargetTimeVeryLowBatt = reader.ReadUInt32();
+            TargetTimeLowBatt = reader.ReadUInt32();
+            TestModeTime = reader.ReadUInt32();
+            EmptyPipeThreshold = reader.ReadUInt16();
+            PCBNumber[0] = reader.ReadByte();
+            PCBNumber[1] = reader.ReadByte();
+            PCBNumber[2] = reader.ReadByte();
+            PCBNumber[3] = reader.ReadByte();
+            PCBNumber[4] = reader.ReadByte();
+            TestModeConfig = reader.ReadByte();
+            RadioAddress = reader.ReadUInt32();
+            TempCalibration = reader.ReadUInt16();
+            AlarmMask = reader.ReadUInt16();
+            ConfigCheckSum = reader.ReadUInt16();
+        }
+    }
+}

TBF/Rig/RegisterReaders/iPerlReaderUNI/comminication/Enums.cs

@@ -0,0 +1,113 @@
+///
+/// Copyright (c) 2015-2021 Sensus Metering Systems
+///
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace TBF.Rig.RegisterReaders.iPerlReaderUNI.comminication
+{
+	public enum MessageID
+	{
+		Calibration = 0x00,				/// Access to stCalibration
+		Configuration = 0x01,			/// Access to stConfig
+		Status = 0x02,					/// Access to stStaus, read only
+		Power = 0x03,					/// Access to stPower, containing power info from both processors
+		LCD = 0x04,						/// Access to stLCD
+		EventData = 0x05,				/// NOT USED
+		IntervalData = 0x06,			/// NOT USED
+		Diagnostics = 0x07,				/// Access tostMetroDiagArray, read onl
+		MetrologyMemory = 0x08,			/// Memory block access, read only
+		Error_LongAck = 0x09,			/// Error message
+		Command = 0x0A,					/// Command to execute, with no arguments
+		Parameterizing = 0x0B,			/// Parameterizing message is used in MCI-SPI interface only
+		Error_ShortAck = 0x0C,			/// Short acknowledge message is used in MCI-SPI interface only
+		ChanelAlive = 0x0D,				/// Channel alive message is used in MCI-SPI interface only
+		RadioPassthrough = 0x0E,		/// RFID <-> Metrology <-> Radio passthrough message
+		ASICRegisterReadTest = 0x0F,	/// ASIC Register read test
+		IMIDebugMessagesAccess = 0x10,	/// IMI debug messages read test
+		ProductionChecksumsRead = 0x11, /// Production checksum read: Calibration (1 byte), Configuration (2 bytes), spare (4 bytes)
+		HardwareParametersTest = 0x12,	/// Hardware Parameters Testing: User configurable fixed field drive time (1 byte)
+		/// <summary>
+		/// Notes:
+		///  1.	Short Ack message contains 1-byte error code and all the fields (Offset, Payload length, payload and password) will not be present.
+		///  2.	Channel Alive message does not contain the fields (Offset, Payload length, payload and password).
+		///  3.	Except the above two special messages, rest all the messages in the above table will follow the message format mentioned in sections 3.1 and 3.2.
+		/// </summary>
+		Count							/// Number of MessageID-s
+	}
+
+	public enum MeterType : byte
+	{
+		DN15         = 0,
+		CoaxManifold = 1,
+		DN20         = 2,
+        DN25         = 3,               /// DN25 Q3 = 6.3 m3/h
+		DN25_Q3_10   = 4,               /// DN25 Q3 = 10 m3/h
+		DN32         = 5,
+		DN40         = 6,
+        AutoDetect,
+		Count							/// Number of meter types
+	}
+
+	public enum VolumeUnits : byte
+	{
+		m3        = 0,
+		UK_gallon = 1,
+		US_gallon = 2,
+		Count							/// Number of volume units
+	}
+
+	public enum FlowArrow : byte
+	{
+		No    = 0,
+		Right = 1,
+		Left  = 2,
+		Count							/// Number of flow arrows
+	}
+
+	public enum MeterSealed : byte
+	{
+		InProduction = 0x00,
+		OutOfProduction = 0xA5,
+		Sealed = 0x5A,
+	}
+
+	public enum MeterState : byte
+	{
+		None      = 0,
+		Idle      = 1,
+		Active    = 2,
+		Test      = 3,
+		EndOfLife = 4,
+		Count							/// Number of meter states
+	}
+
+    public enum Command : byte
+    {
+        SetActiveMode = 6,
+        SetTestMode = 7,
+    }
+
+	public enum FlowState : byte
+	{
+		No = 0,
+		Reverse = 1,
+		Forward = 2,
+		EmptyPipe = 3,
+		Count							/// Number of flow states
+	}
+
+	public enum DataStreamState
+	{
+        Flush = 0,
+        ProcessAndSave,
+	}
+
+	public enum CommunicationInterface
+	{
+		RFID,
+		NFC
+	}
+}

TBF/Rig/RegisterReaders/iPerlReaderUNI/comminication/OptoReceivedEventArgs.cs

@@ -0,0 +1,20 @@
+///
+/// Copyright (c) 2015-2017 Sensus Metering Systems
+///
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace TBF.Rig.RegisterReaders.iPerlReaderUNI.comminication
+{
+	public class OptoReceivedEventArgs : EventArgs
+	{
+		public string Data;
+
+		public OptoReceivedEventArgs(string data)
+		{
+			this.Data = data;
+		}
+	}
+}

TBF/Rig/RegisterReaders/iPerlReaderUNI/test/OpticalHeadTest.cs

@@ -0,0 +1,131 @@
+using Config.Resources;
+using log4net;
+using Sensus.iPerl.RfidCom.Helper;
+using Sensus.iPerl.RfidCom.Services;
+using Sensus.iPerl.RfidCom.Structures;
+using System;
+using System.Threading;
+using TBF.Rig.Hart.Common;
+using TBF.Rig.TestMethods.iPerlCommunication.iPerlHead;
+using static Sensus.iPerl.NfcHandler.MCI_Protocol;
+
+namespace TBF.Rig.RegisterReaders.iPerlReaderUNI.test
+{
+    internal class OpticalHeadTest
+    {
+        protected static readonly ILog rfidDataLogger = LogManager.GetLogger("RfidData");
+
+        internal static string OpenSealing(IperlHead iHead)
+        {
+            if (RfidCommands.OpenSealing($"COM{iHead.RfidComPortNr}")) return "OK";
+            return "Error Open Sealing";
+        }
+
+        internal static string ReadRequest_PCB(IperlHead iHead)
+        {
+            try
+            {
+                byte[] pcb = null;
+                int readRetVal = iPerlCommunicationForm.ReadRequestPort(iHead, MessageID.Configuration, Sensus.iPerl.NfcHandler.MCI_Protocol.StructName.Configuration, 16, 5, out pcb);
+                if (readRetVal == 0)
+                {
+                    return RfidHelper.HexLiteral2Unsigned(RfidHelper.SwapHexcode(BitConverter.ToString(pcb).Replace("-", string.Empty))).ToString();
+                }
+                rfidDataLogger.Error($"COM{iHead.RfidComPortNr}: ReadRequest_PCB ({MessageID.Configuration},16,5...) <- Error: {readRetVal}");
+                return "Error";
+            }
+            catch (Exception ex)
+            {
+                return (ex.Message.ToString());
+            }
+        }
+
+        internal static string SetActiveMode(IperlHead iHead)
+        {
+            byte[] cmd = new byte[1] { (byte)Command.SetActiveMode };
+            if (0 == iPerlCommunicationForm.WriteRequestPort(iHead, MessageID.Command, StructName.Command, 0, 1, cmd))
+            {
+                return "OK";
+            }
+            else
+            {
+                return "Error Set Active Mode";
+            }
+        }
+
+        internal static string SetTestMode(IperlHead iHead)
+        {
+            byte[] cmd = new byte[1] { (byte)Command.SetTestMode  };
+            if (0 == iPerlCommunicationForm.WriteRequestPort(iHead, MessageID.Command, StructName.Command, 0, 1, cmd))
+            {
+                return "OK";
+            }
+            else
+            {
+                return "Error Set Test Mode";
+            }
+        }
+
+#if IPERL
+        internal static string TurnOffRadio(IperlHead iHead)
+        {
+            try
+            {
+                int retValue = iPerlCommunicationForm.WriteRequestPort(iHead, MessageID.RadioPassthrough, StructName.RadioParams, 0x1898, 1, new byte[] { (byte)3 }); // WakeUpInterval
+                return 0 == retValue ? "OK" : "Error";
+            }
+            catch (Exception ex)
+            {
+                return (ex.Message.ToString());
+            }
+        }
+
+        internal static string SetProductionMode(IperlHead iHead)
+        {
+            try
+            {
+                int retValue = iPerlCommunicationForm.WriteRequestPort(iHead, MessageID.RadioPassthrough, StructName.RadioInfo, 0x1804, 1, new byte[] { (byte)1 }); // System Status
+                return 0 == retValue ? "OK" : "Error";
+            }
+            catch (Exception ex)
+            {
+                return (ex.Message.ToString());
+            }
+        }
+
+        internal static string WriteRequestPort_u8_Customer_Text(IperlHead iHead)
+        {
+            string custText = "FF0123456789ABCDEF"; // Sample text to test write function
+            /*try
+            {
+                byte[] cmd = RfidHelper.HexStringToByteArray(custText);
+                if (0 == iPerlCommunicationForm.WriteRequestPort(iHead, MessageID.RadioPassthrough, Sensus.iPerl.NfcHandler.MCI_Protocol.StructName.RadioParams, 0x1899, 9, cmd))
+                {
+                    RfidCommunicationService rfidCommunicationService = new RfidCommunicationService { ComPort = $"COM{iHead.RfidComPortNr}", WaitTimeAfterFailure = 2200, PassThroughWaitTime = 1500, MaxRetries = 3, TimeOut = 5000 };
+                    //rfidCommunicationService.RfidWrite(Params.u8_Customer_Text, custText);
+                    return rfidCommunicationService.RfidRead<string>(Params.u8_Customer_Text).ToString();
+                }
+            }
+            catch (Exception ex)
+            {
+                return (ex.Message.ToString());
+            }*/
+            return $"Error COM{iHead.RfidComPortNr}";
+        }
+
+        internal static string SetRfidMode(IperlHead iHead)
+        {
+            iHead.SetRfidInterface();
+            iHead.SetCommunicationInterface(CommunicationInterface.RFID);
+            return ($"OK - {Strings.Program_restart_is_required_to_apply_some_settings}");
+        }
+
+        internal static string SetNfcMode(IperlHead iHead)
+        {
+            iHead.SetNfcInterface();
+            iHead.SetCommunicationInterface(CommunicationInterface.NFC);
+            return ($"OK - {Strings.Program_restart_is_required_to_apply_some_settings}");
+        }
+#endif /// IPERL
+    }
+}

TBF/Rig/TbfComponents.cs

@@ -77,14 +77,11 @@ namespace TBF.Rig
                 new Modbus.WaterAnalyzer.Factory(),
                 new Network.Adapter.Factory(),
                 new Network.AdapterFTP.Factory(),
-                new Network.AdapterJMS.Factory(),
-                new Network.Camera.CJMS11.Factory(),
                 new Network.Camera.CLP1611.Factory(),
                 new Network.Camera.KeyenceIV3G120.Factory(),
                 new Network.Camera.Display.Factory(),
                 new Network.Camera.Roi.Factory(),
                 new Network.Camera.RoiForFixedStart.Factory(),
-                new Network.Camera.RoiForFixedStartCJMS11.Factory(),
                 new Network.Camera.RoiForFixedStartKeyence.Factory(),
                 new Network.Comet.Ambient.Factory(),
                 new Network.RestAPI.Factory(),

TBF/Rig/TestMethods/StandingStart/StandingStartSeq.cs

@@ -519,8 +519,6 @@ namespace TBF.Rig.TestMethods.StandingStart
 							(rr as Rig.Network.Camera.RoiForFixedStart.Roi).BeginWMState = dataEntryCmpnt.WMStartState(i);
 						if (rr is Rig.Network.Camera.RoiForFixedStartKeyence.Roi)
 							(rr as Rig.Network.Camera.RoiForFixedStartKeyence.Roi).BeginWMState = dataEntryCmpnt.WMStartState(i);
-						if (rr is Rig.Network.Camera.RoiForFixedStartCJMS11.Roi)
-							(rr as Rig.Network.Camera.RoiForFixedStartCJMS11.Roi).BeginWMState = dataEntryCmpnt.WMStartState(i);
                     }
 				}
 
@@ -768,15 +766,6 @@ namespace TBF.Rig.TestMethods.StandingStart
 
 						if (rr is Rig.Network.Camera.RoiForFixedStart.Roi)
 							(rr as Rig.Network.Camera.RoiForFixedStart.Roi).EndWMState = dataEntryCmpnt.WMEndState(i);
-						
-						if (rr is Rig.Network.Camera.RoiForFixedStartKeyence.Roi)
-						{
-							(rr as Rig.Network.Camera.RoiForFixedStartKeyence.Roi).EndWMState =
-								dataEntryCmpnt.WMEndState(i);
-							log.DebugFormat(" StandingStartMassCollectionSeq.cs - EndWMState [{0}] -> RoiForFixedStartKeyence.Roi",dataEntryCmpnt.WMEndState(i));
-						}
-						if(rr is Rig.Network.Camera.RoiForFixedStartCJMS11.Roi)
-							(rr as Rig.Network.Camera.RoiForFixedStartCJMS11.Roi).EndWMState = dataEntryCmpnt.WMEndState(i);
 					}
                 }
 

TBF/Rig/TestMethods/StandingStartMassCollection/StandingStartMassCollectionSeq.cs

@@ -607,8 +607,6 @@ namespace TBF.Rig.TestMethods.StandingStartMassCollection
                                 dataEntryCmpnt.WMStartState(i);
                             log.DebugFormat(" StandingStartMassCollectionSeq.cs - BeginWMState [{0}] -> RoiForFixedStartKeyence.Roi",dataEntryCmpnt.WMStartState(i));
                         }
-                        if (rr is Rig.Network.Camera.RoiForFixedStartCJMS11.Roi)
-                            (rr as Rig.Network.Camera.RoiForFixedStartCJMS11.Roi).BeginWMState = dataEntryCmpnt.WMStartState(i);
                     }
                 }
 
@@ -942,9 +940,6 @@ namespace TBF.Rig.TestMethods.StandingStartMassCollection
                                 dataEntryCmpnt.WMEndState(i);
                             log.DebugFormat(" StandingStartMassCollectionSeq.cs - EndWMState [{0}] -> RoiForFixedStartKeyence.Roi",dataEntryCmpnt.WMEndState(i));
                         }
-                        if(rr is Rig.Network.Camera.RoiForFixedStartCJMS11.Roi)
-                            (rr as Rig.Network.Camera.RoiForFixedStartCJMS11.Roi).EndWMState = dataEntryCmpnt.WMEndState(i);
-
                     }
                 }
 

TBF/TBF.csproj

@@ -28,7 +28,7 @@
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>2.12.497.%2a</ApplicationVersion>
+    <ApplicationVersion>2.12.497.1</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -39,7 +39,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;CAMERA;LANG_PL</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;CAMERA;IPERL;</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;CAMERA;LANG_PL</DefineConstants>
+    <DefineConstants>TRACE;CAMERA;IPERL;</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;CAMERA;LANG_PL</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;CAMERA;IPERL;</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;CAMERA;LANG_PL</DefineConstants>
+    <DefineConstants>TRACE;IPERL;CAMERA</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -113,7 +113,6 @@
     <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
     </Reference>
-    <Reference Include="mscorlib" />
     <Reference Include="MySql.Data">
       <HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
     </Reference>
@@ -142,14 +141,8 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.IO.Compression.FileSystem" />
-    <Reference Include="System.Drawing.Common, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Drawing.Common.9.0.5\lib\net462\System.Drawing.Common.dll</HintPath>
-    </Reference>
     <Reference Include="System.Management" />
     <Reference Include="System.Net.Http" />
-    <Reference Include="System.Net.Sockets, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll</HintPath>
-    </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
@@ -830,15 +823,6 @@
       <DependentUpon>NetadapterCfgCtrl.cs</DependentUpon>
     </Compile>
     <Compile Include="Rig\Network\AdapterInfo.cs" />
-    <Compile Include="Rig\Network\AdapterJMS\Factory.cs" />
-    <Compile Include="Rig\Network\AdapterJMS\Netadapter.cs" />
-    <Compile Include="Rig\Network\AdapterJMS\NetadapterCfg.cs" />
-    <Compile Include="Rig\Network\AdapterJMS\NetadapterCfgCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Rig\Network\AdapterJMS\NetadapterCfgCtrl.designer.cs">
-      <DependentUpon>NetadapterCfgCtrl.cs</DependentUpon>
-    </Compile>
     <Compile Include="Rig\Network\Adapter\Netadapter.cs" />
     <Compile Include="Rig\Network\Adapter\Factory.cs" />
     <Compile Include="Rig\Network\Adapter\NetadapterCfg.cs" />
@@ -848,33 +832,6 @@
     <Compile Include="Rig\Network\Adapter\NetadapterCfgCtrl.designer.cs">
       <DependentUpon>NetadapterCfgCtrl.cs</DependentUpon>
     </Compile>
-    <Compile Include="Rig\Network\Camera\CJMS11\Camera.cs" />
-    <Compile Include="Rig\Network\Camera\CJMS11\CameraCfg.cs" />
-    <Compile Include="Rig\Network\Camera\CJMS11\CameraCfgCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Rig\Network\Camera\CJMS11\CameraCfgCtrl.designer.cs">
-      <DependentUpon>CameraCfgCtrl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Rig\Network\Camera\CJMS11\Factory.cs" />
-    <Compile Include="Rig\Network\Camera\CJMS11\GrabImagesOp.cs" />
-    <Compile Include="Rig\Network\Camera\CJMS11\JmsMessage.cs" />
-    <Compile Include="Rig\Network\Camera\CJMS11\JmsPacket.cs" />
-    <Compile Include="Rig\Network\Camera\CJMS11\LiveStreamOp.cs" />
-    <Compile Include="Rig\Network\Camera\CJMS11\POJO\CommandM.cs" />
-    <Compile Include="Rig\Network\Camera\CJMS11\POJO\CommandMEnum.cs" />
-    <Compile Include="Rig\Network\Camera\CJMS11\POJO\ImageType.cs" />
-    <Compile Include="Rig\Network\Camera\CJMS11\POJO\ImageTypeEnum.cs" />
-    <Compile Include="Rig\Network\Camera\CJMS11\POJO\MessageStatus.cs" />
-    <Compile Include="Rig\Network\Camera\CJMS11\POJO\MessageStatusEnum.cs" />
-    <Compile Include="Rig\Network\Camera\CJMS11\POJO\ParsedImage.cs" />
-    <Compile Include="Rig\Network\Camera\CJMS11\RoisAndResults.cs" />
-    <Compile Include="Rig\Network\Camera\CJMS11\TerminalDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Rig\Network\Camera\CJMS11\TerminalDlg.Designer.cs">
-      <DependentUpon>TerminalDlg.cs</DependentUpon>
-    </Compile>
     <Compile Include="Rig\Network\Camera\CLP1611\Camera.cs" />
     <Compile Include="Rig\Network\Camera\CLP1611\CameraCfg.cs" />
     <Compile Include="Rig\Network\Camera\CLP1611\CameraCfgCtrl.cs">
@@ -896,7 +853,6 @@
     <Compile Include="Rig\Network\Camera\CLP1611\TerminalDlg.Designer.cs">
       <DependentUpon>TerminalDlg.cs</DependentUpon>
     </Compile>
-    <Compile Include="Rig\Network\Camera\common\ImageUtils.cs" />
     <Compile Include="Rig\Network\Camera\Display\DisplayForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -924,19 +880,6 @@
     <Compile Include="Rig\Network\Camera\KeyenceIV3G120\Factory.cs" />
     <Compile Include="Rig\Network\Camera\KeyenceIV3G120\GrabImagesOp.cs" />
     <Compile Include="Rig\Network\Camera\KeyenceIV3G120\RoisAndResults.cs" />
-    <Compile Include="Rig\Network\Camera\RoiForFixedStartCJMS11\common\Frame.cs" />
-    <Compile Include="Rig\Network\Camera\RoiForFixedStartCJMS11\common\MultipleImageOpacity.cs" />
-    <Compile Include="Rig\Network\Camera\RoiForFixedStartCJMS11\common\ResolutionFrames.cs" />
-    <Compile Include="Rig\Network\Camera\RoiForFixedStartCJMS11\Factory.cs" />
-    <Compile Include="Rig\Network\Camera\RoiForFixedStartCJMS11\ProcedureParams.cs" />
-    <Compile Include="Rig\Network\Camera\RoiForFixedStartCJMS11\Roi.cs" />
-    <Compile Include="Rig\Network\Camera\RoiForFixedStartCJMS11\RoiCfg.cs" />
-    <Compile Include="Rig\Network\Camera\RoiForFixedStartCJMS11\RoiCfgCtrl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Rig\Network\Camera\RoiForFixedStartCJMS11\RoiCfgCtrl.designer.cs">
-      <DependentUpon>RoiCfgCtrl.cs</DependentUpon>
-    </Compile>
     <Compile Include="Rig\Network\Camera\RoiForFixedStartKeyence\Factory.cs" />
     <Compile Include="Rig\Network\Camera\RoiForFixedStartKeyence\ProcedureParams.cs" />
     <Compile Include="Rig\Network\Camera\RoiForFixedStartKeyence\Roi.cs" />
@@ -1228,6 +1171,34 @@
     <Compile Include="Rig\RegisterReaders\DataStream\Reader\ProcParams.cs" />
     <Compile Include="Rig\RegisterReaders\DataStream\Reader\Reader.cs" />
     <Compile Include="Rig\RegisterReaders\DataStream\Reader\ReaderCfg.cs" />
+    <Compile Include="Rig\RegisterReaders\iPerlReaderUNI\comminication\CalibrationStruct.cs" />
+    <Compile Include="Rig\RegisterReaders\iPerlReaderUNI\comminication\CalibrationStructV4.cs" />
+    <Compile Include="Rig\RegisterReaders\iPerlReaderUNI\comminication\ConfigStruct.cs" />
+    <Compile Include="Rig\RegisterReaders\iPerlReaderUNI\comminication\Enums.cs" />
+    <Compile Include="Rig\RegisterReaders\iPerlReaderUNI\comminication\OptoReceivedEventArgs.cs" />
+    <Compile Include="Rig\RegisterReaders\iPerlReaderUNI\Factory.cs" />
+    <Compile Include="Rig\RegisterReaders\iPerlReaderUNI\IPerlCfgCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Rig\RegisterReaders\iPerlReaderUNI\IPerlCfgCtrl.designer.cs">
+      <DependentUpon>IPerlCfgCtrl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rig\RegisterReaders\iPerlReaderUNI\IperlHeadTestCtrl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Rig\RegisterReaders\iPerlReaderUNI\IperlHeadTestCtrl.Designer.cs">
+      <DependentUpon>IperlHeadTestCtrl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rig\RegisterReaders\iPerlReaderUNI\IPerlReader.cs" />
+    <Compile Include="Rig\RegisterReaders\iPerlReaderUNI\IPerlCfg.cs" />
+    <Compile Include="Rig\RegisterReaders\iPerlReaderUNI\ProcParams.cs" />
+    <Compile Include="Rig\RegisterReaders\iPerlReaderUNI\test\iPerlCommunicationForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Rig\RegisterReaders\iPerlReaderUNI\test\iPerlCommunicationForm.designer.cs">
+      <DependentUpon>iPerlCommunicationForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Rig\RegisterReaders\iPerlReaderUNI\test\OpticalHeadTest.cs" />
     <Compile Include="Rig\RegisterReaders\KPackE\DataEntryForRadio\CycleBeginningForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -3012,18 +2983,9 @@
     <EmbeddedResource Include="Rig\Network\AdapterFTP\NetadapterCfgCtrl.resx">
       <DependentUpon>NetadapterCfgCtrl.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Rig\Network\AdapterJMS\NetadapterCfgCtrl.resx">
-      <DependentUpon>NetadapterCfgCtrl.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Rig\Network\Adapter\NetadapterCfgCtrl.resx">
       <DependentUpon>NetadapterCfgCtrl.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Rig\Network\Camera\CJMS11\CameraCfgCtrl.resx">
-      <DependentUpon>CameraCfgCtrl.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Rig\Network\Camera\CJMS11\TerminalDlg.resx">
-      <DependentUpon>TerminalDlg.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Rig\Network\Camera\CLP1611\CameraCfgCtrl.resx">
       <DependentUpon>CameraCfgCtrl.cs</DependentUpon>
     </EmbeddedResource>
@@ -3039,9 +3001,6 @@
     <EmbeddedResource Include="Rig\Network\Camera\KeyenceIV3G120\CameraCfgCtrl.resx">
       <DependentUpon>CameraCfgCtrl.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Rig\Network\Camera\RoiForFixedStartCJMS11\RoiCfgCtrl.resx">
-      <DependentUpon>RoiCfgCtrl.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Rig\Network\Camera\RoiForFixedStartKeyence\RoiCfgCtrl.resx">
       <DependentUpon>RoiCfgCtrl.cs</DependentUpon>
     </EmbeddedResource>
@@ -3126,6 +3085,15 @@
     <EmbeddedResource Include="Rig\RegisterReaders\FrequencyMeterFromUniCB\RRCfgCtrl.resx">
       <DependentUpon>RRCfgCtrl.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Rig\RegisterReaders\iPerlReaderUNI\IPerlCfgCtrl.resx">
+      <DependentUpon>IPerlCfgCtrl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Rig\RegisterReaders\iPerlReaderUNI\IperlHeadTestCtrl.resx">
+      <DependentUpon>IperlHeadTestCtrl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Rig\RegisterReaders\iPerlReaderUNI\test\iPerlCommunicationForm.resx">
+      <DependentUpon>iPerlCommunicationForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Rig\RegisterReaders\KPackE\DataEntryForRadio\CycleBeginningForm.resx">
       <DependentUpon>CycleBeginningForm.cs</DependentUpon>
     </EmbeddedResource>
@@ -3826,7 +3794,6 @@
       <Name>Results</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

TBF/packages.config

@@ -8,8 +8,6 @@
   <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net472" />
   <package id="Oracle.ManagedDataAccess" version="19.11.0" targetFramework="net472" />
   <package id="System.Data.SQLite" version="1.0.90.0" targetFramework="net40" />
-  <package id="System.Drawing.Common" version="9.0.5" targetFramework="net472" />
-  <package id="System.Net.Sockets" version="4.3.0" targetFramework="net472" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net472" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
   <package id="log4net" version="2.0.15" targetFramework="net472" />

TBFTests/Rig/Network/Camera/CJMS11/CameraTest.cs

@@ -1,180 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Threading.Tasks;
-using JetBrains.Annotations;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using TBF.Rig.Generic;
-using TBF.Rig.Network.Camera.CJMS11;
-using Factory = TBF.Rig.Network.Camera.CJMS11.Factory;
-
-
-namespace TBFTests.Rig.Network.Camera.CJMS11
-{
-    [TestClass]
-    //[Ignore("Excluded from automatic test runs - manual execution only")]
-    [TestSubject(typeof(TBF.Rig.Network.Camera.CJMS11.Camera))]
-    public class CameraTest
-    {
-        private static string ipCamera1 = "192.168.0.170";
-        private static string ipCamera2 = "192.168.0.169";
-
-        public string IPCamera1 { get { return ipCamera1; } }
-        public string IPCamera2 { get { return ipCamera2; } }
-        
-        [TestMethod]
-        public void Initialize()
-        {
-            TBF.Rig.Network.Camera.CJMS11.Camera camera = GetCamera( IPCamera1);
-            camera.Initialize();
-      
-            TBF.Rig.Network.Camera.CJMS11.Camera camera2 = GetCamera( IPCamera2);
-            camera2.Initialize();
-            
-            TBF.Rig.Network.Camera.CJMS11.Camera camera11 = GetCamera( IPCamera1);
-            camera11.Initialize();
-      
-            TBF.Rig.Network.Camera.CJMS11.Camera camera12 = GetCamera( IPCamera2);
-            camera12.Initialize();
-      
-        }
-
-        
-
-        [TestMethod]
-        public void Initialize_TwoCamerasInParallel()
-        {
-           
-                var task1 = Task.Run(() =>
-                {
-                    var camera = GetCamera(IPCamera1);
-                    camera.Initialize();
-                });
-
-                var task2 = Task.Run(() =>
-                {
-                    var camera = GetCamera(IPCamera2);
-                    camera.Initialize();
-                });
-                
-                var task3 = Task.Run(() =>
-                {
-                    var camera = GetCamera(IPCamera2);
-                    camera.Initialize();
-                });
-                
-                var task4 = Task.Run(() =>
-                {
-                    var camera = GetCamera(IPCamera1);
-                    camera.Initialize();
-                });
-
-                Task.WaitAll(task1, task2, task3, task4); // blocks until both finish
-
-                // Optionally, add assertions or diagnostics
-                Assert.IsTrue(task1.IsCompleted);
-                Assert.IsTrue(task2.IsCompleted);
-                Assert.IsTrue(task3.IsCompleted);
-                Assert.IsTrue(task4.IsCompleted);
-      
-        }
-        
-        [TestMethod]
-        public async Task Initialize_TwoCamerasInParallelAsync()
-        {
-           
-            var task1 = Task.Run(() =>
-            {
-                var camera = GetCamera(IPCamera1);
-                camera.Initialize();
-            });
-
-            var task2 = Task.Run(() =>
-            {
-                var camera = GetCamera(IPCamera2);
-                camera.Initialize();
-            });
-
-            await Task.WhenAll(task1, task2); // blocks until both finish
-
-            // Optionally, add assertions or diagnostics
-            Assert.IsTrue(task1.IsCompleted);
-            Assert.IsTrue(task2.IsCompleted);
-      
-        }
-        
-        [TestMethod]
-        public async Task GrabImageTest()
-        {
-           
-            var task1 = Task.Run(() =>
-            {
-                var camera = GetCamera(IPCamera1);
-
-
-                Task<Image> saveImageTask = Task.Run(() => camera.SaveImageListener());
-                var timeoutAnswerTask = Task.Delay(TimeSpan.FromSeconds(3));
-                var completedAnswerTask = Task.WhenAny(saveImageTask, timeoutAnswerTask).Result;
-                if (completedAnswerTask == timeoutAnswerTask)
-                {
-                   Assert.Fail();
-                }
-
-                //Assert.IsTrue(saveImageTask.Result != null);
-            });
-
-            var task2 = Task.Run(() =>
-            {
-                var camera = GetCamera(IPCamera2);
-                camera.Initialize();
-            });
-            
-            var task3 = Task.Run(() =>
-            {
-                var camera = GetCamera(IPCamera2);
-                
-                Task<Image> saveImageTask = Task.Run(() => camera.SaveImageListener());
-                var timeoutAnswerTask = Task.Delay(TimeSpan.FromSeconds(3));
-                var completedAnswerTask = Task.WhenAny(saveImageTask, timeoutAnswerTask).Result;
-                if (completedAnswerTask == timeoutAnswerTask)
-                {
-                    Assert.Fail();
-                }
-
-                //TODO BUMI enable check image
-                //Assert.IsTrue(saveImageTask.Result != null);
-            });
-            
-            var task4 = Task.Run(() =>
-            {
-                var camera = GetCamera(IPCamera1);
-                camera.Initialize();
-            });
-
-            await Task.WhenAll(task1, task2,task3, task4); // blocks until both finish
-
-            // Optionally, add assertions or diagnostics
-            Assert.IsTrue(task1.IsCompleted);
-            Assert.IsTrue(task2.IsCompleted);
-            Assert.IsTrue(task3.IsCompleted);
-            Assert.IsTrue(task4.IsCompleted);
-      
-        }
-
-        private TBF.Rig.Network.Camera.CJMS11.Camera GetCamera(string ip)
-        {
-            Factory factory = new Factory();
-            CameraCfg config = new CameraCfg("CameraJMS", factory);
-            config.IPAddressCJMS = ip;
-            
-            TBF.Rig.Network.Adapter.Factory factoryNetadapter = new TBF.Rig.Network.Adapter.Factory();
-            IComponentCfg configNetadapter = new TBF.Rig.Network.Adapter.NetadapterCfg("Network.Adapter", factoryNetadapter);
-            
-            IList<IComponent> components = new List<IComponent>();
-            IComponent netAdapter = factoryNetadapter.GetComponent(configNetadapter, null);
-            components.Add(netAdapter);
-            
-            return new TBF.Rig.Network.Camera.CJMS11.Camera(config, components);
-        }
-    }
-}

TBFTests/Rig/RegisterReaders/PoseidonCmdStartStop/CliRunnerTest.cs

@@ -1,50 +0,0 @@
-using System;
-using JetBrains.Annotations;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using TBF.Rig.RegisterReaders.PoseidonCmdStartStop;
-
-namespace TBFTests.Rig.RegisterReaders.PoseidonCmdStartStop
-{
-    [TestClass]
-    [TestSubject(typeof(CliRunner))]
-    public class CliRunnerTest
-    {
-
-        [TestMethod]
-        public void ExtractJson_Test()
-        {
-            String allOutput = " {\n  \"DeviceId\": \"1000000267\"\n}\n";
-            CliRunner cliRunner = new CliRunner(false);
-            string json = cliRunner.ExtractJson(allOutput);
-            
-            Assert.IsTrue(!string.IsNullOrEmpty(json));
-        }
-        
-        [TestMethod]
-        public void ExtractJson_Test2()
-        {
-            String allOutput = "{\n  \"NfcTagDetected\": true,\n  \"ProductType\": 74,\n  \"ProductTypeVersion\": \"B1.0.13\",\n  \"DeviceId\": \"1000000267\",\n  \"Reading\": \"0003292.1\",\n  \"Reading_Totalizer\": \"000329218\",\n  \"Reading_Digits\": \"8\",\n  \"Reading_Shift\": \"-1\",\n  \"Reading_Resolution\": \"-2\",\n  \"Reading_Units\": \"2\",\n  \"Reading_FlowDirection\": \"3\",\n  \"Reading_FlowRate\": \"0\",\n  \"CalibrationFactor\": \"3197\",\n  \"ReadingComplete\": true,\n  \"MeterState\": \"0x02\",\n  \"OpticalDataMode\": \"0x00\",\n  \"SpreadSpectrumParameters\": \"Disabled: 0xTrue\",\n  \"BuildInformation\": \"\"\n}\n";
-            CliRunner cliRunner = new CliRunner(false);
-            string json = cliRunner.ExtractJson(allOutput);
-            
-            Assert.IsTrue(!string.IsNullOrEmpty(json));
-        }
-
-        [TestMethod]
-        public void TryJsonStringDeserialize_Test()
-        {
-            String allOutput = "{\n  \"NfcTagDetected\": true,\n  \"ProductType\": 74,\n  \"ProductTypeVersion\": \"B1.0.13\",\n  \"DeviceId\": \"1000000267\",\n  \"Reading\": \"0003292.1\",\n  \"Reading_Totalizer\": \"000329218\",\n  \"Reading_Digits\": \"8\",\n  \"Reading_Shift\": \"-1\",\n  \"Reading_Resolution\": \"-2\",\n  \"Reading_Units\": \"2\",\n  \"Reading_FlowDirection\": \"3\",\n  \"Reading_FlowRate\": \"0\",\n  \"CalibrationFactor\": \"3197\",\n  \"ReadingComplete\": true,\n  \"MeterState\": \"0x02\",\n  \"OpticalDataMode\": \"0x00\",\n  \"SpreadSpectrumParameters\": \"Disabled: 0xTrue\",\n  \"BuildInformation\": \"\"\n}\n";
-            CliRunner cliRunner = new CliRunner(false);
-            string json = cliRunner.ExtractJson(allOutput);
-
-            var ok = cliRunner.TryJsonStringDeserialize<JsonDataFromPoseidon>(json, out var dto);
-            Assert.IsTrue(ok, "Deserialization failed");
-            Assert.IsNotNull(dto);
-            Assert.AreEqual("1000000267", dto.DeviceId);
-            Assert.AreEqual("0003292.1", dto.Reading);
-            Assert.AreEqual("000329218", dto.Reading_Totalizer);
-            Assert.AreEqual(true, dto.NfcTagDetected);
-            Assert.AreEqual(74, dto.ProductType);
-        }
-    }
-}

TBFTests/Rig/RegisterReaders/PoseidonCmdStartStop/PoseidonReaderTest.cs

@@ -1,42 +0,0 @@
-using JetBrains.Annotations;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using TBF.Rig.RegisterReaders.PoseidonCmdStartStop;
-
-namespace TBFTests.Rig.RegisterReaders.PoseidonCmdStartStop
-{
-    [TestClass]
-    [TestSubject(typeof(PoseidonReader))]
-    public class PoseidonReaderTest
-    {
-
-        [TestMethod]
-        public void TryGetDeviceId_Test1()
-        {
-            string strIn = "{\n \"DeviceId\" : \"1000000267\"\n }";
-            PoseidonReader reader = new PoseidonReader();
-            bool tryGetDeviceId = reader.TryGetDeviceId(strIn, out string strOut);
-            Assert.IsTrue(tryGetDeviceId);
-            Assert.AreEqual("1000000267", strOut);
-        }
-        
-        [TestMethod]
-        public void TryGetDeviceId_Test2()
-        {
-            string strIn = " \"DeviceId\" : \"1000000267\"";
-            PoseidonReader reader = new PoseidonReader();
-            bool tryGetDeviceId = reader.TryGetDeviceId(strIn, out string strOut);
-            Assert.IsTrue(tryGetDeviceId);
-            Assert.AreEqual("1000000267", strOut);
-        }
-        
-        [TestMethod]
-        public void TryGetDeviceId_Test3()
-        {
-            string strIn = "{\n  \"NfcTagDetected\": true,\n  \"ProductType\": 74,\n  \"ProductTypeVersion\": \"B1.0.13\",\n  \"DeviceId\": \"1000000267\",\n  \"Reading\": \"0003292.1\",\n  \"Reading_Totalizer\": \"000329218\",\n  \"Reading_Digits\": \"8\",\n  \"Reading_Shift\": \"-1\",\n  \"Reading_Resolution\": \"-2\",\n  \"Reading_Units\": \"2\",\n  \"Reading_FlowDirection\": \"3\",\n  \"Reading_FlowRate\": \"0\",\n  \"CalibrationFactor\": \"3197\",\n  \"ReadingComplete\": true,\n  \"MeterState\": \"0x02\",\n  \"OpticalDataMode\": \"0x00\",\n  \"SpreadSpectrumParameters\": \"Disabled: 0xTrue\",\n  \"BuildInformation\": \"\"\n}";
-            PoseidonReader reader = new PoseidonReader();
-            bool tryGetDeviceId = reader.TryGetDeviceId(strIn, out string strOut);
-            Assert.IsTrue(tryGetDeviceId);
-            Assert.AreEqual("1000000267", strOut);
-        }
-    }
-}