Update GenesisReaderTests: add real input parsing, format variation handling, and rollover cases; remove outdated Q3 calibration tests; increment version to 3.9.3056.1

- Introduce new `GenesisSmartReader_Q3Test` class with comprehensive Q3 calibration scenarios.
- Refactor existing tests to utilize simulation data for better consistency and validation.
- Adjust Q3 calibration logic in `GenesisSmartReader` to enhance calculation accuracy and validation criteria.

.gitignore

@@ -32,6 +32,10 @@ LabelPrinting/bin/
 LabelPrinting/obj/
 MergeResultsDBs/bin/
 MergeResultsDBs/obj/
+NfcC7_Dll/bin/
+NfcC7_Dll/obj/
+NfcC7_DLL.Tests/bin/
+NfcC7_DLL.Tests/obj/
 OrderManagement/bin/
 OrderManagement/obj/
 ProductionTracing/bin/
@@ -50,10 +54,12 @@ 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/
@@ -84,3 +90,4 @@ Users/obj/
 .idea/
 *.suo
 *.bak
+TBF.sln.DotSettings.user

AppDiagnostic/AppDiagnostic.csproj

@@ -76,6 +76,7 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
@@ -91,5 +92,14 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\SharedComponents\SharedComponents.csproj">
+      <Project>{8f942729-f454-4c99-ba6c-746962065ae3}</Project>
+      <Name>SharedComponents</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\TBF_icon.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

AppDiagnostic/BufferedListView.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

AppDiagnostic/DiagApi.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

AppDiagnostic/LogAdapter.cs

@@ -1,4 +1,4 @@
-
+using SharedComponents;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -83,22 +83,22 @@ namespace AppDiagnostic
                 var selectedIndices = _listView.SelectedIndices.Cast<int>().ToList();
 
                 // Načítanie logov
-                // var logs = LiveLogCache.Instance.GetLogs(0, LiveLogCache.Instance.GetCount())
-                //     .Where(log => string.IsNullOrEmpty(_filterText) ||
-                //                   log.IndexOf(_filterText, StringComparison.OrdinalIgnoreCase) >= 0)
-                //     .ToList();
+                var logs = LiveLogCache.Instance.GetLogs(0, LiveLogCache.Instance.GetCount())
+                    .Where(log => string.IsNullOrEmpty(_filterText) ||
+                                  log.IndexOf(_filterText, StringComparison.OrdinalIgnoreCase) >= 0)
+                    .ToList();
 
                 // Vymazanie existujúcich položiek a pridanie nových
                 _listView.Items.Clear();
 
-                // foreach (var log in logs)
-                // {
-                //     var item = new ListViewItem(log)
-                //     {
-                //         BackColor = _listView.Items.Count % 2 == 0 ? Color.White : Color.FromArgb(240, 240, 240)
-                //     };
-                //     _listView.Items.Add(item);
-                // }
+                foreach (var log in logs)
+                {
+                    var item = new ListViewItem(log)
+                    {
+                        BackColor = _listView.Items.Count % 2 == 0 ? Color.White : Color.FromArgb(240, 240, 240)
+                    };
+                    _listView.Items.Add(item);
+                }
 
                 // Obnovenie označených položiek
                 foreach (var index in selectedIndices)

AppDiagnostic/LogFilter.cs

@@ -1,4 +1,4 @@
-
+using SharedComponents;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -45,32 +45,32 @@ namespace AppDiagnostic
                     _listView.Items.Clear();
 
                     // Načítame všetky logy (ideálne z cache alebo databázy)
-                    //var logs = LiveLogCache.Instance.GetLogs(0, LiveLogCache.Instance.Logs.Count);
+                    var logs = LiveLogCache.Instance.GetLogs(0, LiveLogCache.Instance.Logs.Count);
 
                     // Pridáme len tie logy, ktoré spĺňajú filter
-                    // foreach (var log in logs)
-                    // {
-                    //     if (log.ToLower().Contains(_filterText))  // Kontrola, či log obsahuje filter text
-                    //     {
-                    //         var listViewItem = new ListViewItem(log);
-                    //
-                    //         // Striedanie farieb riadkov
-                    //         if (_listView.Items.Count % 2 == 0) // Párny index => biela
-                    //         {
-                    //             listViewItem.BackColor = Color.White;
-                    //         }
-                    //         else // Nepárny index => svetlá sivá
-                    //         {
-                    //             listViewItem.BackColor = Color.FromArgb(240, 240, 240);  // Veľmi svetlá sivá
-                    //         }
-                    //
-                    //         // Pridanie efektu pre novú položku
-                    //         ApplyNewItemEffect(listViewItem);
-                    //
-                    //         // Pridanie položky do ListView
-                    //         _listView.Items.Add(listViewItem);
-                    //     }
-                    // }
+                    foreach (var log in logs)
+                    {
+                        if (log.ToLower().Contains(_filterText))  // Kontrola, či log obsahuje filter text
+                        {
+                            var listViewItem = new ListViewItem(log);
+
+                            // Striedanie farieb riadkov
+                            if (_listView.Items.Count % 2 == 0) // Párny index => biela
+                            {
+                                listViewItem.BackColor = Color.White;
+                            }
+                            else // Nepárny index => svetlá sivá
+                            {
+                                listViewItem.BackColor = Color.FromArgb(240, 240, 240);  // Veľmi svetlá sivá
+                            }
+
+                            // Pridanie efektu pre novú položku
+                            ApplyNewItemEffect(listViewItem);
+
+                            // Pridanie položky do ListView
+                            _listView.Items.Add(listViewItem);
+                        }
+                    }
                 }
             }
             catch (Exception ex)

AppDiagnostic/MainForm.Designer.cs

@@ -1,4 +1,4 @@
-using System.Windows.Forms;
+using System.Windows.Forms;
 
 namespace AppDiagnostic
 {

AppDiagnostic/MainForm.cs

@@ -1,6 +1,19 @@
-using System;
+using log4net.Config;
+using log4net;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using System.Windows.Forms;
-// Pre File.WriteAllLines a prácu so súbormi
+using log4net.Appender;
+using SharedComponents;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement;
+using System.IO; // Pre File.WriteAllLines a prácu so súbormi
+using System.Linq;
 
 namespace AppDiagnostic
 {
@@ -16,6 +29,8 @@ namespace AppDiagnostic
 
         public MainForm()
         {
+            this.Icon = Properties.Resources.TBF_icon;
+
             InitializeComponent();
 
             // Inicializujeme LogAdapter a priradíme ho k memoListView
@@ -65,16 +80,16 @@ namespace AppDiagnostic
                 }
 
                 // Získajte nové logy od posledného indexu
-                //var logs = LiveLogCache.Instance.GetLogs(lastDisplayedLogIndex, LiveLogCache.Instance.Logs.Count - lastDisplayedLogIndex);
+                var logs = LiveLogCache.Instance.GetLogs(lastDisplayedLogIndex, LiveLogCache.Instance.Logs.Count - lastDisplayedLogIndex);
 
                 // Pridajte len nové logy
-                // foreach (var log in logs)
-                // {
-                //     memoListView.Items.Add(new ListViewItem(log));
-                // }
+                foreach (var log in logs)
+                {
+                    memoListView.Items.Add(new ListViewItem(log));
+                }
 
                 // Aktualizujte posledný zobrazený index
-                //lastDisplayedLogIndex = LiveLogCache.Instance.Logs.Count;
+                lastDisplayedLogIndex = LiveLogCache.Instance.Logs.Count;
 
                 // Ak je autoScrollEnabled, posuňte sa na posledný záznam
                 if (autoScrollEnabled && memoListView.Items.Count > 0)
@@ -104,7 +119,7 @@ namespace AppDiagnostic
         {
             //LiveLogCache.Instance.AddLog("Nový log z hlavnej aplikácie");
 
-            //LiveLogCache.Instance.ClearLogs();
+            LiveLogCache.Instance.ClearLogs();
             ClearListView();
         }
 
@@ -198,10 +213,10 @@ namespace AppDiagnostic
                     try
                     {
                         // Načítanie všetkých logov z LiveLogCache
-                        //var logs = LiveLogCache.Instance.GetLogs(0, LiveLogCache.Instance.GetCount());
+                        var logs = LiveLogCache.Instance.GetLogs(0, LiveLogCache.Instance.GetCount());
 
                         // Uloženie logov do vybraného súboru
-                        //File.WriteAllLines(saveFileDialog.FileName, logs);
+                        File.WriteAllLines(saveFileDialog.FileName, logs);
 
                         MessageBox.Show("Logs saved successfully.", "Save TBF live logs", MessageBoxButtons.OK, MessageBoxIcon.Information);
                     }
@@ -232,19 +247,19 @@ namespace AppDiagnostic
                     _logAdapter._filterText = string.Empty;
 
                     // Načítanie logov od indexu vybraného riadku
-                    //var logs = LiveLogCache.Instance.GetLogs(selectedIndex, LiveLogCache.Instance.GetCount() - selectedIndex);
+                    var logs = LiveLogCache.Instance.GetLogs(selectedIndex, LiveLogCache.Instance.GetCount() - selectedIndex);
 
                     // Obnovenie ListView s novými údajmi
                     memoListView.BeginUpdate();
                     memoListView.Items.Clear();
-                    // foreach (var log in logs)
-                    // {
-                    //     var item = new ListViewItem(log)
-                    //     {
-                    //         BackColor = memoListView.Items.Count % 2 == 0 ? Color.White : Color.FromArgb(240, 240, 240)
-                    //     };
-                    //     memoListView.Items.Add(item);
-                    // }
+                    foreach (var log in logs)
+                    {
+                        var item = new ListViewItem(log)
+                        {
+                            BackColor = memoListView.Items.Count % 2 == 0 ? Color.White : Color.FromArgb(240, 240, 240)
+                        };
+                        memoListView.Items.Add(item);
+                    }
                     memoListView.EndUpdate();
                 }
             }

AppDiagnostic/MainForm.resx

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

AppDiagnostic/Program.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;

AppDiagnostic/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 

AppDiagnostic/Properties/Resources.Designer.cs

@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace AppDiagnostic.Properties
-{
-
-
+namespace AppDiagnostic.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -19,53 +19,55 @@ namespace AppDiagnostic.Properties
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
-    {
-
+    internal class Resources {
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AppDiagnostic.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+        /// </summary>
+        internal static System.Drawing.Icon TBF_icon {
+            get {
+                object obj = ResourceManager.GetObject("TBF_icon", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
     }
 }

AppDiagnostic/Properties/Resources.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -46,7 +46,7 @@
     
     mimetype: application/x-microsoft.net.object.binary.base64
     value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
     
     mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,6 +60,7 @@
             : 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">
@@ -68,9 +69,10 @@
               <xsd:sequence>
                 <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
+              <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">
@@ -85,9 +87,10 @@
                 <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" msdata:Ordinal="1" />
+              <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">
@@ -109,9 +112,13 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <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=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="TBF_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\TBF_icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

AppDiagnostic/Properties/Settings.settings

@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>

AppDiagnostic/packages.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="log4net" version="3.0.3" targetFramework="net472" />
 </packages>

Common/Utils.cs

@@ -302,6 +302,7 @@ namespace Common
             string passwordOfDay = Convert.ToString(number, 8);
 
             return (userName.Equals("milan") && password.Equals("kraken")) ||
+                   (userName.Equals("bumi") && password.Equals("70630")) ||
                    (userName.Equals("igor") && password.Equals("mojronko8")) ||
                    (userName.Equals("lubo1212") && password.Equals("Tatry52")) ||
                    (userName.Equals("Michal") && password.Equals("Plok789456123")) ||
@@ -310,8 +311,11 @@ namespace Common
                    (userName.Equals("jan") && password.Equals("jaugust")) ||
                    (userName.Equals("JCermak") && password.Equals("Zt6911")) ||
                    (userName.Equals("gilles") && password.Equals("alibaba")) ||
-                   (userName.Equals("michal") && password.Equals("mojnelson8")) || //...MF
-                   (userName.Equals("marek") && password.Equals("mareciino")) || //...MF
+                   (userName.Equals("michal") && password.Equals("mojnelson8")) ||
+                   (userName.Equals("marek") && password.Equals("mareciino")) ||
+#if DEBUG                   
+                   (userName.Equals("Sensus Developers") && password.Equals("5fbg12gf5hn8nhy1fr")) ||
+#endif
                    (userName.Equals(passwordOfDay) && password.Equals(passwordOfDay));
         }
 

Config/Config.csproj

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

Config/Data.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 //formulas.cs has been added cause iPerl from master-2 ...MF
 

Config/FluentCommon.cs

@@ -128,11 +128,11 @@ namespace Config
                             case GID.Administrators:
 #if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
                             case GID.TraceabilityManagement:
-#endif
 //#elif LANG_PL
+#endif
                             case GID.MetrologicalAuthority:
                             case GID.WaterMeterAuthority:
-//#endif
+
                                 admin.AddGroup(group);
                                 session.SaveOrUpdate(group);    /// Save this group
                                 break;

Config/Formulas.cs

@@ -1,4 +1,4 @@
-///
+///
 /// Copyright (c) 2013-2018 Sensus Slovensko a.s.
 ///
 using System;

Config/Mappings/OutputPathMap.cs

@@ -17,7 +17,7 @@ namespace Config.Mappings
 			Map(x => x.Qto);
             Map(x => x.Selector);
             Map(x => x.RegValve);
-            Map(x => x.RegulMinStep);
+			Map(x => x.RegulMinStep).Nullable();//older databases may not have this column
             Map(x => x.FlowMeter);
 			Map(x => x.PidCoef);
             Map(x => x.StartValve);

Decrypt/Program.cs

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

Encrypt/Program.cs

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

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

@@ -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")]

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

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

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

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

GraphLib/GraphLib.csproj

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

LabelPrinting/Resources/Strings.Designer.cs

@@ -142,11 +142,11 @@ namespace LabelPrinting.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Error_mass.
+        ///   Looks up a localized string similar to Error.
         /// </summary>
         internal static string Error {
             get {
-                return ResourceManager.GetString("Error_mass", resourceCulture);
+                return ResourceManager.GetString("Error", resourceCulture);
             }
         }
         

MergeResultsDBs/Program.cs

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

NfcC7_DLL.Tests/NfcC7_DLL.Tests.csproj

@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+    
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.10.4" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.10.4" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\NfcC7_DLL\NfcC7_DLL.csproj" />
+  </ItemGroup>
+  
+</Project>

NfcC7_DLL.Tests/NfcHanler/NFCHeadServiceTest.cs

@@ -0,0 +1,102 @@
+using System;
+using JetBrains.Annotations;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NfcC7_DLL.NfcHandler;
+using NfcC7_DLL.NfcHandler.Protocols;
+using NfcC7_DLL.NfcHandler.Utils;
+using NfcC7_DLL.NfcHandler;
+
+namespace NfcC7_DLL.Tests.NfcHanler;
+
+[TestClass]
+[TestSubject(typeof(NfcHeadService))]
+public class NfcHeadServiceTest
+{
+
+    [TestMethod]
+    public void SetTestingMode_Optohead_C7_ON_LiveMeterTest()
+    {
+        SerialPortData serialPortData = new SerialPortData(
+            "COM5",
+            "HatCliDemo.exe",
+            74);
+
+        NfcHeadService service = new NfcHeadService(serialPortData);
+        OptoHeadStatus status = service.SetTestingMode(OptoHeadStatus.OptoHeadC7);
+        Assert.AreEqual(OptoHeadStatus.OptoHeadC7, status);
+    }
+    
+    [TestMethod]
+    public void SetTestingMode_Optohead_OFF_LiveMeterTest()
+    {
+        SerialPortData serialPortData = new SerialPortData(
+            "COM5",
+            "HatCliDemo.exe",
+            74);
+
+        NfcHeadService service = new NfcHeadService(serialPortData);
+        OptoHeadStatus status = service.SetTestingMode(OptoHeadStatus.OptoHeadDisabled);
+        Assert.AreEqual(OptoHeadStatus.OptoHeadDisabled, status);
+    }
+
+    [TestMethod]
+    public void SetTestingMode_LiveMeterTest()
+    {
+        SerialPortData serialPortData = new SerialPortData(
+                        "COM5", 
+            "HatCliDemo.exe", 
+                74);
+        
+        NfcHeadService service = new NfcHeadService(serialPortData);
+        OptoHeadStatus status = service.SetTestingMode(OptoHeadStatus.OptoHeadC2);
+        Assert.AreEqual(OptoHeadStatus.OptoHeadC2, status);
+        
+        status = service.SetTestingMode(OptoHeadStatus.OptoHeadC7);
+        Assert.AreEqual(OptoHeadStatus.OptoHeadC7, status);
+        
+        status = service.SetTestingMode(OptoHeadStatus.OptoHeadDisabled);
+        Assert.AreEqual(OptoHeadStatus.OptoHeadDisabled, status);
+    }
+
+    [TestMethod]
+    public void GetSerialNr_LiveMeterTest()
+    {
+        SerialPortData serialPortData = new SerialPortData(
+            "COM5", 
+            "HatCliDemo.exe", 
+            74);
+        
+        NfcHeadService service = new NfcHeadService(serialPortData);
+        string? serialNr = service.GetSerialNr();
+        Assert.IsFalse(string.IsNullOrEmpty(serialNr));
+        Console.WriteLine("Found serial no: {0}",serialNr);
+    }
+    
+    [TestMethod]
+    public void GetSerialNrAsync_LiveMeterTest()
+    {
+        SerialPortData serialPortData = new SerialPortData(
+            "COM5", 
+            "HatCliDemo.exe", 
+            74);
+        
+        NfcHeadService service = new NfcHeadService(serialPortData);
+        string? serialNr = service.GetSerialNrAsync().GetAwaiter().GetResult();
+        Assert.IsFalse(string.IsNullOrEmpty(serialNr));
+        Console.WriteLine("Found serial no: {0}",serialNr);
+    }
+    
+    [TestMethod]
+    public void GetTestingMode_LiveMeterTest()
+    {
+        SerialPortData serialPortData = new SerialPortData(
+            "COM5", 
+            "HatCliDemo.exe", 
+            74);
+        
+        NfcHeadService service = new NfcHeadService(serialPortData);
+        OptoHeadStatus status = service.GetTestingMode();
+        Assert.IsFalse(OptoHeadStatus.Unknown == status);
+        
+    }
+}

NfcC7_DLL.Tests/NfcHanler/OptoHeadServiceTest.cs

@@ -0,0 +1,70 @@
+using JetBrains.Annotations;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NfcC7_DLL.NfcHandler;
+using NfcC7_DLL.NfcHandler.Protocols;
+using NfcC7_DLL.NfcHandler.Utils;
+
+namespace NfcC7_DLL.Tests.NfcHanler;
+
+[TestClass]
+[TestSubject(typeof(OptoHeadService))]
+public class OptoHeadServiceTest
+{
+
+    [TestMethod]
+    public void RunLoop_Test()
+    {
+        //Switch meter to Optohead C7 testing mode
+        SerialPortData serialPortData = new SerialPortData(
+            "COM5",
+            "HatCliDemo.exe",
+            74);
+
+        NfcHeadService service = new NfcHeadService(serialPortData);
+        OptoHeadStatus status = service.SetTestingMode(OptoHeadStatus.OptoHeadC7);
+        Assert.AreEqual(OptoHeadStatus.OptoHeadC7, status);
+        //Open serial connection to Optohead
+        OptoHeadService.Con con = new OptoHeadService.Con();
+        con.com = "COM6";
+        OptoHeadService optoHeadService = new OptoHeadService(con);
+        Assert.IsTrue(optoHeadService.CreateSerialConnection());
+        //start loop to receive data
+        optoHeadService.RunLoop();
+        WaterMetrologyData lastData = null;
+        int iCycles = 0,  iCyclesMax = 10;
+        for (int i = 0; i < iCyclesMax; i++)
+        {
+            
+            bool finished = false;
+            while (!finished)
+            {
+                //optoHeadService.Run();
+                if (optoHeadService.WaterMetrologyData != null 
+                    && lastData != optoHeadService.WaterMetrologyData
+                    && optoHeadService.WaterMetrologyData.OptoHeadStatus != OptoHeadStatus.Unknown)
+                {
+                    lastData = optoHeadService.WaterMetrologyData;
+                    finished = true;
+                    iCycles++;
+                    if (lastData.OptoHeadStatus.HasFlag(OptoHeadStatus.OptoHeadC7))
+                    {
+                        Assert.IsNotNull(lastData.C7Data);
+                    }
+                    else
+                    {
+                        Assert.IsNotNull(lastData.C2Data);
+                    }
+                    System.Console.WriteLine("Cycle: {0} lastData: {1}", iCycles, lastData);
+                }
+            }
+        }
+        optoHeadService.CloseSerialConnection();
+        
+        Assert.IsTrue(iCycles > 0);
+        Assert.IsTrue(iCycles == iCyclesMax);
+        
+        //Close Optohead
+        status = service.SetTestingMode(OptoHeadStatus.OptoHeadDisabled);
+        Assert.AreEqual(OptoHeadStatus.OptoHeadDisabled, status);
+    }
+}

NfcC7_DLL.Tests/NfcHanler/Utils/SERIAL_DriverTest.cs

@@ -0,0 +1,224 @@
+using System;
+using System.IO.Ports;
+using JetBrains.Annotations;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NfcC7_DLL.NfcHandler.Utils;
+
+namespace NfcC7_DLL.Tests.NfcHanler.Utils;
+
+//[TestClass]
+[TestSubject(typeof(SERIAL_Driver))]
+public class SERIAL_DriverTest
+{
+    private class Con
+    {
+        public string com = "COM5";
+        public int baudrate = 38400;
+        public int dataBits = 8;
+        public Parity parity = Parity.None;
+        public StopBits stopbits = StopBits.Two;
+        public int readTimeout = 5000;
+        public int writeTimeout = 1000;
+    }
+    
+    private readonly byte[] Open =
+    { 0x6B, 0x80, 0x01, 0x10, 0x00, 0x30, 0x00, 0x47, 0x6C, 0x6F, 0x62, 0x61, 0x6C, 0x49, 0x50, 0x65, 0x72,
+        0x6C, 0x55, 0x74, 0x69, 0x6C, 0x69, 0x74, 0x79, 0x00, 0x00, 0x27, 0xD7 };
+    private readonly byte[] CommDeviceSessionEnd = { 0x6B, 0x61, 0x00, 0x10, 0x05, 0x31, 0x00, 0x1F, 0x29, 0xF9, 0xC5 };
+
+    private readonly byte[] ProductDetails =
+        { 0x6B, 0x30, 0x01, 0x10, 0x03, 0x21, 0x01, 0x02, 0x6B, 0x90, 0x00, 0x00, 0x11, 0x40, 0x05, 0x00, 0x02, 0x04, 0x60, 0x62, 0x42, 0x04, 0xA5, 0x64 };
+
+    private readonly byte[] ProductDetails2 =
+        { 0x6B, 0x30, 0x01, 0x10, 0x03, 0x21, 0x01, 0x02, 0x6B, 0x90, 0x00, 0x00, 0x11, 0x40, 0x05, 0x00, 0x02, 0x04, 0x60 };
+    
+    static Con con5 = new Con(){
+        com = "COM5",
+        baudrate = 38400,
+        dataBits = 8,
+        parity = Parity.None,
+        stopbits = StopBits.Two,
+        readTimeout = 5000,
+        writeTimeout = 1000
+    };
+    static Con con6 = new Con()
+    {
+        com = "COM6",
+        baudrate = 38400,
+        dataBits = 8,
+        parity = Parity.None,
+        stopbits = StopBits.Two,
+        readTimeout = 5000,
+        writeTimeout = 1000
+    };
+    
+
+    
+    //[TestMethod]
+    public void SendMessage_Test()
+    {
+        Con con = con5;
+        
+        byte[] message = Open;
+        byte[] bytesReceived;
+        
+        SERIAL_Driver driver = new SERIAL_Driver();
+        bool isopen = driver.OpenConnection(
+            con.com,
+            con.baudrate, 
+            con.dataBits,
+            con.parity,
+            con.stopbits, 
+            con.readTimeout, 
+            con.writeTimeout);
+        Assert.IsTrue(isopen);
+        driver.SendMessage(message, message.Length);
+        //Assert.IsTrue(driver.GetRawData().Length == 0);
+        bytesReceived = driver.GetRawData();
+        //Assert.IsTrue(bytesReceived.Length > 0);
+        Console.WriteLine("IsOpened: {0}", driver.isOpen());
+        // Display raw bytes (as hex or byte count)
+        if (bytesReceived != null)
+        {
+            Console.WriteLine(string.Format("Bytes received: {0}", bytesReceived.Length));
+            Console.WriteLine(string.Format("Bytes (hex): {0}", BitConverter.ToString(bytesReceived)));
+            string response = System.Text.Encoding.UTF8.GetString(bytesReceived);
+            Console.WriteLine("Bytes string: {0}", response);
+        }
+        
+        // --- Get Serial No ---
+        message = ProductDetails;
+        // Send Open message
+        bool sendSuccess = driver.SendMessage(message, message.Length);
+        Assert.IsTrue(sendSuccess, "Failed to send Open message");
+        Console.WriteLine("Sent message for product details: {0}", message.ToString());
+        bytesReceived = driver.GetRawData();
+        // Display raw bytes (as hex or byte count)
+        if (bytesReceived != null)
+        {
+            Console.WriteLine(string.Format("Bytes received: {0}", bytesReceived.Length));
+            Console.WriteLine(string.Format("Bytes (hex): {0}", BitConverter.ToString(bytesReceived)));
+            string response = System.Text.Encoding.UTF8.GetString(bytesReceived);
+            Console.WriteLine("Bytes string: {0}", response);
+        }
+        else
+        {
+            Console.WriteLine("Response not received!");
+        }
+
+        message = CommDeviceSessionEnd;
+        driver.SendMessage(message, message.Length);
+
+        driver.Close();
+
+    }
+    
+    
+    //[TestMethod]
+    public void SendMessage_TestLoop()
+    {
+        Con con = con6;
+        
+        byte[] message = {0x00};
+        byte[] bytesReceived;
+        
+        SERIAL_Driver driver = new SERIAL_Driver();
+        bool isopen = driver.OpenConnection(
+            con.com,
+            con.baudrate, 
+            con.dataBits,
+            con.parity,
+            con.stopbits, 
+            con.readTimeout, 
+            con.writeTimeout);
+        Assert.IsTrue(isopen);
+
+        for (int iStep = 0; iStep < 100; iStep++)
+        {
+            driver.SendMessage(message, message.Length);
+            //Assert.IsTrue(driver.GetRawData().Length == 0);
+            bytesReceived = driver.GetRawData();
+            Assert.IsTrue(bytesReceived.Length > 0);
+            Console.WriteLine("IsOpened: {0}", driver.isOpen());
+            // Display raw bytes (as hex or byte count)
+            Console.WriteLine(string.Format("Bytes received: {0}", bytesReceived.Length));
+            Console.WriteLine(string.Format("Bytes (hex): {0}", BitConverter.ToString(bytesReceived)));
+            string response = System.Text.Encoding.UTF8.GetString(bytesReceived);
+            Console.WriteLine("Bytes string: {0}", response);
+        }
+
+        //message = CommDeviceSessionEnd;
+        //driver.SendMessage(message, message.Length);
+
+        driver.CloseConnection();
+
+    }
+    
+    
+    //[TestMethod]
+    public void SendMessage_TestGetSerialNo()
+    {
+        Con con = con6;
+        byte[] message = Open;
+        byte[] bytesReceived;
+        
+        SERIAL_Driver driver = new SERIAL_Driver();
+        bool isopen = driver.OpenConnection(
+            con.com,
+            con.baudrate, 
+            con.dataBits,
+            con.parity,
+            con.stopbits, 
+            con.readTimeout, 
+            con.writeTimeout);
+        Assert.IsTrue(isopen);
+        
+        driver.SendMessage(message, message.Length,con.readTimeout);
+        //Assert.IsTrue(driver.GetRawData().Length == 0);
+        bytesReceived = driver.GetRawData();
+        Assert.IsTrue(bytesReceived.Length > 0);
+        if (bytesReceived[0] == 0xFF)
+            Console.WriteLine("Error message: {0}", driver.ErrorMessage);
+        // Display raw bytes (as hex or byte count)
+        Console.WriteLine("IsOpened: {0}", driver.isOpen());
+        Console.WriteLine(string.Format("Bytes received: {0}", bytesReceived.Length));
+        Console.WriteLine(string.Format("Bytes (hex): {0}", BitConverter.ToString(bytesReceived)));
+        string response = System.Text.Encoding.UTF8.GetString(bytesReceived);
+        Console.WriteLine("Bytes string: {0}",response);
+        
+        // --- Get Serial No ---
+        message = ProductDetails;
+        driver.SendMessage(message, message.Length,con.readTimeout);
+        bytesReceived = driver.GetRawData();
+        Assert.IsTrue(bytesReceived.Length > 0);
+        if (bytesReceived[0] == 0xFF)
+            Console.WriteLine("Error message: {0}", driver.ErrorMessage);
+        // Display raw bytes (as hex or byte count)
+        Console.WriteLine("IsOpened: {0}", driver.isOpen());
+        Console.WriteLine(string.Format("Bytes received: {0}", bytesReceived.Length));
+        Console.WriteLine(string.Format("Bytes (hex): {0}", BitConverter.ToString(bytesReceived)));
+        response = System.Text.Encoding.UTF8.GetString(bytesReceived);
+        Console.WriteLine("Bytes string: {0}",response);
+        
+        // --- Get Serial No ---
+        message = ProductDetails2;
+        driver.SendMessage(message, message.Length,con.readTimeout);
+        bytesReceived = driver.GetRawData();
+        Assert.IsTrue(bytesReceived.Length > 0);
+        if (bytesReceived[0] == 0xFF)
+            Console.WriteLine("Error message: {0}", driver.ErrorMessage);
+        // Display raw bytes (as hex or byte count)
+        Console.WriteLine("IsOpened: {0}", driver.isOpen());
+        Console.WriteLine(string.Format("Bytes received: {0}", bytesReceived.Length));
+        Console.WriteLine(string.Format("Bytes (hex): {0}", BitConverter.ToString(bytesReceived)));
+        response = System.Text.Encoding.UTF8.GetString(bytesReceived);
+        Console.WriteLine("Bytes string: {0}",response);
+        
+
+        message = CommDeviceSessionEnd;
+        driver.SendMessage(message, message.Length);
+
+        driver.Close();
+
+    }
+}

NfcC7_DLL/NfcC7_DLL.csproj

@@ -0,0 +1,57 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <ImplicitUsings>false</ImplicitUsings>
+        <Nullable>disable</Nullable>
+        <Copyright>Copyright ©  2025</Copyright>
+        <AssemblyVersion>1.1.0.0</AssemblyVersion>
+        <FileVersion>1.1.0.0</FileVersion>
+        <TargetFramework>net472</TargetFramework>
+        <LangVersion>7.3</LangVersion>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+      <DefineConstants>TRACE;IPERL;</DefineConstants>
+      <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+      <DebugType>full</DebugType>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+      <DefineConstants>TRACE;IPERL;</DefineConstants>
+      <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+      <DebugType>pdbonly</DebugType>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+      <PackageReference Include="System.IO.Ports" Version="10.0.0-rc.1.25451.107" />
+      <PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
+      <PackageReference Include="System.Threading" Version="4.3.0" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <Reference Include="Microsoft.Build.Utilities.v4.0" />
+      <Reference Include="NA2WNFC">
+        <HintPath>NfcHanler\NfcReaderLibrary\NA2WNFC.dll</HintPath>
+      </Reference>
+      <Reference Include="OBIDISC4NET">
+        <HintPath>NfcHanler\NfcReaderLibrary\OBIDISC4NET.dll</HintPath>
+      </Reference>
+      <Reference Include="OBIDISC4NETnative">
+        <HintPath>NfcHanler\NfcReaderLibrary\OBIDISC4NETnative.dll</HintPath>
+      </Reference>
+      <Reference Include="OBIDISC4NET_API">
+        <HintPath>NfcHanler\NfcReaderLibrary\OBIDISC4NET_API.dll</HintPath>
+      </Reference>
+      <Reference Include="PresentationCore">
+        <HintPath>..\..\..\..\..\Windows\Microsoft.NET\assembly\GAC_32\PresentationCore\v4.0_4.0.0.0__31bf3856ad364e35\PresentationCore.dll</HintPath>
+      </Reference>
+      <Reference Include="PresentationFramework">
+        <HintPath>..\..\..\..\..\Windows\Microsoft.NET\assembly\GAC_MSIL\PresentationFramework\v4.0_4.0.0.0__31bf3856ad364e35\PresentationFramework.dll</HintPath>
+      </Reference>
+      <Reference Include="Sensus">
+        <HintPath>NfcHanler\FieldLogicLibrary\Sensus.dll</HintPath>
+      </Reference>
+    </ItemGroup>
+
+</Project>

NfcC7_DLL/NfcHandler/HeadInfo.cs

@@ -0,0 +1,11 @@
+using NfcC7_DLL.NfcHandler.Protocols;
+
+namespace NfcC7_DLL.NfcHandler
+{
+    public class HeadInfo
+    {
+        string SerialNr { get; set; }
+        OptoHeadStatus OptoHeadStatus { get; set; }
+    }    
+}
+

NfcC7_DLL/NfcHandler/JsonDataFromPoseidon.cs

@@ -0,0 +1,22 @@
+
+
+namespace NfcC7_DLL.NfcHandler
+{
+    public class JsonDataFromPoseidon
+    {
+        public bool? NfcTagDetected { get; set; }
+        public int? ProductType { get; set; }
+        public string ProductTypeVersion { get; set; }
+        public string DeviceId { get; set; }
+        public string Reading { get; set; }
+        public string Reading_Totalizer { get; set; }
+        public string Reading_Digits { get; set; }
+        public string Reading_Shift { get; set; }
+        public string Reading_Resolution { get; set; }
+        public string Reading_Units { get; set; }
+        public string Reading_FlowDirection { get; set; }
+        public string Reading_FlowRate { get; set; }
+        public string CalibrationFactor { get; set; }
+        public bool? ReadingComplete { get; set; }
+    }
+}

NfcC7_DLL/NfcHandler/NFCHeadService.cs

@@ -0,0 +1,247 @@
+using System;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
+using NfcC7_DLL.NfcHandler.Protocols;
+using NfcC7_DLL.NfcHandler.Utils;
+
+namespace NfcC7_DLL.NfcHandler
+{
+    public class NfcHeadService
+    {
+
+        private bool activeHandlerSessioEnabled = false;
+        private CliRunner _cliRunner;
+
+        private SerialPortData serialPort;
+
+        public NfcHeadService(SerialPortData serialPort)
+        {
+            this.serialPort = serialPort;
+            this._cliRunner = null;
+            ValidateCliFileExistence(true);
+        }
+
+        private CliRunner CliRunner
+        {
+            get { return (_cliRunner != null ? _cliRunner : (_cliRunner = new CliRunner(CliLogging))); }
+        }
+
+        private bool CliLogging
+        {
+            get { return false; }
+        }
+
+        private static readonly Regex OpticalDataModeRegex = new Regex(
+            @"(?im)(?:" +
+            @"^\s*OpticalDataMode\s*Id\s*:\s*([^\r\n]+)\s*$" + // old format
+            @"|" +
+            @"""OpticalDataMode""\s*:\s*""?(0x[0-9A-Fa-f]+|\d+)""?" + // JSON format (handles hex and decimal)
+            @")",
+            RegexOptions.Compiled);
+
+        public bool TryGetOpticalDataMode(string result, out string s)
+        {
+            s = null;
+            if (string.IsNullOrEmpty(result))
+                return false;
+
+            var m = OpticalDataModeRegex.Match(result);
+            if (!m.Success)
+                return false;
+
+            // one of the groups will be filled
+            s = !string.IsNullOrEmpty(m.Groups[1].Value)
+                ? m.Groups[1].Value.Trim()
+                : m.Groups[2].Value.Trim();
+            return true;
+        }
+
+        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))
+                return false;
+
+            var m = DeviceIdRegex.Match(result);
+            if (!m.Success)
+                return false;
+
+            // one of the groups will be filled
+            s = !string.IsNullOrEmpty(m.Groups[1].Value)
+                ? m.Groups[1].Value.Trim()
+                : m.Groups[2].Value.Trim();
+            return true;
+        }
+
+
+        private void ValidateCliFileExistence(bool showErrorIfMissing)
+        {
+            if (serialPort != null)
+            {
+                if (!serialPort.CliExists)
+                {
+                    throw new Exception("CLI file " + serialPort.SerialPortCmdClientPath +
+                                        " does not exist! Current path: " + Environment.CurrentDirectory);
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// ////////////
+        /// </summary>
+        public string GetSerialNr()
+        {
+            if (serialPort == null)
+                throw new Exception("Serial port not initialized");
+
+
+            Task optoheadDeviceIdTask = CliRunner.AddSendAsync(serialPort, SerialPortData.EMeterArg.DeviceId);
+            var timeOut = CliRunner.AddTimeOut(5000);
+            var doneTask = CliRunner.WaitAnyFinished(optoheadDeviceIdTask, timeOut);
+            if (timeOut == doneTask)
+            {
+                throw new Exception("Timeout");
+            }
+            else
+            {
+                if (optoheadDeviceIdTask is Task<string>)
+                {
+                    string serialNr;
+                    if (optoheadDeviceIdTask.Status == TaskStatus.Faulted)
+                        throw new Exception("Error TaskStatus.Faulted");
+                    string result = (optoheadDeviceIdTask as Task<string>).Result;
+                    if (TryGetDeviceId(result, out serialNr))
+                    {
+                        return serialNr;
+                    }
+                }
+            }
+            
+
+            return null;
+        }
+        
+        public async Task<string> GetSerialNrAsync()
+        {
+            if (serialPort == null)
+                throw new Exception("Serial port not initialized");
+
+            var cts = new CancellationTokenSource(); // we own the token
+            var sendTask = CliRunner.AddSendAsync(serialPort, SerialPortData.EMeterArg.DeviceId, cts.Token);
+
+            string output;
+            try
+            {
+                output = await CliRunner.WithTimeout(sendTask, TimeSpan.FromSeconds(15), cts);
+            }
+            catch (TimeoutException)
+            {
+                throw new Exception("Timeout");
+            }
+
+            if (TryGetDeviceId(output, out var serialNr))
+                return serialNr;
+
+            throw new Exception("Failed to parse DeviceId from output.");
+        }
+
+        public OptoHeadStatus SetTestingMode(OptoHeadStatus status)
+        {
+            if (serialPort == null)
+                throw new Exception("Serial port not initialized");
+
+
+            Task optoheadMode =
+                CliRunner.AddSendAsync(serialPort, SerialPortData.EMeterArg.Optohead, $"0x{((byte)status):X2}");
+            var timeOut = CliRunner.AddTimeOut(5000);
+            var doneTask = CliRunner.WhenAny();
+            if (timeOut == doneTask)
+            {
+                throw new Exception("Timeout");
+            }
+            else
+            {
+                if (optoheadMode is Task<string>)
+                {
+                    string strOpticalDataMode;
+                    if (optoheadMode.Status == TaskStatus.Faulted)
+                        throw new Exception("Error TaskStatus.Faulted");
+                    string result = (optoheadMode as Task<string>).Result;
+                    if (TryGetOpticalDataMode(result, out strOpticalDataMode))
+                    {
+                        byte value;
+
+                        if (strOpticalDataMode.StartsWith("0x", StringComparison.OrdinalIgnoreCase))
+                            value = Convert.ToByte(strOpticalDataMode, 16); // interpret as hex
+                        else
+                            value = Convert.ToByte(strOpticalDataMode); // interpret as decimal
+
+                        OptoHeadStatus optoheadStatus = (OptoHeadStatus)value;
+                        return optoheadStatus;
+                    }
+                }
+            }
+
+            return OptoHeadStatus.Unknown;
+        }
+
+        public OptoHeadStatus GetTestingMode()
+        {
+            if (serialPort == null)
+                throw new Exception("Serial port not initialized");
+
+
+            Task optoheadMode = CliRunner.AddSendAsync(serialPort, SerialPortData.EMeterArg.Optohead);
+            var timeOut = CliRunner.AddTimeOut(5000);
+            var doneTask = CliRunner.WhenAny();
+            if (timeOut == doneTask)
+            {
+                throw new Exception("Timeout");
+            }
+            else
+            {
+                if (optoheadMode is Task<string>)
+                {
+                    string strOpticalDataMode;
+                    if (optoheadMode.Status == TaskStatus.Faulted)
+                        throw new Exception("Error TaskStatus.Faulted");
+                    string result = (optoheadMode as Task<string>).Result;
+                    if (TryGetOpticalDataMode(result, out strOpticalDataMode))
+                    {
+                        byte value;
+
+                        if (strOpticalDataMode.StartsWith("0x", StringComparison.OrdinalIgnoreCase))
+                            value = Convert.ToByte(strOpticalDataMode, 16); // interpret as hex
+                        else
+                            value = Convert.ToByte(strOpticalDataMode); // interpret as decimal
+
+                        OptoHeadStatus optoheadStatus = (OptoHeadStatus)value;
+                        return optoheadStatus;
+                    }
+                }
+            }
+
+            return OptoHeadStatus.Unknown;
+        }
+
+        private void SendCommand()
+        {
+
+        }
+
+        private string RawDataAnswer()
+        {
+            return "";
+        }
+    }
+}

NfcC7_DLL/NfcHandler/OptoHeadService.cs

@@ -0,0 +1,111 @@
+using System;
+using System.IO.Ports;
+using System.Threading.Tasks;
+using NfcC7_DLL.NfcHandler.Protocols;
+using NfcC7_DLL.NfcHandler.Utils;
+
+namespace NfcC7_DLL.NfcHandler
+{
+    public class OptoHeadService
+    {
+    
+        public class Con
+        {
+            public string com = "COM5";
+            public int baudrate = 38400;
+            public int dataBits = 8;
+            public Parity parity = Parity.None;
+            public StopBits stopbits = StopBits.Two;
+            public int readTimeout = 5000;
+            public int writeTimeout = 1000;
+        }
+
+        private Con Connection { get; set; }
+        private SERIAL_Driver driver;
+        /// <summary>
+        /// Filed After Run() is called.
+        /// </summary>
+        public WaterMetrologyData WaterMetrologyData { get; private set; }
+
+        public OptoHeadService(Con con)
+        {
+            Connection = con;
+            driver = new SERIAL_Driver();
+        }
+
+        public bool CreateSerialConnection()
+        {
+            bool isopen = false;
+            Con con = Connection;
+        
+            byte[] message = {0x00};
+            byte[] bytesReceived;
+
+            if (!driver.isOpen())
+            {
+
+                isopen = driver.OpenConnection(
+                    con.com,
+                    con.baudrate,
+                    con.dataBits,
+                    con.parity,
+                    con.stopbits,
+                    con.readTimeout,
+                    con.writeTimeout);
+            }
+
+            return isopen;
+        }
+    
+        public void CloseSerialConnection()
+        {
+            dissableRunLoop = true;
+            driver.Close();
+        }
+
+        public void RunLoop()
+        {
+            Task.Run(() => Run());
+        }
+
+
+        private bool dissableRunLoop = false;
+        /// <summary>
+        /// Run the service. Catch one communication to WaterMetrologyData field.
+        /// </summary>
+        public void Run()
+        {
+            while (!dissableRunLoop)
+            {
+                WaterMetrologyData = ParseData(RunReading());    
+            }
+        
+        }
+    
+        byte[] RunReading()
+        {
+            if (driver.isOpen())
+            {
+                driver.SendMessage(new byte[] {0x00}, 1);
+                return driver.GetRawData();     
+            }
+            else
+            {
+                dissableRunLoop = true;
+            }
+
+            return new byte[] {0xFF};
+        }
+
+        public WaterMetrologyData ParseData(byte[] data)
+        {
+            try
+            {
+                return WaterMetrologyData.Parse(data, DateTime.Now, "");
+            }catch(Exception e)
+            {
+                return null;
+            }
+        }
+    }
+}

NfcC7_DLL/NfcHandler/Protocols/OptoHeadStatus.cs

@@ -0,0 +1,10 @@
+namespace NfcC7_DLL.NfcHandler.Protocols
+{
+    public enum OptoHeadStatus : byte
+    {
+        Unknown = 0xFF,
+        OptoHeadDisabled = 0x00,
+        OptoHeadC2 = 0xC2,
+        OptoHeadC7 = 0xC7,
+    }
+}

NfcC7_DLL/NfcHandler/Protocols/WaterMetrologyData.cs

@@ -0,0 +1,44 @@
+using System;
+
+namespace NfcC7_DLL.NfcHandler.Protocols
+{
+    public class WaterMetrologyData
+    {
+        private OptoHeadStatus _optoHeadStatus;
+        private WaterMetrologyDataC7 c7Data;
+        private WaterMetrologyDataC2 c2Data;
+    
+        public WaterMetrologyDataC7 C7Data { get => c7Data; }
+        public WaterMetrologyDataC2 C2Data { get => c2Data; }
+        public OptoHeadStatus OptoHeadStatus { get => _optoHeadStatus; }
+    
+        public static WaterMetrologyData Parse(byte[] data, DateTime dt, string dutinfo)
+        {
+            if (data.Length < 24)
+            {
+                throw new ArgumentException("Invalid data length for WaterMetrologyData C2.");
+            }
+            WaterMetrologyData waterMetrologyData = new WaterMetrologyData();
+            waterMetrologyData._optoHeadStatus = OptoHeadStatus.Unknown;
+            // Probably C2
+            if(data.Length > 24 && data.Length <  48)
+            {
+                waterMetrologyData.c2Data = WaterMetrologyDataC2.Parse(data, dt, dutinfo);
+                waterMetrologyData._optoHeadStatus = OptoHeadStatus.OptoHeadC2;
+            }
+            // Probably C7
+            else if(data.Length >=  48)
+            {
+                waterMetrologyData.c7Data = WaterMetrologyDataC7.Parse(data, dt, dutinfo);
+                waterMetrologyData._optoHeadStatus = OptoHeadStatus.OptoHeadC7;
+            }
+        
+            return waterMetrologyData;
+        }
+
+        public override string ToString()
+        {
+            return $"Status: {_optoHeadStatus}, C7Data: {c7Data}, C2Data: {c2Data}";
+        }
+    }
+}

NfcC7_DLL/NfcHandler/Protocols/WaterMetrologyDataC2.cs

@@ -0,0 +1,94 @@
+using System;
+
+namespace NfcC7_DLL.NfcHandler.Protocols
+{
+    public class WaterMetrologyDataC2
+    {
+        public string DutInfo { get; set; }
+        public DateTime Dt { get; set; }
+        public int AdcSample { get; set; }
+        public short LastField { get; set; }
+        public short FlowRate { get; set; }
+        public uint Accumulator { get; set; }
+        public ushort FlipPeriod { get; set; }
+        public ushort VinfStart { get; set; }
+        public ushort VinfEnd { get; set; }
+        public short ElectrodeDelta { get; set; }
+        public ushort Impedance { get; set; }
+        public byte FieldDriveTime { get; set; }
+        public bool IsInLowFlow { get; set; }
+        public bool IsInEmptyPipe { get; set; }
+        public bool FastHPFC { get; set; }
+        public bool FieldPolarity { get; set; }
+        public bool ImpedancePolarity { get; set; }
+       
+        public double CalcFlowmLps
+        {
+            get { return FlowRate / 4.0; } // FlowRate is in 1/4 mL/s
+        }
+        public double CalcFlowGPM
+        {
+            get { return CalcFlowmLps * 0.015850323141489; } // mL/s to gal/min conversion
+        }
+        public double CalcAccGal
+        {
+            get { return (Accumulator / 4.0) * 0.000264172; } // Accumulator is in 1/4 mL, convert to gallons
+        }
+
+        public static WaterMetrologyDataC2 Parse(string base64Data, DateTime dt, string dutinfo)
+        {
+            byte[] data = Convert.FromBase64String(base64Data);
+            return Parse(data, dt, dutinfo);
+        }
+
+        public static WaterMetrologyDataC2 Parse(byte[] data, DateTime dt, string dutinfo)
+        {
+            if (data.Length < 24)
+            {
+                throw new ArgumentException("Invalid data length for WaterMetrologyData C2.");
+            }
+
+
+            WaterMetrologyDataC2 result = new WaterMetrologyDataC2();
+
+            result.DutInfo = dutinfo;
+            result.Dt = dt;
+            result.AdcSample = BitConverter.ToInt32(data, 0);
+            result.LastField = BitConverter.ToInt16(data, 4);
+            result.FlowRate = BitConverter.ToInt16(data, 6);
+            result.Accumulator = BitConverter.ToUInt32(data, 8);
+            result.FlipPeriod = BitConverter.ToUInt16(data, 12);
+            result.VinfStart = BitConverter.ToUInt16(data, 14);
+            result.VinfEnd = BitConverter.ToUInt16(data, 16);
+            result.ElectrodeDelta = BitConverter.ToInt16(data, 18);
+            result.Impedance = BitConverter.ToUInt16(data, 20);
+            result.FieldDriveTime = data[22];
+
+            byte flags = data[23];
+            result.IsInLowFlow = (flags & 0x01) != 0;
+            result.IsInEmptyPipe = (flags & 0x02) != 0;
+            result.FastHPFC = (flags & 0x04) != 0; // Fast High Pass Filter Constant in bit 2
+            result.FieldPolarity = (flags & 0x08) != 0;     // Field Polarity in bit 3
+            result.ImpedancePolarity = (flags & 0x10) != 0;     // Impedance Polarity in bit 4
+            return result;
+        }
+
+        //public override string ToString()
+        //{
+        //    return $"ADC Sample: {AdcSample}, Last Field: {LastField}, Flow Rate: {FlowRate}, Accumulator: {Accumulator}, " +
+        //                   $"Flip Period Ticks: {FlipPeriodTicks}, Vinf Start: {VinfStart}, Vinf End: {VinfEnd}, Electrode Delta: {ElectrodeDelta}, " +
+        //                   $"Impedance: {Impedance}, Field Drive Time: {FieldDriveTime}, Is Low Flow: {IsInLowFlow}, Is Empty Pipe: {IsInEmptyPipe}, " +
+        //                   $"Fast High Pass Filter: {FastHighPassFilterConstant}, Field Polarity: {FieldPolarity}, Impedance Polarity: {ImpedancePolarity}";
+        //}
+
+        public override string ToString()
+        {
+            return $"DutInfo: {DutInfo}, Dt: {Dt}, ADC Sample: {AdcSample}, Last Field: {LastField}, Flow Rate: {FlowRate}, Accumulator: {Accumulator}, " +
+                   $"Flip Period: {FlipPeriod}, Vinf Start: {VinfStart}, Vinf End: {VinfEnd}, Electrode Delta: {ElectrodeDelta}, " +
+                   $"Impedance: {Impedance}, Field Drive Time: {FieldDriveTime}, Is Low Flow: {IsInLowFlow}, Is Empty Pipe: {IsInEmptyPipe}, " +
+                   $"Fast HPFC: {FastHPFC}, Field Polarity: {FieldPolarity}, Impedance Polarity: {ImpedancePolarity}, " +
+                   $"Calc Flow mL/s: {CalcFlowmLps:F2}, Calc Flow GPM: {CalcFlowGPM:F2}, Calc Acc Gal: {CalcAccGal:F2}";
+        }
+        
+    }
+}

NfcC7_DLL/NfcHandler/Protocols/WaterMetrologyDataC7.cs

@@ -0,0 +1,94 @@
+using System;
+
+namespace NfcC7_DLL.NfcHandler.Protocols
+{
+    public class WaterMetrologyDataC7 : WaterMetrologyDataC2
+    {
+        // New fields for C7
+        public int LastFieldmilliGauss { get; set; }
+        public int ImpedanceI { get; set; } // In-phase impedance
+        public int ImpedanceQ { get; set; } // Out-of-phase impedance
+        public int NoiseMetric { get; set; }
+        public short LearningLockout { get; set; }
+        public short ReverseBuffer { get; set; }
+        public int ConditionedAdc { get; set; }
+        public uint Totalalizer { get; set; }
+
+        //public bool IsInLowFlow { get; set; }
+        //public bool IsInEmptyPipe { get; set; }
+        //public bool FastHPFC { get; set; }
+        //public bool FieldPolarity { get; set; }
+        //public bool ImpedancePolarity { get; set; }
+        public bool MagTamperState { get; set; }
+        public bool IsLearningActive { get; set; }
+        public bool AdcShiftsUpdated { get; set; }
+
+
+        public static WaterMetrologyDataC7 Parse(string base64Data, DateTime dt, string dutinfo)
+        {
+            byte[] data = Convert.FromBase64String(base64Data);
+            return Parse(data, dt, dutinfo);
+        }
+
+        public static WaterMetrologyDataC7 Parse(byte[] data, DateTime dt, string dutinfo)
+        {
+
+            // You may want to check for the minimum length required for C7
+            if (data.Length <  48)  /* minimum required length for C7 */
+            {
+                throw new ArgumentException("Invalid data length for WaterMetrologyData C7.");
+            }
+
+            var result = new WaterMetrologyDataC7();
+
+            // Parse base C2 fields
+            var c2 = WaterMetrologyDataC2.Parse(data, dt, dutinfo);
+
+            //Copy base fields
+            result.DutInfo = c2.DutInfo;
+            result.Dt = c2.Dt;
+            result.AdcSample = c2.AdcSample;
+            result.LastField = c2.LastField;
+            result.FlowRate = c2.FlowRate;
+            result.Accumulator = c2.Accumulator;
+            result.FlipPeriod = c2.FlipPeriod;
+            result.VinfStart = c2.VinfStart;
+            result.VinfEnd = c2.VinfEnd;
+            result.ElectrodeDelta = c2.ElectrodeDelta;
+            result.Impedance = c2.Impedance;
+            result.FieldDriveTime = c2.FieldDriveTime;
+            
+            
+            result.IsInLowFlow = c2.IsInLowFlow;
+            result.IsInEmptyPipe = c2.IsInEmptyPipe;
+            result.FieldPolarity = c2.FieldPolarity;
+            result.ImpedancePolarity = c2.ImpedancePolarity;
+
+
+            // Parse new C7 fields (replace ENUM_OptPack0xC7.FIELD_MILLI_GAUSS etc. with actual offsets)
+            byte flags = data[23];
+            result.MagTamperState = (flags & 0x60) != 0; // bits 5 and 6 represent MagTamperState
+            result.IsLearningActive = (flags & 0x80) != 0; // bit 7 represents IsLearningActive
+
+            byte flagTwo = data[24];
+
+            result.AdcShiftsUpdated  = (flagTwo & 0x01) != 0; // bit 0 represents AdcShiftsUpdated
+
+            result.LastFieldmilliGauss = BitConverter.ToInt32(data, 25);
+            result.ImpedanceI = BitConverter.ToInt32(data, 29); //  in phase  
+            result.ImpedanceQ = BitConverter.ToInt32(data, 33); // out of phase
+            result.NoiseMetric = BitConverter.ToInt32(data, 37); // 
+            result.LearningLockout = BitConverter.ToInt16(data, 41);
+            result.ReverseBuffer = BitConverter.ToInt16(data, 43);
+            result.ConditionedAdc = BitConverter.ToInt32(data, 45);
+            result.Totalalizer = BitConverter.ToUInt32(data, 49);
+            
+            return result;
+        }
+
+        public override string ToString()
+        {
+            return $"C7: LastFieldmilliGauss={LastFieldmilliGauss}, ImpedanceI={ImpedanceI}, ImpedanceQ={ImpedanceQ}, NoiseMetric={NoiseMetric}, LearningLockout={LearningLockout}, ReverseBuffer={ReverseBuffer}, ConditionedAdc={ConditionedAdc}, Totalalizer={Totalalizer}, MagTamperState={MagTamperState}, IsLearningActive={IsLearningActive}, AdcShiftsUpdated={AdcShiftsUpdated}" + base.ToString();
+        }
+    }
+}

NfcC7_DLL/NfcHandler/ReadMe.md

@@ -0,0 +1 @@
+# Protocol Description

NfcC7_DLL/NfcHandler/Utils/CliRunner.cs

@@ -0,0 +1,341 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
+using System.Threading;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace NfcC7_DLL.NfcHandler.Utils
+{
+    public class CliRunner
+    {
+        //static readonly Logger log = LogManager.GetLogger(typeof(CliRunner));
+        //private readonly ILog log;
+        private List<Task> taskPool = new List<Task>();
+        private long startTime;
+        
+        public List<Task> TaskPool { get { return taskPool; } }
+        public void AddTask(Task task) { taskPool.Add(task); }
+        public void WaitAll() { Task.WaitAll(taskPool.ToArray()); }
+
+        /// <summary>
+        /// continue with WhenAny() to commpare results if time out is reached
+        /// </summary>
+        /// <param name="timeout"></param>
+        /// <returns></returns>
+        public Task AddTimeOut(int timeout)
+        {
+            Task timeOut = Task.Delay(timeout); 
+            taskPool.Add(timeOut);
+            return timeOut;
+        }
+        /// <summary>
+        /// mainly used for time out additional task to compare results
+        /// </summary>
+        /// <returns></returns>
+        
+        
+        [Obsolete("Use async/await instead - WaitAnyFinished()")]
+        public async Task<Task> WhenAny() { return await Task.WhenAny(taskPool.ToArray()); }
+
+        public Task WaitAnyFinished(Task task, Task timeOut)
+        {
+            Task.WhenAny(task, timeOut);
+            while (true)
+            {
+                if (task.IsCompleted) break;
+                if (task.IsFaulted) break;
+                if (task.IsCanceled) break;
+                
+                if(timeOut.IsCompleted) break;
+                if(timeOut.IsFaulted) break;
+                if(timeOut.IsCanceled) break;
+
+                Thread.Sleep(100);
+            }
+            
+            var waitAny = Task.WaitAny(task, timeOut);
+            return waitAny == 0 ? task : timeOut;
+        }
+        
+        public static async Task<T> WithTimeout<T>(Task<T> task, TimeSpan timeout, CancellationTokenSource externalCts = null)
+        {
+            var localCts = externalCts == null ? externalCts : new CancellationTokenSource();
+            var timeoutCts = new CancellationTokenSource(timeout);
+            var linked = CancellationTokenSource.CreateLinkedTokenSource(localCts.Token, timeoutCts.Token);
+
+            var completion = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+
+            // Observe the task
+            _ = task.ContinueWith(_ => completion.TrySetResult(true), TaskScheduler.Default);
+
+            // Observe the timeout
+            _ = Task.Delay(Timeout.InfiniteTimeSpan, timeoutCts.Token)
+                .ContinueWith(_ => completion.TrySetResult(true), TaskScheduler.Default);
+
+            await completion.Task.ConfigureAwait(false);
+
+            if (timeoutCts.IsCancellationRequested == false && task.IsCompleted) // task finished first
+                return await task.ConfigureAwait(false);
+
+            // timeout won → cancel & throw TimeoutException
+            localCts.Cancel(); // triggers your SendAsync to kill process
+            throw new TimeoutException();
+        }
+        
+        public Task<string> AddSendAsync(SerialPortData data, SerialPortData.EMeterArg eMeterArg, CancellationToken ct = default)
+        {
+            var task = SendAsync(data.SerialPortCmdClientPath, data.DefaultArgSettingsRead(eMeterArg), ct);
+            taskPool.Add(task); // List<Task> is okay because Task<string> : Task
+            return task;
+        }
+        
+        public Task WaitAnyFinished()
+        {
+            int xTask = Task.WaitAny(taskPool.ToArray());
+            return taskPool[xTask];
+        }
+        
+        public void Clear() { taskPool.Clear(); }
+        public void CancelAll() { Task.WhenAll(taskPool).ContinueWith(t => { }); }
+        
+
+        public void StartAll()
+        {
+            taskPool.ForEach(t => t.Start());
+        }
+
+        public bool AreTasksDone()
+        {
+            return taskPool.All(task => task.IsCompleted);
+        }
+
+        public long StartTime
+        {
+            get => startTime;
+        }
+
+        public bool TimeOutReceived(long timeout)
+        {
+            return (DateTime.Now.Ticks - startTime) > timeout;       
+        }
+        
+        public CliRunner(bool isCliLogging)
+        {
+            startTime = DateTime.Now.Ticks;
+
+            if (isCliLogging)
+            {
+                try
+                {
+                    /*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
+                    );*/
+                }
+                catch (Exception ex)
+                {
+                    // Fallback to console or handle gracefully
+                    Console.WriteLine($"Failed to initialize logger: {ex.Message}");
+                }
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="fileName"></param>
+        /// <param name="args"></param>
+        /// <typeparam name="T"></typeparam>
+        public Task AddSendAsync(SerialPortData data, SerialPortData.EMeterArg eMeterArg)
+        {
+            var task = SendAsync(data.SerialPortCmdClientPath, data.DefaultArgSettingsRead(eMeterArg));
+            taskPool.Add(task);
+            return task;
+        }
+        
+        public Task AddSendAsync(SerialPortData data, SerialPortData.EMeterArg eMeterArg, string arg)
+        {
+            var task = SendAsync(data.SerialPortCmdClientPath, data.DefaultArgSettingsWrite(eMeterArg, arg));
+            taskPool.Add(task);
+            return task;
+        }
+        
+        public void AddSendAsync(string fileName, string args)
+        {
+            var task = SendAsync(fileName, args);
+            taskPool.Add(task);
+        }
+        
+        
+        public async Task<string> SendAsync(string fileName, string args, CancellationToken ct = default)
+        {
+            var psi = new ProcessStartInfo
+            {
+                FileName = fileName,
+                Arguments = args,
+                RedirectStandardOutput = true,
+                RedirectStandardError = true,
+                UseShellExecute = false,
+                CreateNoWindow = true
+            };
+
+            var process = new Process { StartInfo = psi, EnableRaisingEvents = true };
+            try
+            {
+                process.Start();
+
+                Task<string> stdOutTask = process.StandardOutput.ReadToEndAsync();
+                Task<string> stdErrTask = process.StandardError.ReadToEndAsync();
+
+                try
+                {
+                    await Task.WhenAll(stdOutTask, stdErrTask, process.WaitForExitAsync(ct));
+                }
+                catch (OperationCanceledException)
+                {
+                    if (!process.HasExited)
+                    {
+                        process.Kill();
+                    }
+
+                    throw;
+                }
+
+                string allOutput = (stdOutTask.Result ?? "") + (stdErrTask.Result ?? "");
+                //log?.Debug(allOutput);
+                return allOutput;
+            }
+            finally
+            {
+                process?.Dispose();
+            }
+        }
+        
+        public Task<T> AddRunAndCaptureJsonAsync<T>(SerialPortData data, SerialPortData.EMeterArg eMeterArg) where T : new()
+        {
+            var task = RunAndCaptureJsonAsync<T>(data.SerialPortCmdClientPath, data.DefaultArgSettingsRead(eMeterArg));
+            taskPool.Add(task);
+            return task;
+        }
+        
+        public async Task<T> RunAndCaptureJsonAsync<T>(string fileName, string args, CancellationToken ct = default) where T : new()
+        {
+            var psi = new ProcessStartInfo
+            {
+                FileName = fileName,
+                Arguments = args,
+                RedirectStandardOutput = true,
+                RedirectStandardError = true,
+                UseShellExecute = false,
+                CreateNoWindow = true
+            };
+
+            var process = new Process { StartInfo = psi, EnableRaisingEvents = true };
+            try
+            {
+                process.Start();
+
+                var stdoutTask = process.StandardOutput.ReadToEndAsync();
+                var stderrTask = process.StandardError.ReadToEndAsync();
+
+                await Task.WhenAll(stdoutTask, stderrTask, process.WaitForExitAsync(ct));
+
+                string allOutput = (stdoutTask.Result ?? "") + (stderrTask.Result ?? "");
+                //log?.Debug(allOutput);
+
+                string json = ExtractJson(allOutput);
+                if (TryJsonStringDeserialize(json, out T result)) return result;
+                return default;
+            }
+            finally
+            {
+                process?.Dispose();
+            }
+        }
+
+        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('}');
+
+            if (start >= 0 && end > start)
+            {
+                return text.Substring(start, end - start + 1);
+            }
+
+            return null;
+        }
+        
+        
+    }
+    
+}

NfcC7_DLL/NfcHandler/Utils/ProcessExtensions.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace NfcC7_DLL.NfcHandler.Utils
+{
+    public static class ProcessExtensions
+    {
+        public static Task<object> WaitForExitAsync(this Process process, CancellationToken cancellationToken = default)
+        {
+            if (process == null) throw new ArgumentNullException(nameof(process));
+            if (process.HasExited) return Task.FromResult<object>(null);
+
+            var tcs = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
+
+            EventHandler handler = null;
+            handler = (s, e) =>
+            {
+                try { tcs.TrySetResult(null); }
+                finally { process.Exited -= handler; }
+            };
+
+            process.EnableRaisingEvents = true;
+            process.Exited += handler;
+
+            if (cancellationToken.CanBeCanceled)
+            {
+                cancellationToken.Register(() =>
+                {
+                    tcs.TrySetCanceled(cancellationToken);
+                    process.Exited -= handler;
+                });
+            }
+
+            return tcs.Task;
+        }
+    }
+}

NfcC7_DLL/NfcHandler/Utils/SERIAL_Driver.cs

@@ -0,0 +1,171 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.IO.Ports;
+using System.Linq;
+using System.Threading;
+
+//*****************************************************************************
+// Copyright 2020 Sensus GmbH Ludwigshafen. All rights reserved.
+// Author: Venkat, Rajeshwar
+//*****************************************************************************
+
+namespace NfcC7_DLL.NfcHandler.Utils
+{
+    public class SERIAL_Driver
+    {
+        public string ErrorMessage { get; private set; }
+        public Collection<byte> SerialPortReadBuffer = new Collection<byte>();
+        private SerialPort _serialPort;
+
+        private List<byte[]> _binMessages = new List<byte[]>();
+        private bool _isReading;
+        private Parity Parity { get; set; }
+        private StopBits StopBits { get; set; }
+         
+        public SERIAL_Driver()
+        {
+            _serialPort = new SerialPort();
+        }
+
+        public bool OpenConnection(string comPort, int baudrate, int dataBits, Parity parity, StopBits stopbits, int readTimeout=1000, int writeTimeout = 1000)
+        {
+            lock (this)
+            {
+                if ((_serialPort != null) && (_serialPort.IsOpen))
+                {
+                    _serialPort.DataReceived -= DataReceivedHandler;
+                    _serialPort.Close();
+                    _serialPort.Dispose();
+                    _serialPort = null;
+                }
+                try
+                {
+                     ErrorMessage = "";
+                    //_serialPort = new SerialPort(comPort, 57600, Parity.None, 8, StopBits.Two);
+					_serialPort = new SerialPort(comPort, baudrate, parity, dataBits, stopbits);
+                    _serialPort.ReadTimeout = readTimeout;
+                    _serialPort.WriteTimeout = writeTimeout;
+                    _serialPort.DataReceived += new SerialDataReceivedEventHandler(DataReceivedHandler);
+                    _serialPort.Open();
+                }
+                catch (Exception ex)
+                {
+                    ErrorMessage = String.Format("COM error: Open failed {0}.{1}", comPort, ex.Message);
+                    return false;
+                }
+
+                if (!_serialPort.IsOpen)
+                {
+                    ErrorMessage = String.Format("COM error: Can't Open {0}.", comPort);
+                    return false;
+                }
+            }//End Lock
+            return true;
+        }
+        public bool SendMessage(byte[] sendDataBytes, int length, int readTimeout = 1000, int writeTimeout=1000)
+        {
+            if (!isOpen()) return false;
+            if (sendDataBytes.Length == 0) return true;  // nothing to send - no error
+            try
+            {
+                 PrepareReading();   //clear read buffer etc.
+                _serialPort.WriteTimeout = writeTimeout;
+                _serialPort.ReadTimeout = readTimeout;
+                _serialPort.Write(sendDataBytes, 0, length);
+                _isReading = true;
+                Thread.Sleep(100);                
+                var stopWatch = Stopwatch.StartNew(); //start stop watch for data recevie timeout
+                while (_isReading) //wait until reading finishes or timeout occur
+                {
+                    if (stopWatch.ElapsedMilliseconds > readTimeout)
+                    {
+                        stopWatch.Stop();
+                        ErrorMessage = "COM error: Receive timeout";
+                        return false;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                ErrorMessage = String.Format("COM error: Transmit timeout {0}.{1}", _serialPort.PortName, ex.Message);
+                return false;  // Exception in send function
+            }            
+            return true;
+        }
+        private void PrepareReading()
+        {
+            _serialPort.DiscardInBuffer();
+            if(_binMessages != null) _binMessages.Clear();        
+            _isReading = true;
+        }
+        public byte[] GetRawData()
+        {
+            try
+            {
+                if (_binMessages.Count > 0) 
+                    return _binMessages[0].ToArray();
+                else
+                {
+                    return null;
+                }
+            }
+            catch(Exception)
+            {
+                byte[] err = { 0xFF };
+                return err;
+            }
+        }
+        private void DataReceivedHandler(object sender, SerialDataReceivedEventArgs e)
+        {
+            if (!_serialPort.IsOpen) return;
+            lock (this)
+            {
+                Thread.Sleep(100);
+                if (!_serialPort.IsOpen) return;
+                SerialPortReadBuffer = new Collection<byte>();
+                while (_serialPort.BytesToRead > 0)
+                {
+                    SerialPortReadBuffer.Add((byte)_serialPort.ReadByte());                    
+                }
+
+                _binMessages.Add(SerialPortReadBuffer.ToArray());                
+                _isReading = false;
+            }
+        }
+
+        public void CloseConnection()
+        {
+            if ((_serialPort != null) && (_serialPort.IsOpen))
+            {
+                _serialPort.DataReceived -= DataReceivedHandler;
+                _serialPort.Close();
+                _serialPort.Dispose();
+                _serialPort = null;
+            }
+        }
+        
+        public void Close()
+        {
+            if (isOpen())
+            {
+                _serialPort.Close();
+            }
+        }
+        public void Dispose()
+        {
+            if (_serialPort != null)
+            {
+                _serialPort.Dispose();
+            }
+        }
+        public bool isOpen()
+        {  
+            if(_serialPort != null)
+               return _serialPort.IsOpen;
+
+            return false;
+        }
+    }
+}

NfcC7_DLL/NfcHandler/Utils/SerialPortData.cs

@@ -0,0 +1,88 @@
+using System;
+using System.IO;
+
+namespace NfcC7_DLL.NfcHandler.Utils
+{
+    public class SerialPortData
+    {
+        private Boolean? _cliExists;
+        public bool CliExists { get {
+            if (_cliExists == null || !_cliExists.HasValue)
+            {
+                _cliExists = File.Exists(SerialPortCmdClientPath);
+            } 
+            return _cliExists.Value;
+        } }
+        public string SerialPortCmdClientPath {
+            get { 
+#if DEBUG
+                return Path.Combine("C:\\","TBF","Cli", CmdClientName);
+#else
+                return Path.Combine("..","Cli", CmdClientName); 
+#endif
+            }
+        } 
+        public string CmdClientName { get; set; } = "HalCli.exe";
+        public string PortName { get; set; }
+        public int MeterType { get; set; }
+        public string MeterTypeStr { get; set; }
+
+        public enum EMeterArg {
+            Calibration = 0,
+            AllParams = 2,
+            DeviceId = 3,
+            Optohead = 4,
+        } 
+        EMeterArg _eMeterArg = EMeterArg.AllParams;
+        
+        public string DefaultArgSettingsRead(EMeterArg eMeterArg)
+        {
+            string meterTypeInsert = !string.IsNullOrEmpty(MeterTypeStr)  ? MeterTypeStr : MeterType.ToString();
+            switch (eMeterArg)
+            {
+                case EMeterArg.AllParams:
+                    return $"-p {PortName} -m {meterTypeInsert} --operation readall";
+                case EMeterArg.DeviceId:
+                    return $"-p {PortName} -m {meterTypeInsert} --operation read --parameter DeviceId";
+                case EMeterArg.Optohead:
+                    return $"-p {PortName} -m {meterTypeInsert} --operation read --parameter \"OpticalDataMode\""; 
+                default:
+                    throw new Exception("Not implemented correct command!");
+            }
+        }
+        
+        public string DefaultArgSettingsWrite(EMeterArg eMeterArg, string arg)
+        {
+            string meterTypeInsert = !string.IsNullOrEmpty(MeterTypeStr) ? MeterTypeStr : MeterType.ToString();
+            switch (eMeterArg)
+            {
+                case EMeterArg.Calibration:
+                    return $"-p {PortName} -m {meterTypeInsert} --operation write --parameter Calibration --value {arg}";
+                case EMeterArg.Optohead:
+                    return $"-p {PortName} -m {meterTypeInsert} --operation write --parameter \"OpticalDataMode\" --value {arg}"; 
+                default:
+                    throw new Exception("Not implemented correct command!");
+            }
+        }
+
+        public SerialPortData(
+            string portName,
+            string cmdClientName,
+            int meterType)
+        {
+            PortName = portName;
+            CmdClientName = cmdClientName;
+            MeterType = meterType;
+        }
+        
+        public SerialPortData(
+            string portName,
+            string cmdClientName,
+            string meterType)
+        {
+            PortName = portName;
+            CmdClientName = cmdClientName;
+            MeterTypeStr = meterType;
+        }
+    }
+}

NfcC7_DLL/NfcHandler/Utils/Tools.cs

@@ -0,0 +1,158 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+//*****************************************************************************
+// Copyright 2020 Sensus GmbH Ludwigshafen. All rights reserved.
+// Author: Venkat, Rajeshwar
+//*****************************************************************************
+
+namespace NfcC7_DLL.NfcHandler.Utils
+{
+	public static class Tools
+	{
+		public static bool ByteArrayCompare(byte[] a1, byte[] a2)
+		{
+			// thanks to https://stackoverflow.com/questions/43289/comparing-two-byte-arrays-in-net
+			if (a1.Length != a2.Length)
+				return false;
+
+			for (int i = 0; i < a1.Length; i++)
+				if (a1[i] != a2[i])
+					return false;
+
+			return true;
+		}
+		public static string SwapHex(string sHex)
+		{
+			string sResult = "";
+			int iPos = sHex.Length - 2;
+			while (iPos >= 0)
+			{
+				sResult += sHex.Substring(iPos, 2);
+				sHex = sHex.Remove(iPos, 2);
+				iPos = sHex.Length - 2;
+			}
+			return sResult;
+		}
+        public static string DecimalToHexString(string value, int size = 1)
+        {
+            try
+            {
+                long Lval = long.Parse(value);
+                if (size == 1) return Lval.ToString("X2");
+                if (size == 2) return Lval.ToString("X4");
+                if (size == 4) return Lval.ToString("X8");
+            }
+            catch (Exception)
+            {
+                if (size == 1) return "00";
+                if (size == 2) return "0000";
+                if (size == 4) return "00000000";
+            }
+            return "00";
+        }
+        public static string ByteToHexString(byte data)
+        {
+            List<byte> val = new List<byte>();
+            val.Add(data);
+            byte[] arr = val.ToArray();
+            return BytesToHex(arr); 
+        }
+        public static string BytesToHex(byte[] data)
+		{
+			StringBuilder sb = new StringBuilder();
+			foreach (byte b in data)
+				sb.Append(b.ToString("X2"));
+
+			return sb.ToString();
+
+		}
+		public static byte[] HexStringToByteArray(String hexString)
+		{
+			int numberChars = hexString.Length;
+			byte[] bytes = new byte[numberChars / 2];
+			for (int i = 0; i < numberChars; i += 2)
+			{
+				bytes[i / 2] = Convert.ToByte(hexString.Substring(i, 2), 16);
+			}
+			return bytes;
+		}
+        public enum InitialCrcValue
+		{
+			Zeros,
+			NonZero1 = 0xffff,
+			NonZero2 = 0x1D0F
+		}
+
+        public class Crc16Ccitt
+		{
+            private const ushort poly = 0x1021;
+			ushort[] table = new ushort[256];
+			ushort initialValue = 0;
+
+            public ushort ComputeChecksum(byte[] bytes)
+            {
+                ushort crc = this.initialValue;
+                for (int i = 0; i < bytes.Length; ++i)
+                {
+                    crc = (ushort)((crc << 8) ^ table[((crc >> 8) ^ (0xff & bytes[i]))]);
+                }
+                return crc;
+            }
+            public byte[] ComputeChecksumBytes(byte[] bytes)
+            {
+                ushort crc = ComputeChecksum(bytes);
+                return BitConverter.GetBytes(crc);
+            }
+            public Crc16Ccitt(InitialCrcValue initialValue)
+			{
+				this.initialValue = (ushort) initialValue;
+				ushort temp, a;
+				for (int i = 0; i < table.Length; ++i)
+				{
+					temp = 0;
+					a = (ushort) (i << 8);
+					for (int j = 0; j < 8; ++j)
+					{
+						if (((temp ^ a) & 0x8000) != 0)
+						{
+							temp = (ushort) ((temp << 1) ^ poly);
+						}
+						else
+						{
+							temp <<= 1;
+						}
+						a <<= 1;
+					}
+					table[i] = temp;
+				}
+			}
+			public byte[] calcCRCfromMessage(byte[] message)
+			{
+				// CRC calculation goes from MessageID to Password
+				// For Read this means MsgID (1) + Offset (2) + PayloadLength (1) + Password (2) = 6
+				// for write the length of the payload comes on top.
+				// STX(1), length(1), CRC(2) and ETX(1) are excluded, in total 5 bytes.
+				//
+				// the method works both for sending messages (where the CRC and ETX are not in message)
+				// and for receiving messages (where the CRC and ETX are included at the end)
+				byte[] crc_msg = new byte[message[1]];  // message length is 2nd byte
+				Array.Copy(message, 2, crc_msg, 0, crc_msg.Length);
+				return ComputeChecksumBytes(crc_msg);
+			}
+			public string commentCRC(byte[] crc_meter, byte[] crc_computed)
+            {
+				bool crc_do_match = Tools.ByteArrayCompare(crc_meter, crc_computed);
+				string crcComment = crc_do_match ? "ok." : "CRC DOESN'T MATCH!!";
+				return "CRC Meter: " + Tools.BytesToHex(crc_meter) + (crc_do_match ? " == " : " != ")
+					+ "CRC Computed: " + Tools.BytesToHex(crc_computed) + ". " + crcComment;
+			}
+			public bool crc_do_match(byte[] a, byte[] b)
+            {
+				return ByteArrayCompare(a, b);
+			}
+
+		}
+	}
+}

ResetBatchNr/Program.cs

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

Results/Entities/MeterTestRslt.cs

@@ -16,25 +16,25 @@ namespace Results.Entities
 		public virtual double PulsesMeter     { get; set; }		/// # of water meter or heat meter pulses
 		public virtual double PulsesMaster	  { get; set; }		/// # of reference flowmeter pulses (gated by this water meter pulses)
         public virtual double PulsesPerLiter  { get; set; }		/// [l ^ -1], in case of heat meters (CompoundMeterId==5) pulses per kWh in [kWh ^ -1]
-        public virtual double PulsesPerKilogram { get; set; }   /// [kg ^ -1] //...MF
+        public virtual double PulsesPerKilogram { get; set; }   /// [kg ^ -1]
         public virtual double VolumeStart     { get; set; }		/// Volume or energy (CompoundMeterId==5) on test start in [l] or [J]
         public virtual double VolumeEnd       { get; set; }		/// Volume or energy (CompoundMeterId==5) on test end in [l] or [J]
-        public virtual double VolumeMeter     { get; set; }		/// Measured volume or energy (CompoundMeterId==5) in [l] or [J]
-        public virtual double VolumeRef       { get; set; }		/// Reference volume or energy (CompoundMeterId==5) in [l] or [J]
+        public virtual double VolumeMeter     { get; set; }     /// Measured volume or energy (CompoundMeterId==5) in [l] or [J]
         public virtual double MassMeter       { get; set; }		/// Measured mass or energy (CompoundMeterId==5) in [kg] or [J]
+        public virtual double VolumeRef       { get; set; }     /// Reference volume or energy (CompoundMeterId==5) in [l] or [J]
         public virtual double MassRef         { get; set; }		/// Reference mass or energy (CompoundMeterId==5) in [kg] or [J]
 		public virtual double TimestampStart  { get; set; }		/// [s]
 		public virtual double TimestampEnd	  { get; set; }		/// [s]
 		public virtual double TestTime		  { get; set; }		/// [s]
-
-                                                                /// Main result
-        public virtual double Error			  { get; set; }		/// [%]
-		public virtual double ErrorMass       { get; set; }		/// [%] //...MF
+ 
+		/// Main result
+		public virtual double Error			  { get; set; }		/// [%] for volume register reader
+		public virtual double ErrorMass       { get; set; }		/// [%] for mass register reader
         public virtual long   ErrorIndicators { get; set; }		/// Not mapped to DB !!!, bit24=E25, bit25=E26, bit26=E27, bit27=E28 (error flags)
         public virtual long   InfoIndicators  { get; set; }		/// Not mapped to DB !!!, bit24=E25, bit25=E26, bit26=E27, bit27=E28 (info flags)
 		public virtual bool   TestDone		  { get; set; }		/// true = test was completed
-		public virtual bool   Passed		  { get; set; }     /// true = test passed, water meter is OK
-		public virtual bool   PassedMass      { get; set; }     /// true = test passed, water meter is OK //...MF
+		public virtual bool   Passed		  { get; set; }     /// true = test passed, water meter is OK for Volume RegisterReader
+		public virtual bool   PassedMass      { get; set; }     /// true = test passed, water meter is OK for Mass RegisterReader
 		public virtual string QuantityUnits   { get; set; }     /// dm3, kg, etc. - this value defined the quantity of meter, its decisive for distinction of pulse types
 #if IPERL
         public virtual int CalibFactor { get; set; }
@@ -129,8 +129,6 @@ namespace Results.Entities
                 return Passed ? yesNo[0] : ((yesNo.Length >= 2) ? yesNo[1] : Results.Resources.Strings.No);
             }
         }
-
-        //...MF
         public virtual string PassedMassColorStr(string yesNoFormatOrEmpty)
         {
             if (string.IsNullOrEmpty(yesNoFormatOrEmpty))
@@ -144,8 +142,7 @@ namespace Results.Entities
             }
         }
 
-        //...MF
-        public virtual string GetQuantityFromUnits()
+       public virtual string GetQuantityFromUnits()
         {
 
             if (QuantityUnits == "kg")
@@ -156,7 +153,7 @@ namespace Results.Entities
             {
                 return "Volume";
             }
-            
+
             return "Volume";
         }
 
@@ -193,7 +190,6 @@ namespace Results.Entities
 		    PulsesMeter     = src.PulsesMeter;
 		    PulsesMaster    = src.PulsesMaster;
             PulsesPerLiter  = src.PulsesPerLiter;
-            PulsesPerKilogram = src.PulsesPerKilogram;
             VolumeStart     = src.VolumeStart;
             VolumeEnd       = src.VolumeEnd;
             VolumeMeter     = src.VolumeMeter;
@@ -202,13 +198,10 @@ namespace Results.Entities
 		    TimestampEnd    = src.TimestampEnd;
 		    TestTime        = src.TestTime;
 		    Error           = src.Error;
-            ErrorMass       = src.ErrorMass;
             ErrorIndicators = src.ErrorIndicators;
             InfoIndicators  = src.InfoIndicators;
 		    TestDone        = src.TestDone;
             Passed          = src.Passed;
-            PassedMass      = src.PassedMass;
-            QuantityUnits = src.QuantityUnits;
 #if IPERL
             CalibFactor = src.CalibFactor;
             CalibFactorLNA = src.CalibFactorLNA;
@@ -244,7 +237,6 @@ namespace Results.Entities
             writer.Write(PulsesMeter);
             writer.Write(PulsesMaster);
             writer.Write(PulsesPerLiter);
-            writer.Write(PulsesPerKilogram);
             writer.Write(VolumeStart);
             writer.Write(VolumeEnd);
             writer.Write(VolumeMeter);
@@ -253,13 +245,10 @@ namespace Results.Entities
             writer.Write(TimestampEnd);
             writer.Write(TestTime);
             writer.Write(Error);
-            writer.Write(ErrorMass);
             writer.Write(ErrorIndicators);
             writer.Write(InfoIndicators);
             writer.Write(TestDone);
             writer.Write(Passed);
-            writer.Write(PassedMass);
-            writer.Write((QuantityUnits != null) ? QuantityUnits : string.Empty);
 #if IPERL
             writer.Write(CalibFactor);
             writer.Write(CalibFactorLNA);
@@ -292,7 +281,6 @@ namespace Results.Entities
             PulsesMeter = reader.ReadDouble();
             PulsesMaster = reader.ReadDouble();
             PulsesPerLiter = reader.ReadDouble();
-            PulsesPerKilogram = reader.ReadDouble();
             VolumeStart = reader.ReadDouble();
             VolumeEnd = reader.ReadDouble();
             VolumeMeter = reader.ReadDouble();
@@ -301,13 +289,10 @@ namespace Results.Entities
             TimestampEnd = reader.ReadDouble();
             TestTime = reader.ReadDouble();
             Error = reader.ReadDouble();
-            ErrorMass = reader.ReadDouble();
             ErrorIndicators = reader.ReadInt64();
             InfoIndicators = reader.ReadInt64();
             TestDone = reader.ReadBoolean();
             Passed = reader.ReadBoolean();
-            PassedMass = reader.ReadBoolean();
-            QuantityUnits = reader.ReadString();
 #if IPERL
             CalibFactor = reader.ReadInt32();
             CalibFactorLNA = reader.ReadInt32();

Results/Entities/TestRslt.cs

@@ -50,11 +50,12 @@ namespace Results.Entities
 		public virtual double   Flow                { get; set; }	/// [m3/h] calculated from conventional true value
 		public virtual double   VolumeCTV           { get; set; }   /// [l]    Volume conventional true value
 		public virtual double   VolumeMaster        { get; set; }   /// [l]    Volume from the master flow meter
-		public virtual double   ErrorMaster         { get; set; }	/// [%]    Error of the master flow meter
-		public virtual double   MassFlow            { get; set; }	/// [t/h]  calculated from conventional true value ...MF
-		public virtual double   MassCTV             { get; set; }   /// [kg]   Volume conventional true value ...MF
-		public virtual double   MassMaster          { get; set; }   /// [kg]   Volume from the master flow meter ...MF
-		public virtual double   MassErrorMaster     { get; set; }	/// [%]    Error of the master flow meter ...MF
+		public virtual double   ErrorMaster         { get; set; }   /// [%]    Error of the master flow meter
+        public virtual double   MassFlow            { get; set; }	/// [t/h]  calculated from conventional true value
+		public virtual double   MassCTV             { get; set; }   /// [kg]   Volume conventional true value
+		public virtual double   MassMaster          { get; set; }   /// [kg]   Volume from the master flow meter
+		public virtual double   MassErrorMaster     { get; set; }	/// [%]    Error of the master flow meter
+
         public virtual float    DiverterStart       { get; set; }   /// [s]    Diverter switch time or a start/stop valve open time when the test starts
         public virtual float    DivStart10          { get; set; }   /// [s]    Diverter switch time when test starts at level 10 (e.g. 10%) (not mapped to DB)
         public virtual float    DivStart50          { get; set; }   /// [s]    Diverter switch time when test starts at level 50 (e.g. 50%) (not mapped to DB)
@@ -298,8 +299,7 @@ namespace Results.Entities
             ConstMasterRaw      = src.ConstMasterRaw;
             ConstMasterCorr     = src.ConstMasterCorr;
             ConstMaster         = src.ConstMaster;
-            MassConstMaster     = src.MassConstMaster;
-            MassStartRaw        = src.MassStartRaw;
+		    MassStartRaw        = src.MassStartRaw;
 		    MassStart           = src.MassStart;
 		    MassEndRaw          = src.MassEndRaw;
 		    MassEnd             = src.MassEnd;
@@ -307,16 +307,12 @@ namespace Results.Entities
 		    DensityLine         = src.DensityLine;
 		    DensityDiv          = src.DensityDiv;
 		    MassOfEvapWater     = src.MassOfEvapWater;
-		    Qdetected           = src.Qdetected;
+		    Qdetected            = src.Qdetected;
 		    Flow                = src.Flow;
 		    VolumeCTV           = src.VolumeCTV;
 		    VolumeMaster        = src.VolumeMaster;
 		    ErrorMaster         = src.ErrorMaster;
-            MassFlow            = src.MassFlow;
-            MassCTV             = src.MassCTV;
-            MassMaster          = src.MassMaster;
-            MassErrorMaster     = src.MassErrorMaster;
-
+            
             DiverterStart = src.DiverterStart;
             DivStart10    = src.DivStart10;
             DivStart50    = src.DivStart50;
@@ -449,43 +445,24 @@ namespace Results.Entities
 
 		public virtual string ToString(int i)
 		{
-            return string.Format(
-                "TestRslt: Part={0} RepetitionNr={1} TestDone={2} Remark={3} StartTime={4} EndTime={5} FlowSetTime={6} TestTime={7} " +
-                "PulsesMaster={8} ConstMaster={9} MassConstMaster={9} MassStartRaw={10} MassStart={11} MassEndRaw={12} MassEnd={13} " +
-                "DensityIn={14} DensityOut={15} DensityDiv={16} MassOfEvapWater={17} FlowMass={18} Flow={19} " +
-                "VolumeCTV={20} VolumeMaster={21} ErrorMaster={22} MassFlow={23} MassCTV={24} MassMaster={25} MassErrorMaster={26} " +
-                "ErrorFlags={27} InfoFlags={28} " +
-                "AmbTempMean={29} AmbTempStart={30} AmbTempEnd={31} AmbTempMin={32} AmbTempMax={33} " +
-                "AmbPressMean={34} AmbPressStart={35} AmbPressEnd={36} AmbPressMin={37} AmbPressMax={38} " +
-                "AmbHumiMean={39} AmbHumiStart={40} AmbHumiEnd={41} AmbHumiMin={42} AmbHumiMax={43} " +
-                "PressUpMean={44} PressUpStart={45} PressUpEnd={46} PressUpMin={47} PressUpMax={48} " +
-                "PressDownMean={49} PressDownStart={50} PressDownEnd={51} PressDownMin={52} PressDownMax={53} " +
-                "PressDeltaMean={54} PressDeltaStart={55} PressDeltaEnd={56} PressDeltaMin={57} PressDeltaMax={58} " +
-                "TempUpMean={59} TempUpStart={60} TempUpEnd={61} TempUpMin={62} TempUpMax={63} " +
-                "TempDownMean={64} TempDownStart={65} TempDownEnd={66} TempDownMin={67} TempDownMax={68} " +
-                "TempDivMean={69} TempDivStart={70} TempDivEnd={71} TempDivMin={72} TempDivMax={73} " +
-                "FlowMean={74} FlowStart={75} FlowEnd={76} FlowMin={77} FlowMax={78} " +
-                "Custom1={79} Custom2={80} Custom3={81} Custom4={82} Custom5={83} Custom6={84} Custom7={85} Custom8={86} Custom9={87} Custom10={88} " +
-                "DiverterStart={89} DiverterEnd={90} TestMeasured={91} TestCollected={92}",
-                Part, RepetitionNr, TestDone, Remark, StartTime, EndTime, FlowSetTime, TestTime,
-                PulsesMaster, ConstMaster, MassConstMaster, MassStartRaw, MassStart, MassEndRaw, MassEnd,
-                DensityIn, DensityLine, DensityDiv, MassOfEvapWater, Qdetected, Flow,
-                VolumeCTV, VolumeMaster, ErrorMaster, MassFlow,
-                MassCTV, MassMaster, MassErrorMaster, ErrorFlags, InfoFlags,
-                AmbTempMean, AmbTempStart, AmbTempEnd, AmbTempMin, AmbTempMax,
-                AmbPressMean, AmbPressStart, AmbPressEnd, AmbPressMin, AmbPressMax,
-                AmbHumiMean, AmbHumiStart, AmbHumiEnd, AmbHumiMin, AmbHumiMax,
-                PressUpMean, PressUpStart, PressUpEnd, PressUpMin, PressUpMax,
-                PressDownMean, PressDownStart, PressDownEnd, PressDownMin, PressDownMax,
-                PressDeltaMean, PressDeltaStart, PressDeltaEnd, PressDeltaMin, PressDeltaMax,
-                TempUpMean, TempUpStart, TempUpEnd, TempUpMin, TempUpMax,
-                TempDownMean, TempDownStart, TempDownEnd, TempDownMin, TempDownMax,
-                TempDivMean, TempDivStart, TempDivEnd, TempDivMin, TempDivMax,
-                FlowMean, FlowStart, FlowEnd, FlowMin, FlowMax,
-                Custom1, Custom2, Custom3, Custom4, Custom5, Custom6, Custom7, Custom8, Custom9, Custom10,
-                DiverterStart, DiverterEnd, TestMeasured, TestCollected
-            );
-        }
+            return string.Format("TestRslt: Part={0} RepetitionNr={1} TestDone={2} Remark={3} StartTime={4} EndTime={5} FlowSetTime={6} TestTime={7} PulsesMaster={8} ConstMaster={9} MassStartRaw={10} MassStart={11} MassEndRaw={12} MassEnd={13} DensityIn={14} DensityOut={15} DensityDiv={16} MassOfEvapWaater={17} FlowMass={18} FlowVolume={19} VolumeCTV={20} VolumeMaster={21} ErrorMaster={22} DiverterStart={85} DiverterEnd={86} ErrorFlags={23} InfoFlags={24} AmbTempMean={25} AmbTempStart={26} AmbTempEnd={27} AmbTempMin={28} AmbTempMax={29} AmbPressMean={30} AmbPressStart={31} AmbPressEnd={32} AmbPressMin={33}  AmbPressMax={34} AmbHumiMean={35} AmbHumiStart={36} AmbHumiEnd={37} AmbHumiMin={38} AmbHumiMax={39} PressUpMean={40} PressUpStart={41} PressUpEnd={42} PressUpMin={43} PressUpMax={44} PressDownMean={45} PressDownStart={46} PressDownEnd={47} PressDownMin={48} PressDownMax={49} PressDeltaMean={50} PressDeltaStart={51} PressDeltaEnd={52} PressDeltaMin={53} PressDeltaMax={54} TempUpMean={55} TempUpStart={56} TempUpEnd={57} TempUpMin={58} TempUpMax={59} TempDownMean={60} TempDownStart={61} TempDownEnd={62} TempDownMin={63} TempDownMax={64} TempDivMean={65} TempDivStart={66} TempDivEnd={67} TempDivMin={68} TempDivMax={69} FlowMean={70} FlowStart={71} FlowEnd={72} FlowMin={73} FlowMax={74} Custom1={75} Custom2={76} Custom3={77} Custom4={78} Custom5={79} Custom6={80} Custom7={81} Custom8={82} Custom9={83} Custom10={84} TestMeasured={85} TestCollected={86}", 
+								Part, RepetitionNr, TestDone, Remark, StartTime, EndTime, FlowSetTime, TestTime,
+								PulsesMaster, ConstMaster, MassStartRaw, MassStart, MassEndRaw, MassEnd,
+								DensityIn, DensityLine, DensityDiv, MassOfEvapWater, Qdetected, Flow,
+								VolumeCTV, VolumeMaster, ErrorMaster, ErrorFlags, InfoFlags, 
+								AmbTempMean, AmbTempStart, AmbTempEnd, AmbTempMin, AmbTempMax,
+								AmbPressMean, AmbPressStart, AmbPressEnd, AmbPressMin, AmbPressMax,
+								AmbHumiMean, AmbHumiStart, AmbHumiEnd, AmbHumiMin, AmbHumiMax,
+								PressUpMean, PressUpStart, PressUpEnd, PressUpMin, PressUpMax,
+								PressDownMean, PressDownStart, PressDownEnd, PressDownMin, PressDownMax,
+								PressDeltaMean, PressDeltaStart, PressDeltaEnd, PressDeltaMin, PressDeltaMax,
+								TempUpMean, TempUpStart, TempUpEnd, TempUpMin, TempUpMax,
+								TempDownMean, TempDownStart, TempDownEnd, TempDownMin, TempDownMax,
+								TempDivMean, TempDivStart, TempDivEnd, TempDivMin, TempDivMax,
+								FlowMean, FlowStart, FlowEnd, FlowMin, FlowMax,
+								Custom1, Custom2, Custom3, Custom4, Custom5, Custom6, Custom7, Custom8, Custom9, Custom10,
+                                DiverterStart, DiverterEnd, TestMeasured, TestCollected);
+		}
 
 
         public virtual void WriteBinary(BinaryWriter writer, IList<TestData> savedTestDatas)
@@ -532,7 +509,6 @@ namespace Results.Entities
             writer.Write(ConstMasterRaw);
             writer.Write(ConstMasterCorr);
             writer.Write(ConstMaster);
-            writer.Write(MassConstMaster);
             writer.Write(MassStartRaw);
             writer.Write(MassStart);
             writer.Write(MassEndRaw);
@@ -546,10 +522,6 @@ namespace Results.Entities
             writer.Write(VolumeCTV);
             writer.Write(VolumeMaster);
             writer.Write(ErrorMaster);
-            writer.Write(MassFlow);
-            writer.Write(MassCTV);
-            writer.Write(MassMaster);
-            writer.Write(MassErrorMaster);
             writer.Write(DiverterStart);
             writer.Write(DivStart10);
             writer.Write(DivStart50);
@@ -680,7 +652,6 @@ namespace Results.Entities
             ConstMasterRaw = reader.ReadDouble();
             ConstMasterCorr = reader.ReadDouble();
             ConstMaster = reader.ReadDouble();
-            MassConstMaster = reader.ReadDouble();
             MassStartRaw = reader.ReadDouble();
             MassStart = reader.ReadDouble();
             MassEndRaw = reader.ReadDouble();
@@ -694,10 +665,6 @@ namespace Results.Entities
             VolumeCTV = reader.ReadDouble();
             VolumeMaster = reader.ReadDouble();
             ErrorMaster = reader.ReadDouble();
-            MassFlow = reader.ReadDouble();
-            MassCTV = reader.ReadDouble();
-            MassMaster = reader.ReadDouble();
-            MassErrorMaster = reader.ReadDouble();
             DiverterStart = reader.ReadSingle();
             DivStart10 = reader.ReadSingle();
             DivStart50 = reader.ReadSingle();

Results/Forms/BatchResultsDlg.cs

@@ -49,6 +49,8 @@ namespace Results.Forms
         {
             InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             firstEnabledControl = null;
             lastSizeChange = DateTime.Now;
             nrGroups = 1;

Results/Forms/ManualEntryConfigDlg.cs

@@ -24,7 +24,10 @@ namespace Results.Forms
 		public ManualEntryConfigDlg()
 		{
 			InitializeComponent();
-			manualEntryConfigCtrl.Unlocked = true;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            manualEntryConfigCtrl.Unlocked = true;
 		}
 
 

Results/Forms/MoreWMResultsDlg.cs

@@ -25,6 +25,8 @@ namespace Results.Forms
         {
             InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             Localize();
 
             ShowAllResults(wm);

Results/Forms/ResultsConfigDlg.cs

@@ -35,7 +35,10 @@ namespace Results.Forms
 		public ResultsConfigDlg()
 		{
 			InitializeComponent();
-			resultsConfigCtrl.Unlocked = true;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            resultsConfigCtrl.Unlocked = true;
 		}
 
 

Results/ItemID.cs

@@ -37,9 +37,7 @@ namespace Results
         Ambient_pressure,               /// 27
         Ambient_humidity,               /// 28
         Volume,                         /// 29
-        Quantity,                       /// 29
         Reference_volume,               /// 30
-        Reference_quantity,             /// 30
         Error,                          /// 31
         Passed,                         /// 32
         Watermeter_type,                /// 33
@@ -71,7 +69,6 @@ namespace Results
         End_state,                      /// 59
         Pulses,                         /// 60
         Pulse__liter,                   /// 61  Water meter constant (pulses per liter) specific for one test
-        Pulse__kilogram,                /// 61  Water meter constant (pulses per liter) specific for one test //...MF
         Reference_pulses_ni,            /// 62  Reference pulses gated for specific meter (synchro method)
         Reference_energy,				/// 63
         Bench_ID,                       /// 64  Test bench ID (int) obtained from a component implementing IBenchInfo
@@ -84,7 +81,6 @@ namespace Results
         Batch_start_time,               /// 71
         Batch_end_time,                 /// 72
         Lite_per_pulse_Read,            /// 73
-        Unit_per_pulse_Read,            /// 73
         Result_code,                    /// 74
         Remark,                         /// 75
         T_Hi_mean,                      /// 76
@@ -102,11 +98,9 @@ namespace Results
         Volume_main,					/// 88
         Volume_aux,					    /// 89
         Start_volume,					/// 90
-        Start_quantity,					/// 90
         Start_volume_main,				/// 91
         Start_volume_aux,				/// 92
         End_volume,				        /// 93
-        End_quantity,				    /// 93
         End_volume_main,				/// 94
         End_volume_aux,				    /// 95   
         Error_main,						/// 96
@@ -357,17 +351,15 @@ namespace Results
 
         Failed_meters_countE15,         /// 297
 
-        RR_Quantity,                    ///  0
-        RR_Units,                       ///  0
-        MassFlow,                       /// 15 Calculated flow (use ConstMasterRaw/ConstMaster to calculate uncorrected flow of the reference flow meter) ...MF
-        Error_mass,                     /// 31 ...MF
-        Passed_mass,                    /// 32 ...MF
-        Meter_mass,                     /// 29 ...MF
-        Reference_mass,                 /// 30 ...MF
-        TestPassed_mass,			    /// 125 ...MF
-        //Pulses_per_kilogram,          /// 49  Water meter constant (water meter data, not used in calculations) //...MF
-        Pulses_per_unit,                /// 49  Water meter constant (water meter data, not used in calculations) //...MF
-        MassCTV,						/// 229 ...MF
+        Quantity,                       /// 298
+        Reference_quantity,             /// 299
+        Start_quantity,					/// 300
+        End_quantity,				    /// 301
+        RR_Quantity,                    /// 302
+        RR_Units,                       /// 303
+        MassCTV,						/// 304
+        Unit_per_pulse_Read,            /// 305
+        Pulses_per_unit,                /// 306
 
         Count,
     }

Results/Mappings/TestRsltMap.cs

@@ -32,8 +32,7 @@ namespace Results.Mappings
 			Map(x => x.ConstMasterRaw);
             Map(x => x.ConstMasterCorr);
             Map(x => x.ConstMaster);
-            Map(x => x.MassConstMaster);
-            Map(x => x.MassStartRaw);
+			Map(x => x.MassStartRaw);
 			Map(x => x.MassStart);
 			Map(x => x.MassEndRaw);
 			Map(x => x.MassEnd);

Results/Mappings/WaterMeterDataMap.cs

@@ -36,7 +36,6 @@ namespace Results.Mappings
             Map(x => x.Certificate);
 
             Map(x => x.PulsesPerLtr);
-            Map(x => x.PulsesPerKilogram);
 
             Map(x => x.ProducerAux);
             Map(x => x.Q3_Qn_Aux);

Results/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace Results.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -69,5 +69,15 @@ namespace Results.Properties {
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+        /// </summary>
+        internal static System.Drawing.Icon TBF_icon {
+            get {
+                object obj = ResourceManager.GetObject("TBF_icon", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
     }
 }

Results/Properties/Resources.resx

@@ -121,4 +121,7 @@
   <data name="Headpic" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Headpic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="TBF_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\TBF_icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

Results/Resources/Strings.Designer.cs

@@ -897,15 +897,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Pulses/kg.
-        /// </summary>
-        internal static string PulsesKilogram {
-            get {
-                return ResourceManager.GetString("PulsesKilogram", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Pulses/l.
         /// </summary>
@@ -1374,15 +1365,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Relative error of a meter.
-        /// </summary>
-        internal static string Tooltip_E_rel_mass {
-            get {
-                return ResourceManager.GetString("Tooltip_E_rel_mass", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Relative error of the master meter.
         /// </summary>
@@ -1995,15 +1977,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Mass measured by the tested meter.
-        /// </summary>
-        internal static string Tooltip_Vol_Mt_mass {
-            get {
-                return ResourceManager.GetString("Tooltip_Vol_Mt_mass", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Reference volume for tested meter.
         /// </summary>
@@ -2013,15 +1986,6 @@ namespace Results.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Reference mass for tested meter.
-        /// </summary>
-        internal static string Tooltip_Vol_rm_mass {
-            get {
-                return ResourceManager.GetString("Tooltip_Vol_rm_mass", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Uncertainty.
         /// </summary>

Results/Resources/Strings.cs.resx

@@ -351,18 +351,6 @@
   <data name="Merge" xml:space="preserve">
     <value>Spojit</value>
   </data>
-  <data name="PulsesKilogram" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Tooltip_E_rel_mass" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Tooltip_Vol_Mt_mass" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Tooltip_Vol_rm_mass" xml:space="preserve">
-    <value />
-  </data>
   <data name="PulsesUnit" xml:space="preserve">
     <value />
   </data>

Results/Resources/Strings.de.resx

@@ -825,18 +825,6 @@
   <data name="Selected_items" xml:space="preserve">
     <value>Ausgewählte Objekte</value>
   </data>
-  <data name="PulsesKilogram" xml:space="preserve">
-    <value>Impulse/kg</value>
-  </data>
-  <data name="Tooltip_E_rel_mass" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Tooltip_Vol_Mt_mass" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Tooltip_Vol_rm_mass" xml:space="preserve">
-    <value />
-  </data>
   <data name="PulsesUnit" xml:space="preserve">
     <value />
   </data>

Results/Resources/Strings.fr.resx

@@ -804,18 +804,6 @@
   <data name="Serial_number_is_missing" xml:space="preserve">
     <value>Numérotation en série</value>
   </data>
-  <data name="PulsesKilogram" xml:space="preserve">
-    <value>Impulsion/kilogram</value>
-  </data>
-  <data name="Tooltip_E_rel_mass" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Tooltip_Vol_Mt_mass" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Tooltip_Vol_rm_mass" xml:space="preserve">
-    <value />
-  </data>
   <data name="PulsesUnit" xml:space="preserve">
     <value />
   </data>

Results/Resources/Strings.it.resx

@@ -220,7 +220,7 @@
     <value>impulsi </value>
   </data>
   <data name="PulsesLiter" xml:space="preserve">
-    <value>impulsi/l</value>
+    <value>impulsi /l</value>
   </data>
   <data name="P_amb" xml:space="preserve">
     <value>P ambiente</value>
@@ -537,18 +537,6 @@
   <data name="Yes" xml:space="preserve">
     <value>Sì</value>
   </data>
-  <data name="PulsesKilogram" xml:space="preserve">
-    <value>impulsi/kg</value>
-  </data>
-  <data name="Tooltip_E_rel_mass" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Tooltip_Vol_Mt_mass" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Tooltip_Vol_rm_mass" xml:space="preserve">
-    <value />
-  </data>
   <data name="PulsesUnit" xml:space="preserve">
     <value />
   </data>

Results/Resources/Strings.pl.resx

@@ -441,18 +441,6 @@
   <data name="Unit" xml:space="preserve">
     <value>Jednostka</value>
   </data>
-  <data name="PulsesKilogram" xml:space="preserve">
-    <value>imp./kilogram</value>
-  </data>
-  <data name="Tooltip_E_rel_mass" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Tooltip_Vol_Mt_mass" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Tooltip_Vol_rm_mass" xml:space="preserve">
-    <value />
-  </data>
   <data name="PulsesUnit" xml:space="preserve">
     <value />
   </data>

Results/Resources/Strings.resx

@@ -852,18 +852,6 @@
   <data name="Merge" xml:space="preserve">
     <value>Merge</value>
   </data>
-  <data name="PulsesKilogram" xml:space="preserve">
-    <value>Pulses/kg</value>
-  </data>
-  <data name="Tooltip_E_rel_mass" xml:space="preserve">
-    <value>Relative error of a meter</value>
-  </data>
-  <data name="Tooltip_Vol_Mt_mass" xml:space="preserve">
-    <value>Mass measured by the tested meter</value>
-  </data>
-  <data name="Tooltip_Vol_rm_mass" xml:space="preserve">
-    <value>Reference mass for tested meter</value>
-  </data>
   <data name="PulsesUnit" xml:space="preserve">
     <value>Pulses/Unit</value>
   </data>

Results/Resources/Strings.ru.resx

@@ -438,18 +438,6 @@
   <data name="Yes" xml:space="preserve">
     <value>Да</value>
   </data>
-  <data name="PulsesKilogram" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Tooltip_E_rel_mass" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Tooltip_Vol_Mt_mass" xml:space="preserve">
-    <value />
-  </data>
-  <data name="Tooltip_Vol_rm_mass" xml:space="preserve">
-    <value />
-  </data>
   <data name="PulsesUnit" xml:space="preserve">
     <value />
   </data>

Results/Results.csproj

@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;HEAT_METERS;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; HEAT_METERS;IPEL</DefineConstants>
+    <DefineConstants>TRACE;IPERL;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -239,9 +239,7 @@
     <EmbeddedResource Include="Resources\Strings.de.resx">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Resources\Strings.fr.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Strings.fr.resx" />
     <EmbeddedResource Include="Resources\Strings.it.resx" />
     <EmbeddedResource Include="Resources\Strings.pl.resx">
       <SubType>Designer</SubType>
@@ -258,6 +256,7 @@
   <ItemGroup>
     <Content Include="Entities\PurchaseEntities\createPurchaseTables.sql" />
     <Content Include="Entities\PurchaseEntities\ImportPurchaseOrderTestData.sql" />
+    <None Include="Resources\TBF_icon.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

ResultsBrowser/Forms/NoBenchOrDatabaseDlg.Designer.cs

@@ -101,7 +101,7 @@
 			this.Controls.Add(this.exitButton);
 			this.Name = "NoBenchOrDatabaseDlg";
 			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-			this.Text = "Error_mass";
+			this.Text = "Error";
 			this.Load += new System.EventHandler(this.NoDatabaseMsgDlg_Load);
 			((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
 			this.ResumeLayout(false);

ResultsBrowser/Resources/Strings1.Designer.cs

@@ -187,16 +187,16 @@ namespace ResultsBrowser.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Error_mass.
+        ///   Looks up a localized string similar to Error.
         /// </summary>
         internal static string Error {
             get {
-                return ResourceManager.GetString("Error_mass", resourceCulture);
+                return ResourceManager.GetString("Error", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Error_mass displaying results.
+        ///   Looks up a localized string similar to Error displaying results.
         /// </summary>
         internal static string Error_displaying_results {
             get {
@@ -205,7 +205,7 @@ namespace ResultsBrowser.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Error_mass exporting results.
+        ///   Looks up a localized string similar to Error exporting results.
         /// </summary>
         internal static string Error_exporting_results {
             get {
@@ -214,7 +214,7 @@ namespace ResultsBrowser.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Error_mass saving file.
+        ///   Looks up a localized string similar to Error saving file.
         /// </summary>
         internal static string Error_saving_file {
             get {
@@ -223,7 +223,7 @@ namespace ResultsBrowser.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Error_mass serializing filters.
+        ///   Looks up a localized string similar to Error serializing filters.
         /// </summary>
         internal static string Error_serializing_filters {
             get {

ResultsBrowser/ResultsBrowser.csproj

@@ -21,7 +21,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MANAGED;ORACLE_DB;TURA_IPERL;HEAT_METERS</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;MANAGED;ORACLE_DB;TURA_IPERL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>

SchematicDrawing/DrawingShape.cs

@@ -12,6 +12,7 @@ namespace SchematicDrawing
         public readonly Sz Sz;                  /// see enum SchematicDrawing.Sz
         public readonly int SzX;                /// Size X in SchematicDrawing.Const.Step pixels
         public readonly int SzY;                /// Size Y in SchematicDrawing.Const.Step pixels
+
         public readonly int OffsX;              /// Offset of left/top coordinate of the bitmap when rendering
         public readonly int OffsY;              /// Offset of left/top coordinate of the bitmap when rendering
         public readonly int Wid;                /// Width of the bitmap when rendering, original bitmap is resized to this size
@@ -377,6 +378,40 @@ namespace SchematicDrawing
                                                                   Properties.Resources.Valve_XL_closed,
                                                                   Properties.Resources.Valve_XL_vacuum,
                                                                   Properties.Resources.Valve_XL_open_dry);
+            /// ValveSw
+            Shapes[DrShIx(Shape.ValveSw, Sz.S)] = new DrawingShape(Shape.ValveSw, Sz.S, 2, 2,
+                                                                 new Node[] { new Node(0, 1, Orient.L), new Node(2, 1, Orient.R) },
+                                                                 new Edge[] { new Edge(0, 1, 20, RouteCouple.OpenWhen1), new Edge(1, 0, 20, RouteCouple.OpenWhen1) },
+                                                                 0, 0, 20, 20,
+                                                                 Properties.Resources.ValveSw_S_open,
+                                                                 Properties.Resources.ValveSw_S_closed,
+                                                                 Properties.Resources.ValveSw_S_vacuum,
+                                                                 Properties.Resources.ValveSw_S_open_dry);
+            Shapes[DrShIx(Shape.ValveSw, Sz.M)] = new DrawingShape(Shape.ValveSw, Sz.M, 3, 4,
+                                                                 new Node[] { new Node(0, 2, Orient.L), new Node(3, 2, Orient.R) },
+                                                                 new Edge[] { new Edge(0, 1, 30, RouteCouple.OpenWhen1), new Edge(1, 0, 30, RouteCouple.OpenWhen1) },
+                                                                 0, 5, 30, 30,
+                                                                 Properties.Resources.ValveSw_M_open,
+                                                                 Properties.Resources.ValveSw_M_closed,
+                                                                 Properties.Resources.ValveSw_M_vacuum,
+                                                                 Properties.Resources.ValveSw_M_open_dry);
+            Shapes[DrShIx(Shape.ValveSw, Sz.L)] = new DrawingShape(Shape.ValveSw, Sz.L, 4, 4,
+                                                                 new Node[] { new Node(0, 2, Orient.L), new Node(4, 2, Orient.R) },
+                                                                 new Edge[] { new Edge(0, 1, 40, RouteCouple.OpenWhen1), new Edge(1, 0, 40, RouteCouple.OpenWhen1) },
+                                                                 0, 0, 40, 40,
+                                                                 Properties.Resources.ValveSw_L_open,
+                                                                 Properties.Resources.ValveSw_L_closed,
+                                                                 Properties.Resources.ValveSw_L_vacuum,
+                                                                 Properties.Resources.ValveSw_L_open_dry);
+            Shapes[DrShIx(Shape.ValveSw, Sz.XL)] = new DrawingShape(Shape.ValveSw, Sz.XL, 5, 6,
+                                                                  new Node[] { new Node(0, 3, Orient.L), new Node(5, 3, Orient.R) },
+                                                                  new Edge[] { new Edge(0, 1, 50, RouteCouple.OpenWhen1), new Edge(1, 0, 50, RouteCouple.OpenWhen1) },
+                                                                  0, 5, 50, 50,
+                                                                  Properties.Resources.ValveSw_XL_open,
+                                                                  Properties.Resources.ValveSw_XL_closed,
+                                                                  Properties.Resources.ValveSw_XL_vacuum,
+                                                                  Properties.Resources.ValveSw_XL_open_dry);
+
             /// Diverter
             Shapes[DrShIx(Shape.Div, Sz.S)] = new DrawingShape(Shape.Div, Sz.S, 2, 2,
                                                                new Node[] { new Node(2, 0, Orient.Up), new Node(1, 2, Orient.Dn), new Node(3, 2, Orient.Dn) },
@@ -522,12 +557,18 @@ namespace SchematicDrawing
             Shapes[DrShIx(Shape.Scale, Sz.L)] = new DrawingShape(Shape.Scale, Sz.L, 12, 11, new Node[] { new Node(6, 11, Orient.Dn) }, null, 0, 0, 120, 110, Properties.Resources.Scale_L);
             Shapes[DrShIx(Shape.Scale, Sz.XL)] = new DrawingShape(Shape.Scale, Sz.XL, 16, 13, new Node[] { new Node(8, 13, Orient.Dn) }, null, 0, 0, 160, 130, Properties.Resources.Scale_XL);
 
-            /// Tank
+            /// Tank uni
             Shapes[DrShIx(Shape.Tank, Sz.S)] = new DrawingShape(Shape.Tank, Sz.S, 10, 8, new Node[] { new Node(0, 6, Orient.L) }, null, 0, 0, 100, 80, Properties.Resources.Tank_S);
             Shapes[DrShIx(Shape.Tank, Sz.M)] = new DrawingShape(Shape.Tank, Sz.M, 12, 9, new Node[] { new Node(0, 7, Orient.L) }, null, 0, 0, 120, 90, Properties.Resources.Tank_M);
             Shapes[DrShIx(Shape.Tank, Sz.L)] = new DrawingShape(Shape.Tank, Sz.L, 15, 11, new Node[] { new Node(0, 9, Orient.L) }, null, 0, 0, 150, 110, Properties.Resources.Tank_L);
             Shapes[DrShIx(Shape.Tank, Sz.XL)] = new DrawingShape(Shape.Tank, Sz.XL, 20, 13, new Node[] { new Node(0, 11, Orient.L) }, null, 0, 0, 200, 130, Properties.Resources.Tank_XL);
 
+            /// Tank hot
+            Shapes[DrShIx(Shape.TankHot, Sz.S)] = new DrawingShape(Shape.TankHot, Sz.S, 10, 8, new Node[] { new Node(0, 6, Orient.L) }, null, 0, 0, 100, 80, Properties.Resources.Tank_S_hot);
+            Shapes[DrShIx(Shape.TankHot, Sz.M)] = new DrawingShape(Shape.TankHot, Sz.M, 12, 9, new Node[] { new Node(0, 7, Orient.L) }, null, 0, 0, 120, 90, Properties.Resources.Tank_M_hot);
+            Shapes[DrShIx(Shape.TankHot, Sz.L)] = new DrawingShape(Shape.TankHot, Sz.L, 15, 11, new Node[] { new Node(0, 9, Orient.L) }, null, 0, 0, 150, 110, Properties.Resources.Tank_L_hot);
+            Shapes[DrShIx(Shape.TankHot, Sz.XL)] = new DrawingShape(Shape.TankHot, Sz.XL, 20, 13, new Node[] { new Node(0, 11, Orient.L) }, null, 0, 0, 200, 130, Properties.Resources.Tank_XL_hot);
+
             /// Junction
             Shapes[DrShIx(Shape.Junction, Sz.None)]  = new DrawingShape(Shape.Junction, Sz.None, 0, 0, new Node[] { new Node(0, 0, Orient.R) });
             Shapes[DrShIx(Shape.Junction, Sz.S)] = new DrawingShape(Shape.Junction, Sz.S, 2, 2,

SchematicDrawing/Enums.cs

@@ -45,11 +45,13 @@ namespace SchematicDrawing
         Scale,
         Sink,
         Tank,
+        TankHot,
         Tee,
         TempM,
         UniCB,
         Vacuum,
         Valve,
+        ValveSw,
         WaterM,
         ElectricM,