Update .DotSettings.user file with adjusted ResxEditorPersonal settings

Merge branch 'refs/heads/master-3' into feature/camera_jms
# Conflicts: # TBF.sln.DotSettings.user # TBF/Properties/AssemblyInfo.cs # TBF/TBF.csproj # TBFTests/obj/Debug/TBFTests.csproj.CoreCompileInputs.cache # TBFTests/obj/Release/TBFTests.csproj.CoreCompileInputs.cache
2025-09-26 14:50:49 +02:00 · 2025-09-26 14:27:01 +02:00 · 2025-09-22 13:51:32 +02:00 · 2025-09-22 13:46:49 +02:00 · 2025-09-22 13:45:20 +02:00 · 2025-09-22 13:36:42 +02:00
558 changed files with 426948 additions and 377029 deletions
@@ -1,3 +1,5 @@
+AppDiagnostic/bin/
+AppDiagnostic/obj/
 Common/bin/
 Common/obj/
 Config/bin/
@@ -48,14 +50,18 @@ ResultsParser/bin/
 ResultsParser/obj/
 S640TestApp/bin/
 S640TestApp/obj/
-SharedDatabase/bin
-SharedDatabase/obj
-SchematicDrawing/bin
-SchematicDrawing/obj
+SharedComponents/bin/
+SharedComponents/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/
@@ -302,6 +302,7 @@ 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")) ||
@@ -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>
@@ -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;
            }
@@ -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;
            }
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.7.2", FrameworkDisplayName = ".NET Framework 4.7.2")]
@@ -1 +0,0 @@
-e4ab36b7b0030299e8d3f9c15f8edfab217c00c33b5d908f61099287ac9a64d6
@@ -1,17 +0,0 @@
-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
@@ -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>
@@ -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();
        }
    }
@@ -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;
        }
@@ -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>
@@ -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>
@@ -1,4 +1,35 @@
 <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>
@@ -9,12 +40,35 @@
    &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" IsActive="True" 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" 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>
@@ -22,20 +76,263 @@
 	
 	
 	<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_002FRig_002FDataEntry_002FStandartCameraPurchaseOrder_002FCycleBeginningForm/@EntryIndexedValue">False</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_002FCycleEndForm/@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_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_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_002FOutput_002FPrinters_002FGroupPrinting_002FSingle_002FPrinterCfgCtrl/@EntryIndexedValue">False</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_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_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/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/Initialized/@EntryValue">True</s:Boolean></wpf:ResourceDictionary>
@@ -76,7 +76,7 @@ namespace TBF.Boxes
 			}
 			else
 			{
-                return string.Format(Format, Val * Factor);
+                return string.Format(string.Format("{{0:{0}}}", Format), Val * Factor);
 			}
        }

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.9.2146.3")]
-[assembly: AssemblyFileVersion("3.9.2146.3")]
+[assembly: AssemblyVersion("3.9.2147.1")]
+[assembly: AssemblyFileVersion("3.9.2147.1")]
@@ -5153,6 +5153,15 @@ namespace TBF.Resources {
            }
        }
        
+        /// <summary>
+        ///   Looks up a localized string similar to Save Communication.
+        /// </summary>
+        internal static string SaveCommunication {
+            get {
+                return ResourceManager.GetString("SaveCommunication", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   Looks up a localized string similar to Saving all results.
        /// </summary>
@@ -5549,6 +5558,15 @@ namespace TBF.Resources {
            }
        }
        
+        /// <summary>
+        ///   Looks up a localized string similar to Show Dialog.
+        /// </summary>
+        internal static string ShowDialog {
+            get {
+                return ResourceManager.GetString("ShowDialog", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   Looks up a localized string similar to Shut down computer after exiting Test Bench Framework.
        /// </summary>
@@ -1755,4 +1755,7 @@
  <data name="Project_number" xml:space="preserve">
    <value>Projtové číslo</value>
  </data>
+  <data name="ShowDialog" xml:space="preserve">
+    <value>Zobraz Okno</value>
+  </data>
 </root>
@@ -2220,4 +2220,7 @@
  <data name="Project_number" xml:space="preserve">
    <value>Projektnummer</value>
  </data>
+  <data name="ShowDialog" xml:space="preserve">
+    <value>Dialog anzeigen</value>
+  </data>
 </root>
@@ -123,4 +123,7 @@
  <data name="Project_number" xml:space="preserve">
    <value>Número de proyecto</value>
  </data>
+  <data name="ShowDialog" xml:space="preserve">
+    <value>Mostrar diálogo</value>
+  </data>
 </root>
@@ -2019,4 +2019,7 @@
  <data name="Project_number" xml:space="preserve">
    <value>Numéro de projet</value>
  </data>
+  <data name="ShowDialog" xml:space="preserve">
+    <value>Afficher la boîte de dialogue</value>
+  </data>
 </root>
@@ -1788,4 +1788,7 @@
  <data name="Project_number" xml:space="preserve">
    <value>Numero del progetto</value>
  </data>
+  <data name="ShowDialog" xml:space="preserve">
+    <value>Mostra dialogo</value>
+  </data>
 </root>
@@ -2467,4 +2467,11 @@
  <data name="Voltage" xml:space="preserve">
    <value>Voltage</value>
  </data>
+  <data name="ShowDialog" xml:space="preserve">
+    <value>Show Dialog</value>
+  </data>
+  <data name="SaveCommunication" xml:space="preserve">
+    <value>Save Communication</value>
+  </data>
+ 
 </root>
@@ -840,4 +840,7 @@
  <data name="Project_number" xml:space="preserve">
    <value>Numărul proiectului</value>
  </data>
+  <data name="SaveCommunication" xml:space="preserve">
+    <value>Save Communication</value>
+  </data>
 </root>
@@ -244,4 +244,10 @@
  <data name="Project_number" xml:space="preserve">
    <value>Číslo projektu</value>
  </data>
+  <data name="ShowDialog" xml:space="preserve">
+    <value>Zobraz dialóg</value>
+  </data>
+  <data name="SaveCommunication" xml:space="preserve">
+    <value>Ulož komunikáciu</value>
+  </data>
 </root>
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 using log4net;
 using Dirichlet.Numerics;
 using TBF.Boxes;
@@ -273,6 +274,11 @@ namespace TBF.Rig.BuiltIn
 		/// <summary>Start this operation</summary>
 		public void Start()
        {
+	        if (cb.DebugLevel == DebugMode.Simulate)
+	        {
+		        return ;
+	        }
+	        
 			UInt128 changed = cb.SetValves(switchPoints[0].MasksOpen, switchPoints[0].MasksClose, StateMachine.LogicalFnValves);

            if (timeStamp != null && switchPoints[0].TimeSec == timeShift)
@@ -291,7 +297,12 @@ namespace TBF.Rig.BuiltIn
 		/// </returns>
 		public Event Run()
 		{
-            if (nextIx >= switchPoints.Count)
+			if (cb.DebugLevel == DebugMode.Simulate)
+			{
+				return Event.ValvesSet;
+			}
+
+			if (nextIx >= switchPoints.Count)
            {
                return (StateMachine.Time >= swStartTime + maxDelayTime + waitOnCBDelay) ? Event.ValvesSet : Event.ValvesBusy;
            }
@@ -320,6 +331,11 @@ namespace TBF.Rig.BuiltIn
        /// <summary>Start this operation</summary>
        public void Stop()
 		{
+			if (cb.DebugLevel == DebugMode.Simulate)
+			{
+				return;
+			}
+			
            if (switchTime != null && startStopValveBitNr >= 16 && startStopValveBitNr <= 23 && cb is ControlBoard.Uni.UniCB)
            {
                switchTime.Val = (cb as ControlBoard.Uni.UniCB).Data.ValveSwitchTime[startStopValveBitNr - 16];
@@ -292,7 +292,17 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
 			currentOp = CurrentOp.None;
 		}

-		public bool ShowForm { get; set; }
+		public bool ShowForm
+		{
+			get { return entryFormCfg == null ? false : entryFormCfg.ShowDialog; }
+			set {} // only for read - svia dilalog
+		}
+
+		public bool CliLogging
+		{
+			get { return entryFormCfg == null ? false : entryFormCfg.SaveCommunication;}
+		}
+
 		public bool ReadAndSetDataToMeters()
 		{
 			bool bOperationSuccess = false;
@@ -307,6 +317,8 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
 						if (iRegReader is PoseidonReader)
 						{
 							PoseidonReader poseidonReader = (iRegReader as PoseidonReader);
+							poseidonReader.SetCliLogging(CliLogging);
+							
 							if (poseidonReader.CurrentOp == PoseidonReader.CurrentPoseidonOp.SendStartDataStream_Done
 							    || poseidonReader.CurrentOp == PoseidonReader.CurrentPoseidonOp.SendStartDataStream_Runing)
 							{
@@ -346,8 +358,9 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
 						if (iRegReader is PoseidonReader)
 						{
 							PoseidonReader poseidonReader = (iRegReader as PoseidonReader);
-							if(poseidonReader != null)
+							if(poseidonReader == null)
 								continue;
+							poseidonReader.SetCliLogging(CliLogging);
 							if (!(poseidonReader.CurrentOp == PoseidonReader.CurrentPoseidonOp.ReadDatastream_Done
 							    || poseidonReader.CurrentOp == PoseidonReader.CurrentPoseidonOp.ReadDatastream_Running))
 							{
@@ -68,6 +68,8 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
 		///
        public Direction Direction;
        public Orders Orders;
+        public bool ShowDialog;
+        public bool SaveCommunication;

 		/// Private parameterless constructor invoked by all other (public) constructors
 		EntryFormCfg() { }
@@ -87,12 +89,16 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
        {
            Direction = Direction.Forward_RL;
            Orders = Orders.Arbitrary;
+            ShowDialog = false; 
+            SaveCommunication = false;
        }

        string[] paramNames = new string[]
 		{
            Strings.Direction,
            Strings.Orders,
+            Strings.ShowDialog,
+            Strings.SaveCommunication,
        };
        public string ParamName(int i) { return paramNames[i]; }
        public int ParamsCount() { return paramNames.Length; }
@@ -108,6 +114,14 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
                case 1:
                    for (Orders o = 0; o < Orders.Count; o++) list.Add(o.ToDescription());
                    return list;
+                case 2:
+                    list.Add("True");
+                    list.Add("False");
+                    return list;
+                case 3:
+                    list.Add("True");
+                    list.Add("False");
+                    return list;
                default:
                    return null;
            }
@@ -120,8 +134,10 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
            {
                case 0: return Direction.ToDescription();
                case 1: return Orders.ToDescription();
+                case 2: return ShowDialog.ToString();
+                case 3: return SaveCommunication.ToString();
                default:
-                    return string.Format("Name={0}, Direction={1}, Orders={2}", Name, Direction, Orders);
+                    return string.Format("Name={0}, Direction={1}, Orders={2}, ShowDialog={3}, StoreCommunication={4}", Name, Direction, Orders, ShowDialog, SaveCommunication);
            }
        }

@@ -146,6 +162,24 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
                            return CfgUpdateFlags.RestartRqrd;
                        }
                    break;
+                case 2:
+                    {
+                        bool lastSetting = ShowDialog;
+                        if (str == "True") ShowDialog = true;
+                        else ShowDialog = false;
+                        if (lastSetting != ShowDialog)
+                            return CfgUpdateFlags.RestartRqrd;  
+                    }
+                    break;
+                case 3:
+                    {
+                        bool lastSetting = SaveCommunication;
+                        if (str == "True") SaveCommunication = true;
+                        else SaveCommunication = false;  
+                        if (lastSetting != SaveCommunication)
+                            return CfgUpdateFlags.RestartRqrd;
+                    }
+                    break;
            }

            return CfgUpdateFlags.None;
@@ -161,6 +195,10 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
                case 1:
                    if (ParamValues(i).Contains(str)) return true;
                    break;
+                case 2:
+                case 3:
+                    if (str == "True" || str == "False") return true;
+                    break;
                default:
                    message = "Invalid index";
                    return false;
@@ -174,6 +212,8 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
        {
            prms.Direction = this.Direction;
            prms.Orders = this.Orders;
+            prms.ShowDialog = this.ShowDialog;
+            prms.SaveCommunication = this.SaveCommunication;       
        }

        public IParamsProvider Clone()
@@ -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.");
                }
            }
        }
@@ -302,11 +302,27 @@ 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>
@@ -0,0 +1,25 @@
+///
+/// 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);
+		}
+	}
+}
@@ -0,0 +1,115 @@
+///
+/// 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();
+            // }
+        }
+	}
+}
@@ -0,0 +1,39 @@
+///
+/// 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);
+		}
+	}
+}
@@ -0,0 +1,140 @@
+///
+/// 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;
+		}
+	}
+}
@@ -0,0 +1,109 @@
+///
+/// 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;
+	}
+}
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
@@ -0,0 +1,74 @@
+///
+/// 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);
+		}
+	}
+}
@@ -0,0 +1,276 @@
+///
+/// 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;
+        }
+    }
+}
@@ -0,0 +1,260 @@
+///
+/// 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;
+	}
+}
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
@@ -0,0 +1,25 @@
+///
+/// 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);
+		}
+	}
+}
@@ -0,0 +1,198 @@
+///
+/// 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();
+			}
+		}
+	}
+}
@@ -0,0 +1,72 @@
+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);
+        }
+    }
+}
@@ -0,0 +1,98 @@
+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());
+        }
+    }
+    
+}
@@ -0,0 +1,67 @@
+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);
+            }
+		}
+	}
+}
@@ -0,0 +1,24 @@
+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_
+    }
+}
@@ -0,0 +1,46 @@
+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;
+        }
+    }
+}
@@ -0,0 +1,10 @@
+namespace TBF.Rig.Network.Camera.CJMS11.POJO
+{
+    public enum ImageType
+    {
+        UNKNOWN,
+        BASE_64,
+        MJPEG,
+        RGB888
+    }
+}
@@ -0,0 +1,31 @@
+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;
+        }
+    }
+}
@@ -0,0 +1,10 @@
+namespace TBF.Rig.Network.Camera.CJMS11.POJO
+{
+    public enum MessageStatus
+    {
+        UNDEFINED,
+        ACK,
+        NACK,
+        ERROR
+    }
+}
@@ -0,0 +1,31 @@
+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;
+        }
+    }
+}
@@ -0,0 +1,38 @@
+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);
+            }
+        }
+    }
+}
@@ -0,0 +1,91 @@
+///
+/// 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;
+				}
+			}
+		}
+	}
+}
@@ -0,0 +1,62 @@
+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;
+	}
+}
@@ -0,0 +1,37 @@
+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;
+		}
+	}
+}
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
@@ -42,14 +42,10 @@ namespace TBF.Rig.Network.Camera.Roi
 			{
 				foreach (var cmpnt in parent.CmpntEntities)
 				{
-					if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is TBF.Rig.Network.Camera.CLP1611.Factory)
+					if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is TBF.Rig.Network.Camera.CJMS11.Factory)
 					{
 						parentNameComboBox.Items.Add(cmpnt.Name);
 					}
-					if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is TBF.Rig.Network.Camera.Roi.Factory)
-					{
-						previousRoiComboBox.Items.Add(cmpnt.Name);
-					}
 				}
 			}

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

 namespace TBF.Rig.Network.Telnet
 {
@@ -61,6 +63,50 @@ 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;
+		}
+	}



@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+using Config.Entities;
+using TBF.Rig.Generic;
+
+namespace TBF.Rig.RegisterReaders.FrequencyMeterFromUniCB
+{
+    public class Factory : IComponentFactory
+    {
+        public string ClassName { get { return GetType().Namespace.Substring(8); } }
+
+        public override string ToString() { return ClassName; }
+
+        public IComponent DummyComponent() { return new FrequencyRegisterReader(); }
+
+        public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new FrequencyRegisterReader(cfg, components); }
+
+        public IComponentCfg DefaultConfig() { return new RRCfg("Frequency", this); }
+
+        public IComponentCfg CmpntCfgFromCmpntEntity(Component component)
+        {
+            return ComponentCfgBase.CreateFromDbEntity(RRCfg.Serializer, component, this);
+        }
+    }
+}
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using Common;
+using log4net;
+using TBF.Rig.GenericDevices;
+
+namespace TBF.Rig.RegisterReaders.FrequencyMeterFromUniCB
+{
+    public class FrequencyRegisterReader : ComponentBase, GenericDevices.IRegReader
+    {
+        private static readonly ILog log = LogManager.GetLogger(typeof(FrequencyRegisterReader));
+
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
+        
+        readonly RRCfg rrCfg;
+        readonly TBF.Rig.ControlBoard.IControlBoard cb;
+
+        public int Position { get{ return rrCfg.Position; } }
+        public Common.RegisterReaderType RegisterReaderType { get { return Common.RegisterReaderType.Pulses; } }
+        public double PulsesPerLtr { get { return rrCfg.ProcParams.PulsesPerLtr; } }
+        public double LtrsPerPulse { get { return (PulsesPerLtr <= float.Epsilon) ? 1.0 : (1 / PulsesPerLtr); ; } }
+        public int Filter { get { return rrCfg.ProcParams.Filter; } }
+
+        public int WMPulses { get { return cb.PulsesWM(Position); } }
+        public int WMRefPulses { get { return cb.RefPulsesWM(Position); } }
+        public double WMVolume { get { return LtrsPerPulse * Convert.ToDouble(WMPulses); } }
+
+        public double BeginWMState { get { return 0; } }			/// Always 0
+        public double EndWMState { get { return WMVolume; } }		/// Derived from WMVolume
+        
+        
+        public FrequencyRegisterReader() { }
+
+        public FrequencyRegisterReader(Generic.IComponentCfg cfg, IList<Generic.IComponent> components)
+            : base(cfg)
+        {
+            rrCfg = cfg as RRCfg;
+
+            cb = TbfComponents.FindComponent(cfg.ParentName, components) as TBF.Rig.ControlBoard.IControlBoard;
+            if (cb == null) throw new Exception("Cannot find " + Name + " parent");
+
+            log.Warn(this.ToString());
+        }
+
+        public override void Initialize() { }
+    }
+}
@@ -0,0 +1,51 @@
+using System.Collections.Generic;
+using System.Xml.Serialization;
+using Common;
+using Config.Entities;
+using TBF.Rig.Generic;
+
+namespace TBF.Rig.RegisterReaders.FrequencyMeterFromUniCB
+{
+    public class RRCfg : ComponentCfgBase, Generic.IChildComponentCfg
+    {
+        
+        public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(RRCfg) })[0];
+        public override XmlSerializer GetSerializer() { return Serializer; }
+
+        IComponentCfgCtrl IComponentCfg.GetControl(IList<Component> cmpntEntities) { return new RRCfgCtrl(); }
+        
+        ///
+        /// Serialized parameters 
+        ///
+        public int Position;			/// 1..nrWaterMeters
+
+        /// <summary> Procedure parameters </summary>
+        [XmlIgnore]
+        public RRProcParams ProcParams;
+        public override IParamsProvider GetRuntimeProcParamsProvider() { return ProcParams; }
+        public override IParamsProvider CreateProcParamsProvider() { return new RRProcParams(true); }
+        
+        /// Private parameterless constructor invoked by all other (public) constructors
+        RRCfg()
+        {
+            ProcParams = new RRProcParams(true);
+        }
+        
+        public RRCfg(string name, IComponentFactory factory)
+            : this()
+        {
+            Name = name;
+            Factory = factory;
+            ParentName = "UniCB";
+            Position = 1;
+        }
+
+        string IComponentCfg.ToString(int i)
+        {
+            return string.Format("Name={0}, Parent={1}, Position={2}",
+                Name,
+                (string.IsNullOrEmpty(ParentName) ? "-" : ParentName),
+                Position);
+        }
+    }
+}
@@ -0,0 +1,106 @@
+///
+/// Copyright (c) 2021 Sensus Slovensko a.s.
+///
+using System;
+using System.Windows.Forms;
+using Common;
+using TBF.Rig.Generic;
+using TBF.UI.Bench.Components;
+
+namespace TBF.Rig.RegisterReaders.FrequencyMeterFromUniCB
+{
+	public partial class RRCfgCtrl : UserControl, IComponentCfgCtrl
+	{
+		ComponentParametersDlg parent;
+
+		bool IComponentCfgCtrl.ShowMore { get { return false; } }
+
+		RRCfg config;
+
+		IComponentCfg IComponentCfgCtrl.Config
+		{
+			get { return config as IComponentCfg; }
+			set
+			{
+				config = value as RRCfg;
+				Redraw();
+			}
+		}
+
+		public RRCfgCtrl()
+		{
+			InitializeComponent();
+		}
+
+		private void RegisterReaderCfgCtrl_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 ControlBoard.Uni.Factory)
+					{
+						parentNameComboBox.Items.Add(cmpnt.Name);
+					}
+				}
+			}
+
+			Redraw();
+		}
+
+		void IComponentCfgCtrl.Closing()
+		{
+		}
+
+		void Redraw()
+		{
+			if (config == null) return;			/// Control was not loaded, settings were not changed
+												
+			componentNameLabel.Text = config.Factory.ClassName;
+			nameTextBox.Text = config.Name;
+			parentNameComboBox.Text = string.IsNullOrEmpty(config.ParentName) ? "---" : config.ParentName;
+			positionTextBox.Text = config.Position.ToString();
+		}
+
+		void IComponentCfgCtrl.Unlock()
+		{
+			nameTextBox.Enabled = true;
+			parentNameComboBox.Enabled = true;
+			positionTextBox.Enabled = true;
+		}
+
+		CfgUpdateFlags IComponentCfgCtrl.VerifyCfg(ref string message)
+		{
+            CfgUpdateFlags flags = CfgUpdateFlags.None;
+
+			int dummy;
+			if (!parentNameComboBox.Items.Contains(parentNameComboBox.Text))
+			{
+				flags |= CfgUpdateFlags.Error;
+				message += Environment.NewLine + "Invalid 'Parent Name'";
+			}
+            if (!int.TryParse(positionTextBox.Text, out dummy) || (dummy < 1))
+			{
+				flags |= CfgUpdateFlags.Error;
+				message += Environment.NewLine + "'Position' should be >= 1";
+			}
+			return flags;
+		}
+
+		CfgUpdateFlags IComponentCfgCtrl.UpdateCfg()
+		{
+			CfgUpdateFlags flags = CfgUpdateFlags.RestartRqrd;
+
+			if (config == null) return CfgUpdateFlags.Error;	/// Control was not loaded, settings were not changed
+
+			config.Name = nameTextBox.Text;
+			config.ParentName = parentNameComboBox.Text.Equals("---") ? string.Empty : parentNameComboBox.Text;
+			config.Position = int.Parse(positionTextBox.Text);
+
+			return flags;
+		}
+	}
+}
@@ -0,0 +1,133 @@
+///
+/// Copyright (c) 2021 Sensus Slovensko a.s.
+///
+namespace TBF.Rig.RegisterReaders.FrequencyMeterFromUniCB
+{
+	partial class RRCfgCtrl
+	{
+		/// <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.positionTextBox = new System.Windows.Forms.TextBox();
+			this.positionLabel = 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.componentNameLabel = new System.Windows.Forms.Label();
+			this.parentNameComboBox = new System.Windows.Forms.ComboBox();
+			this.SuspendLayout();
+			// 
+			// positionTextBox
+			// 
+			this.positionTextBox.Enabled = false;
+			this.positionTextBox.Location = new System.Drawing.Point(136, 119);
+			this.positionTextBox.Name = "positionTextBox";
+			this.positionTextBox.Size = new System.Drawing.Size(46, 20);
+			this.positionTextBox.TabIndex = 6;
+			// 
+			// positionLabel
+			// 
+			this.positionLabel.AutoSize = true;
+			this.positionLabel.Location = new System.Drawing.Point(26, 122);
+			this.positionLabel.Name = "positionLabel";
+			this.positionLabel.Size = new System.Drawing.Size(44, 13);
+			this.positionLabel.TabIndex = 5;
+			this.positionLabel.Text = "Position";
+			// 
+			// parentNameLabel
+			// 
+			this.parentNameLabel.AutoSize = true;
+			this.parentNameLabel.Location = new System.Drawing.Point(26, 96);
+			this.parentNameLabel.Name = "parentNameLabel";
+			this.parentNameLabel.Size = new System.Drawing.Size(69, 13);
+			this.parentNameLabel.TabIndex = 3;
+			this.parentNameLabel.Text = "Parent Name";
+			// 
+			// nameTextBox
+			// 
+			this.nameTextBox.Enabled = false;
+			this.nameTextBox.Location = new System.Drawing.Point(136, 67);
+			this.nameTextBox.Name = "nameTextBox";
+			this.nameTextBox.Size = new System.Drawing.Size(130, 20);
+			this.nameTextBox.TabIndex = 2;
+			// 
+			// nameLabel
+			// 
+			this.nameLabel.AutoSize = true;
+			this.nameLabel.Location = new System.Drawing.Point(26, 70);
+			this.nameLabel.Name = "nameLabel";
+			this.nameLabel.Size = new System.Drawing.Size(35, 13);
+			this.nameLabel.TabIndex = 1;
+			this.nameLabel.Text = "Name";
+			// 
+			// componentNameLabel
+			// 
+			this.componentNameLabel.AutoSize = true;
+			this.componentNameLabel.Location = new System.Drawing.Point(133, 43);
+			this.componentNameLabel.Name = "componentNameLabel";
+			this.componentNameLabel.Size = new System.Drawing.Size(83, 13);
+			this.componentNameLabel.TabIndex = 0;
+			this.componentNameLabel.Text = "ComonentName";
+			// 
+			// parentNameComboBox
+			// 
+			this.parentNameComboBox.Enabled = false;
+			this.parentNameComboBox.FormattingEnabled = true;
+			this.parentNameComboBox.Location = new System.Drawing.Point(136, 93);
+			this.parentNameComboBox.Name = "parentNameComboBox";
+			this.parentNameComboBox.Size = new System.Drawing.Size(130, 21);
+			this.parentNameComboBox.TabIndex = 4;
+			// 
+			// RegisterReaderCfgCtrl
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.Controls.Add(this.parentNameComboBox);
+			this.Controls.Add(this.positionTextBox);
+			this.Controls.Add(this.positionLabel);
+			this.Controls.Add(this.parentNameLabel);
+			this.Controls.Add(this.nameTextBox);
+			this.Controls.Add(this.nameLabel);
+			this.Controls.Add(this.componentNameLabel);
+			this.Name = "RegisterReaderCfgCtrl";
+			this.Size = new System.Drawing.Size(300, 200);
+            this.Load += new System.EventHandler(this.RegisterReaderCfgCtrl_Load);
+            this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+
+		private System.Windows.Forms.TextBox positionTextBox;
+		private System.Windows.Forms.Label positionLabel;
+		private System.Windows.Forms.Label parentNameLabel;
+		private System.Windows.Forms.TextBox nameTextBox;
+		private System.Windows.Forms.Label nameLabel;
+		private System.Windows.Forms.Label componentNameLabel;
+		private System.Windows.Forms.ComboBox parentNameComboBox;
+	}
+}
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
@@ -0,0 +1,132 @@
+///
+/// Copyright (c) 2021 Sensus Slovensko a.s.
+///
+using System;
+using System.IO;
+using System.Text;
+using System.Xml.Serialization;
+using Common;
+using Config.Entities;
+using TBF.Rig.Generic;
+using TBF.Resources;
+
+namespace TBF.Rig.RegisterReaders.FrequencyMeterFromUniCB
+{
+	public class RRProcParams : ProcedureParamsBase, IParamsProvider, IProcedureParams
+	{
+		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(RRProcParams) })[0];
+		public override XmlSerializer GetSerializer() { return Serializer; }
+
+		public double PulsesPerLtr;				/// [l^-1]
+        public int Filter;
+
+		public override void InitializeAll()
+		{
+			PulsesPerLtr = 1.0;
+            Filter = 0;
+		}
+
+		string[] paramNames = new string[]
+		{
+			Strings.PulsesPerLtr,
+            Strings.Filter,
+		};
+		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();
+                case 1: return Filter.ToString();
+                default: return string.Empty;
+			}
+		}
+
+		/// Retrieves parameters from UI controls
+		CfgUpdateFlags IParamsProvider.UpdateParam(int i, string strValue)
+		{
+			switch (i)
+			{
+                case 0: PulsesPerLtr = Utils.ParseUDouble(strValue); return CfgUpdateFlags.None;
+                case 1: Filter = int.Parse(strValue); return CfgUpdateFlags.None;
+                default: return CfgUpdateFlags.None;
+			}
+		}
+
+		/// Verifies whether strings in UI controls represent valid parameters
+		bool IParamsProvider.ValidateParam(int i, string strValue, out string message)
+		{
+			message = string.Empty;
+
+			double dummy;
+            int idummy;
+			switch (i)
+			{
+				case 0:
+					if (Utils.TryParseUDouble(strValue, out dummy)) return true;
+					break;
+
+                case 1:
+                    if (int.TryParse(strValue, out idummy) && (idummy >= 0)) return true;
+                    break;
+                
+                default:
+					message = "Invalid index";
+					return false;
+			}
+
+			message = ParamName(i) + " is invalid";
+			return false;
+		}
+
+		void CopyContentTo(RRProcParams prms)
+		{
+			prms.PulsesPerLtr = this.PulsesPerLtr;
+            prms.Filter = this.Filter;
+		}
+
+		IParamsProvider IParamsProvider.Clone()
+		{
+			RRProcParams pars = new RRProcParams();
+			CopyContentTo(pars);
+			return pars;
+		}
+
+		public override void UpdateFromDbEntity(ComponentProcedure dbEntity)
+		{
+			if (dbEntity == null) return;
+			try
+			{
+				RRProcParams tmp = Serializer.Deserialize(new StringReader(dbEntity.Parameters)) as RRProcParams;
+
+				procedureParamsEntity = dbEntity;
+				componentName = dbEntity.CmpntName;
+				procedure = dbEntity.Procedure;
+
+				if (tmp != null) tmp.CopyContentTo(this);
+			}
+			catch
+			{
+			}
+		}
+		
+
+		public RRProcParams()
+		{
+		}
+
+		public RRProcParams(bool initialize)
+		{
+			if (initialize) InitializeAll();
+		}
+
+		public RRProcParams(ComponentProcedure procedureParamsEntity, string componentName, Procedure procedure)
+		{
+			this.procedureParamsEntity = procedureParamsEntity;
+			this.componentName = componentName;
+			this.procedure = procedure;
+		}
+	}
+}
@@ -1,15 +1,23 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
+using log4net;
+using log4net.Config;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using SharedDatabase;

 namespace TBF.Rig.RegisterReaders.PoseidonCmdStartStop
 {
    public class CliRunner
    {
+        //static readonly ILog log = LogManager.GetLogger(typeof(CliRunner));
+        private readonly ILog log;
        private List<Task> taskPool = new List<Task>();
        private long startTime;
        
@@ -39,9 +47,22 @@ namespace TBF.Rig.RegisterReaders.PoseidonCmdStartStop
            return (DateTime.Now.Ticks - startTime) > timeout;       
        }
        
-        public CliRunner()
+        public CliRunner(bool isCliLogging)
        {
            startTime = DateTime.Now.Ticks;
+
+            if (isCliLogging)
+            {
+                log = new ScopedLoggerFactory().CreateLogger<CliRunner>(
+                    @"C:\TBF\Logs\CliRunner.txt",
+                    10, // maxFileSizeMB
+                    7,  // maxBackups
+                    log4net.Core.Level.Debug,
+                    true,                   // zipRolledFiles
+                    true,                   // singleZipPerDay
+                    TimeSpan.FromMinutes(2) // zipScanInterval
+                );
+            }
        }

        /// <summary>
@@ -91,18 +112,18 @@ namespace TBF.Rig.RegisterReaders.PoseidonCmdStartStop

            // Now all outputs are available
            string allOutput = sb.ToString();
-
+            log?.Debug(allOutput);
            
            return allOutput;
        }
        
-        public void AddRunAndCaptureJsonAsync<T>(SerialPortData data, SerialPortData.EMeterArg eMeterArg)
+        public void AddRunAndCaptureJsonAsync<T>(SerialPortData data, SerialPortData.EMeterArg eMeterArg) where T : new()
        {
            var task = RunAndCaptureJsonAsync<T>(data.SerialPortCmdClientPath, data.DefaultArgSettings(eMeterArg));
            taskPool.Add(task);
        }
        
-        public async Task<T> RunAndCaptureJsonAsync<T>(string fileName, string args)
+        public async Task<T> RunAndCaptureJsonAsync<T>(string fileName, string args) where T : new()
        {
            var psi = new ProcessStartInfo
            {
@@ -130,19 +151,77 @@ namespace TBF.Rig.RegisterReaders.PoseidonCmdStartStop

            // Now sb contains all output text
            string allOutput = sb.ToString();
+            log?.Debug(allOutput);

            // Extract JSON part
            string json = ExtractJson(allOutput);

-            if (json != null)
-            {
-                return JsonConvert.DeserializeObject<T>(json);
-            }
+            if (TryJsonStringDeserialize(json, out T runAndCaptureJsonAsync)) return runAndCaptureJsonAsync;

            return default;
        }

-        private string ExtractJson(string text)
+        public bool TryJsonStringDeserialize<T>(string json, out T runAndCaptureJsonAsync) where T : new()
+        {
+            if (json != null)
+            {
+                try
+                {
+                    runAndCaptureJsonAsync = JsonConvert.DeserializeObject<T>(json);
+                    return true;
+                }
+                catch (Exception ex)
+                {
+                    log.Debug(ex.Message);
+                    runAndCaptureJsonAsync = TryConvert<T>(json);
+                    return true;
+                }
+            }
+
+            runAndCaptureJsonAsync = default;
+            return false;
+        }
+
+
+        private static T TryConvert<T>(string json) where T : new()
+        {
+            
+                T obj = new T();
+
+                try
+                {
+                    JObject jObject = JObject.Parse(json);
+
+                    foreach (PropertyInfo prop in typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance))
+                    {
+                        if (!prop.CanWrite) continue;
+
+                        JToken token;
+                        if (jObject.TryGetValue(prop.Name, StringComparison.OrdinalIgnoreCase, out token))
+                        {
+                            try
+                            {
+                                object value = token.ToObject(prop.PropertyType);
+                                prop.SetValue(obj, value);
+                            }
+                            catch
+                            {
+                                // leave default if conversion fails
+                            }
+                        }
+                        // else → keep default value
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine($"TryConvert failed: {ex.Message}");
+                }
+
+                return obj;
+            
+        }
+
+        public string ExtractJson(string text)
        {
            int start = text.IndexOf('{');
            int end = text.LastIndexOf('}');
@@ -31,7 +31,17 @@ namespace TBF.Rig.RegisterReaders.PoseidonCmdStartStop
        
        private bool activeHandlerSessioEnabled = false;
        private CliRunner _cliRunner;
-        
+
+        private CliRunner CliRunner
+        {
+	        get
+	        {
+		        return (_cliRunner != null ? 
+			        _cliRunner : 
+			        (_cliRunner = new CliRunner(GetCliLogging())));
+	        }
+        }
+
        public enum CurrentPoseidonOp
        {
 	        None,
@@ -48,6 +58,7 @@ namespace TBF.Rig.RegisterReaders.PoseidonCmdStartStop
        
        CurrentPoseidonOp _currentOp;
        private bool _isReadingStart = true;
+        private bool? _isCliLogging;

        public CurrentPoseidonOp CurrentOp
        {
@@ -58,6 +69,16 @@ namespace TBF.Rig.RegisterReaders.PoseidonCmdStartStop
        {
 	         _currentOp =  operation ; 
        }
+
+        public bool GetCliLogging()
+        {
+	        return _isCliLogging.HasValue ? _isCliLogging.Value : true;
+        }
+        
+        public void SetCliLogging(bool isCliLogging)
+        {
+	        _isCliLogging = isCliLogging;
+        }
        
        public int Position
        {
@@ -300,23 +321,27 @@ namespace TBF.Rig.RegisterReaders.PoseidonCmdStartStop
 		/// <summary>Start this operation</summary>
 		public void Start()
 		{
-			//TODO BUMI start CLI serial port
-			_cliRunner = new CliRunner();
 		}

+		/// <summary>
+		/// for debug purposes what time will consume answer
+		/// </summary>
+		private long startTimeInMilis, fullTimeInMilis;
+		private static long SafetyTimeOut = 30 * 1000; /// 30 seconds
+
 		/// <summary>Run this operation</summary>
 		/// <returns>eventDone</returns>
 		public Event Run()
 		{
 			if (_currentOp == CurrentPoseidonOp.SendStartDataStream)
 			{
-				_cliRunner.AddSendAsync(serialPort, SerialPortData.EMeterArg.AllParams);
+				CliRunner.AddSendAsync(serialPort, SerialPortData.EMeterArg.AllParams);
 				return Event.Busy;       
 			}
 			else if (_currentOp == CurrentPoseidonOp.SendStartDataStream_Runing)
 			{
-				if (_cliRunner.AreTasksDone() 
-				    || _cliRunner.TimeOutReceived(5000))
+				if (CliRunner.AreTasksDone() 
+				    || CliRunner.TimeOutReceived(SafetyTimeOut))
 				{
 					_currentOp = CurrentPoseidonOp.SendStartDataStream_Done;
 				}
@@ -330,14 +355,15 @@ namespace TBF.Rig.RegisterReaders.PoseidonCmdStartStop
 			else if (_currentOp == CurrentPoseidonOp.ReadDataStream_Start 
 			         || _currentOp == CurrentPoseidonOp.ReadDataStream_End)
 			{
+				startTimeInMilis = DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond;
 				_isReadingStart = (_currentOp == CurrentPoseidonOp.ReadDataStream_Start);
-				_cliRunner.AddRunAndCaptureJsonAsync<JsonDataFromPoseidon>(serialPort, SerialPortData.EMeterArg.AllParams);
+				CliRunner.AddRunAndCaptureJsonAsync<JsonDataFromPoseidon>(serialPort, SerialPortData.EMeterArg.AllParams);
 				_currentOp = CurrentPoseidonOp.ReadDatastream_Running;
 				return Event.Busy;
 			}else if (_currentOp == CurrentPoseidonOp.ReadDatastream_Running)
 			{
-				if (_cliRunner.AreTasksDone() 
-				    || _cliRunner.TimeOutReceived(5000))
+				if (CliRunner.AreTasksDone() 
+				    || CliRunner.TimeOutReceived(SafetyTimeOut))
 				{
 					_currentOp = CurrentPoseidonOp.ReadDatastream_Done;
 				}
@@ -345,8 +371,10 @@ namespace TBF.Rig.RegisterReaders.PoseidonCmdStartStop
 			}
 			else if (_currentOp == CurrentPoseidonOp.ReadDatastream_Done)
 			{
+				fullTimeInMilis = (DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - startTimeInMilis;
+				log.Debug($"PoseidonReader.Run() Name= {Cfg.Name} fullTimeInMilis = {fullTimeInMilis} ");
 				JsonDataFromPoseidon data = null;
-				var first = _cliRunner.TaskPool.FindLast(t => t is Task<JsonDataFromPoseidon>);
+				var first = CliRunner.TaskPool.FindLast(t => t is Task<JsonDataFromPoseidon>);
 				if (first != null && first is Task<JsonDataFromPoseidon>)
 				{ 
 					data = (first as Task<JsonDataFromPoseidon>).Result;
@@ -438,10 +466,10 @@ namespace TBF.Rig.RegisterReaders.PoseidonCmdStartStop
 			else
 			{
 				//TODO BUMI start session - CMD send data to Poseidon
-				_cliRunner = new CliRunner();
-				_cliRunner.AddSendAsync(serialPort, SerialPortData.EMeterArg.DeviceId);
-				_cliRunner.WaitAll();
-				foreach (Task task in _cliRunner.TaskPool)
+				
+				CliRunner.AddSendAsync(serialPort, SerialPortData.EMeterArg.DeviceId);
+				CliRunner.WaitAll();
+				foreach (Task task in CliRunner.TaskPool)
 				{
 					if (task is Task<string>)
 					{
@@ -453,13 +481,18 @@ namespace TBF.Rig.RegisterReaders.PoseidonCmdStartStop
 					}
 				}

-				_cliRunner.Clear();
+				CliRunner.Clear();
 			}
 		}

-		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)
+		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)
 		{
 			s = null;
 			if (string.IsNullOrEmpty(result))
@@ -469,7 +502,10 @@ namespace TBF.Rig.RegisterReaders.PoseidonCmdStartStop
 			if (!m.Success)
 				return false;

-			s = m.Groups[1].Value.Trim();
+			// one of the groups will be filled
+			s = !string.IsNullOrEmpty(m.Groups[1].Value)
+				? m.Groups[1].Value.Trim()
+				: m.Groups[2].Value.Trim();
 			return true;
 		}

@@ -482,7 +518,7 @@ namespace TBF.Rig.RegisterReaders.PoseidonCmdStartStop
 		{
 			if (_cliRunner != null)
 			{
-				
+				_cliRunner.Clear();
 			}
 			activeHandlerSessioEnabled = false;
 		}
@@ -0,0 +1,172 @@
+using System;
+using System.Collections.Concurrent;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading;
+using log4net;
+using log4net.Appender;
+using log4net.Core;
+using log4net.Layout;
+using log4net.Repository.Hierarchy;
+
+
+namespace TBF.Rig.RegisterReaders.PoseidonCmdStartStop
+{
+      public sealed class ScopedLoggerFactory
+    {
+        private static readonly LogZipService ZipService = new LogZipService();
+
+        public ILog CreateLogger<T>(
+            string logFile,
+            int maxFileSizeMB,
+            int maxBackups,
+            Level level,
+            bool zipRolledFiles,
+            bool singleZipPerDay,
+            TimeSpan zipScanInterval)
+        {
+            var layout = new PatternLayout("%date %-5level %logger - %message%newline");
+            layout.ActivateOptions();
+
+            var appender = new RollingFileAppender
+            {
+                Name = typeof(T).Name + "Appender",
+                File = logFile,
+                AppendToFile = true,
+                RollingStyle = RollingFileAppender.RollingMode.Composite,
+                DatePattern = "'.'yyyyMMdd",
+                StaticLogFileName = true,
+                PreserveLogFileNameExtension = true,
+                MaxSizeRollBackups = maxBackups,
+                MaximumFileSize = maxFileSizeMB + "MB",
+                CountDirection = 1,
+                LockingModel = new FileAppender.MinimalLock(),
+                ImmediateFlush = true,
+                Layout = layout
+            };
+            appender.ActivateOptions();
+
+            var hierarchy = (Hierarchy)LogManager.GetRepository();
+            var logger = (log4net.Repository.Hierarchy.Logger)hierarchy.GetLogger(typeof(T).FullName);
+
+            logger.RemoveAllAppenders();
+            logger.AddAppender(appender);
+            logger.Level = level ?? Level.Debug;
+            logger.Additivity = false;
+            hierarchy.Configured = true;
+
+            if (zipRolledFiles)
+            {
+                ZipService.StartFor(logFile, singleZipPerDay, zipScanInterval);
+            }
+
+            return LogManager.GetLogger(typeof(T));
+        }
+    }
+
+    internal sealed class LogZipService : IDisposable
+    {
+        private readonly ConcurrentDictionary<string, Timer> _timers =
+            new ConcurrentDictionary<string, Timer>();
+
+        public void StartFor(string baseLogFile, bool singleZipPerDay, TimeSpan interval)
+        {
+            _timers.GetOrAdd(baseLogFile, delegate (string key)
+            {
+                // .NET Framework Timer ctor: Timer(Callback, state, dueTimeMs, periodMs)
+                return new Timer(
+                    new TimerCallback(delegate (object state) { CompressRolledFiles(key, singleZipPerDay); }),
+                    null,
+                    (int)TimeSpan.FromSeconds(20).TotalMilliseconds,
+                    (int)interval.TotalMilliseconds
+                );
+            });
+        }
+
+        private static void CompressRolledFiles(string baseLogFile, bool singleZipPerDay)
+        {
+            try
+            {
+                var dir = Path.GetDirectoryName(baseLogFile);
+                var fileName = Path.GetFileName(baseLogFile);
+                var nameNoExt = Path.GetFileNameWithoutExtension(fileName);
+                var ext = Path.GetExtension(fileName);
+
+                var candidates = Directory.EnumerateFiles(dir)
+                    .Where(f =>
+                        !f.EndsWith(".zip", StringComparison.OrdinalIgnoreCase) &&
+                        !StringComparer.OrdinalIgnoreCase.Equals(f, baseLogFile) &&
+                        Regex.IsMatch(Path.GetFileName(f),
+                                      "^" + Regex.Escape(nameNoExt) + "\\.\\d{8}(\\.\\d+)?" + Regex.Escape(ext) + "$"));
+
+                foreach (var f in candidates)
+                {
+                    if ((DateTime.UtcNow - File.GetLastWriteTimeUtc(f)).TotalSeconds < 15)
+                        continue;
+
+                    if (!CanOpenExclusive(f)) continue;
+
+                    string zipPath = singleZipPerDay
+                        ? Path.Combine(dir, nameNoExt + "-" + ExtractDatePart(f) + ".zip")
+                        : f + ".zip";
+
+                    AddFileToZip(zipPath, f);
+                    File.Delete(f);
+                }
+            }
+            catch
+            {
+                // ignore errors
+            }
+        }
+
+        private static void AddFileToZip(string zipPath, string fileToAdd)
+        {
+            var entryName = Path.GetFileName(fileToAdd);
+            if (!File.Exists(zipPath))
+            {
+                using (var archive = ZipFile.Open(zipPath, ZipArchiveMode.Create))
+                {
+                    archive.CreateEntryFromFile(fileToAdd, entryName, CompressionLevel.Optimal);
+                }
+            }
+            else
+            {
+                using (var archive = ZipFile.Open(zipPath, ZipArchiveMode.Update))
+                {
+                    var existing = archive.GetEntry(entryName);
+                    if (existing != null) existing.Delete();
+                    archive.CreateEntryFromFile(fileToAdd, entryName, CompressionLevel.Optimal);
+                }
+            }
+        }
+
+        private static bool CanOpenExclusive(string path)
+        {
+            try
+            {
+                using (FileStream fs = File.Open(path, FileMode.Open, FileAccess.Read, FileShare.None))
+                {
+                    return true;
+                }
+            }
+            catch { return false; }
+        }
+
+        private static string ExtractDatePart(string rolledFilePath)
+        {
+            var name = Path.GetFileName(rolledFilePath);
+            var m = Regex.Match(name, @"\.(\d{8})(?:\.\d+)?(\.[^.]+)$");
+            if (m.Success) return m.Groups[1].Value;
+            return DateTime.UtcNow.ToString("yyyyMMdd");
+        }
+
+        public void Dispose()
+        {
+            foreach (var t in _timers.Values) t.Dispose();
+            _timers.Clear();
+        }
+    }
+}
@@ -539,12 +539,10 @@ namespace TBF.Rig.Sequences
                               //---endnew2
                               (outPath.Scale is IScale) ? (outPath.Scale as IScale).Mass : 0,              /// collected water mass in kg
                               "VolMM",
-                               //---new2
-                               AmbTemp.ToString(),                                          /// ambient temperature in degree C
-                               AmbHumi.ToString(),                                          /// ambient humidity in R%
-                               AmbPress.ToString(),                                         /// ambient pressure in mbar (= 1 hPa)
-                               //---endnew2
-                               outPath.RegValve.Position.ToString("F1"));       /// regulation valve position in % (0=closed / 100=open)
+                               AmbTemp,                                          /// ambient temperature in degree C
+                               AmbHumi,                                          /// ambient humidity in R%
+                               AmbPress,                                         /// ambient pressure in mbar (= 1 hPa)
+                               outPath.RegValve?.Position.ToString("F1"));       /// regulation valve position in % (0=closed / 100=open)
        }

        public void LogProcessDataHeaderHeatMeters(ILog logger, string sectionName)
@@ -1505,23 +1505,25 @@ namespace TBF.Rig.Sequences
            tstRslt.DensityLine = Formulas.RealDensity();
            tstRslt.DensityDiv = Formulas.RealDensity();

+            double flowMeterLtrPerPulse = outPath.FlowMeter?.LtrPerPulse ?? 1;
+
            tstRslt.MethodClass     = TbfComponents.FindComponent(test.Method).ClassName;
            tstRslt.StartTime       = DateTime.Now;
            tstRslt.EndTime         = DateTime.Now + new TimeSpan(0, 0, 1);
            tstRslt.FlowSetTime     = 10;
            tstRslt.TestTime        = tstRslt.TargetTime();
-            tstRslt.PulsesMaster    = (outPath.FlowMeter.LtrPerPulse > 1E-6) ? (1.0075 * tstRslt.TargetVolume() / outPath.FlowMeter.LtrPerPulse) : 1;
+            tstRslt.PulsesMaster    = (flowMeterLtrPerPulse > 1E-6) ? (1.0075 * tstRslt.TargetVolume() / flowMeterLtrPerPulse) : 1;
            tstRslt.MassStartRaw    = 0;
            tstRslt.MassStart       = MeasurementCorrection.CorrectedValue(tstRslt.MassStartRaw, outPath.Scale.Corrections);
            tstRslt.MassEndRaw      = tstRslt.TargetVolume() * Formulas.RealDensity() / 1000.0f;
            tstRslt.MassEnd         = MeasurementCorrection.CorrectedValue(tstRslt.MassEndRaw, outPath.Scale.Corrections);
-            tstRslt.Flow            = 3.6 * outPath.FlowMeter.LtrPerPulse * tstRslt.PulsesMaster / tstRslt.TestTime;
+            tstRslt.Flow            = 3.6 * flowMeterLtrPerPulse * tstRslt.PulsesMaster / tstRslt.TestTime;
            tstRslt.MassOfEvapWater = 0;
            tstRslt.VolumeCTV       = 1000 * tstRslt.Batch.Buoyancy * (tstRslt.MassEnd - tstRslt.MassStart) / tstRslt.DensityLine;    /// [l] commercially true volume
-            tstRslt.VolumeMaster    = outPath.FlowMeter.LtrPerPulse * tstRslt.PulsesMaster;							/// [l] volume from the master flow meter
-            tstRslt.ConstMasterRaw  = outPath.FlowMeter.LtrPerPulse;                                                /// Uncorrected master flowmeter coefficient
-            tstRslt.ConstMasterCorr = outPath.FlowMeter.LtrPerPulseCorrected(tstRslt.Flow, tstRslt.TempDownMean);   /// Corrected master pulses per liter
-            tstRslt.ConstMaster     = (tstRslt.VolumeMaster == 0) ? tstRslt.ConstMasterCorr : (outPath.FlowMeter.LtrPerPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster);
+            tstRslt.VolumeMaster    = flowMeterLtrPerPulse * tstRslt.PulsesMaster;							/// [l] volume from the master flow meter
+            tstRslt.ConstMasterRaw  = flowMeterLtrPerPulse;                                                /// Uncorrected master flowmeter coefficient
+            tstRslt.ConstMasterCorr = outPath.FlowMeter?.LtrPerPulseCorrected(tstRslt.Flow, tstRslt.TempDownMean) ?? 1;   /// Corrected master pulses per liter
+            tstRslt.ConstMaster     = (tstRslt.VolumeMaster == 0) ? tstRslt.ConstMasterCorr : (flowMeterLtrPerPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster);

            tstRslt.ErrorMaster = Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV);

@@ -77,11 +77,14 @@ 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(),
@@ -125,6 +128,7 @@ namespace TBF.Rig
                new BuiltIn.PumpTandem.PumpFactory(),
                new RegisterReaders.DataStream.MefImport.Factory(),             /// 'Interface for data stream stream via MEF'
                new RegisterReaders.DataStream.Reader.Factory(),                /// 'RegisterReader for data stream stream via MEF'
+                new RegisterReaders.FrequencyMeterFromUniCB.Factory(),          /// 
                new RegisterReaders.PulsesFromUniCB.Factory(),                  /// 'RegisterReader'
                new RegisterReaders.StandingStartStop.Factory(),                /// 'RegisterReader for standing start/stop'
                new TestMethods.iPerlCommunication.iPerlHead.Factory(),         /// 'RegisterReader for iPerl'
@@ -123,6 +123,11 @@ namespace TBF.Rig.TestMethods.LeakTest
 			Bridge.OnActivity(this, Strings.Setting_the_water_pressure);
 			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
            //------------------------------------------------
+            
+            //TODO BUMI - check this possition for sstart logging - when finish remove this comment
+            //--- log start process in this section
+            LogProcessDataTestInfo(processDataLogger, test.Procedure.Name, test.Name);
+            

 			float pumpPower = test.PumpPower;
 			int startTime = StateMachine.Time;
@@ -214,10 +219,14 @@ namespace TBF.Rig.TestMethods.LeakTest
 			Bridge.OnActivity(this, Strings.Test_in_progress);
 			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
            //------------------------------------------------
+            
+            LogProcessDataHeader(processDataLogger, "Maximum water pressure set");
+            
 			State.Create(string.Format("{0}({1}) : Maximum water pressure set", test.Method, test.Name))
 				 .AddOperation(checkUiOp)
                 .AddOperations(readTempPressOps)
 				 .AddOperation(new Operations.TimerOp(testParams.DurationPMax))
+				 .AddOperation(processDataLoggingOp)
 				 .EnterState();
 			do {
 				e = StateMachine.WaitRunDevsRunOps();
@@ -246,10 +255,14 @@ namespace TBF.Rig.TestMethods.LeakTest
                //-----------------------------------------------------
                Bridge.OnActivity(this, Strings.Measuring_the_weight);
                //-----------------------------------------------------
+                
+                LogProcessDataHeader(processDataLogger, "Measuring the start mass");
+                
                State.Create(string.Format("{0}({1}) : Measuring the start mass", test.Method, test.Name))
                     .AddOperation(checkUiOp)
                     .AddOperations(readTempPressOps)
                     .AddOperation(scale.ReadStableMassOp(ref StartMass, test.TimeFlow2Mass, test.MassMethod, test.MassRepeats, test.MassSpread))
+                     .AddOperation(processDataLoggingOp)
                     .EnterState();
                do {
                    e = StateMachine.WaitRunDevsRunOps();
@@ -275,10 +288,14 @@ namespace TBF.Rig.TestMethods.LeakTest
 			///------------------------------------------------
 			Bridge.OnActivity(this, Strings.Test_in_progress);
 			///------------------------------------------------
+			
+			LogProcessDataHeader(processDataLogger, "Starting the test");
+			
 			State.Create(string.Format("{0}({1}) : Starting the test", test.Method, test.Name))
 				 .AddOperation(checkUiOp)
                 .AddOperations(readTempPressOps)
 				 .AddOperation(new Operations.TimerOp(testParams.DurationLeak))
+				 .AddOperation(processDataLoggingOp)
 				 .EnterState();
 			do {
 				e = StateMachine.WaitRunDevsRunOps();
@@ -305,10 +322,14 @@ namespace TBF.Rig.TestMethods.LeakTest
                //-----------------------------------------------------
                Bridge.OnActivity(this, Strings.Measuring_the_weight);
                //-----------------------------------------------------
+                
+                LogProcessDataHeader(processDataLogger, " Measuring the end mass");
+                
                State.Create(string.Format("{0}({1}) : Measuring the end mass", test.Method, test.Name))
                     .AddOperation(checkUiOp)
                     .AddOperations(readTempPressOps)
                     .AddOperation(scale.ReadStableMassOp(ref EndMass, test.TimeStop2Mass, test.MassMethod, test.MassRepeats, test.MassSpread))
+                     .AddOperation(processDataLoggingOp)
                     .EnterState();
                do {
                    e = StateMachine.WaitRunDevsRunOps();
@@ -111,7 +111,7 @@ namespace TBF.Rig.TestMethods.PMaxTest
 			Bridge.OnActivity(this, Strings.Setting_the_water_pressure);
 			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
            //------------------------------------------------
-
+            
 			float pumpPower = test.PumpPower;
            while (true)
 			{				
@@ -175,11 +175,21 @@ namespace TBF.Rig.TestMethods.PMaxTest

 			int startTime = StateMachine.Time;
 			int endTime = startTime + testParams.DurationPMax;
+			
+			//TODO BUMI - check this possition for sstart logging - when finish remove this comment
+			//--- log start process in this section
+			LogProcessDataTestInfo(processDataLogger, test.Procedure.Name, test.Name);

            //------------------------------------------------
            Bridge.OnActivity(this, Strings.Test_in_progress);
 			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
            //------------------------------------------------
+            
+            //TODO BUMI - check if is ok possition to start logging - at last remove comment 
+            //--- log start process in this section
+            LogProcessDataHeader(processDataLogger, "Starting the test");
+            
+            

            /*//---new1
            LogProcessDataTestInfo(processDataLogger, test.Procedure.Name, test.Name);
@@ -194,10 +204,8 @@ namespace TBF.Rig.TestMethods.PMaxTest
 				 .AddOperation(checkUiOp)
                 .AddOperations(readTempPressOps)
 				 .AddOperation(new Operations.TimerOp(testParams.DurationPMax))
-                 //---new1
-                 .AddOperation(processDataLoggingOp)
-                 //---endNew1
-                 .EnterState();
+				 .AddOperation(processDataLoggingOp)
+				 .EnterState();
 			do {
 				e = StateMachine.WaitRunDevsRunOps();

@@ -213,7 +221,8 @@ namespace TBF.Rig.TestMethods.PMaxTest
 					Bridge.OnActivity(this, string.Format("{0} ... {1} s", Strings.Test_in_progress, remainingTime));
 			}
 			while (e.Contains(Event.TimerBusy));
-
+			
+			
            ///
            /// PMaxTest completed
            ///
@@ -469,7 +469,8 @@ namespace TBF.Rig.TestMethods.StandingStart

 					(dataEntryCmpnt as GenericDevices.IDataEntryForCamera).StartImages = startImages;
 				}
-
+				
+				long readStartTime = StateMachine.Time;
 				Bridge.OnActivity(this, Strings.Enter_water_meter_data);
 				State.Create(string.Format("{0}({1}) : Entering begin-state", test.Method, test.Name))
                     .AddOperation(checkUiOp)
@@ -482,6 +483,11 @@ namespace TBF.Rig.TestMethods.StandingStart
 					if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
 				}
 				while (!e.Contains(Event.ModelessFormClosed));
+				
+				long readEndTime = StateMachine.Time;
+				var elapsed = TimeSpan.FromTicks((readEndTime - readStartTime));
+				log.Debug($"Read poseidon Begin operation (with dialog) - took:{elapsed.TotalSeconds} => {elapsed:mm\\:ss}");
+

 				if (heatMetersTestParams != null)
 				{
@@ -513,6 +519,8 @@ 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);
                    }
 				}

@@ -703,7 +711,8 @@ namespace TBF.Rig.TestMethods.StandingStart

 					(dataEntryCmpnt as GenericDevices.IDataEntryForCamera).EndImages = endImages;
 				}
-				
+
+				long readStartTime = DateTime.Now.Ticks;
 				Bridge.OnActivity(this, Strings.Enter_water_meter_data);
                State state = State.Create(string.Format("{0}({1}) : Entering the end-state", test.Method, test.Name));
                if (heatMetersTestParams != null && dataEntryCmpnt is GenericDevices.IHasHeatMtrStatesForm)
@@ -726,6 +735,9 @@ namespace TBF.Rig.TestMethods.StandingStart
                    if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                }
                while (!e.Contains(Event.ModelessFormClosed));
+                long readEndTime = DateTime.Now.Ticks;
+                var elapsed = TimeSpan.FromTicks((readEndTime - readStartTime));
+                log.Debug($"Read poseidon End operation (with dialog) - took:{elapsed.TotalSeconds} => {elapsed:mm\\:ss}");


                if (heatMetersTestParams != null)
@@ -756,6 +768,15 @@ 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);
 					}
                }

@@ -555,6 +555,7 @@ namespace TBF.Rig.TestMethods.StandingStartMassCollection
                

                Bridge.OnActivity(this, Strings.Enter_water_meter_data);
+                long readStartTime = StateMachine.Time;
                State.Create(string.Format("{0}({1}) : Enter start states of water meters", test.Method, test.Name))
                     .AddOperation(checkUiOp)
                     .AddOperations(readTempPressOps)
@@ -568,6 +569,9 @@ namespace TBF.Rig.TestMethods.StandingStartMassCollection
                    if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                }
                while (!e.Contains(Event.ModelessFormClosed));
+                long readEndTime = StateMachine.Time;
+                
+                log.Debug("Read poseidon - took:" + (readEndTime - readStartTime));

                if (heatMetersTestParams != null)
                {
@@ -603,6 +607,8 @@ 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);
                    }
                }

@@ -936,6 +942,9 @@ 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);
+
                    }
                }

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
michal	eef1f31a21	Update `.DotSettings.user` file with adjusted ResxEditorPersonal settings	2025-09-26 14:50:49 +02:00
michal	b878ee96a5	Merge branch 'refs/heads/master-3' into feature/camera_jms # Conflicts: # TBF.sln.DotSettings.user # TBF/Properties/AssemblyInfo.cs # TBF/TBF.csproj # TBFTests/obj/Debug/TBFTests.csproj.CoreCompileInputs.cache # TBFTests/obj/Release/TBFTests.csproj.CoreCompileInputs.cache	2025-09-26 14:27:01 +02:00
michal	e4c0219783	packages update Add Antlr3.Runtime.xml documentation file for API references.	2025-09-22 13:51:32 +02:00
michal	3362fdfaff	Remove bin/, obj/, and other build artifacts from Git tracking	2025-09-22 13:46:49 +02:00
michal	6093db4502	Remove bin/, obj/, and other build artifacts from Git tracking	2025-09-22 13:45:20 +02:00
michal	5e7598667b	Remove bin/, obj/, and other build artifacts from Git tracking	2025-09-22 13:36:42 +02:00
michal	4fe8729b85	Remove bin/, obj/, and other build artifacts from Git tracking	2025-09-22 13:34:07 +02:00
michal	b1dd6666f1	Version increment to 3.9.2147.1	2025-09-22 12:26:02 +02:00
michal	a3613889e1	HEAT_METERS disabled update `.gitignore` with additional folders and files for better coverage.	2025-09-22 12:25:32 +02:00
michal	7b87d63531	PoseidonReader - fix support Cli version 1.4 - Extend `TryGetDeviceId` to support JSON format and add corresponding tests	2025-09-22 09:35:22 +02:00
michal	d838c78a8a	CliRunner - Added test and refactor	2025-09-19 12:02:16 +02:00
michal	7a8bef501a	HEAT_METERS enabled	2025-09-19 12:00:59 +02:00
michal	9863b54bc8	Enhance ScopedLoggerFactory to support log file compression with rolling, include LogZipService for managing zipped archives, and update CliRunner configuration accordingly.	2025-09-17 13:00:17 +02:00
michal	e57c6a6a02	Add ShowDialog and SaveCommunication fields to `EntryFormCfg`, implement related functionalities in PoseidonReader and EntryForm, and improve logging with ScopedLoggerFactory integration.	2025-09-17 10:45:40 +02:00
michal	afa215534c	Version increment to 3.9.2146.4	2025-09-09 20:48:19 +02:00
michal	780d44166e	Refactor `PoseidonReader` to use lazy initialization for `CliRunner`, introduce `SafetyTimeOut`, enhance JSON deserialization with fallback logic, and improve error logging using `log4net`.	2025-09-09 20:47:53 +02:00
michal	35e4078dda	Merge branch 'master-3' into PoseidonCmd	2025-09-09 15:13:29 +02:00
michal	47e09584f2	Frequency pulse meter	2025-09-09 12:51:26 +02:00
michal	fc8e82c0e8	Merge branch 'master-3' into feature/processLogging # Conflicts: # TBF/Rig/Sequences/ProcessData.cs # TBF/Rig/TestMethods/PMaxTest/PMaxTestSeq.cs	2025-09-09 12:24:20 +02:00
michal	50a38bc557	"Refactor CJMS11 image grab functionality with timeout handling and error resilience - Introduced a new `GrabImageListener` method with asynchronous timeout support for improved response handling. - Enhanced error logging and implemented retry logic for capturing images to address NACK scenarios. - Added overlay rendering and event-based image delivery for better UI integration. - Refined `SendImageListener` logic to include command handling improvements and listener termination checks. - Minor parameter adjustments in `OnImageReceived` for default values support."	2025-07-30 10:34:56 +02:00
michal	3e643854bc	Add support for multiple image capture and time gap configuration in CJMS11 - Implemented functionality to handle multiple image captures with adjustable time gaps using the new `MultipleImageOpacity` class. - Enhanced `RoiCfgCtrl` and `RoiCfg` to integrate multi-image configuration. - Updated CJMS11 camera to support sequential image handling and delegate events for multiple images. - Introduced UI elements for specifying image count and time gap in the configuration panel. - Extended `GrabImagesOp` and event arguments to handle and store multiple grabbed images. - Refactored project to include `MultipleImageOpacity` utility in TBF solution.	2025-07-28 10:16:07 +02:00
michal	0daefb93bb	Add CJMS11 enhancements, logging, and resolution support - Extended CJMS11 camera handling with new functionalities, including image grabbing, resolution configuration, and improved ROI support. - Added new `ToString` method implementations for enhanced debugging and logging in key classes like `JmsMessage`, `JmsPacket`, and `RoiCfg`. - Introduced additional commands (`start_stream_images`, `stop_stream_images`) in `CommandM` and its enum. - Implemented new resolution handling in `RoiCfg` with support for configurable image frames. - Refactored resolution-related UI elements in `RoiCfgCtrl` to add a dropdown for selecting resolution. - Made minor UX improvements by replacing inconsistent string formats with verbatim strings in console messages. - Updated project dependencies with new resolution-related utilities (`Frame` and `ResolutionFrames`). - Resolved camera-specific symbolic issues by transitioning to `CJMS11.Camera` over prior naming inconsistencies.	2025-07-18 08:50:22 +02:00
michal	f5731c67a0	Improve CJMS11 camera connection handling with timeout support - Replaced synchronous connection retry logic with asynchronous timeout-based handling. - Added exception handling for connection attempts exceeding 1 second. - Introduced `EstablishCameraConnectionRepeticaly` with updated timeout intervals for retries.	2025-06-02 09:58:01 +02:00
michal	d2ae5f3e83	It works !!! ?? Add support for `System.Net.Sockets`, enhance JMS camera detection, and refactor adapter connection handling - Added `System.Net.Sockets` as a project dependency and updated the configuration file accordingly. - Enhanced timeout logic for JMS camera detection, improving reliability in identifying cameras. - Refactored `NetAdapter` to support async connection handling with better initialization in simulate mode. - Fixed IP setup for debugging and added new task management for asynchronous operations.	2025-05-30 15:34:21 +02:00
michal	c4d332b68b	Add JMS network adapter support and multi-camera handling improvements - Introduced `AdapterJMS` component and configurations, including its factory, control, and designer files. - Enhanced CJMS11 camera initialization with improved connection handling via multiple retries. - Updated TbfComponents to include the new JMS adapter factory. - Refactored camera test methods and connection logic for better reliability and performance. - Adjusted resource definitions in the project file to include new JMS adapter resources.	2025-05-30 13:44:40 +02:00
michal	1daa0212ef	test of connection - multiple connections	2025-05-29 12:59:21 +02:00
michal	1748a83ec8	`Add multi-camera initialization and update dependencies` Enhanced camera initialization with parallel and async tests for two cameras. Removed unused Telnet references, adjusted camera indexing logic, and added `System.Drawing.Common` dependency.	2025-05-28 22:50:47 +02:00
michal	b3d6b5a59f	Refactor camera handling; add UI and image management support. Replaced legacy UDP and RTP mechanisms with new live stream, grab, and save image functionality using TCP. Introduced event-based UI command handling and image overlay. Updated resource management for improved reliability and added support for saving captured images to disk.	2025-05-26 08:58:46 +02:00
michal	891795b101	Add support for CJMS11 camera integration Introduced the CJMS11 camera component and its factory in TbfComponents. Added implementation for the CJMS11 camera class, along with unit tests to validate its functionality and integration. This enhances existing camera support in the system.	2025-05-21 11:31:19 +02:00
michal	a20b0761fd	Fix nested string formatting in DoubleBox's return statement Revised the return statement to correctly handle nested string formatting by ensuring the format string is constructed properly. This resolves potential formatting issues with dynamic values.	2025-03-26 10:22:50 +01:00
michal	3b9e8d754d	fix valve Debug Simulate mode	2025-01-10 08:48:52 +01:00
michal	fed3281525	log for processData in LeakTestSeq.cs set	2025-01-08 07:43:58 +01:00
michal	c1d966d86a	final add process data to PMaxTestSeq.cs	2025-01-07 16:23:01 +01:00
michal	b2d2f8c13b	Solved problem with Null Exeprion in ProcessData.cs	2025-01-07 16:22:18 +01:00
michal	4e5e3d63e1	Fixed problem with F2 formating of decimal num	2025-01-07 16:21:28 +01:00
michal	25602fb914	Bug fix - Refactor flow meter handling and add validation checks. Simplified flow meter logic by introducing a reusable variable for `LtrPerPulse` and handling potential null values. Added batch components correlation validation to ensure water meter counts align with configuration, preventing mismatches. Additionally, improved code formatting for consistency and readability.	2024-12-19 14:16:25 +01:00
michal	602d0d5308	Add logging for process start and measurement steps Updated `PMaxTestSeq` to include logging of process data at key steps: process start and measurement. Added TODO comments to review logging positions for alignment with expected workflow.	2024-12-17 09:59:31 +01:00
				`@@ -1 +0,0 @@`
				`e4ab36b7b0030299e8d3f9c15f8edfab217c00c33b5d908f61099287ac9a64d6`