Reconfigured for Warsaw PT50

.gitignore

@@ -4,6 +4,10 @@ Config/bin/
 Config/obj/
 DataStreamInterface/bin/
 DataStreamInterface/obj/
+DataStreamInterfaceTest/bin/
+DataStreamInterfaceTest/obj/
+DataStreamMeter/bin/
+DataStreamMeter/obj/
 Decrypt/bin/
 Decrypt/obj/
 DeviceTest/bin/

Config/Config.csproj

@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;WARSAW_50;LANG_PL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -30,7 +30,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;WARSAW_50;LANG_PL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>

Config/Data.cs

@@ -8,31 +8,43 @@ namespace Config
 		public const string AdminPassword = "staratura";
 		public const string SQLiteDbFName = "SQLite.db";
 
-#if MUNICH
+#if DN100 || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || CEVAK_200
+		public const int WMsCount = 3;
+		public const int LineSize = 3;
+		public const int CompoundWMsCount = 1;
+		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = 1;
+#elif MUNICH
 		public const int WMsCount = 3;
 		public const int LineSize = 3;
 		public const int CompoundWMsCount = 3;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = 3;
-#elif DN100 || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || CEVAK_200
-		public const int WMsCount = 3;
-		public const int LineSize = 3;
-		public const int CompoundWMsCount = 1;
-		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = WMsCount / LineSize;
-#elif FUZHOU_300 || FUZHOU_150 || IZRAEL_200 || GENESIS || SLM_150 || PETERSBURG_200
+#elif MALTA_WSD25
 		public const int WMsCount = 6;
 		public const int LineSize = 6;
-		public const int CompoundWMsCount = 1;
+		public const int CompoundWMsCount = 0;
 		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = 3;
+        public const int MaxPartNr = 1;
+#elif BADGER_MALA_TRAT || BERLIN || FUZHOU_150 || FUZHOU_300 || GELSENWASSER || GENESIS || IZRAEL_200 || PETERSBURG_200 || SENTEC || SLM_150 || TORINO_50 || TURA_SPECIAL
+        public const int WMsCount = 6;
+        public const int LineSize = 6;
+        public const int CompoundWMsCount = 1;
+        public const int HeatMetersCount = 0;
+        public const int MaxPartNr = 1;
 #elif PUCHONG_200
 		public const int WMsCount = 6;
 		public const int LineSize = 6;
 		public const int CompoundWMsCount = 3;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = 3;
-#elif DEWA_300 || ROMA_200
+#elif RUM_MOB
+        public const int WMsCount = 8;
+		public const int LineSize = 8;
+		public const int CompoundWMsCount = 1;
+		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = WMsCount / LineSize;
+#elif DEWA_300 || FUZHOU_100 || ROMA_200 || LUXEMBURG_40
         public const int WMsCount = 10;
         public const int LineSize = 10;
         public const int CompoundWMsCount = 1;
@@ -44,63 +56,33 @@ namespace Config
 		public const int CompoundWMsCount = 0;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = WMsCount / LineSize;
-#elif IZRAEL_50
-		public const int WMsCount = 40;
-		public const int LineSize = 10;
-		public const int CompoundWMsCount = 0;
-		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = WMsCount / LineSize;
-#elif FUZHOU_100
-		public const int WMsCount = 10;
-		public const int LineSize = 10;
+#elif SLM_END || WARSAW_END
+        public const int WMsCount = 10;
+		public const int LineSize = 5;
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = WMsCount / LineSize;
-#elif TORINO_50 || BADGER_MALA_TRAT || BERLIN || GELSENWASSER
-		public const int WMsCount = 6;
-		public const int LineSize = 6;
+        public const int MaxPartNr = 4;
+#elif SLM_50
+		public const int WMsCount = 12;
+		public const int LineSize = 12;
 		public const int CompoundWMsCount = 1;
-		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = 1;
-#elif TORUN_50 || CEVAK_40 || MURES_40 || FUZHOU_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || ALZIR_25
+		public const int HeatMetersCount = 6;
+        public const int MaxPartNr = WMsCount / LineSize;
+#elif ALZIR_25 || BAHRAIN_50 || CEVAK_40 || FEWA_50 || FILIPINY_50 || FUZHOU_50 || HONGKONG_50 || IZRAEL_25 || JUZNA_AFRIKA_50 || KEMPNO_50 || KRAKOW_50 || MURES_40 || PETERSBURG_50 || TORUN_50 || WARSAW_50 || ZAMBIA || ZODINO
         public const int WMsCount = 20;
 		public const int LineSize = 10;
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = WMsCount / LineSize;
-#elif RUM_MOB
-        public const int WMsCount = 8;
-		public const int LineSize = 8;
-		public const int CompoundWMsCount = 1;
-		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = WMsCount / LineSize;
 #elif TURA_IPERL || TURA_IPERL_NEW
 		public const int WMsCount = 40;
 		public const int LineSize = 20;
 		public const int CompoundWMsCount = 1;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = WMsCount / LineSize;
-#elif TURA_SPECIAL || SENTEC
-        public const int WMsCount = 6;
-		public const int LineSize = 6;
-		public const int CompoundWMsCount = 1;
-		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = WMsCount / LineSize;
-#elif SLM_50
-		public const int WMsCount = 12;
-		public const int LineSize = 12;
-		public const int CompoundWMsCount = 1;
-		public const int HeatMetersCount = 6;
-        public const int MaxPartNr = WMsCount / LineSize;
-#elif SLM_END || WARSAW_END
-        public const int WMsCount = 10;
-		public const int LineSize = 5;
-		public const int CompoundWMsCount = 1;
-		public const int HeatMetersCount = 0;
-        public const int MaxPartNr = 4;
-#elif MALTA_WSD25
-		public const int WMsCount = 6;
-		public const int LineSize = 6;
+#elif IZRAEL_50
+		public const int WMsCount = 40;
+		public const int LineSize = 10;
 		public const int CompoundWMsCount = 0;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = WMsCount / LineSize;

Config/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.26.1458.0")]
-[assembly: AssemblyFileVersion("2.26.1458.0")]
+[assembly: AssemblyVersion("2.26.1519.0")]
+[assembly: AssemblyFileVersion("2.26.1519.0")]

Config/Units.cs

@@ -17,14 +17,21 @@ namespace Config
 #else
         [Description("degree")]     degree,
 #endif
+        [Description("ml")]         ml,         ///   1 ml = 0.001 l
         [Description("l")]          l,          /// * 1 liter
-        [Description("dm3")]        dm3,        ///   1 dm3 = 1 liter
-        [Description("m3")]         m3,         ///   1000 l
-        [Description("gal(UK)")]    gal_UK,     ///   1 gal(UK) = 4.54609 l
-        [Description("gal(US)")]    gal_US,     ///   1 gal(US) = 3.78541178 l
+        [Description("dm3")]        dm3,        ///   1 dm3 = 1 l
+        [Description("US gal")]     USgal,      ///   1 US gallon = 3.78541178 l
+        [Description("imper.gal")]  UKgal,      ///   1 imperial gallon = 4.54609 l
+        [Description("cf")]         cf,         ///   1 cubic foot = 28.316846592 l
+        [Description("m3")]         m3,         ///   1 m3 = 1000 l
 
-        [Description("l/h")]        lph,        ///   1 liter/h
-        [Description("m3/h")]       m3ph,       /// * 1 m3/h = 1000 l/h
+        [Description("l/h")]        lph,        ///   1 l/h = 0.001 m3/h
+        [Description("l/m")]        lpm,        ///   1 l/m = 60 l/h = 0.06 m3/h
+        [Description("m3/h")]       m3ph,       /// * 1 m3/h
+        [Description("l/s")]        lps,        ///   1 liter/s = 3.6 m3/h
+        [Description("US gal/s")]   USgalps,    ///   1 US gallon per second = 13.627482408 m3/h
+        [Description("m3/m")]       m3pm,       ///   1 m3/m = 60 m3/h
+        [Description("cf/s")]       cfs,        ///   1 cubic foot per second = 101.9406477312 m3/h
 
         [Description("g")]          g,          ///   0.001 kg
         [Description("lb")]         lb,         ///   0.45359237 kg
@@ -43,7 +50,7 @@ namespace Config
         [Description("Pa")]         Pa,         ///   1 Pa = 0.01 hPa
         [Description("hPa")]        hPa,        ///   1 hPa = 100 Pa
         [Description("mbar")]       mbar,       ///   1 mbar = 1 hPa = 100 Pa
-        [Description("kPa")]        kPa,        ///   1 kPa = 10 hPa = 10000 Pa
+        [Description("kPa")]        kPa,        ///   1 kPa = 10 hPa = 1000 Pa
         [Description("inHg")]       inHg,       ///   1 inHg = 33.864 hPa
         [Description("psi")]        psi,        ///   1 psi = 0.0689475729 bar
         [Description("bar")]        bar,        /// * 1 Bar = 1000 mbar = 0.1 MPa = 100000 Pa
@@ -51,13 +58,16 @@ namespace Config
 
         [Description("R%")]         RPct,       /// * 1 R%
 
-        [Description("%")]          Pct,        /// * 1 %
         [Description("promile")]    Promile,    ///   1 promile = 0.1 %
+        [Description("%")]          Pct,        /// * 1 %
 
         [Description("mm")]         mm,         /// * 1 millimeter
         [Description("cm")]         cm,         ///   1 cm = 10 mm
-        [Description("m")]          m,          ///   1 m = 1000 mm
         [Description("in")]         inch,       ///   1 inch = 25.4 mm
+        [Description("dm")]         dm,         ///   1 dm = 100 mm
+        [Description("ft")]         foot,       ///   1 foot = 304.8 mm
+        [Description("yd")]         yard,       ///   1 yard = 914.4 mm
+        [Description("m")]          m,          ///   1 m = 1000 mm
 
         [Description("kg/m3")]      kgpm3,		/// * 1 kg/m3 = 0.001 kg/l
         [Description("kg/l")]       kgpl,		///   1 kg/l = 1000 kg/m3
@@ -70,6 +80,7 @@ namespace Config
         [Description("MWh")]        MWh,		///   1 MWh = 3600000000 J
 
         [Description("uS/cm")]      uSpcm,      /// * 1 uS/cm
+        [Description("mS/m")]       mSpm,       ///   1 mS/m = 10 uS/cm
 
 #if LANG_PL
         [Description("imp/l")]       ppl,		/// * 1 pulse/l
@@ -82,17 +93,17 @@ namespace Config
         [Description("dm3/stopień")] dm3pdeg,	/// * 1 dm3/degree
 #else
         [Description("pulse/l")]    ppl,		/// * 1 pulse/l
-        [Description("pulse/dm3")]  ppdm3,		/// * 1 pulse/dm3
-        [Description("degree/l")]   degpl,		/// * 1 degree/l
-        [Description("degree/dm3")] degpdm3,	/// * 1 degree/dm3
-        [Description("l/pulse")]    lpp,		/// * 1 l/pulse
-        [Description("dm3/pulse")]  dm3pp,		/// * 1 dm3/pulse
-        [Description("l/degree")]   lpdeg,		/// * 1 l/degree
-        [Description("dm3/degree")] dm3pdeg,	/// * 1 dm3/degree
+        [Description("pulse/dm3")]  ppdm3,		///   1 pulse/dm3
+        [Description("degree/l")]   degpl,		///   1 degree/l
+        [Description("degree/dm3")] degpdm3,	///   1 degree/dm3
+        [Description("l/pulse")]    lpp,		///   1 l/pulse
+        [Description("dm3/pulse")]  dm3pp,		///   1 dm3/pulse
+        [Description("l/degree")]   lpdeg,		///   1 l/degree
+        [Description("dm3/degree")] dm3pdeg,	///   1 dm3/degree
 #endif
         /// 
         [Description("pulse/kWh")]  ppkWh,		/// * 1 pulse/kWh
-        [Description("kWh/pulse")]  kWhpp,		/// * 1 kWh/pulse
+        [Description("kWh/pulse")]  kWhpp,		///   1 kWh/pulse
                                                 
         Count
     }
@@ -228,8 +239,9 @@ namespace Config
 
         public static bool IsDefaultUnit(Unit unit)
         {
-            return unit == Unit.l || unit == Unit.m3ph || unit == Unit.kg || unit == Unit.s || unit == Unit.C || unit == Unit.bar || unit == Unit.RPct ||
-                   unit == Unit.Pct || unit == Unit.mm || unit == Unit.kgpm3 || unit == Unit.J || unit == Unit.ppl || unit == Unit.ppkWh || unit == Unit.uSpcm;
+            return unit == Unit.l || unit == Unit.m3ph || unit == Unit.kg || unit == Unit.s || unit == Unit.C ||
+                   unit == Unit.bar || unit == Unit.RPct || unit == Unit.Pct || unit == Unit.mm || unit == Unit.kgpm3 ||
+                   unit == Unit.J || unit == Unit.uSpcm || unit == Unit.ppl || unit == Unit.ppkWh;
         }
 
         public static bool IsQuantity(Unit units, Quantity quantity)
@@ -243,35 +255,42 @@ namespace Config
             {
                 case Unit.pulse:
                 case Unit.degree:
-                    return Config.Quantity.Pulses;
+                    return Quantity.Pulses;
 
+                case Unit.ml:
                 case Unit.l:
                 case Unit.dm3:
+                case Unit.USgal:
+                case Unit.UKgal:
+                case Unit.cf:
                 case Unit.m3:
-                case Unit.gal_UK:
-                case Unit.gal_US:
-					return Config.Quantity.Volume;
+					return Quantity.Volume;
 
                 case Unit.lph:
+                case Unit.lpm:
                 case Unit.m3ph:
-					return Config.Quantity.Flow;
+                case Unit.lps:
+                case Unit.USgalps:
+                case Unit.m3pm:
+                case Unit.cfs:
+                    return Quantity.Flow;
 
                 case Unit.g:
+                case Unit.lb:
                 case Unit.kg:
                 case Unit.t:
-                case Unit.lb:
-					return Config.Quantity.Mass;
+					return Quantity.Mass;
 
+                case Unit.ms:
                 case Unit.s:
                 case Unit.min:
                 case Unit.hour:
-                case Unit.ms:
-                    return Config.Quantity.Time;
+                    return Quantity.Time;
 
                 case Unit.C:
                 case Unit.F:
                 case Unit.K:
-					return Config.Quantity.Temperature;
+					return Quantity.Temperature;
 
                 case Unit.Pa:
                 case Unit.hPa:
@@ -281,24 +300,27 @@ namespace Config
                 case Unit.psi:
                 case Unit.bar:
                 case Unit.MPa:
-                    return Config.Quantity.Pressure;
+                    return Quantity.Pressure;
 
                 case Unit.RPct:
-                    return Config.Quantity.Humidity;
+                    return Quantity.Humidity;
 
-                case Unit.Pct:
                 case Unit.Promile:
-					return Config.Quantity.Error;
+                case Unit.Pct:
+					return Quantity.Error;
 
                 case Unit.mm:
                 case Unit.cm:
-                case Unit.m:
                 case Unit.inch:
-					return Config.Quantity.Length;
+                case Unit.dm:
+                case Unit.foot:
+                case Unit.yard:
+                case Unit.m:
+					return Quantity.Length;
 
 				case Unit.kgpm3:
 				case Unit.kgpl:
-					return Config.Quantity.Density;
+					return Quantity.Density;
 
 				case Unit.J:
 				case Unit.kJ:
@@ -306,7 +328,11 @@ namespace Config
                 case Unit.Wh:
 				case Unit.kWh:
                 case Unit.MWh:
-                    return Config.Quantity.Energy;
+                    return Quantity.Energy;
+
+                case Unit.uSpcm:
+                case Unit.mSpm:
+                    return Quantity.Conductivity;
 
                 case Unit.ppl:
                 case Unit.ppdm3:
@@ -316,17 +342,14 @@ namespace Config
                 case Unit.dm3pp:
                 case Unit.lpdeg:
                 case Unit.dm3pdeg:
-                    return Config.Quantity.PulsePerLtr;
+                    return Quantity.PulsePerLtr;
 
                 case Unit.ppkWh:
                 case Unit.kWhpp:
-                    return Config.Quantity.PulsePerKWh;
-
-                case Unit.uSpcm:
-                    return Config.Quantity.Conductivity;
+                    return Quantity.PulsePerKWh;
 
                 default:
-					return Config.Quantity.Number;
+					return Quantity.Number;
             }
 		}
 
@@ -347,78 +370,80 @@ namespace Config
         public static bool IsConductivity(Unit units) { return IsQuantity(units, Config.Quantity.Conductivity); }
 
 
-
 		public static double ConvertTo(Unit units, double v)
         {
             switch (units)
             {
                 /// Volume: internal representation in l
-                case Unit.dm3:
-                case Unit.l:        return v;               /// 1 liter
-                case Unit.m3:       return 0.001 * v;       /// 1 m3 = 1000 l
-                case Unit.gal_UK:   return 0.21996925 * v;  /// 1 gal(UK) = 4.54609 l
-                case Unit.gal_US:   return 0.26417205 * v;  /// 1 gal(US) = 3.78541178 l
+                case Unit.ml:       return 1000 * v;            /// 1 ml = 0.001 l
+                case Unit.USgal:    return 0.26417205 * v;      /// 1 gal(US) = 3.78541178 l
+                case Unit.UKgal:    return 0.21996925 * v;      /// 1 gal(UK) = 4.54609 l
+                case Unit.cf:       return 0.0353146667215 * v; /// 1 cubic foot = 28.316846592 l
+                case Unit.m3:       return 0.001 * v;           /// 1 m3 = 1000 l
 
                 /// Flow: internal representation in m3/h
-                case Unit.lph:      return 1000 * v;        /// 1 liter/h
-                case Unit.m3ph:     return v;               /// 1 m3/h = 1000 l/h
+                case Unit.lph:      return 1000 * v;            /// 1 l/h
+                case Unit.lpm:      return v / 0.06;            /// 1 l/m
+                case Unit.lps:      return v / 3.6;             /// 1 l/s
+                case Unit.USgalps:  return 0.0733811257326 * v; /// 1 US gallon per second
+                case Unit.m3pm:     return v / 60;              /// 1 m3/m
+                case Unit.cfs:      return 0.009809629644858 * v; /// 1 cubic foot per second
 
                 /// Mass: internal representation in kg
-                case Unit.g:        return 1000 * v;        /// 1 g = 0.001 kg
-                case Unit.kg:       return v;               /// 1 kilogram
-                case Unit.t:        return 0.001 * v;       /// 1 t = 1000 kg
-                case Unit.lb:       return 2.2046226 * v;   /// 1 lb = 0.45359237 kg
+                case Unit.g:        return 1000 * v;            /// 1 g = 0.001 kg
+                case Unit.lb:       return 2.2046226 * v;       /// 1 lb = 0.45359237 kg
+                case Unit.t:        return 0.001 * v;           /// 1 t = 1000 kg
 
                 /// Time or duration: internal representation in seconds [s] 
-                case Unit.s:        return v;
+                case Unit.ms:       return 1000 * v;
                 case Unit.min:      return v / 60;
                 case Unit.hour:     return v / 3600;
-                case Unit.ms:       return 1000 * v;
 
 				/// Temperature: internal representation in °C
-				case Unit.C:        return v;               /// degree Celsius (°C)
-                case Unit.F:        return 1.8 * v + 32;    /// degree Fahrenheit
-                case Unit.K:        return v + 273.15;      /// degree Kelvin
+                case Unit.F:        return 1.8 * v + 32;        /// degree Fahrenheit
+                case Unit.K:        return v + 273.15;          /// degree Kelvin
 
                 /// Pressure: internal representation in  bar = 0.1 MPa
-                case Unit.Pa:       return 100000 * v;      /// 1 hPa = 100 Pa
-                case Unit.hPa:      return 1000 * v;        /// 1 hPa = 100 Pa
-                case Unit.mbar:     return 1000 * v;        /// 1 mbar = 1 hPa = 100 Pa
-                case Unit.kPa:      return 100 * v;         /// 1 kPa = 10 HPa
-                case Unit.inHg:     return 29.53 * v;       /// 1 inHg =
-                case Unit.psi:      return 14.50377378 * v; /// 1 psi =
-                case Unit.bar:      return v;               /// 1 bar = 1000 mbar = 100000 Pa
-                case Unit.MPa:      return 0.1 * v;         /// 1 MPa = 10000 hPa
+                case Unit.Pa:       return 100000 * v;          /// 1 hPa = 100 Pa
+                case Unit.hPa:      return 1000 * v;            /// 1 hPa = 100 Pa
+                case Unit.mbar:     return 1000 * v;            /// 1 mbar = 1 hPa = 100 Pa
+                case Unit.kPa:      return 100 * v;             /// 1 kPa = 10 HPa
+                case Unit.inHg:     return 29.53 * v;           /// 1 inHg =
+                case Unit.psi:      return 14.5037738 * v;      /// 1 psi =
+                case Unit.MPa:      return 0.1 * v;             /// 1 MPa = 10000 hPa
 
-                /// Error: internal representation in %
-                case Unit.Pct:      return v;               /// 1 %
-                case Unit.Promile:  return 10 * v;          /// 1 promile = 0.1 %
+                /// Relative error: internal representation in %
+                case Unit.Promile:  return 10 * v;              /// 1 promile = 0.1 %
 
                 /// Diameter, length: internal representation in mm
-                case Unit.mm:       return v;               /// 1 mm
-                case Unit.cm:       return 0.1 * v;         /// 1 cm = 10 mm
-                case Unit.m:        return 0.001 * v;       /// 1 m = 1000 mm
-                case Unit.inch:     return v / 25.4;        /// 1 inch = 25.4 mm
-
+                case Unit.cm:       return 0.1 * v;             /// 1 cm = 10 mm
+                case Unit.inch:     return v / 25.4;            /// 1 inch = 25.4 mm
+                case Unit.dm:       return 0.01 * v;            /// 1 dm = 100 mm
+                case Unit.foot:     return v / 304.8;           /// 1 foot = 304.8 mm
+                case Unit.yard:     return v / 914.4;           /// 1 yard = 914,4 mm
+                case Unit.m:        return 0.001 * v;           /// 1 m = 1000 mm
+                                                                
 				/// Density: internal representation in kg/m3
-				case Unit.kgpm3:    return v;
 				case Unit.kgpl:     return 0.001 * v;
 
 				/// Energy, internal representation in Joul
-				case Unit.J:        return v;               /// 1 Joul
-				case Unit.kJ:       return 0.001 * v;       /// 1 kJ = 1000 J
-                case Unit.MJ:       return 0.000001 * v;    /// 1 kJ = 1000000 J
-                case Unit.Wh:       return v / 3600.0;      /// 1 Wh = 3600 J
-				case Unit.kWh:      return v / 3600000.0;   /// 1 kWh = 3600000 J
-                case Unit.MWh:      return v / 3600000000.0;/// 1 MWh = 3600000000 J
+				case Unit.kJ:       return 0.001 * v;           /// 1 kJ = 1000 J
+                case Unit.MJ:       return 0.000001 * v;        /// 1 kJ = 1000000 J
+                case Unit.Wh:       return v / 3600.0;          /// 1 Wh = 3600 J
+				case Unit.kWh:      return v / 3600000.0;       /// 1 kWh = 3600000 J
+                case Unit.MWh:      return v / 3600000000.0;    /// 1 MWh = 3600000000 J
 
+                /// Electrical conductivity
+                case Unit.mSpm:     return 0.1 * v;
+
+                /// Invert pulses
                 case Unit.kWhpp:
                 case Unit.lpp:
                 case Unit.dm3pp:
                 case Unit.lpdeg:
-                case Unit.dm3pdeg:  return ((v <= float.Epsilon) ? 0 : 1 / v);
+                case Unit.dm3pdeg:  return (v <= float.Epsilon) ? 0 : 1/v;
 
-                default:            return v;
+                default:            return v;                   /// Do not convert
             }
         }
 
@@ -427,72 +452,75 @@ namespace Config
             switch (units)
             {
                 /// Volume: internal representation in l
-                case Unit.dm3:
-                case Unit.l:        return v;               /// 1 liter
-                case Unit.m3:       return 1000 * v;        /// 1000 l
-                case Unit.gal_UK:   return 4.54609 * v;     /// 1 gal(UK) = 4.54609 l
-                case Unit.gal_US:   return 3.78541178 * v;  /// 1 gal(US) = 3.78541178 l
+                case Unit.ml:       return 0.001 * v;           /// 0.001 l
+                case Unit.USgal:    return 3.78541178 * v;      /// 1 gal(US) = 3.78541178 l
+                case Unit.UKgal:    return 4.54609 * v;         /// 1 gal(UK) = 4.54609 l
+                case Unit.cf:       return 28.316846592 * v;    /// 1 cubic foot = 28.316846592 l
+                case Unit.m3:       return 1000 * v;            /// 1000 l
 
                 /// Flow: internal representation in m3/h
-                case Unit.lph:      return 0.001 * v;       /// 1 liter/h
-                case Unit.m3ph:     return v;               /// 1 m3/h = 1000 l/h
+                case Unit.lph:      return 0.001 * v;           /// 1 l/h
+                case Unit.lpm:      return 0.06 * v;            /// 1 l/m
+                case Unit.lps:      return 3.6 * v;             /// 1 l/s
+                case Unit.USgalps:  return 13.627482408 * v;    /// 1 US gallon per second
+                case Unit.m3pm:     return 60 * v;              /// 1 m3/m
+                case Unit.cfs:      return 101.9406477312 * v;  /// 1 cubic foot per second
 
                 /// Mass: internal representation in kg
-                case Unit.g:        return 0.001 * v;       /// 1 g = 0.001 kg
-                case Unit.kg:       return v;               /// 1 kilogram
-                case Unit.t:        return 1000 * v;        /// 1 t = 1000 kg
-                case Unit.lb:       return 0.45359237 * v;  /// 1 lb = 0.45359237 kg
+                case Unit.g:        return 0.001 * v;           /// 1 g = 0.001 kg
+                case Unit.lb:       return 0.45359237 * v;      /// 1 lb = 0.45359237 kg
+                case Unit.t:        return 1000 * v;            /// 1 t = 1000 kg
 
                 /// Time or duration: internal representation in seconds [s] 
-                case Unit.s:        return v;
+                case Unit.ms:       return 0.001 * v;
                 case Unit.min:      return 60 * v;
                 case Unit.hour:     return 3600 * v;
-                case Unit.ms:       return v / 1000;
 
 				/// Temperature: internal representation in °C
-				case Unit.C:        return v;               /// degree Celsius (°C)
-                case Unit.F:        return 5 * (v-32) / 9;  /// degree Fahrenheit
-                case Unit.K:        return v - 273.15;      /// degree Kelvin
+                case Unit.F:        return 5 * (v - 32) / 9;    /// degree Fahrenheit
+                case Unit.K:        return v - 273.15;          /// degree Kelvin
 
                 /// Pressure: internal representation in  bar = 0.1 MPa
-                case Unit.Pa:       return 0.00001 * v;     /// 1 hPa = 100 Pa
-                case Unit.hPa:      return 0.001 * v;       /// 1 hPa = 100 Pa
-                case Unit.mbar:     return 0.001 * v;       /// 1 mbar = 1 hPa = 100 Pa
-                case Unit.kPa:      return 0.01 * v;        /// 1 kPa = 10 HPa
-                case Unit.inHg:     return 0.033864 * v;    /// 1 inHg = 33.864 hPa
-                case Unit.psi:      return 0.0689475729 * v;/// 1 psi = 0.0689475729 bar
-                case Unit.bar:      return v;               /// 1 bar = 1000 mbar = 100000 Pa
-                case Unit.MPa:      return 10 * v;          /// 1 MPa = 10000 hPa
+                case Unit.Pa:       return 0.00001 * v;         /// 1 hPa = 100 Pa
+                case Unit.hPa:      return 0.001 * v;           /// 1 hPa = 100 Pa
+                case Unit.mbar:     return 0.001 * v;           /// 1 mbar = 1 hPa = 100 Pa
+                case Unit.kPa:      return 0.01 * v;            /// 1 kPa = 10 HPa
+                case Unit.inHg:     return 0.033864 * v;        /// 1 inHg = 33.864 hPa
+                case Unit.psi:      return 0.0689475729 * v;    /// 1 psi = 0.0689475729 bar
+                case Unit.MPa:      return 10 * v;              /// 1 MPa = 10000 hPa
 
-                /// Error: internal representation in %
-                case Unit.Pct:      return v;               /// 1 %
-                case Unit.Promile:  return 0.1 * v;         /// 1 promile = 0.1 %
+                /// Relative error: internal representation in %
+                case Unit.Promile:  return 0.1 * v;             /// 1 promile = 0.1 %
 
                 /// Diameter, length: internal representation in mm
-                case Unit.mm:       return v;               /// 1 mm
-                case Unit.cm:       return 10 * v;          /// 1 cm = 10 mm
-                case Unit.m:        return 1000 * v;        /// 1 m = 1000 mm
-                case Unit.inch:     return 25.4 * v;        /// 1 inch = 25.4 mm
+                case Unit.cm:       return 10 * v;              /// 1 cm = 10 mm
+                case Unit.inch:     return 25.4 * v;            /// 1 inch = 25.4 mm
+                case Unit.dm:       return 100 * v;             /// 1 dm = 100 mm
+                case Unit.foot:     return 304.8 * v;           /// 1 foot = 304.8 mm
+                case Unit.yard:     return 914.4 * v;           /// 1 yard = 914,4 mm
+                case Unit.m:        return 1000 * v;            /// 1 m = 1000 mm
 
 				/// Density: internal representation in kg/m3
-				case Unit.kgpm3:    return v;
 				case Unit.kgpl:     return 1000 * v;
 
 				/// Energy, internal representation in Joul
-				case Unit.J:		return v;               /// 1 Joul
-				case Unit.kJ:		return 1000 * v;        /// 1 kJ = 1000 J
-                case Unit.MJ:       return 1000000 * v;     /// 1 kJ = 1000000 J
-                case Unit.Wh:       return 3600 * v;        /// 1 Wh = 3600 J
-				case Unit.kWh:		return 3600000 * v;     /// 1 kWh = 3600000 J
-                case Unit.MWh:      return 3600000000 * v;  /// 1 kWh = 3600000000 J
+				case Unit.kJ:		return 1000 * v;            /// 1 kJ = 1000 J
+                case Unit.MJ:       return 1000000 * v;         /// 1 kJ = 1000000 J
+                case Unit.Wh:       return 3600 * v;            /// 1 Wh = 3600 J
+				case Unit.kWh:		return 3600000 * v;         /// 1 kWh = 3600000 J
+                case Unit.MWh:      return 3600000000 * v;      /// 1 kWh = 3600000000 J
 
+                /// Electrical conductivity
+                case Unit.mSpm:     return 10 * v;
+
+                /// Invert
                 case Unit.kWhpp:
                 case Unit.lpp:
                 case Unit.dm3pp:
                 case Unit.lpdeg:
-                case Unit.dm3pdeg:  return ((v == 0) ? 0 : 1 / v);
+                case Unit.dm3pdeg:  return (v <= float.Epsilon) ? 0 : 1/v;
 
-                default:            return v;
+                default:            return v;                   /// Do not convert
             }
         }
 	}

DataStreamInterface/DataFrame.cs

@@ -7,12 +7,12 @@ namespace DataStreamInterface
 {
     public class DataFrame
     {
-        public readonly UInt64 ID;          /// Frame ID
+        public readonly Int64 ID;          /// Frame ID
         public readonly double Time;        /// Time stamp in units of time
         public readonly double Volume;      /// Volume in units of volume
         public readonly double[] Quantity;  /// An array of optional quantities in their respective units
 
-        public DataFrame(UInt64 id, double time, double volume, double[] quantity)
+        public DataFrame(Int64 id, double time, double volume, double[] quantity)
         {
             ID = id;
             Time = time;

DataStreamInterface/DataStreamInterface.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>DataStreamInterface</RootNamespace>
     <AssemblyName>DataStreamInterface</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -21,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,9 +30,11 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />

DataStreamInterface/Enums.cs

@@ -13,22 +13,28 @@ namespace DataStreamInterface
         degree,
 
         /// Volume
-        ml,         ///   0.001 l
-        l,          /// * 1 liter = 1 l
+        ml,         ///   1 ml = 0.001 l
+        l,          /// * 1 liter
         dm3,        ///   1 dm3 = 1 l
-        m3,         ///   1000 l
-        gal_UK,     ///   1 gal(UK) = 4.54609 l
-        gal_US,     ///   1 gal(US) = 3.78541178 l
+        USgal,      ///   1 US gallon = 3.78541178 l
+        UKgal,      ///   1 imperial gallon = 4.54609 l
+        cf,         ///   1 cubic foot = 28.316846592 l
+        m3,         ///   1 m3 = 1000 l
 
         /// Flow
-        lph,        ///   1 liter/h
-        m3ph,       /// * 1 m3/h = 1000 l/h
+        lph,        ///   1 l/h = 0.001 m3/h
+        lpm,        ///   1 l/m = 60 l/h = 0.06 m3/h
+        m3ph,       /// * 1 m3/h
+        lps,        ///   1 liter/s = 3.6 m3/h
+        USgalps,    ///   1 US gallon per second = 13.627482408 m3/h
+        m3pm,       ///   1 m3/m = 60 m3/h
+        cfs,        ///   1 cubic foot per second = 101.9406477312 m3/h
 
         /// Mass
         g,          ///   0.001 kg
+        lb,         ///   0.45359237 kg
         kg,         /// * 1 kilogram
         t,          ///   1000 kg
-        lb,         ///   0.45359237 kg
 
         /// Time
         ms,         ///   1 ms = 0.001 s
@@ -47,6 +53,7 @@ namespace DataStreamInterface
         mbar,       ///   1 mbar = 1 hPa = 100 Pa
         kPa,        ///   1 kPa = 10 HPa
         inHg,       ///   1 inHg = 33.864 hPa
+        psi,        ///   1 psi = 0.0689475729 bar
         bar,        /// * 1 Bar = 1000 mbar = 0.1 MPa = 100000 Pa
         MPa,        ///   1 MPa = 10000 hPa
 
@@ -61,7 +68,9 @@ namespace DataStreamInterface
         mm,         /// * 1 millimeter
         cm,         ///   1 cm = 10 mm
         inch,       ///   1 inch = 25.4 mm
+        dm,         ///   1 dm = 100 mm
         foot,       ///   1 foot = 304.8 mm
+        yard,       ///   1 yard = 914.4 mm
         m,          ///   1 m = 1000 mm
 
         /// Density
@@ -76,20 +85,317 @@ namespace DataStreamInterface
         kWh,		///   1 kWh = 3600000 J
         MWh,		///   1 MWh = 3600000000 J
 
+        /// Electrical conductivity
+        uSpcm,      /// * 1 uS/cm
+        mSpm,       ///   1 mS/m = 10 uS/cm
+
         /// Meter coefficient - volume
         ppl,		/// * 1 pulse/l
-        ppdm3,		/// * 1 pulse/dm3
-        degpl,		/// * 1 degree/l
-        degpdm3,	/// * 1 degree/dm3
-        lpp,		/// * 1 l/pulse
-        dm3pp,		/// * 1 dm3/pulse
-        lpdeg,		/// * 1 l/degree
-        dm3pdeg,	/// * 1 dm3/degree
+        ppdm3,		///   1 pulse/dm3
+        degpl,		///   1 degree/l
+        degpdm3,	///   1 degree/dm3
+        lpp,		///   1 l/pulse
+        dm3pp,		///   1 dm3/pulse
+        lpdeg,		///   1 l/degree
+        dm3pdeg,	///   1 dm3/degree
 
         /// Meter coefficient - energy
         ppkWh,		/// * 1 pulse/kWh
-        kWhpp,		/// * 1 kWh/pulse
-
-        Count
+        kWhpp,		///   1 kWh/pulse
     }
+
+    public enum Quantity
+    {
+        /// Quantities with units and conversions (double -> double)
+        Volume,
+        Flow,
+        Mass,
+        Time,
+        Temperature,
+        Pressure,
+        Humidity,
+        Error,
+        Length,
+        Density,
+        Energy,
+        Pulses,
+        PulsePerLtr,
+        PulsePerKWh,
+        Conductivity,
+
+        /// Quantities without units and conversions
+        Number,
+        String,
+        Boolean,
+        DateTime,
+        Enumerated,
+    }
+
+    public static class Units
+    {
+        public static bool IsDefaultUnit(Unit unit)
+        {
+            return unit == Unit.l || unit == Unit.m3ph || unit == Unit.kg || unit == Unit.s || unit == Unit.C ||
+                   unit == Unit.bar || unit == Unit.RPct || unit == Unit.Pct || unit == Unit.mm || unit == Unit.kgpm3 ||
+                   unit == Unit.J || unit == Unit.uSpcm || unit == Unit.ppl || unit == Unit.ppkWh;
+        }
+
+        public static Quantity GetQuantity(Unit units)
+        {
+            switch (units)
+            {
+                case Unit.pulse:
+                case Unit.degree:
+                    return Quantity.Pulses;
+
+                case Unit.ml:
+                case Unit.l:
+                case Unit.dm3:
+                case Unit.USgal:
+                case Unit.UKgal:
+                case Unit.cf:
+                case Unit.m3:
+                    return Quantity.Volume;
+
+                case Unit.lph:
+                case Unit.lpm:
+                case Unit.m3ph:
+                case Unit.lps:
+                case Unit.USgalps:
+                case Unit.m3pm:
+                case Unit.cfs:
+                    return Quantity.Flow;
+
+                case Unit.g:
+                case Unit.lb:
+                case Unit.kg:
+                case Unit.t:
+                    return Quantity.Mass;
+
+                case Unit.ms:
+                case Unit.s:
+                case Unit.min:
+                case Unit.hour:
+                    return Quantity.Time;
+
+                case Unit.C:
+                case Unit.F:
+                case Unit.K:
+                    return Quantity.Temperature;
+
+                case Unit.Pa:
+                case Unit.hPa:
+                case Unit.mbar:
+                case Unit.kPa:
+                case Unit.inHg:
+                case Unit.psi:
+                case Unit.bar:
+                case Unit.MPa:
+                    return Quantity.Pressure;
+
+                case Unit.RPct:
+                    return Quantity.Humidity;
+
+                case Unit.Promile:
+                case Unit.Pct:
+                    return Quantity.Error;
+
+                case Unit.mm:
+                case Unit.cm:
+                case Unit.inch:
+                case Unit.dm:
+                case Unit.foot:
+                case Unit.yard:
+                case Unit.m:
+                    return Quantity.Length;
+
+                case Unit.kgpm3:
+                case Unit.kgpl:
+                    return Quantity.Density;
+
+                case Unit.J:
+                case Unit.kJ:
+                case Unit.MJ:
+                case Unit.Wh:
+                case Unit.kWh:
+                case Unit.MWh:
+                    return Quantity.Energy;
+
+                case Unit.uSpcm:
+                case Unit.mSpm:
+                    return Quantity.Conductivity;
+
+                case Unit.ppl:
+                case Unit.ppdm3:
+                case Unit.degpl:
+                case Unit.degpdm3:
+                case Unit.lpp:
+                case Unit.dm3pp:
+                case Unit.lpdeg:
+                case Unit.dm3pdeg:
+                    return Quantity.PulsePerLtr;
+
+                case Unit.ppkWh:
+                case Unit.kWhpp:
+                    return Quantity.PulsePerKWh;
+
+                default:
+                    return Quantity.Number;
+            }
+        }
+
+        public static double ConvertTo(Unit units, double v)
+        {
+            switch (units)
+            {
+                /// Volume: internal representation in l
+                case Unit.ml:       return 1000 * v;            /// 1 l = 1000 ml
+                case Unit.USgal:    return 0.26417205 * v;      /// 1 gal(US) = 3.78541178 l
+                case Unit.UKgal:    return 0.21996925 * v;      /// 1 gal(UK) = 4.54609 l
+                case Unit.cf:       return 0.0353146667215 * v; /// 1 cubic foot = 28.316846592 l
+                case Unit.m3:       return 0.001 * v;           /// 1 m3 = 1000 l
+
+                /// Flow: internal representation in m3/h
+                case Unit.lph:      return 1000 * v;            /// 1 l/h
+                case Unit.lpm:      return v / 0.06;            /// 1 l/m
+                case Unit.lps:      return v / 3.6;             /// 1 l/s
+                case Unit.USgalps:  return 0.0733811257326 * v; /// 1 US gallon per second
+                case Unit.m3pm:     return v / 60;              /// 1 m3/m
+                case Unit.cfs:      return 0.009809629644858 * v; /// 1 cubic foot per second
+
+                /// Mass: internal representation in kg
+                case Unit.g:        return 1000 * v;            /// 1 g = 0.001 kg
+                case Unit.lb:       return 2.2046226 * v;       /// 1 lb = 0.45359237 kg
+                case Unit.t:        return 0.001 * v;           /// 1 t = 1000 kg
+
+                /// Time or duration: internal representation in seconds [s] 
+                case Unit.ms:       return 1000 * v;
+                case Unit.min:      return v / 60;
+                case Unit.hour:     return v / 3600;
+
+                /// Temperature: internal representation in °C
+                case Unit.F:        return 1.8 * v + 32;        /// degree Fahrenheit
+                case Unit.K:        return v + 273.15;          /// degree Kelvin
+
+                /// Pressure: internal representation in  bar = 0.1 MPa
+                case Unit.Pa:       return 100000 * v;
+                case Unit.hPa:      return 1000 * v;            /// 1 hPa = 100 Pa
+                case Unit.mbar:     return 1000 * v;            /// 1 mbar = 1 hPa = 100 Pa
+                case Unit.kPa:      return 100 * v;             /// 1 kPa = 10 HPa
+                case Unit.inHg:     return 29.53 * v;           /// 1 inHg =
+                case Unit.psi:      return 14.5037738 * v;      /// 1 psi =
+                case Unit.MPa:      return 0.1 * v;             /// 1 MPa = 10000 hPa
+
+                /// Relative error: internal representation in %
+                case Unit.Promile:  return 10 * v;              /// 1 promile = 0.1 %
+
+                /// Diameter, length: internal representation in mm
+                case Unit.cm:       return 0.1 * v;             /// 1 cm = 10 mm
+                case Unit.inch:     return v / 25.4;            /// 1 inch = 25.4 mm
+                case Unit.dm:       return 0.01 * v;            /// 1 dm = 100 mm
+                case Unit.foot:     return v / 304.8;           /// 1 foot = 304.8 mm
+                case Unit.yard:     return v / 914.4;           /// 1 yard = 914,4 mm
+                case Unit.m:        return 0.001 * v;           /// 1 m = 1000 mm
+
+                /// Density: internal representation in kg/m3
+                case Unit.kgpl:     return 0.001 * v;
+
+                /// Energy, internal representation in Joul
+                case Unit.kJ:       return 0.001 * v;           /// 1 kJ = 1000 J
+                case Unit.MJ:       return 0.000001 * v;        /// 1 kJ = 1000000 J
+                case Unit.Wh:       return v / 3600.0;          /// 1 Wh = 3600 J
+                case Unit.kWh:      return v / 3600000.0;       /// 1 kWh = 3600000 J
+                case Unit.MWh:      return v / 3600000000.0;    /// 1 MWh = 3600000000 J
+
+                /// Electrical conductivity
+                case Unit.mSpm:     return 0.1 * v;
+
+                /// Invert pulses
+                case Unit.kWhpp:
+                case Unit.lpp:
+                case Unit.dm3pp:
+                case Unit.lpdeg:
+                case Unit.dm3pdeg:  return (v <= float.Epsilon) ? 0 : 1/v;
+
+                default:            return v;                   /// Do not convert
+            }
+        }
+
+        public static double ConvertFrom(Unit units, double v)
+        {
+            switch (units)
+            {
+                /// Volume: internal representation in l
+                case Unit.ml:       return 0.001 * v;           /// 0.001 l
+                case Unit.USgal:    return 3.78541178 * v;      /// 1 gal(US) = 3.78541178 l
+                case Unit.UKgal:    return 4.54609 * v;         /// 1 gal(UK) = 4.54609 l
+                case Unit.cf:       return 28.316846592 * v;    /// 1 cubic foot = 28.316846592 l
+                case Unit.m3:       return 1000 * v;            /// 1000 l
+
+                /// Flow: internal representation in m3/h
+                case Unit.lph:      return 0.001 * v;           /// 1 l/h
+                case Unit.lpm:      return 0.06 * v;            /// 1 l/m
+                case Unit.lps:      return 3.6 * v;             /// 1 l/s
+                case Unit.USgalps:  return 13.627482408 * v;    /// 1 US gallon per second
+                case Unit.m3pm:     return 60 * v;              /// 1 m3/m
+                case Unit.cfs:      return 101.9406477312 * v;  /// 1 cubic foot per second
+
+                /// Mass: internal representation in kg
+                case Unit.g:        return 0.001 * v;           /// 1 g = 0.001 kg
+                case Unit.lb:       return 0.45359237 * v;      /// 1 lb = 0.45359237 kg
+                case Unit.t:        return 1000 * v;            /// 1 t = 1000 kg
+
+                /// Time or duration: internal representation in seconds [s] 
+                case Unit.ms:       return 0.001 * v;
+                case Unit.min:      return 60 * v;
+                case Unit.hour:     return 3600 * v;
+
+                /// Temperature: internal representation in °C
+                case Unit.F:        return 5 * (v - 32) / 9;    /// degree Fahrenheit
+                case Unit.K:        return v - 273.15;          /// degree Kelvin
+
+                /// Pressure: internal representation in  bar = 0.1 MPa
+                case Unit.Pa:       return 0.00001 * v;         /// 1 hPa = 100 Pa
+                case Unit.hPa:      return 0.001 * v;           /// 1 hPa = 100 Pa
+                case Unit.mbar:     return 0.001 * v;           /// 1 mbar = 1 hPa = 100 Pa
+                case Unit.kPa:      return 0.01 * v;            /// 1 kPa = 10 HPa
+                case Unit.inHg:     return 0.033864 * v;        /// 1 inHg = 33.864 hPa
+                case Unit.psi:      return 0.0689475729 * v;    /// 1 psi = 0.0689475729 bar
+                case Unit.MPa:      return 10 * v;              /// 1 MPa = 10000 hPa
+
+                /// Relative error: internal representation in %
+                case Unit.Promile:  return 0.1 * v;             /// 1 promile = 0.1 %
+
+                /// Diameter, length: internal representation in mm
+                case Unit.cm:       return 10 * v;              /// 1 cm = 10 mm
+                case Unit.inch:     return 25.4 * v;            /// 1 inch = 25.4 mm
+                case Unit.dm:       return 100 * v;             /// 1 dm = 100 mm
+                case Unit.foot:     return 304.8 * v;           /// 1 foot = 304.8 mm
+                case Unit.yard:     return 914.4 * v;           /// 1 yard = 914,4 mm
+                case Unit.m:        return 1000 * v;            /// 1 m = 1000 mm
+
+                /// Density: internal representation in kg/m3
+                case Unit.kgpl:     return 1000 * v;
+
+                /// Energy, internal representation in Joul
+                case Unit.kJ:       return 1000 * v;            /// 1 kJ = 1000 J
+                case Unit.MJ:       return 1000000 * v;         /// 1 kJ = 1000000 J
+                case Unit.Wh:       return 3600 * v;            /// 1 Wh = 3600 J
+                case Unit.kWh:      return 3600000 * v;         /// 1 kWh = 3600000 J
+                case Unit.MWh:      return 3600000000 * v;      /// 1 kWh = 3600000000 J
+
+                /// Electrical conductivity
+                case Unit.mSpm:     return 10 * v;
+
+                /// Invert
+                case Unit.kWhpp:
+                case Unit.lpp:
+                case Unit.dm3pp:
+                case Unit.lpdeg:
+                case Unit.dm3pdeg:  return (v <= float.Epsilon) ? 0 : 1/v;
+
+                default:            return v;                   /// Do not convert
+            }
+        }
+	}
 }

DataStreamInterface/IDataStreamMeter.cs

@@ -2,58 +2,82 @@
 /// Copyright (c) 2020 Sensus Slovensko a.s.
 ///
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace DataStreamInterface
 {
     public interface IDataStreamMeter
     {
+        /// <summary>
+        /// Returns count of water meters supported by the data stream component
+        /// </summary>
+        /// <returns>Water meters count</returns>
+        int GetMetersCount();
+
         /// <summary>
         /// Get state of the connected data stream meter
         /// </summary>
+        /// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
         /// <param name="state">Current state of the meter</param>
+        /// <param name="parameter">Current extra parameter of the meter</param>
         /// <returns>true when successful</returns>
-        bool GetState(out int state, out string parameter);
+        bool GetState(int meterIx, out int state, out string parameter);
 
         /// <summary>
         /// Set state of the connected data stream meter
         /// </summary>
+        /// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
         /// <param name="state">Required state of the meter</param>
+        /// <param name="parameter">Required extra parameter of the meter</param>
         /// <returns>true when successful</returns>
-        bool SetState(int state, string parameter);
+        bool SetState(int meterIx, int state, string parameter);
+
+        bool SetStateAll(int state, string parameter);
 
         /// <summary>
         /// Establish connection with a data stream meter
         /// </summary>
+        /// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
         /// <param name="connectionParameters">Connection parameters</param>
         /// <param name="meterId">Meter ID (e.g. serial number)</param>
         /// <returns>true when successful</returns>
-        bool OpenConnection(string connectionParameters, out string meterId);
-
-        /// <summary>
-        /// Closes connection with the data stream meter
-        /// </summary>
-        /// <returns>true when successful</returns>
-        bool CloseConnection();
+        bool OpenConnection(int meterIx, string connectionParameters, out string meterId);
 
         /// <summary>
         /// Stars saving measurement results into internal data structures of the component.
         /// Each data frame obtains a unique ID.
         /// The very first data fraim obrains ID = 0.
         /// </summary>
+        /// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
         /// <returns>true when successful</returns>
-        bool StartMeasurement();
+        bool StartMeasurement(int meterIx);
+
+        bool StartMeasurementAll();
 
         /// <summary>
         /// Stops saving measurement results into internal data structures of the component.
         /// Updates ID of the last date frame received from the meter.
         /// </summary>
-        /// <param name="lastFrameID">ID of the last date frame</param>
+        /// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
+        /// <param name="storedFramesCount">Number of stored date frames</param>
         /// <returns>true when successful</returns>
-        bool StopMeasurement(out UInt64 lastFrameID);
+        bool StopMeasurement(int meterIx, out Int64 storedFramesCount);
+
+        bool StopMeasurementAll(out Int64[] storedFramesCounts);
+
+        /// <summary>
+        /// Closes connection with the data stream meter
+        /// </summary>
+        /// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
+        /// <returns>true when successful</returns>
+        bool CloseConnection(int meterIx);
+
+        bool CloseConnectionAll();
+
+        /// <summary>
+        /// This function is called when TBF program is shutting down.
+        /// </summary>
+        /// <returns>true when successful</returns>
+        bool Shutdown();
 
         ///------------------------------------------------
         /// Units of time, volume and optional quantities
@@ -70,7 +94,7 @@ namespace DataStreamInterface
         Unit GetVolumeUnits();
 
         ///-----------------------------------------------
-        /// Ooptional quantities: count, units, captions
+        /// Optional quantities: count, units, captions
         ///-----------------------------------------------
 
         /// <summary>
@@ -83,13 +107,13 @@ namespace DataStreamInterface
         /// Returns units of the specified quantity
         /// </summary>
         /// <param name="quanityNr">Zero based quantity number 0 .. quantites count-1</param>
-        Unit GetQuantityUnits(int quanityNr);
+        Unit GetQuantityUnits(int quantityNr);
 
         /// <summary>
         /// Returns caption of the specified quantity
         /// </summary>
         /// <param name="quanityNr">Zero based quantity number 0 .. quantites count-1</param>
-        string GetQuantityCaption(int quanityNr);
+        string GetQuantityCaption(int quantityNr);
 
         ///---------------------------
         /// Datastream data exchange
@@ -98,17 +122,19 @@ namespace DataStreamInterface
         /// <summary>
         /// Retuns 'count' data frames starting with data frame with ID = 'id' 
         /// </summary>
+        /// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
         /// <param name="id">First frame ID</param>
         /// <param name="count">Frames count</param>
         /// <returns>Selected data frames</returns>
-        DataFrame[] GetFrames(UInt64 id, int count);
+        DataFrame[] GetFrames(int meterIx, Int64 id, int count);
 
         /// <summary>
         /// Returns ID of the data frame where time equals or exceeds the specified time.
         /// When time of the first frame (ID=0) is larger then specified time, function returns 0.
         /// </summary>
+        /// <param name="meterIx">Index of the meter in range 0 .. (GetMetersCount() - 1)</param>
         /// <param name="time">Time</param>
         /// <returns>ID of the data frame at or after the pecified time</returns>
-        UInt64 GetID(double time);
+        Int64 GetID(int meterIx, double time);
     }
 }

DataStreamInterfaceTest/ActivityLog.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+
+namespace DataStreamInterfaceTest
+{
+    public class ActivityLog
+    {
+        const int LinesCount = 50;
+
+        TextBox textBox;
+        string[] lines;
+        string activity;
+
+        public ActivityLog(TextBox textBox)
+        {
+            this.textBox = textBox;
+            lines = new string[LinesCount];
+            for (int i = 0; i < LinesCount; i++) lines[i] = string.Empty;
+        }
+
+        public void Print(string log)
+        {
+            for (int i = LinesCount - 1; i > 0; i--) lines[i] = lines[i - 1];
+            lines[0] = log;
+            DisplayLines();
+        }
+
+        private void DisplayLines()
+        {
+            StringBuilder sb = new StringBuilder();
+            foreach (var line in lines) sb.AppendLine(line);
+            textBox.Text = sb.ToString();
+        }
+    }
+}

DataStreamInterfaceTest/App.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+    </startup>
+</configuration>

DataStreamInterfaceTest/DataStreamInterfaceTest.csproj

@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{1D1EEF9C-7F41-43D3-BD09-5054D00F7A23}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>DataStreamInterfaceTest</RootNamespace>
+    <AssemblyName>DataStreamInterfaceTest</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ActivityLog.cs" />
+    <Compile Include="DemoMainWnd.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DemoMainWnd.Designer.cs">
+      <DependentUpon>DemoMainWnd.cs</DependentUpon>
+    </Compile>
+    <Compile Include="GetDblValueDlg.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="GetDblValueDlg.designer.cs">
+      <DependentUpon>GetDblValueDlg.cs</DependentUpon>
+    </Compile>
+    <Compile Include="GetFrameBoundariesDlg.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="GetFrameBoundariesDlg.designer.cs">
+      <DependentUpon>GetFrameBoundariesDlg.cs</DependentUpon>
+    </Compile>
+    <Compile Include="GetIntegerNumberDlg.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="GetIntegerNumberDlg.Designer.cs">
+      <DependentUpon>GetIntegerNumberDlg.cs</DependentUpon>
+    </Compile>
+    <Compile Include="GetStateDlg.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="GetStateDlg.designer.cs">
+      <DependentUpon>GetStateDlg.cs</DependentUpon>
+    </Compile>
+    <Compile Include="LviIDComparer.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="DemoMainWnd.resx">
+      <DependentUpon>DemoMainWnd.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="GetDblValueDlg.resx">
+      <DependentUpon>GetDblValueDlg.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="GetFrameBoundariesDlg.resx">
+      <DependentUpon>GetFrameBoundariesDlg.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="GetIntegerNumberDlg.resx">
+      <DependentUpon>GetIntegerNumberDlg.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="GetStateDlg.resx">
+      <DependentUpon>GetStateDlg.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\DataStreamInterface\DataStreamInterface.csproj">
+      <Project>{7ebeea14-91c4-48d7-af0a-7a4bc3ff9a28}</Project>
+      <Name>DataStreamInterface</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

DataStreamInterfaceTest/DemoMainWnd.Designer.cs

@@ -0,0 +1,380 @@
+namespace DataStreamInterfaceTest
+{
+    partial class DemoMainWnd
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+            this.getIDButton = new System.Windows.Forms.Button();
+            this.getFramesButton = new System.Windows.Forms.Button();
+            this.measurementLabel = new System.Windows.Forms.Label();
+            this.stateLabel = new System.Windows.Forms.Label();
+            this.capabilitiesLabel = new System.Windows.Forms.Label();
+            this.getQuantityUnitsButton = new System.Windows.Forms.Button();
+            this.getQuantityCaptionButton = new System.Windows.Forms.Button();
+            this.getQuantitiesCountButton = new System.Windows.Forms.Button();
+            this.getVolumeUnitsButton = new System.Windows.Forms.Button();
+            this.getTimeUnitsButton = new System.Windows.Forms.Button();
+            this.setStateButton = new System.Windows.Forms.Button();
+            this.getStateButton = new System.Windows.Forms.Button();
+            this.stopMeasurementButton = new System.Windows.Forms.Button();
+            this.startMeasurementButton = new System.Windows.Forms.Button();
+            this.closeConnectionButton = new System.Windows.Forms.Button();
+            this.openConnectionButton = new System.Windows.Forms.Button();
+            this.splitContainer2 = new System.Windows.Forms.SplitContainer();
+            this.logsTextBox = new System.Windows.Forms.TextBox();
+            this.dataTabControl = new System.Windows.Forms.TabControl();
+            this.tabPage1 = new System.Windows.Forms.TabPage();
+            this.framesListView = new System.Windows.Forms.ListView();
+            this.tabPage2 = new System.Windows.Forms.TabPage();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
+            this.splitContainer1.Panel1.SuspendLayout();
+            this.splitContainer1.Panel2.SuspendLayout();
+            this.splitContainer1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
+            this.splitContainer2.Panel1.SuspendLayout();
+            this.splitContainer2.Panel2.SuspendLayout();
+            this.splitContainer2.SuspendLayout();
+            this.dataTabControl.SuspendLayout();
+            this.tabPage1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // splitContainer1
+            // 
+            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+            this.splitContainer1.IsSplitterFixed = true;
+            this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer1.Name = "splitContainer1";
+            // 
+            // splitContainer1.Panel1
+            // 
+            this.splitContainer1.Panel1.Controls.Add(this.getIDButton);
+            this.splitContainer1.Panel1.Controls.Add(this.getFramesButton);
+            this.splitContainer1.Panel1.Controls.Add(this.measurementLabel);
+            this.splitContainer1.Panel1.Controls.Add(this.stateLabel);
+            this.splitContainer1.Panel1.Controls.Add(this.capabilitiesLabel);
+            this.splitContainer1.Panel1.Controls.Add(this.getQuantityUnitsButton);
+            this.splitContainer1.Panel1.Controls.Add(this.getQuantityCaptionButton);
+            this.splitContainer1.Panel1.Controls.Add(this.getQuantitiesCountButton);
+            this.splitContainer1.Panel1.Controls.Add(this.getVolumeUnitsButton);
+            this.splitContainer1.Panel1.Controls.Add(this.getTimeUnitsButton);
+            this.splitContainer1.Panel1.Controls.Add(this.setStateButton);
+            this.splitContainer1.Panel1.Controls.Add(this.getStateButton);
+            this.splitContainer1.Panel1.Controls.Add(this.stopMeasurementButton);
+            this.splitContainer1.Panel1.Controls.Add(this.startMeasurementButton);
+            this.splitContainer1.Panel1.Controls.Add(this.closeConnectionButton);
+            this.splitContainer1.Panel1.Controls.Add(this.openConnectionButton);
+            // 
+            // splitContainer1.Panel2
+            // 
+            this.splitContainer1.Panel2.Controls.Add(this.splitContainer2);
+            this.splitContainer1.Size = new System.Drawing.Size(826, 583);
+            this.splitContainer1.SplitterDistance = 150;
+            this.splitContainer1.TabIndex = 0;
+            // 
+            // getIDButton
+            // 
+            this.getIDButton.Location = new System.Drawing.Point(12, 480);
+            this.getIDButton.Name = "getIDButton";
+            this.getIDButton.Size = new System.Drawing.Size(128, 24);
+            this.getIDButton.TabIndex = 12;
+            this.getIDButton.Text = "Get ID";
+            this.getIDButton.UseVisualStyleBackColor = true;
+            this.getIDButton.Click += new System.EventHandler(this.getIDButton_Click);
+            // 
+            // getFramesButton
+            // 
+            this.getFramesButton.Location = new System.Drawing.Point(12, 450);
+            this.getFramesButton.Name = "getFramesButton";
+            this.getFramesButton.Size = new System.Drawing.Size(128, 24);
+            this.getFramesButton.TabIndex = 11;
+            this.getFramesButton.Text = "Get frames";
+            this.getFramesButton.UseVisualStyleBackColor = true;
+            this.getFramesButton.Click += new System.EventHandler(this.getFramesButton_Click);
+            // 
+            // measurementLabel
+            // 
+            this.measurementLabel.AutoSize = true;
+            this.measurementLabel.Location = new System.Drawing.Point(12, 374);
+            this.measurementLabel.Name = "measurementLabel";
+            this.measurementLabel.Size = new System.Drawing.Size(74, 13);
+            this.measurementLabel.TabIndex = 15;
+            this.measurementLabel.Text = "Measurement:";
+            // 
+            // stateLabel
+            // 
+            this.stateLabel.AutoSize = true;
+            this.stateLabel.Location = new System.Drawing.Point(12, 194);
+            this.stateLabel.Name = "stateLabel";
+            this.stateLabel.Size = new System.Drawing.Size(112, 13);
+            this.stateLabel.TabIndex = 14;
+            this.stateLabel.Text = "State and connection:";
+            // 
+            // capabilitiesLabel
+            // 
+            this.capabilitiesLabel.AutoSize = true;
+            this.capabilitiesLabel.Location = new System.Drawing.Point(12, 9);
+            this.capabilitiesLabel.Name = "capabilitiesLabel";
+            this.capabilitiesLabel.Size = new System.Drawing.Size(63, 13);
+            this.capabilitiesLabel.TabIndex = 13;
+            this.capabilitiesLabel.Text = "Capabilities:";
+            // 
+            // getQuantityUnitsButton
+            // 
+            this.getQuantityUnitsButton.Location = new System.Drawing.Point(12, 145);
+            this.getQuantityUnitsButton.Name = "getQuantityUnitsButton";
+            this.getQuantityUnitsButton.Size = new System.Drawing.Size(128, 24);
+            this.getQuantityUnitsButton.TabIndex = 4;
+            this.getQuantityUnitsButton.Text = "Get quantity units";
+            this.getQuantityUnitsButton.UseVisualStyleBackColor = true;
+            this.getQuantityUnitsButton.Click += new System.EventHandler(this.getQuantityUnitsButton_Click);
+            // 
+            // getQuantityCaptionButton
+            // 
+            this.getQuantityCaptionButton.Location = new System.Drawing.Point(12, 115);
+            this.getQuantityCaptionButton.Name = "getQuantityCaptionButton";
+            this.getQuantityCaptionButton.Size = new System.Drawing.Size(128, 24);
+            this.getQuantityCaptionButton.TabIndex = 3;
+            this.getQuantityCaptionButton.Text = "Get quantity caption";
+            this.getQuantityCaptionButton.UseVisualStyleBackColor = true;
+            this.getQuantityCaptionButton.Click += new System.EventHandler(this.getQuantityCaptionButton_Click);
+            // 
+            // getQuantitiesCountButton
+            // 
+            this.getQuantitiesCountButton.Location = new System.Drawing.Point(12, 85);
+            this.getQuantitiesCountButton.Name = "getQuantitiesCountButton";
+            this.getQuantitiesCountButton.Size = new System.Drawing.Size(128, 24);
+            this.getQuantitiesCountButton.TabIndex = 2;
+            this.getQuantitiesCountButton.Text = "Get quantities count";
+            this.getQuantitiesCountButton.UseVisualStyleBackColor = true;
+            this.getQuantitiesCountButton.Click += new System.EventHandler(this.getQuantitiesCountButton_Click);
+            // 
+            // getVolumeUnitsButton
+            // 
+            this.getVolumeUnitsButton.Location = new System.Drawing.Point(12, 55);
+            this.getVolumeUnitsButton.Name = "getVolumeUnitsButton";
+            this.getVolumeUnitsButton.Size = new System.Drawing.Size(128, 24);
+            this.getVolumeUnitsButton.TabIndex = 1;
+            this.getVolumeUnitsButton.Text = "Get volume units";
+            this.getVolumeUnitsButton.UseVisualStyleBackColor = true;
+            this.getVolumeUnitsButton.Click += new System.EventHandler(this.getVolumeUnitsButton_Click);
+            // 
+            // getTimeUnitsButton
+            // 
+            this.getTimeUnitsButton.Location = new System.Drawing.Point(12, 25);
+            this.getTimeUnitsButton.Name = "getTimeUnitsButton";
+            this.getTimeUnitsButton.Size = new System.Drawing.Size(128, 24);
+            this.getTimeUnitsButton.TabIndex = 0;
+            this.getTimeUnitsButton.Text = "Get time units";
+            this.getTimeUnitsButton.UseVisualStyleBackColor = true;
+            this.getTimeUnitsButton.Click += new System.EventHandler(this.getTimeUnitsButton_Click);
+            // 
+            // setStateButton
+            // 
+            this.setStateButton.Location = new System.Drawing.Point(12, 315);
+            this.setStateButton.Name = "setStateButton";
+            this.setStateButton.Size = new System.Drawing.Size(128, 24);
+            this.setStateButton.TabIndex = 8;
+            this.setStateButton.Text = "Set state";
+            this.setStateButton.UseVisualStyleBackColor = true;
+            this.setStateButton.Click += new System.EventHandler(this.setStateButton_Click);
+            // 
+            // getStateButton
+            // 
+            this.getStateButton.Location = new System.Drawing.Point(12, 285);
+            this.getStateButton.Name = "getStateButton";
+            this.getStateButton.Size = new System.Drawing.Size(128, 24);
+            this.getStateButton.TabIndex = 7;
+            this.getStateButton.Text = "Get state";
+            this.getStateButton.UseVisualStyleBackColor = true;
+            this.getStateButton.Click += new System.EventHandler(this.getStateButton_Click);
+            // 
+            // stopMeasurementButton
+            // 
+            this.stopMeasurementButton.Location = new System.Drawing.Point(12, 420);
+            this.stopMeasurementButton.Name = "stopMeasurementButton";
+            this.stopMeasurementButton.Size = new System.Drawing.Size(128, 24);
+            this.stopMeasurementButton.TabIndex = 10;
+            this.stopMeasurementButton.Text = "Stop measurement";
+            this.stopMeasurementButton.UseVisualStyleBackColor = true;
+            this.stopMeasurementButton.Click += new System.EventHandler(this.stopMeasurementButton_Click);
+            // 
+            // startMeasurementButton
+            // 
+            this.startMeasurementButton.Location = new System.Drawing.Point(12, 390);
+            this.startMeasurementButton.Name = "startMeasurementButton";
+            this.startMeasurementButton.Size = new System.Drawing.Size(128, 24);
+            this.startMeasurementButton.TabIndex = 9;
+            this.startMeasurementButton.Text = "Start measurement";
+            this.startMeasurementButton.UseVisualStyleBackColor = true;
+            this.startMeasurementButton.Click += new System.EventHandler(this.startMeasurementButton_Click);
+            // 
+            // closeConnectionButton
+            // 
+            this.closeConnectionButton.Location = new System.Drawing.Point(12, 240);
+            this.closeConnectionButton.Name = "closeConnectionButton";
+            this.closeConnectionButton.Size = new System.Drawing.Size(128, 24);
+            this.closeConnectionButton.TabIndex = 6;
+            this.closeConnectionButton.Text = "Close connection";
+            this.closeConnectionButton.UseVisualStyleBackColor = true;
+            this.closeConnectionButton.Click += new System.EventHandler(this.closeConnectionButton_Click);
+            // 
+            // openConnectionButton
+            // 
+            this.openConnectionButton.Location = new System.Drawing.Point(12, 210);
+            this.openConnectionButton.Name = "openConnectionButton";
+            this.openConnectionButton.Size = new System.Drawing.Size(128, 24);
+            this.openConnectionButton.TabIndex = 5;
+            this.openConnectionButton.Text = "Open connection";
+            this.openConnectionButton.UseVisualStyleBackColor = true;
+            this.openConnectionButton.Click += new System.EventHandler(this.openConnectionButton_Click);
+            // 
+            // splitContainer2
+            // 
+            this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer2.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer2.Name = "splitContainer2";
+            this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal;
+            // 
+            // splitContainer2.Panel1
+            // 
+            this.splitContainer2.Panel1.Controls.Add(this.logsTextBox);
+            // 
+            // splitContainer2.Panel2
+            // 
+            this.splitContainer2.Panel2.Controls.Add(this.dataTabControl);
+            this.splitContainer2.Size = new System.Drawing.Size(672, 583);
+            this.splitContainer2.SplitterDistance = 222;
+            this.splitContainer2.TabIndex = 0;
+            // 
+            // logsTextBox
+            // 
+            this.logsTextBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.logsTextBox.Location = new System.Drawing.Point(0, 0);
+            this.logsTextBox.Multiline = true;
+            this.logsTextBox.Name = "logsTextBox";
+            this.logsTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+            this.logsTextBox.Size = new System.Drawing.Size(672, 222);
+            this.logsTextBox.TabIndex = 0;
+            // 
+            // dataTabControl
+            // 
+            this.dataTabControl.Controls.Add(this.tabPage1);
+            this.dataTabControl.Controls.Add(this.tabPage2);
+            this.dataTabControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dataTabControl.Location = new System.Drawing.Point(0, 0);
+            this.dataTabControl.Name = "dataTabControl";
+            this.dataTabControl.SelectedIndex = 0;
+            this.dataTabControl.Size = new System.Drawing.Size(672, 357);
+            this.dataTabControl.TabIndex = 0;
+            // 
+            // tabPage1
+            // 
+            this.tabPage1.Controls.Add(this.framesListView);
+            this.tabPage1.Location = new System.Drawing.Point(4, 22);
+            this.tabPage1.Name = "tabPage1";
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage1.Size = new System.Drawing.Size(664, 331);
+            this.tabPage1.TabIndex = 0;
+            this.tabPage1.Text = "Transferred frames";
+            this.tabPage1.UseVisualStyleBackColor = true;
+            // 
+            // framesListView
+            // 
+            this.framesListView.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.framesListView.GridLines = true;
+            this.framesListView.Location = new System.Drawing.Point(3, 3);
+            this.framesListView.Name = "framesListView";
+            this.framesListView.Size = new System.Drawing.Size(658, 325);
+            this.framesListView.TabIndex = 0;
+            this.framesListView.UseCompatibleStateImageBehavior = false;
+            this.framesListView.View = System.Windows.Forms.View.Details;
+            // 
+            // tabPage2
+            // 
+            this.tabPage2.Location = new System.Drawing.Point(4, 22);
+            this.tabPage2.Name = "tabPage2";
+            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage2.Size = new System.Drawing.Size(664, 331);
+            this.tabPage2.TabIndex = 1;
+            this.tabPage2.Text = "Graph";
+            this.tabPage2.UseVisualStyleBackColor = true;
+            // 
+            // DemoMainWnd
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(826, 583);
+            this.Controls.Add(this.splitContainer1);
+            this.Name = "DemoMainWnd";
+            this.Text = "Datastream interface test";
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.DemoMainWnd_FormClosing);
+            this.splitContainer1.Panel1.ResumeLayout(false);
+            this.splitContainer1.Panel1.PerformLayout();
+            this.splitContainer1.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
+            this.splitContainer1.ResumeLayout(false);
+            this.splitContainer2.Panel1.ResumeLayout(false);
+            this.splitContainer2.Panel1.PerformLayout();
+            this.splitContainer2.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
+            this.splitContainer2.ResumeLayout(false);
+            this.dataTabControl.ResumeLayout(false);
+            this.tabPage1.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.SplitContainer splitContainer1;
+        private System.Windows.Forms.Button openConnectionButton;
+        private System.Windows.Forms.Button closeConnectionButton;
+        private System.Windows.Forms.Button stopMeasurementButton;
+        private System.Windows.Forms.Button startMeasurementButton;
+        private System.Windows.Forms.Button setStateButton;
+        private System.Windows.Forms.Button getStateButton;
+        private System.Windows.Forms.Button getQuantityUnitsButton;
+        private System.Windows.Forms.Button getQuantityCaptionButton;
+        private System.Windows.Forms.Button getQuantitiesCountButton;
+        private System.Windows.Forms.Button getVolumeUnitsButton;
+        private System.Windows.Forms.Button getTimeUnitsButton;
+        private System.Windows.Forms.Label measurementLabel;
+        private System.Windows.Forms.Label stateLabel;
+        private System.Windows.Forms.Label capabilitiesLabel;
+        private System.Windows.Forms.Button getIDButton;
+        private System.Windows.Forms.Button getFramesButton;
+        private System.Windows.Forms.SplitContainer splitContainer2;
+        private System.Windows.Forms.TextBox logsTextBox;
+        private System.Windows.Forms.TabControl dataTabControl;
+        private System.Windows.Forms.TabPage tabPage1;
+        private System.Windows.Forms.ListView framesListView;
+        private System.Windows.Forms.TabPage tabPage2;
+    }
+}
+

DataStreamInterfaceTest/DemoMainWnd.cs

@@ -0,0 +1,292 @@
+using System;
+using System.Text;
+using System.Windows.Forms;
+using DataStreamInterface;
+
+namespace DataStreamInterfaceTest
+{
+    public partial class DemoMainWnd : Form
+    {
+        IDataStreamMeter dataStreamMeter;
+
+        ActivityLog activityLog;
+
+        Unit timeUnits;
+        Unit volumeUnits;
+        int quantitiesCount;
+        string[] quantityCaption;
+        Unit[] quantityUnit;
+
+        Int64 storedFramesCount;
+        DataFrame[] transferredFrames;
+
+        public DemoMainWnd() : this(null) { }
+
+        public DemoMainWnd(IDataStreamMeter dataStreamMeter)
+        {
+            InitializeComponent();
+            this.dataStreamMeter = dataStreamMeter;
+            activityLog = new ActivityLog(logsTextBox);
+
+            framesListView.Columns.Add("ID", 100);
+            framesListView.Columns.Add("Time", 100);
+            framesListView.Columns.Add("Volume", 100);
+            framesListView.Columns.Add("Additional quantities", 300);
+            framesListView.ListViewItemSorter = new LviIDComparer();
+        }
+
+        void ShowNoMeterInterfaceMessage()
+        {
+            MessageBox.Show("No datastream meter interface");
+        }
+
+        private void getTimeUnitsButton_Click(object sender, EventArgs e)
+        {
+            if (dataStreamMeter == null)
+                ShowNoMeterInterfaceMessage();
+            else
+            {
+                timeUnits = dataStreamMeter.GetTimeUnits();
+                activityLog.Print(string.Format("Time units are {0}", timeUnits));
+            }
+        }
+
+        private void getVolumeUnitsButton_Click(object sender, EventArgs e)
+        {
+            if (dataStreamMeter == null)
+                ShowNoMeterInterfaceMessage();
+            else
+            {
+                volumeUnits = dataStreamMeter.GetVolumeUnits();
+                activityLog.Print(string.Format("Volume units are {0}", volumeUnits));
+            }
+        }
+
+        private void getQuantitiesCountButton_Click(object sender, EventArgs e)
+        {
+            if (dataStreamMeter == null)
+                ShowNoMeterInterfaceMessage();
+            else
+            {
+                int quantitesCountOri = quantitiesCount;
+                quantitiesCount = dataStreamMeter.GetQuantitiesCount();
+                activityLog.Print(string.Format("There are {0} additional quantites", quantitiesCount));
+
+                if (quantitesCountOri == 0)
+                {
+                    quantityUnit = new Unit[quantitiesCount];
+                    quantityCaption = new string[quantitiesCount];
+                    for (int i = 0; i < quantitiesCount; i++) quantityCaption[i] = string.Empty;
+                }
+                else if (quantitiesCount != quantitesCountOri)
+                {
+                    quantityUnit = new Unit[quantitiesCount];
+                    quantityCaption = new string[quantitiesCount];
+                    for (int i = 0; i < quantitiesCount; i++) quantityCaption[i] = string.Empty;
+
+                    activityLog.Print(string.Format("Quantities count changed during operation"));
+                    MessageBox.Show("Quantities count changed during operation", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+                }
+            }
+        }
+
+        private void getQuantityCaptionButton_Click(object sender, EventArgs e)
+        {
+            if (dataStreamMeter == null)
+                ShowNoMeterInterfaceMessage();
+            else
+            {
+                GetIntegerNumberDlg dlg = new GetIntegerNumberDlg(string.Format("Enter index {0} .. {1}", 0, quantitiesCount - 1), 0, quantitiesCount - 1);
+                if (dlg.ShowDialog() == DialogResult.OK)
+                {
+                    quantityCaption[dlg.Number] = dataStreamMeter.GetQuantityCaption(dlg.Number);
+                    activityLog.Print(string.Format("Caption of quantity #{0} is {1}", dlg.Number, quantityCaption[dlg.Number]));
+                }
+            }
+        }
+
+        private void getQuantityUnitsButton_Click(object sender, EventArgs e)
+        {
+            if (dataStreamMeter == null)
+                ShowNoMeterInterfaceMessage();
+            else
+            {
+                GetIntegerNumberDlg dlg = new GetIntegerNumberDlg(string.Format("Enter index {0} .. {1}", 0, quantitiesCount - 1), 0, quantitiesCount - 1);
+                if (dlg.ShowDialog() == DialogResult.OK)
+                {
+                    quantityUnit[dlg.Number] = dataStreamMeter.GetQuantityUnits(dlg.Number);
+                    activityLog.Print(string.Format("Units of quantity #{0} are {1}", dlg.Number, quantityUnit[dlg.Number]));
+                }
+            }
+        }
+
+        private void openConnectionButton_Click(object sender, EventArgs e)
+        {
+            if (dataStreamMeter == null)
+                ShowNoMeterInterfaceMessage();
+            else
+            {
+                string meterId;
+                if (dataStreamMeter.OpenConnection(0, "no connection parameters", out meterId))
+                {
+                    activityLog.Print(string.Format("Connection established, meter ID is {0}", meterId));
+                }
+                else
+                {
+                    activityLog.Print("Failed to establish a connection");
+                }
+            }
+        }
+
+        private void closeConnectionButton_Click(object sender, EventArgs e)
+        {
+            if (dataStreamMeter == null)
+                ShowNoMeterInterfaceMessage();
+            else
+            {
+                if (dataStreamMeter.CloseConnection(0))
+                {
+                    framesListView.Items.Clear();
+                    activityLog.Print("Connection closed");
+                }
+                else
+                {
+                    activityLog.Print("Failed to close the connection");
+                }
+            }
+        }
+
+        private void DemoMainWnd_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            if (dataStreamMeter == null)
+            {
+                dataStreamMeter.Shutdown();
+            }
+        }
+
+        private void getStateButton_Click(object sender, EventArgs e)
+        {
+            if (dataStreamMeter == null)
+                ShowNoMeterInterfaceMessage();
+            else
+            {
+                int state;
+                string parameter;
+                if (dataStreamMeter.GetState(0, out state, out parameter))
+                {
+                    activityLog.Print(string.Format("Water meter state is {0} / {1}", state, parameter));
+                }
+                else
+                {
+                    activityLog.Print("Failed to obtain the water meter state");
+                }
+            }
+        }
+
+        private void setStateButton_Click(object sender, EventArgs e)
+        {
+            if (dataStreamMeter == null)
+                ShowNoMeterInterfaceMessage();
+            else
+            {
+                GetStateDlg dlg = new GetStateDlg();
+                if (dlg.ShowDialog() == DialogResult.OK)
+                {
+                    if (dataStreamMeter.SetState(0, dlg.State, dlg.Parameter))
+                    {
+                        activityLog.Print(string.Format("Water meter state set to {0} / {1}", dlg.State, dlg.Parameter));
+                    }
+                    else
+                    {
+                        activityLog.Print(string.Format("Failed to set the water meter state to {0} / {1}", dlg.State, dlg.Parameter));
+                    }
+                }
+            }
+        }
+
+        private void startMeasurementButton_Click(object sender, EventArgs e)
+        {
+            if (dataStreamMeter == null)
+                ShowNoMeterInterfaceMessage();
+            else
+            {
+                if (dataStreamMeter.StartMeasurement(0))
+                {
+                    framesListView.Items.Clear();
+                    activityLog.Print(string.Format("Measurement started"));
+                }
+                else
+                {
+                    activityLog.Print("Failed to start a measurement");
+                }
+            }
+        }
+
+        private void stopMeasurementButton_Click(object sender, EventArgs e)
+        {
+            if (dataStreamMeter == null)
+                ShowNoMeterInterfaceMessage();
+            else
+            {
+                if (dataStreamMeter.StopMeasurement(0, out storedFramesCount))
+                {
+                    framesListView.Items.Clear();
+                    activityLog.Print(string.Format("Measurement sopped, {0} frames acquired", storedFramesCount));
+                }
+                else
+                {
+                    activityLog.Print("Failed to stop the measurement");
+                }
+            }
+        }
+
+        private void getFramesButton_Click(object sender, EventArgs e)
+        {
+            if (dataStreamMeter == null)
+                ShowNoMeterInterfaceMessage();
+            else
+            {
+                GetFrameBoundariesDlg dlg = new GetFrameBoundariesDlg("Enter frames range boundaries", 0, storedFramesCount - 1);
+                if (dlg.ShowDialog() != DialogResult.OK) return;
+                DataFrame[] frames = dataStreamMeter.GetFrames(0, dlg.From, Convert.ToInt32(dlg.To - dlg.From + 1));
+                {
+                    foreach (var frame in frames)
+                    {
+                        if (frame != null) framesListView.Items.Add(GetListViewItem(frame));
+                    }
+                }
+            }
+        }
+
+        private void getIDButton_Click(object sender, EventArgs e)
+        {
+            if (dataStreamMeter == null)
+                ShowNoMeterInterfaceMessage();
+            else
+            {
+                GetDblValueDlg dlg = new GetDblValueDlg("Enter time in seconds");
+                if (dlg.ShowDialog() == DialogResult.OK)
+                {
+                    Int64 id = dataStreamMeter.GetID(0, dlg.DblValue);
+                    activityLog.Print(string.Format("GetID({0}) returned {1}", dlg.DblValue, id));
+                }
+            }
+        }
+
+        ListViewItem GetListViewItem(DataFrame frame)
+        {
+            ListViewItem lvi = new ListViewItem(frame.ID.ToString());
+            lvi.SubItems.Add(frame.Time.ToString());
+            lvi.SubItems.Add(frame.Volume.ToString());
+            StringBuilder sb = new StringBuilder();
+            foreach (var quantity in frame.Quantity)
+            {
+                sb.Append(quantity.ToString());
+                sb.Append("  ");
+            }
+            lvi.SubItems.Add(sb.ToString());
+            lvi.Tag = frame;
+            return lvi;
+        }
+    }
+}

DataStreamInterfaceTest/GetDblValueDlg.Designer.cs

@@ -0,0 +1,88 @@
+namespace DataStreamInterfaceTest
+{
+    partial class GetDblValueDlg
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.valueTextBox = new System.Windows.Forms.TextBox();
+            this.okButton = new System.Windows.Forms.Button();
+            this.cancelButton = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // valueTextBox
+            // 
+            this.valueTextBox.Location = new System.Drawing.Point(35, 20);
+            this.valueTextBox.Name = "valueTextBox";
+            this.valueTextBox.Size = new System.Drawing.Size(94, 20);
+            this.valueTextBox.TabIndex = 0;
+            // 
+            // okButton
+            // 
+            this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.okButton.Location = new System.Drawing.Point(216, 16);
+            this.okButton.Name = "okButton";
+            this.okButton.Size = new System.Drawing.Size(75, 29);
+            this.okButton.TabIndex = 1;
+            this.okButton.Text = "OK";
+            this.okButton.UseVisualStyleBackColor = true;
+            this.okButton.Click += new System.EventHandler(this.okButton_Click);
+            // 
+            // cancelButton
+            // 
+            this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.cancelButton.Location = new System.Drawing.Point(306, 16);
+            this.cancelButton.Name = "cancelButton";
+            this.cancelButton.Size = new System.Drawing.Size(75, 29);
+            this.cancelButton.TabIndex = 2;
+            this.cancelButton.Text = "Cancel";
+            this.cancelButton.UseVisualStyleBackColor = true;
+            // 
+            // GetFlowDlg
+            // 
+            this.AcceptButton = this.okButton;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.cancelButton;
+            this.ClientSize = new System.Drawing.Size(396, 58);
+            this.Controls.Add(this.cancelButton);
+            this.Controls.Add(this.okButton);
+            this.Controls.Add(this.valueTextBox);
+            this.Name = "GetFlowDlg";
+            this.Text = "Enter flow";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TextBox valueTextBox;
+        private System.Windows.Forms.Button okButton;
+        private System.Windows.Forms.Button cancelButton;
+    }
+}

DataStreamInterfaceTest/GetDblValueDlg.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Globalization;
+using System.Windows.Forms;
+
+namespace DataStreamInterfaceTest
+{
+    public partial class GetDblValueDlg : Form
+    {
+        public double DblValue;
+
+        double lowerLimit;
+        double upperLimit;
+
+
+        public GetDblValueDlg()
+            : this("Enter flow in [m3/h] please")
+        {
+        }
+
+        public GetDblValueDlg(string title)
+            : this(title, 0, 100.0)
+        {
+        }
+
+        public GetDblValueDlg(string title, double lowerLimit, double upperLimit)
+        {
+            InitializeComponent();
+            this.Text = title;
+            this.lowerLimit = lowerLimit;
+            this.upperLimit = upperLimit;
+        }
+
+
+        private void okButton_Click(object sender, EventArgs e)
+        {
+            double val;
+            if (TryParseUDouble(valueTextBox.Text, out val))
+            {
+                DblValue = val;
+                DialogResult = DialogResult.OK;
+                Close();
+            }
+            else
+            {
+                MessageBox.Show("Invalid value");
+                DialogResult = DialogResult.None;
+            }
+        }
+
+        /// <summary>
+        /// Parse an unsigned double number
+        /// </summary>
+        bool TryParseUDouble(string text, out double result)
+        {
+            return double.TryParse(text, NumberStyles.AllowDecimalPoint, CultureInfo.CurrentCulture, out result) ||
+                   double.TryParse(text, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out result);
+        }
+    }
+}

DataStreamInterfaceTest/GetDblValueDlg.resx

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

DataStreamInterfaceTest/GetFrameBoundariesDlg.Designer.cs

@@ -0,0 +1,126 @@
+namespace DataStreamInterfaceTest
+{
+    partial class GetFrameBoundariesDlg
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.fromTextBox = new System.Windows.Forms.TextBox();
+            this.okButton = new System.Windows.Forms.Button();
+            this.cancelButton = new System.Windows.Forms.Button();
+            this.toTextBox = new System.Windows.Forms.TextBox();
+            this.fromLabel = new System.Windows.Forms.Label();
+            this.toLabel = new System.Windows.Forms.Label();
+            this.SuspendLayout();
+            // 
+            // fromTextBox
+            // 
+            this.fromTextBox.Location = new System.Drawing.Point(89, 16);
+            this.fromTextBox.Name = "fromTextBox";
+            this.fromTextBox.Size = new System.Drawing.Size(100, 20);
+            this.fromTextBox.TabIndex = 0;
+            // 
+            // okButton
+            // 
+            this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.okButton.Location = new System.Drawing.Point(225, 24);
+            this.okButton.Name = "okButton";
+            this.okButton.Size = new System.Drawing.Size(75, 36);
+            this.okButton.TabIndex = 1;
+            this.okButton.Text = "OK";
+            this.okButton.UseVisualStyleBackColor = true;
+            this.okButton.Click += new System.EventHandler(this.okButton_Click);
+            // 
+            // cancelButton
+            // 
+            this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.cancelButton.Location = new System.Drawing.Point(316, 24);
+            this.cancelButton.Name = "cancelButton";
+            this.cancelButton.Size = new System.Drawing.Size(75, 36);
+            this.cancelButton.TabIndex = 2;
+            this.cancelButton.Text = "Cancel";
+            this.cancelButton.UseVisualStyleBackColor = true;
+            // 
+            // toTextBox
+            // 
+            this.toTextBox.Location = new System.Drawing.Point(89, 46);
+            this.toTextBox.Name = "toTextBox";
+            this.toTextBox.Size = new System.Drawing.Size(100, 20);
+            this.toTextBox.TabIndex = 3;
+            // 
+            // fromLabel
+            // 
+            this.fromLabel.AutoSize = true;
+            this.fromLabel.Location = new System.Drawing.Point(12, 19);
+            this.fromLabel.Name = "fromLabel";
+            this.fromLabel.Size = new System.Drawing.Size(30, 13);
+            this.fromLabel.TabIndex = 4;
+            this.fromLabel.Text = "From";
+            // 
+            // toLabel
+            // 
+            this.toLabel.AutoSize = true;
+            this.toLabel.Location = new System.Drawing.Point(12, 49);
+            this.toLabel.Name = "toLabel";
+            this.toLabel.Size = new System.Drawing.Size(20, 13);
+            this.toLabel.TabIndex = 5;
+            this.toLabel.Text = "To";
+            // 
+            // GetFrameBoundariesDlg
+            // 
+            this.AcceptButton = this.okButton;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoSize = true;
+            this.CancelButton = this.cancelButton;
+            this.ClientSize = new System.Drawing.Size(419, 79);
+            this.ControlBox = false;
+            this.Controls.Add(this.toLabel);
+            this.Controls.Add(this.fromLabel);
+            this.Controls.Add(this.toTextBox);
+            this.Controls.Add(this.cancelButton);
+            this.Controls.Add(this.okButton);
+            this.Controls.Add(this.fromTextBox);
+            this.Name = "GetFrameBoundariesDlg";
+            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "Enter frames range boundaries";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TextBox fromTextBox;
+        private System.Windows.Forms.Button okButton;
+        private System.Windows.Forms.Button cancelButton;
+        private System.Windows.Forms.TextBox toTextBox;
+        private System.Windows.Forms.Label fromLabel;
+        private System.Windows.Forms.Label toLabel;
+    }
+}

DataStreamInterfaceTest/GetFrameBoundariesDlg.cs

@@ -0,0 +1,88 @@
+using System;
+using System.Windows.Forms;
+
+namespace DataStreamInterfaceTest
+{
+    public partial class GetFrameBoundariesDlg : Form
+    {
+        /// <summary>
+        /// Integer number entered in this form
+        /// </summary>
+        public Int64 From;
+        public Int64 To;
+
+        Int64 lowerLimit;
+        Int64 upperLimit;
+
+
+        /// <summary>
+        /// Default constructor
+        /// </summary>
+        public GetFrameBoundariesDlg()
+            : this("Enter state please")
+        {
+        }
+
+        /// <summary>
+        /// Constructor with a custom window title.
+        /// </summary>
+        /// <param name="title">Window title</param>
+        public GetFrameBoundariesDlg(string title)
+            : this(title, Int64.MinValue, Int64.MaxValue)
+        {
+        }
+
+        /// <summary>
+        /// Constructor with a custom window title, limits and non-empty initial value.
+        /// </summary>
+        /// <param name="title">Window title</param>
+        /// <param name="lowerLimit">Lower limit</param>
+        /// <param name="upperLimit">Upper limit</param>
+        /// <param name="initialValue">Initial value</param>
+        public GetFrameBoundariesDlg(string title, Int64 lowerLimit, Int64 upperLimit, int initialValue)
+            : this(title, lowerLimit, upperLimit)
+        {
+            fromTextBox.Text = initialValue.ToString();
+        }
+
+        /// <summary>
+        /// Constructor with a custom window title and lower/upper limits.
+        /// </summary>
+        /// <param name="title">Window title</param>
+        /// <param name="lowerLimit">Lower limit</param>
+        /// <param name="upperLimit">Upper limit</param>
+        public GetFrameBoundariesDlg(string title, Int64 lowerLimit, Int64 upperLimit)
+        {
+            InitializeComponent();
+            this.Text = title;
+            this.lowerLimit = lowerLimit;
+            this.upperLimit = upperLimit;
+        }
+
+
+        /// <summary>
+        /// OK button handler that verifies validity of the entered value.
+        /// </summary>
+        private void okButton_Click(object sender, EventArgs e)
+        {
+            Int64 from;
+            Int64 to;
+            if (Int64.TryParse(fromTextBox.Text, out from) && from >= lowerLimit && from <= upperLimit &&
+                Int64.TryParse(toTextBox.Text, out to) && to >= lowerLimit && to <= upperLimit &&
+                to >= from && to < from + Int32.MaxValue)
+            {
+                From = from;
+                To = to;
+                DialogResult = DialogResult.OK;
+            }
+            else
+            {
+                string message = (lowerLimit != 0 || upperLimit != Int32.MaxValue)
+                               ? string.Format("Invalid boundaries ({0}..{1})", lowerLimit, upperLimit)
+                               : "Invalid boundaries";
+                MessageBox.Show(message);
+                DialogResult = DialogResult.None;   /// Prevent closing this window
+            }
+        }
+    }
+}

DataStreamInterfaceTest/GetFrameBoundariesDlg.resx

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

DataStreamInterfaceTest/GetIntegerNumberDlg.Designer.cs

@@ -0,0 +1,90 @@
+namespace DataStreamInterfaceTest
+{
+    partial class GetIntegerNumberDlg
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.numberTextBox = new System.Windows.Forms.TextBox();
+            this.okButton = new System.Windows.Forms.Button();
+            this.cancelButton = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // numberTextBox
+            // 
+            this.numberTextBox.Location = new System.Drawing.Point(36, 16);
+            this.numberTextBox.Name = "numberTextBox";
+            this.numberTextBox.Size = new System.Drawing.Size(100, 20);
+            this.numberTextBox.TabIndex = 0;
+            // 
+            // okButton
+            // 
+            this.okButton.Location = new System.Drawing.Point(174, 7);
+            this.okButton.Name = "okButton";
+            this.okButton.Size = new System.Drawing.Size(75, 36);
+            this.okButton.TabIndex = 1;
+            this.okButton.Text = "OK";
+            this.okButton.UseVisualStyleBackColor = true;
+            this.okButton.Click += new System.EventHandler(this.okButton_Click);
+            // 
+            // cancelButton
+            // 
+            this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.cancelButton.Location = new System.Drawing.Point(265, 7);
+            this.cancelButton.Name = "cancelButton";
+            this.cancelButton.Size = new System.Drawing.Size(75, 36);
+            this.cancelButton.TabIndex = 2;
+            this.cancelButton.Text = "Cancel";
+            this.cancelButton.UseVisualStyleBackColor = true;
+            // 
+            // GetIntegerNumberDlg
+            // 
+            this.AcceptButton = this.okButton;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoSize = true;
+            this.CancelButton = this.cancelButton;
+            this.ClientSize = new System.Drawing.Size(363, 50);
+            this.ControlBox = false;
+            this.Controls.Add(this.cancelButton);
+            this.Controls.Add(this.okButton);
+            this.Controls.Add(this.numberTextBox);
+            this.Name = "GetIntegerNumberDlg";
+            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "Enter integer number please";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TextBox numberTextBox;
+        private System.Windows.Forms.Button okButton;
+        private System.Windows.Forms.Button cancelButton;
+    }
+}

DataStreamInterfaceTest/GetIntegerNumberDlg.cs

@@ -0,0 +1,83 @@
+using System;
+using System.Windows.Forms;
+
+namespace DataStreamInterfaceTest
+{
+    public partial class GetIntegerNumberDlg : Form
+    {
+        /// <summary>
+        /// Integer number entered in this form
+        /// </summary>
+        public int Number;
+        
+        int lowerLimit;
+        int upperLimit;
+
+
+        /// <summary>
+        /// Default constructor
+        /// </summary>
+        public GetIntegerNumberDlg()
+            : this("Enter integer number please")
+        {
+        }
+
+        /// <summary>
+        /// Constructor with a custom window title.
+        /// </summary>
+        /// <param name="title">Window title</param>
+        public GetIntegerNumberDlg(string title)
+            : this(title, Int32.MinValue, Int32.MaxValue)
+        {
+        }
+
+        /// <summary>
+        /// Constructor with a custom window title, limits and non-empty initial value.
+        /// </summary>
+        /// <param name="title">Window title</param>
+        /// <param name="lowerLimit">Lower limit</param>
+        /// <param name="upperLimit">Upper limit</param>
+        /// <param name="initialValue">Initial value</param>
+        public GetIntegerNumberDlg(string title, int lowerLimit, int upperLimit, int initialValue)
+            : this(title, lowerLimit, upperLimit)
+        {
+            numberTextBox.Text = initialValue.ToString();
+        }
+
+        /// <summary>
+        /// Constructor with a custom window title and lower/upper limits.
+        /// </summary>
+        /// <param name="title">Window title</param>
+        /// <param name="lowerLimit">Lower limit</param>
+        /// <param name="upperLimit">Upper limit</param>
+        public GetIntegerNumberDlg(string title, int lowerLimit, int upperLimit)
+        {
+            InitializeComponent();
+            this.Text = title;
+            this.lowerLimit = lowerLimit;
+            this.upperLimit = upperLimit;
+        }
+
+
+        /// <summary>
+        /// OK button handler that verifies validity of the entered value.
+        /// </summary>
+        private void okButton_Click(object sender, EventArgs e)
+        {
+            int number;
+            if (int.TryParse(numberTextBox.Text, out number) && number >= lowerLimit && number <= upperLimit)
+            {
+                Number = number;
+                DialogResult = DialogResult.OK;
+            }
+            else
+            {
+                string message = (lowerLimit != Int32.MinValue || upperLimit != Int32.MaxValue)
+                               ? string.Format("Invalid integer number ({0}..{1})", lowerLimit, upperLimit)
+                               : "Invalid integer number";
+                MessageBox.Show(message);
+                DialogResult = DialogResult.None;   /// Prevent closing this window
+            }
+        }
+    }
+}

DataStreamInterfaceTest/GetIntegerNumberDlg.resx

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

DataStreamInterfaceTest/GetStateDlg.Designer.cs

@@ -0,0 +1,126 @@
+namespace DataStreamInterfaceTest
+{
+    partial class GetStateDlg
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.stateTextBox = new System.Windows.Forms.TextBox();
+            this.okButton = new System.Windows.Forms.Button();
+            this.cancelButton = new System.Windows.Forms.Button();
+            this.parameterTextBox = new System.Windows.Forms.TextBox();
+            this.stateLabel = new System.Windows.Forms.Label();
+            this.parameterLabel = new System.Windows.Forms.Label();
+            this.SuspendLayout();
+            // 
+            // stateTextBox
+            // 
+            this.stateTextBox.Location = new System.Drawing.Point(89, 16);
+            this.stateTextBox.Name = "stateTextBox";
+            this.stateTextBox.Size = new System.Drawing.Size(100, 20);
+            this.stateTextBox.TabIndex = 0;
+            // 
+            // okButton
+            // 
+            this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.okButton.Location = new System.Drawing.Point(225, 24);
+            this.okButton.Name = "okButton";
+            this.okButton.Size = new System.Drawing.Size(75, 36);
+            this.okButton.TabIndex = 1;
+            this.okButton.Text = "OK";
+            this.okButton.UseVisualStyleBackColor = true;
+            this.okButton.Click += new System.EventHandler(this.okButton_Click);
+            // 
+            // cancelButton
+            // 
+            this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.cancelButton.Location = new System.Drawing.Point(316, 24);
+            this.cancelButton.Name = "cancelButton";
+            this.cancelButton.Size = new System.Drawing.Size(75, 36);
+            this.cancelButton.TabIndex = 2;
+            this.cancelButton.Text = "Cancel";
+            this.cancelButton.UseVisualStyleBackColor = true;
+            // 
+            // parameterTextBox
+            // 
+            this.parameterTextBox.Location = new System.Drawing.Point(89, 46);
+            this.parameterTextBox.Name = "parameterTextBox";
+            this.parameterTextBox.Size = new System.Drawing.Size(100, 20);
+            this.parameterTextBox.TabIndex = 3;
+            // 
+            // stateLabel
+            // 
+            this.stateLabel.AutoSize = true;
+            this.stateLabel.Location = new System.Drawing.Point(12, 19);
+            this.stateLabel.Name = "stateLabel";
+            this.stateLabel.Size = new System.Drawing.Size(32, 13);
+            this.stateLabel.TabIndex = 4;
+            this.stateLabel.Text = "State";
+            // 
+            // parameterLabel
+            // 
+            this.parameterLabel.AutoSize = true;
+            this.parameterLabel.Location = new System.Drawing.Point(12, 49);
+            this.parameterLabel.Name = "parameterLabel";
+            this.parameterLabel.Size = new System.Drawing.Size(55, 13);
+            this.parameterLabel.TabIndex = 5;
+            this.parameterLabel.Text = "Parameter";
+            // 
+            // GetStateDlg
+            // 
+            this.AcceptButton = this.okButton;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoSize = true;
+            this.CancelButton = this.cancelButton;
+            this.ClientSize = new System.Drawing.Size(419, 79);
+            this.ControlBox = false;
+            this.Controls.Add(this.parameterLabel);
+            this.Controls.Add(this.stateLabel);
+            this.Controls.Add(this.parameterTextBox);
+            this.Controls.Add(this.cancelButton);
+            this.Controls.Add(this.okButton);
+            this.Controls.Add(this.stateTextBox);
+            this.Name = "GetStateDlg";
+            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "Enter state please";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TextBox stateTextBox;
+        private System.Windows.Forms.Button okButton;
+        private System.Windows.Forms.Button cancelButton;
+        private System.Windows.Forms.TextBox parameterTextBox;
+        private System.Windows.Forms.Label stateLabel;
+        private System.Windows.Forms.Label parameterLabel;
+    }
+}

DataStreamInterfaceTest/GetStateDlg.cs

@@ -0,0 +1,85 @@
+using System;
+using System.Windows.Forms;
+
+namespace DataStreamInterfaceTest
+{
+    public partial class GetStateDlg : Form
+    {
+        /// <summary>
+        /// Integer number entered in this form
+        /// </summary>
+        public int State;
+        public string Parameter;
+        
+        int lowerLimit;
+        int upperLimit;
+
+
+        /// <summary>
+        /// Default constructor
+        /// </summary>
+        public GetStateDlg()
+            : this("Enter state please")
+        {
+        }
+
+        /// <summary>
+        /// Constructor with a custom window title.
+        /// </summary>
+        /// <param name="title">Window title</param>
+        public GetStateDlg(string title)
+            : this(title, Int32.MinValue, Int32.MaxValue)
+        {
+        }
+
+        /// <summary>
+        /// Constructor with a custom window title, limits and non-empty initial value.
+        /// </summary>
+        /// <param name="title">Window title</param>
+        /// <param name="lowerLimit">Lower limit</param>
+        /// <param name="upperLimit">Upper limit</param>
+        /// <param name="initialValue">Initial value</param>
+        public GetStateDlg(string title, int lowerLimit, int upperLimit, int initialValue)
+            : this(title, lowerLimit, upperLimit)
+        {
+            stateTextBox.Text = initialValue.ToString();
+        }
+
+        /// <summary>
+        /// Constructor with a custom window title and lower/upper limits.
+        /// </summary>
+        /// <param name="title">Window title</param>
+        /// <param name="lowerLimit">Lower limit</param>
+        /// <param name="upperLimit">Upper limit</param>
+        public GetStateDlg(string title, int lowerLimit, int upperLimit)
+        {
+            InitializeComponent();
+            this.Text = title;
+            this.lowerLimit = lowerLimit;
+            this.upperLimit = upperLimit;
+        }
+
+
+        /// <summary>
+        /// OK button handler that verifies validity of the entered value.
+        /// </summary>
+        private void okButton_Click(object sender, EventArgs e)
+        {
+            int number;
+            if (int.TryParse(stateTextBox.Text, out number) && number >= lowerLimit && number <= upperLimit)
+            {
+                State = number;
+                Parameter = parameterTextBox.Text;
+                DialogResult = DialogResult.OK;
+            }
+            else
+            {
+                string message = (lowerLimit != Int32.MinValue || upperLimit != Int32.MaxValue)
+                               ? string.Format("Invalid state ({0}..{1})", lowerLimit, upperLimit)
+                               : "Invalid state";
+                MessageBox.Show(message);
+                DialogResult = DialogResult.None;   /// Prevent closing this window
+            }
+        }
+    }
+}

DataStreamInterfaceTest/GetStateDlg.resx

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

DataStreamInterfaceTest/LviIDComparer.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections;
+using System.Windows.Forms;
+
+namespace DataStreamInterfaceTest
+{
+    public class LviIDComparer : IComparer
+    {
+        int column;
+        SortOrder order;
+
+        public LviIDComparer()
+        {
+            column = 0;
+            order = SortOrder.Ascending;
+        }
+
+        public LviIDComparer(int column, SortOrder order)
+        {
+            this.column = column;
+            this.order = order;
+        }
+
+        public int Compare(object x, object y)
+        {
+            Int64 valX = Int64.Parse(((ListViewItem)x).SubItems[column].Text);
+            Int64 valY = Int64.Parse(((ListViewItem)y).SubItems[column].Text);
+
+            if (order == SortOrder.Ascending)
+            {
+                return valX > valY ? 1 : valX == valY ? 0 : -1;
+            }
+            else
+            {
+                return valX < valY ? 1 : valX == valY ? 0 : -1;
+            }
+        }
+    }
+}

DataStreamInterfaceTest/Program.cs

@@ -0,0 +1,55 @@
+using System;
+using System.IO;
+using System.ComponentModel.Composition;
+using System.ComponentModel.Composition.Hosting;
+using System.Windows.Forms;
+using DataStreamInterface;
+
+namespace DataStreamInterfaceTest
+{
+    class Program
+    {
+#if DEBUG
+        const string CatalogDir = "..\\..\\..\\DataStreamMeter\\bin\\Debug";
+#else
+        const string CatalogDir = "..\\..\\..\\DataStreamMeter\\bin\\Release";
+#endif
+
+        [Import(typeof(IDataStreamMeter))]
+        IDataStreamMeter dataStreamMeter;
+
+        private Program()
+        {
+            Console.WriteLine("Components found:");
+            foreach (var file in Directory.EnumerateFiles(CatalogDir))
+            {
+                Console.WriteLine(file);
+            }
+
+            try
+            {
+                var catalog = new AggregateCatalog();
+                catalog.Catalogs.Add(new AssemblyCatalog(typeof(DataStreamInterface.IDataStreamMeter).Assembly));
+                catalog.Catalogs.Add(new DirectoryCatalog(CatalogDir));
+                (new CompositionContainer(catalog)).ComposeParts(this);
+            }
+            catch (CompositionException compositionException)
+            {
+                Console.WriteLine(compositionException.ToString());
+            }
+        }
+
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        [STAThread]
+        static void Main()
+        {
+            Program p = new Program();
+
+            Application.EnableVisualStyles();
+            Application.SetCompatibleTextRenderingDefault(false);
+            Application.Run(new DemoMainWnd(p.dataStreamMeter));
+        }
+    }
+}

DataStreamInterfaceTest/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("DataStreamInterfaceTest")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("DataStreamInterfaceTest")]
+[assembly: AssemblyCopyright("Copyright ©  2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("429fdea9-ec3a-47d8-88b3-5df11de8b4c8")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

DataStreamInterfaceTest/Properties/Resources.Designer.cs

@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace DataStreamInterfaceTest.Properties
+{
+
+
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // 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.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    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()
+        {
+        }
+
+        /// <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))
+                {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DataStreamMainDemo.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
+            {
+                return resourceCulture;
+            }
+            set
+            {
+                resourceCulture = value;
+            }
+        }
+    }
+}

DataStreamInterfaceTest/Properties/Resources.resx

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

DataStreamInterfaceTest/Properties/Settings.Designer.cs

@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace DataStreamInterfaceTest.Properties
+{
+
+
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+    {
+
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+        public static Settings Default
+        {
+            get
+            {
+                return defaultInstance;
+            }
+        }
+    }
+}

DataStreamInterfaceTest/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>

DataStreamMeter/DataStreamMeter.csproj

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{E6925701-57A6-4167-B5C4-BF670F1DE310}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>DataStreamMeter</RootNamespace>
+    <AssemblyName>DataStreamMeter</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="GetDblValueDlg.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="GetDblValueDlg.Designer.cs">
+      <DependentUpon>GetDblValueDlg.cs</DependentUpon>
+    </Compile>
+    <Compile Include="MeterDataEventArgs.cs" />
+    <Compile Include="MeterSimulationDlg.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MeterSimulationDlg.Designer.cs">
+      <DependentUpon>MeterSimulationDlg.cs</DependentUpon>
+    </Compile>
+    <Compile Include="MeterSimulation.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Sample.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\DataStreamInterface\DataStreamInterface.csproj">
+      <Project>{7ebeea14-91c4-48d7-af0a-7a4bc3ff9a28}</Project>
+      <Name>DataStreamInterface</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="GetDblValueDlg.resx">
+      <DependentUpon>GetDblValueDlg.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="MeterSimulationDlg.resx">
+      <DependentUpon>MeterSimulationDlg.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

DataStreamMeter/GetDblValueDlg.Designer.cs

@@ -0,0 +1,88 @@
+namespace DataStreamMeter
+{
+    partial class GetDblValueDlg
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.valueTextBox = new System.Windows.Forms.TextBox();
+            this.okButton = new System.Windows.Forms.Button();
+            this.cancelButton = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // valueTextBox
+            // 
+            this.valueTextBox.Location = new System.Drawing.Point(35, 20);
+            this.valueTextBox.Name = "valueTextBox";
+            this.valueTextBox.Size = new System.Drawing.Size(94, 20);
+            this.valueTextBox.TabIndex = 0;
+            // 
+            // okButton
+            // 
+            this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.okButton.Location = new System.Drawing.Point(216, 16);
+            this.okButton.Name = "okButton";
+            this.okButton.Size = new System.Drawing.Size(75, 29);
+            this.okButton.TabIndex = 1;
+            this.okButton.Text = "OK";
+            this.okButton.UseVisualStyleBackColor = true;
+            this.okButton.Click += new System.EventHandler(this.okButton_Click);
+            // 
+            // cancelButton
+            // 
+            this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.cancelButton.Location = new System.Drawing.Point(306, 16);
+            this.cancelButton.Name = "cancelButton";
+            this.cancelButton.Size = new System.Drawing.Size(75, 29);
+            this.cancelButton.TabIndex = 2;
+            this.cancelButton.Text = "Cancel";
+            this.cancelButton.UseVisualStyleBackColor = true;
+            // 
+            // GetFlowDlg
+            // 
+            this.AcceptButton = this.okButton;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.cancelButton;
+            this.ClientSize = new System.Drawing.Size(396, 58);
+            this.Controls.Add(this.cancelButton);
+            this.Controls.Add(this.okButton);
+            this.Controls.Add(this.valueTextBox);
+            this.Name = "GetFlowDlg";
+            this.Text = "Enter flow";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TextBox valueTextBox;
+        private System.Windows.Forms.Button okButton;
+        private System.Windows.Forms.Button cancelButton;
+    }
+}

DataStreamMeter/GetDblValueDlg.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Globalization;
+using System.Windows.Forms;
+
+namespace DataStreamMeter
+{
+    public partial class GetDblValueDlg : Form
+    {
+        public double DblValue;
+
+        double lowerLimit;
+        double upperLimit;
+
+
+        public GetDblValueDlg()
+            : this("Enter flow in [m3/h] please")
+        {
+        }
+
+        public GetDblValueDlg(string title)
+            : this(title, 0, 100.0)
+        {
+        }
+
+        public GetDblValueDlg(string title, double lowerLimit, double upperLimit)
+        {
+            InitializeComponent();
+            this.Text = title;
+            this.lowerLimit = lowerLimit;
+            this.upperLimit = upperLimit;
+        }
+
+
+        private void okButton_Click(object sender, EventArgs e)
+        {
+            double val;
+            if (TryParseUDouble(valueTextBox.Text, out val))
+            {
+                DblValue = val;
+                DialogResult = DialogResult.OK;
+                Close();
+            }
+            else
+            {
+                MessageBox.Show("Invalid value");
+                DialogResult = DialogResult.None;
+            }
+        }
+
+        /// <summary>
+        /// Parse an unsigned double number
+        /// </summary>
+        bool TryParseUDouble(string text, out double result)
+        {
+            return double.TryParse(text, NumberStyles.AllowDecimalPoint, CultureInfo.CurrentCulture, out result) ||
+                   double.TryParse(text, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out result);
+        }
+    }
+}

DataStreamMeter/GetDblValueDlg.resx

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

DataStreamMeter/MeterDataEventArgs.cs

@@ -0,0 +1,20 @@
+using System;
+
+namespace DataStreamMeter
+{
+    public class MeterDataEventArgs : EventArgs
+    {
+        public State State;
+        public double Time;
+        public double Volume;
+        public double Flow;
+
+        public MeterDataEventArgs(State state, double time, double volume, double flow)
+        {
+            State = state;
+            Time = time;
+            Volume = volume;
+            Flow = flow;
+        }
+    }
+}

DataStreamMeter/MeterSimulation.cs

@@ -0,0 +1,351 @@
+using System;
+using System.ComponentModel.Composition;
+using DataStreamInterface;
+
+namespace DataStreamMeter
+{
+    [Export(typeof(IDataStreamMeter))]
+    public class MeterSimulation : IDataStreamMeter
+    {
+        MeterSimulationDlg modelessDlg;
+
+        /// Water meter specification
+        public readonly string MeterID = "3141592653";
+        public const Unit TimeUnits = Unit.s;           /// Unit.s, Unit.ms, ...
+        public const Unit VolumeUnits = Unit.l;         /// Unit.l, Unit.USgal, ...
+        public const Unit FlowUnits = Unit.m3ph;        /// Unit.m3ph, Unit.USgalps, Unit.cfs, ...
+        public const double SamplingPeriodSec = 0.125;  /// Sampling period in seconds (here 125 ms, 8 Hz)
+        public readonly double SamplingPeriod;
+
+
+        public const Int64 MaxSamplesCount = 40000;    /// Maximal test time is SamplingPeriod * MaxSamplesCount
+        Sample[] samples = new Sample[MaxSamplesCount];
+        Int64 storedSamplesCount;
+
+
+        readonly object stateChangeAndTimerTickLock = new object();
+        public State State;
+        string connectionParameters;
+
+        /// initialTime is time when simulation started 
+        /// (lastSampleTime - initialTime).TotalSeconds is multiple of Sampling Period
+        DateTime initialTime;
+
+        /// Last user interface tick info
+        bool lastTickValid;
+        State lastTickState;
+
+        /// Values incrementally updated on each timer tick
+        double currentTime;
+        double currentVolume;
+        double currentFlow;
+        double currentFlow_m3ph;
+
+        DateTime startTimeStamp;        /// Measurement start DateTime
+        double startTime;               /// Measurement start time in seconds
+        DateTime stopTimeStamp;         /// Measurement end DateTime
+        double stopTime;                /// Measurement end time in seconds
+
+
+        public MeterSimulation()
+        {
+            modelessDlg = null;
+            State = State.Disconnected;
+            SamplingPeriod = DataStreamInterface.Units.ConvertTo(TimeUnits, SamplingPeriodSec);
+            lastTickValid = false;
+            initialTime = DateTime.Now.Date;    /// An arbitrary initial time (in this case the last midnight)
+        }
+
+        public Unit GetTimeUnits()
+        {
+            return TimeUnits;
+        }
+
+        public Unit GetVolumeUnits()
+        {
+            return VolumeUnits;
+        }
+
+        public int GetQuantitiesCount()
+        {
+            return 1;
+        }
+
+        public string GetQuantityCaption(int quantityNr)
+        {
+            if (quantityNr == 0) return "Flow";
+            return string.Empty;
+        }
+
+        public Unit GetQuantityUnits(int quantityNr)
+        {
+            if (quantityNr == 0) return FlowUnits;
+            return Unit.None;
+        }
+
+
+        public int GetMetersCount()
+        {
+            return 1;
+        }
+
+        public bool OpenConnection(int meterIx, string connectionParameters, out string meterID)
+        {
+            lock (stateChangeAndTimerTickLock)
+            {
+                if (State != State.Disconnected)
+                {
+                    /// Meter is already connected
+                    meterID = MeterID;
+                    return true;
+                }
+
+                /// Connect the meter
+                meterID = MeterID;
+                this.connectionParameters = connectionParameters;
+                lastTickValid = false;
+                State = State.Connected;
+            }
+
+            /// Open modeless form
+            modelessDlg = new MeterSimulationDlg(this, MeterID);
+            modelessDlg.Show();
+            return true;
+        }
+
+        public bool CloseConnection(int meterIx)
+        {
+            bool closeModelessDlg = false;
+
+            lock (stateChangeAndTimerTickLock)
+            {
+                if (State != State.Disconnected)
+                {
+                    State = State.Disconnected;
+                    storedSamplesCount = 0;
+                    closeModelessDlg = true;
+                }
+            }
+
+            if (closeModelessDlg)
+            {
+                if (modelessDlg != null) modelessDlg.Close();
+                modelessDlg = null;
+            }
+            return true;
+        }
+
+        public bool CloseConnectionAll()
+        {
+            return CloseConnection(0);
+        }
+
+        public bool Shutdown()
+        {
+            return true;
+        }
+
+        public bool GetState(int meterIx, out int state, out string parameter)
+        {
+            state = (int)this.State;
+            parameter = this.connectionParameters;
+            return true;
+        }
+
+        public bool SetState(int meterIx, int state, string parameter)
+        {
+            /// It's not allowed to change the satate in this demo
+            return false;
+        }
+
+        public bool SetStateAll(int state, string parameter)
+        {
+            return SetState(0, state, parameter);
+        }
+
+        public bool StartMeasurement(int meterIx = 0)
+        {
+            lock (stateChangeAndTimerTickLock)
+            {
+                if (State == State.Connected)
+                {
+                    startTimeStamp = DateTime.Now;
+                    startTime = TimeInSecondsFromDateTime(startTimeStamp, initialTime, SamplingPeriodSec);
+                    storedSamplesCount = 0;
+                    State = State.MeasurementInProgress;
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+        }
+
+        public bool StartMeasurementAll()
+        {
+            return StartMeasurement(0);
+        }
+
+        public bool StopMeasurement(int meterIx, out Int64 storedFramesCount)
+        {
+            lock (stateChangeAndTimerTickLock)
+            {
+                if (State == State.MeasurementInProgress)
+                {
+                    stopTimeStamp = DateTime.Now;
+                    stopTime = TimeInSecondsFromDateTime(stopTimeStamp, initialTime, SamplingPeriodSec);
+
+                    int newSamplesCount = Convert.ToInt32(Math.Round((stopTime - currentTime) / SamplingPeriodSec));
+                    double time = Units.ConvertTo(TimeUnits, currentTime);
+                    double volume = currentVolume;
+                    double volumeIncrement = Units.ConvertTo(VolumeUnits, currentFlow_m3ph * (SamplingPeriodSec / 3.6));
+                    for (int i = 0; i < newSamplesCount; i++)
+                    {
+                        time += SamplingPeriod;
+                        volume += volumeIncrement;
+                        if (storedSamplesCount < MaxSamplesCount)
+                        {
+                            samples[storedSamplesCount++] = new Sample(time, volume, currentFlow);
+                        }
+                    }
+
+                    State = State.Connected;
+                    storedFramesCount = storedSamplesCount;
+                    return true;
+                }
+                else
+                {
+                    storedFramesCount = 0;
+                    return false;
+                }
+            }
+        }
+
+        public bool StopMeasurementAll(out Int64[] storedFramesCount)
+        {
+            storedFramesCount = new Int64[1];
+            return StopMeasurement(0, out storedFramesCount[0]);
+        }
+
+        public void TimerTick(double flow_m3ph)
+        {
+            lock (stateChangeAndTimerTickLock)
+            {
+                double lastSampleTime = TimeInSecondsFromDateTime(DateTime.Now, initialTime, SamplingPeriodSec);
+                currentFlow_m3ph = flow_m3ph;
+                currentFlow = Units.ConvertTo(FlowUnits, flow_m3ph);
+
+                if (!lastTickValid)
+                {
+                    currentTime = lastSampleTime;
+                    currentVolume = 0;
+                    lastTickValid = true;
+                    lastTickState = State;
+                    return;
+                }
+                else
+                {
+                    int newSamplesCount = Convert.ToInt32(Math.Round((lastSampleTime - currentTime) / SamplingPeriodSec));
+                    double volumeIncrement = Units.ConvertTo(VolumeUnits, currentFlow_m3ph * (SamplingPeriodSec / 3.6));
+                    for (int i = 0; i < newSamplesCount; i++)
+                    {
+                        currentTime += SamplingPeriodSec;
+                        currentVolume += volumeIncrement;
+
+                        if (State == State.MeasurementInProgress && currentTime > startTime && storedSamplesCount < MaxSamplesCount)
+                        {
+                            samples[storedSamplesCount++] = new Sample(Units.ConvertTo(TimeUnits, currentTime), currentVolume, currentFlow);
+                        }
+                    }
+                    currentTime = lastSampleTime;   /// Rectify, prevent error propagation
+                    lastTickState = State;
+                }
+            }
+
+            modelessDlg.OnMeterdata(new MeterDataEventArgs(State, currentTime, currentVolume, currentFlow));
+        }
+
+        
+        /// <summary>
+        /// Obtain the last time instance before 'DateTime time' which is multiple of samplingPeriod-s after 'DateTime initialTime'.
+        /// </summary>
+        /// <param name="time">Time to be converted to seconds and rounded to samplingPeriod-s</param>
+        /// <param name="startTime">Initial time</param>
+        /// <param name="samplePeriod">Sampling period in seconds</param>
+        /// <returns></returns>
+        double TimeInSecondsFromDateTime(DateTime time, DateTime initialTime, double samplingPeriod)
+        {
+            TimeSpan span = time - initialTime;
+            return samplingPeriod * Math.Floor(span.TotalSeconds / samplingPeriod);
+        }
+
+
+        ///---------------------------
+        /// Datastream data exchange
+        ///---------------------------
+
+        /// <summary>
+        /// Retuns 'count' data frames starting with data frame with ID = 'id' 
+        /// </summary>
+        /// <param name="id">First frame ID</param>
+        /// <param name="count">Frames count</param>
+        /// <returns>Selected data frames</returns>
+        public DataFrame[] GetFrames(int meterIx, Int64 startID, int count)
+        {
+            DataFrame[] frames = new DataFrame[count];
+
+            if (State != State.MeasurementInProgress)
+            {
+                for (int j = 0; j < count; j++)
+                {
+                    Int64 id = startID + j;
+                    if (id < storedSamplesCount)
+                    {
+                        frames[j] = new DataFrame(id, samples[id].Time, samples[id].Volume, new double[1] { samples[id].Flow });
+                    }
+                }
+            }
+
+            return frames;
+        }
+
+        /// <summary>
+        /// Returns ID of the data frame where time equals or exceeds the specified time.
+        /// When time of the first frame (ID=0) is larger then specified time, function returns 0.
+        /// </summary>
+        /// <param name="time">Time</param>
+        /// <returns>ID of the data frame at or after the pecified time</returns>
+        public Int64 GetID(int meterIx, double time)
+        {
+            if (storedSamplesCount == 0) return -1;
+
+            Int64 lo = 0;
+            Int64 hi = storedSamplesCount - 1;
+
+            if (samples[hi].Time < time) return -1;
+
+            while (lo < hi)
+            {
+                Int64 mid = (lo + hi) / 2;
+                if (samples[mid].Time < time)
+                {
+                    lo = mid + 1;
+                }
+                else
+                {
+                    hi = mid;
+                }
+            }
+
+            return lo;
+        }
+    }
+
+    public enum State
+    {
+        Disconnected = 0,
+        Connected = 1,
+        MeasurementInProgress = 2,
+    }
+}

DataStreamMeter/MeterSimulationDlg.Designer.cs

@@ -0,0 +1,323 @@
+namespace DataStreamMeter
+{
+    partial class MeterSimulationDlg
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            this.meterIDGroupBox = new System.Windows.Forms.GroupBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.volumeUnitsTextBox = new System.Windows.Forms.TextBox();
+            this.timeUnitsTextBox = new System.Windows.Forms.TextBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.meterIDTextBox = new System.Windows.Forms.TextBox();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.setFlowButton = new System.Windows.Forms.Button();
+            this.flowm3phTextBox = new System.Windows.Forms.TextBox();
+            this.flowTrackBar = new System.Windows.Forms.TrackBar();
+            this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.flowTextBox = new System.Windows.Forms.TextBox();
+            this.volumeTextBox = new System.Windows.Forms.TextBox();
+            this.timeTextBox = new System.Windows.Forms.TextBox();
+            this.stateTextBox = new System.Windows.Forms.TextBox();
+            this.label8 = new System.Windows.Forms.Label();
+            this.label7 = new System.Windows.Forms.Label();
+            this.label6 = new System.Windows.Forms.Label();
+            this.label5 = new System.Windows.Forms.Label();
+            this.lastUITickTextBox = new System.Windows.Forms.TextBox();
+            this.label4 = new System.Windows.Forms.Label();
+            this.timer1 = new System.Windows.Forms.Timer(this.components);
+            this.meterIDGroupBox.SuspendLayout();
+            this.groupBox1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.flowTrackBar)).BeginInit();
+            this.groupBox2.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // meterIDGroupBox
+            // 
+            this.meterIDGroupBox.Controls.Add(this.label3);
+            this.meterIDGroupBox.Controls.Add(this.label2);
+            this.meterIDGroupBox.Controls.Add(this.volumeUnitsTextBox);
+            this.meterIDGroupBox.Controls.Add(this.timeUnitsTextBox);
+            this.meterIDGroupBox.Controls.Add(this.label1);
+            this.meterIDGroupBox.Controls.Add(this.meterIDTextBox);
+            this.meterIDGroupBox.Location = new System.Drawing.Point(12, 12);
+            this.meterIDGroupBox.Name = "meterIDGroupBox";
+            this.meterIDGroupBox.Size = new System.Drawing.Size(453, 105);
+            this.meterIDGroupBox.TabIndex = 0;
+            this.meterIDGroupBox.TabStop = false;
+            this.meterIDGroupBox.Text = "Water meter info";
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(18, 76);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(67, 13);
+            this.label3.TabIndex = 5;
+            this.label3.Text = "Volume units";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(18, 50);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(55, 13);
+            this.label2.TabIndex = 4;
+            this.label2.Text = "Time units";
+            // 
+            // volumeUnitsTextBox
+            // 
+            this.volumeUnitsTextBox.Enabled = false;
+            this.volumeUnitsTextBox.Location = new System.Drawing.Point(122, 73);
+            this.volumeUnitsTextBox.Name = "volumeUnitsTextBox";
+            this.volumeUnitsTextBox.Size = new System.Drawing.Size(52, 20);
+            this.volumeUnitsTextBox.TabIndex = 3;
+            // 
+            // timeUnitsTextBox
+            // 
+            this.timeUnitsTextBox.Enabled = false;
+            this.timeUnitsTextBox.Location = new System.Drawing.Point(122, 47);
+            this.timeUnitsTextBox.Name = "timeUnitsTextBox";
+            this.timeUnitsTextBox.Size = new System.Drawing.Size(52, 20);
+            this.timeUnitsTextBox.TabIndex = 2;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(18, 24);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(73, 13);
+            this.label1.TabIndex = 1;
+            this.label1.Text = "Meter ID (s/n)";
+            // 
+            // meterIDTextBox
+            // 
+            this.meterIDTextBox.Enabled = false;
+            this.meterIDTextBox.Location = new System.Drawing.Point(122, 21);
+            this.meterIDTextBox.Name = "meterIDTextBox";
+            this.meterIDTextBox.Size = new System.Drawing.Size(145, 20);
+            this.meterIDTextBox.TabIndex = 0;
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.setFlowButton);
+            this.groupBox1.Controls.Add(this.flowm3phTextBox);
+            this.groupBox1.Controls.Add(this.flowTrackBar);
+            this.groupBox1.Location = new System.Drawing.Point(12, 123);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(453, 96);
+            this.groupBox1.TabIndex = 1;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Flow";
+            // 
+            // setFlowButton
+            // 
+            this.setFlowButton.Location = new System.Drawing.Point(289, 17);
+            this.setFlowButton.Name = "setFlowButton";
+            this.setFlowButton.Size = new System.Drawing.Size(75, 23);
+            this.setFlowButton.TabIndex = 4;
+            this.setFlowButton.Text = "Set value";
+            this.setFlowButton.UseVisualStyleBackColor = true;
+            this.setFlowButton.Click += new System.EventHandler(this.setFlowButton_Click);
+            // 
+            // flowm3phTextBox
+            // 
+            this.flowm3phTextBox.Enabled = false;
+            this.flowm3phTextBox.Location = new System.Drawing.Point(122, 19);
+            this.flowm3phTextBox.Name = "flowm3phTextBox";
+            this.flowm3phTextBox.Size = new System.Drawing.Size(145, 20);
+            this.flowm3phTextBox.TabIndex = 3;
+            // 
+            // flowTrackBar
+            // 
+            this.flowTrackBar.LargeChange = 1;
+            this.flowTrackBar.Location = new System.Drawing.Point(0, 43);
+            this.flowTrackBar.Maximum = 25;
+            this.flowTrackBar.Name = "flowTrackBar";
+            this.flowTrackBar.Size = new System.Drawing.Size(447, 45);
+            this.flowTrackBar.TabIndex = 2;
+            this.flowTrackBar.Scroll += new System.EventHandler(this.flowTrackBar_Scroll);
+            // 
+            // groupBox2
+            // 
+            this.groupBox2.Controls.Add(this.flowTextBox);
+            this.groupBox2.Controls.Add(this.volumeTextBox);
+            this.groupBox2.Controls.Add(this.timeTextBox);
+            this.groupBox2.Controls.Add(this.stateTextBox);
+            this.groupBox2.Controls.Add(this.label8);
+            this.groupBox2.Controls.Add(this.label7);
+            this.groupBox2.Controls.Add(this.label6);
+            this.groupBox2.Controls.Add(this.label5);
+            this.groupBox2.Controls.Add(this.lastUITickTextBox);
+            this.groupBox2.Controls.Add(this.label4);
+            this.groupBox2.Location = new System.Drawing.Point(12, 225);
+            this.groupBox2.Name = "groupBox2";
+            this.groupBox2.Size = new System.Drawing.Size(453, 150);
+            this.groupBox2.TabIndex = 2;
+            this.groupBox2.TabStop = false;
+            this.groupBox2.Text = "State";
+            // 
+            // flowTextBox
+            // 
+            this.flowTextBox.Enabled = false;
+            this.flowTextBox.Location = new System.Drawing.Point(122, 121);
+            this.flowTextBox.Name = "flowTextBox";
+            this.flowTextBox.Size = new System.Drawing.Size(99, 20);
+            this.flowTextBox.TabIndex = 9;
+            // 
+            // volumeTextBox
+            // 
+            this.volumeTextBox.Enabled = false;
+            this.volumeTextBox.Location = new System.Drawing.Point(122, 95);
+            this.volumeTextBox.Name = "volumeTextBox";
+            this.volumeTextBox.Size = new System.Drawing.Size(99, 20);
+            this.volumeTextBox.TabIndex = 8;
+            // 
+            // timeTextBox
+            // 
+            this.timeTextBox.Enabled = false;
+            this.timeTextBox.Location = new System.Drawing.Point(122, 68);
+            this.timeTextBox.Name = "timeTextBox";
+            this.timeTextBox.Size = new System.Drawing.Size(99, 20);
+            this.timeTextBox.TabIndex = 7;
+            // 
+            // stateTextBox
+            // 
+            this.stateTextBox.Enabled = false;
+            this.stateTextBox.Location = new System.Drawing.Point(122, 42);
+            this.stateTextBox.Name = "stateTextBox";
+            this.stateTextBox.Size = new System.Drawing.Size(99, 20);
+            this.stateTextBox.TabIndex = 6;
+            // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.Location = new System.Drawing.Point(18, 124);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(29, 13);
+            this.label8.TabIndex = 5;
+            this.label8.Text = "Flow";
+            // 
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.Location = new System.Drawing.Point(18, 98);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(42, 13);
+            this.label7.TabIndex = 4;
+            this.label7.Text = "Volume";
+            // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.Location = new System.Drawing.Point(18, 71);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(30, 13);
+            this.label6.TabIndex = 3;
+            this.label6.Text = "Time";
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(18, 45);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(32, 13);
+            this.label5.TabIndex = 2;
+            this.label5.Text = "State";
+            // 
+            // lastUITickTextBox
+            // 
+            this.lastUITickTextBox.Enabled = false;
+            this.lastUITickTextBox.Location = new System.Drawing.Point(122, 13);
+            this.lastUITickTextBox.Name = "lastUITickTextBox";
+            this.lastUITickTextBox.Size = new System.Drawing.Size(145, 20);
+            this.lastUITickTextBox.TabIndex = 1;
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(18, 16);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(61, 13);
+            this.label4.TabIndex = 0;
+            this.label4.Text = "Last UI tick";
+            // 
+            // timer1
+            // 
+            this.timer1.Interval = 1000;
+            this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+            // 
+            // MeterSimulationDlg
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(477, 387);
+            this.Controls.Add(this.groupBox2);
+            this.Controls.Add(this.groupBox1);
+            this.Controls.Add(this.meterIDGroupBox);
+            this.Name = "MeterSimulationDlg";
+            this.Text = "MeterDialog";
+            this.meterIDGroupBox.ResumeLayout(false);
+            this.meterIDGroupBox.PerformLayout();
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.flowTrackBar)).EndInit();
+            this.groupBox2.ResumeLayout(false);
+            this.groupBox2.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.GroupBox meterIDGroupBox;
+        private System.Windows.Forms.TextBox meterIDTextBox;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.TextBox volumeUnitsTextBox;
+        private System.Windows.Forms.TextBox timeUnitsTextBox;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.TextBox flowm3phTextBox;
+        private System.Windows.Forms.TrackBar flowTrackBar;
+        private System.Windows.Forms.GroupBox groupBox2;
+        private System.Windows.Forms.Button setFlowButton;
+        private System.Windows.Forms.Timer timer1;
+        private System.Windows.Forms.TextBox lastUITickTextBox;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.TextBox flowTextBox;
+        private System.Windows.Forms.TextBox volumeTextBox;
+        private System.Windows.Forms.TextBox timeTextBox;
+        private System.Windows.Forms.TextBox stateTextBox;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.Label label5;
+    }
+}

DataStreamMeter/MeterSimulationDlg.cs

@@ -0,0 +1,91 @@
+using System;
+using System.Windows.Forms;
+
+namespace DataStreamMeter
+{
+    public partial class MeterSimulationDlg : Form
+    {
+        MeterSimulation meterSimulation;
+        double currentFlow;
+
+
+        public string MeterID;
+
+
+        public void OnMeterdata(MeterDataEventArgs args)
+        {
+            if (MeterDataHandler == null) return;
+            MeterDataHandler(null, args);
+        }
+        public event EventHandler<MeterDataEventArgs> MeterDataHandler;
+
+
+        /// <summary>
+        /// Default constructor with no meter
+        /// </summary>
+        public MeterSimulationDlg()
+            : this(null, string.Empty)
+        {
+        }
+
+        public MeterSimulationDlg(MeterSimulation meterSimulation, string meterID)
+        {
+            InitializeComponent();
+            this.meterSimulation = meterSimulation;
+            meterIDTextBox.Text = meterID;
+
+            currentFlow = 0;
+            flowm3phTextBox.Text = currentFlow.ToString();
+            flowTrackBar.Value = Convert.ToInt32(currentFlow);
+
+            MeterDataHandler += delegate(object sender, MeterDataEventArgs args)
+            {
+                if (InvokeRequired)
+                {
+                    Invoke(new EventHandler<MeterDataEventArgs>(DisplayMeterData), sender, args);
+                }
+                else
+                {
+                    DisplayMeterData(sender, args);
+                }
+            };
+
+            if (meterSimulation != null)
+            {
+                timer1.Enabled = true;
+                timer1.Start();
+            }
+        }
+
+        private void flowTrackBar_Scroll(object sender, EventArgs e)
+        {
+            currentFlow = flowTrackBar.Value;
+            flowm3phTextBox.Text = currentFlow.ToString("F2");
+        }
+
+        private void setFlowButton_Click(object sender, EventArgs e)
+        {
+            GetDblValueDlg dlg = new GetDblValueDlg("Enter flow in [m3/h] please", 0, 25.0);
+            if (dlg.ShowDialog() == DialogResult.OK)
+            {
+                currentFlow = dlg.DblValue;
+                flowm3phTextBox.Text = currentFlow.ToString();
+                flowTrackBar.Value = Convert.ToInt32(currentFlow);
+            }
+        }
+
+        private void timer1_Tick(object sender, EventArgs e)
+        {
+            lastUITickTextBox.Text = DateTime.Now.ToString("HH:mm:ss fff");
+            meterSimulation.TimerTick(currentFlow);
+        }
+
+        void DisplayMeterData(object sender, MeterDataEventArgs args)
+        {
+            stateTextBox.Text = args.State.ToString();
+            timeTextBox.Text = args.Time.ToString();
+            volumeTextBox.Text = args.Volume.ToString();
+            flowTextBox.Text = args.Flow.ToString();
+        }
+    }
+}

DataStreamMeter/MeterSimulationDlg.resx

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

DataStreamMeter/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("DataStreamMeter")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("DataStreamMeter")]
+[assembly: AssemblyCopyright("Copyright ©  2020")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("8acd46eb-c84d-4199-9f40-7420b7ebabc2")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

DataStreamMeter/Sample.cs

@@ -0,0 +1,23 @@
+using System;
+
+namespace DataStreamMeter
+{
+    public class Sample
+    {
+        public readonly double Time;        /// In water meter time units
+        public readonly double Volume;      /// In water meter colume units
+        public readonly double Flow;        /// In water meter flow units
+
+        public Sample(double time, double volume, double flow)
+        {
+            Time = time;
+            Volume = volume;
+            Flow = flow;
+        }
+
+        public override string ToString()
+        {
+            return string.Format("time={0} volume={1} flow={2}", Time, Volume, Flow);
+        }
+    }
+}

DeviceTest/DeviceTestDlg.cs

@@ -645,7 +645,8 @@ namespace DeviceTest
 								MessageBoxIcon.Exclamation);
 
 				foreach (var dev in tbfDevices) dev.StopDevice();
-				tbfDevices.Clear();
+                foreach (var dev in tbfDevices) dev.StopDevice2();
+                tbfDevices.Clear();
 
 				startButton.Enabled = true;
 				stopButton.Enabled = false;
@@ -856,7 +857,8 @@ namespace DeviceTest
 			}
 
 			foreach (var d in tbfDevices) d.StopDevice();
-		}
+            foreach (var d in tbfDevices) d.StopDevice2();
+        }
 
 		private void stopButton_Click(object sender, EventArgs e)
 		{

Results/Output/SensusTestInfo.cs

@@ -23,6 +23,7 @@ namespace Results.Output
         Suez_EMP_DN32,      /// EMP: 12 flow rates
         Suez_EMP_DN40,      /// EMP: 12 flow rates
         Greece,             /// Q3, Q2adj, Q2, Q1
+        S620,               /// Q3, Q100, Q2, Q1
         Count,
         None,
     }
@@ -414,6 +415,16 @@ namespace Results.Output
                         new SensusTestInfo("Q2",          2,    "Q2",   2, "02",   2,   "Q2", Range.R100_110),
                         new SensusTestInfo("Q1",          1,    "Q1",   1, "01",   1,   "Q1", Range.R100_110),
                     };
+
+                case LogType.S620:
+                    return new SensusTestInfo[]
+                    {
+                        ///                TBF           Oracle DB    Opto RAW   LU logfiles 
+                        new SensusTestInfo("Q3",          5,    "Q3",   5, "04",   5,   "Q3", Range.R90_100),
+                        new SensusTestInfo("Q100",        4, "Q100l",   4, "03",   4,"Q100l", Range.R100_110),
+                        new SensusTestInfo("Q2",          2,    "Q2",   2, "02",   2,   "Q2", Range.R100_110),
+                        new SensusTestInfo("Q1",          1,    "Q1",   1, "01",   1,   "Q1", Range.R100_110),
+                    };
             }
         }
 

Results/Results.csproj

@@ -19,7 +19,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;WARSAW_50;LANG_PL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -29,7 +29,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;WARSAW_50;LANG_PL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>

ResultsBrowser/Forms/CustomQuerySpecificationForm.Designer.cs

@@ -181,7 +181,7 @@
             // 
             // parameterValueTextBox
             // 
-            this.parameterValueTextBox.Location = new System.Drawing.Point(325, 14);
+            this.parameterValueTextBox.Location = new System.Drawing.Point(612, 13);
             this.parameterValueTextBox.Name = "parameterValueTextBox";
             this.parameterValueTextBox.Size = new System.Drawing.Size(68, 20);
             this.parameterValueTextBox.TabIndex = 1;
@@ -189,7 +189,7 @@
             // parameterNameLabel
             // 
             this.parameterNameLabel.AutoSize = true;
-            this.parameterNameLabel.Location = new System.Drawing.Point(128, 17);
+            this.parameterNameLabel.Location = new System.Drawing.Point(121, 17);
             this.parameterNameLabel.Name = "parameterNameLabel";
             this.parameterNameLabel.Size = new System.Drawing.Size(0, 13);
             this.parameterNameLabel.TabIndex = 0;

ResultsBrowser/Forms/CustomQuerySpecificationForm.cs

@@ -83,7 +83,7 @@ namespace ResultsBrowser.Forms
             else if (CQCriteria == CQCriteria.BenchAndBatchNr)
             {
                 parameterGroupBox.Enabled = true;
-                parameterNameLabel.Text = "Test bench number (e.g. 10 for WR10)";
+                parameterNameLabel.Text = "wr10=5, wr11=6, wr13=8, wr14=10, wr15=9, wr18=11, wr19=12, wr20=13, wr21=14";
             }
             else
             {

ResultsBrowser/ResultsBrowser.csproj

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

ResultsBrowser/ResultsBrowserWnd.cs

@@ -743,28 +743,28 @@ namespace ResultsBrowser
                             /// SUEZ specific
                             switch (testId)
                             {
-                                case -2: oraD.AdjErrA4 = error; break;
-                                case -1: oraD.AdjErr = error; break;
-                                case 1:  oraD.Q1LrErr = error; break;
-                                case 2:  oraD.Q2acLrErr = error; break;
-                                case 3:  oraD.Q2LrErr = error; break;
-                                case 5:  oraD.Q3LrErr = error; break;
-                                case 6:  oraD.Q1RlErr = error; break;
-                                case 7:  oraD.Q2acRlErr = error; break;
-                                case 8:  oraD.Q2RlErr = error; break;
-                                case 10: oraD.Q3RlErr = error; break;
+                                case -2: oraD.AdjErrA4  = error; break;
+                                case -1: oraD.AdjErr    = error; break;
+                                case  1: oraD.Q1LrErr   = error; break;
+                                case  2: oraD.Q2acLrErr = error; break;
+                                case  3: oraD.Q2LrErr   = error; break;
+                                case  5: oraD.Q3LrErr   = error; break;
+                                case  6: oraD.Q1RlErr   = error; break;
+                                case  7: oraD.Q2acRlErr = error; break;
+                                case  8: oraD.Q2RlErr   = error; break;
+                                case 10: oraD.Q3RlErr   = error; break;
                                 default: break;
                             }
 
 #else                        /// DEWA specific
                             switch (testId)
                             {
-                                case -1: oraD.AdjErr = error; break;
-                                case 1:  oraD.Q1Err = error; break;
-                                case 2:  oraD.Q2Err = error; break;
-                                case 3:  oraD.Q2AdjErr = error; break;
-                                case 4:  oraD.Q3Err = error; break;
-                                case 5:  oraD.Q4Err = error; break;
+                                case -1: oraD.AdjErr   = error; break;
+                                case  1: oraD.Q1Err    = error; break;
+                                case  2: oraD.Q2Err    = error; break;
+                                case  3: oraD.Q2AdjErr = error; break;
+                                case  4: oraD.Q3Err    = error; break;
+                                case  5: oraD.Q4Err    = error; break;
                                 default: break;
                             }
 #endif
@@ -779,15 +779,27 @@ namespace ResultsBrowser
                 {
                     switch (dlg.IntParameter)
                     {
-                        case 10: Results.DB.ConnectionString = "SERVER=10.42.130.69;  DATABASE=st-wr10-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
-                        case 11: Results.DB.ConnectionString = "SERVER=10.42.129.27;  DATABASE=st-wr11-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
-                        case 13: Results.DB.ConnectionString = "SERVER=10.42.130.52;  DATABASE=st-wr13-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
-                        case 15: Results.DB.ConnectionString = "SERVER=10.42.130.71;  DATABASE=st-wr15-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
-                        case 14: Results.DB.ConnectionString = "SERVER=10.42.130.72;  DATABASE=st-wr14-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
-                        case 18: Results.DB.ConnectionString = "SERVER=10.42.130.165; DATABASE=st-wr18-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
-                        case 19: Results.DB.ConnectionString = "SERVER=10.42.128.159; DATABASE=st-wr19-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
-                        case 20: Results.DB.ConnectionString = "SERVER=10.42.130.76;  DATABASE=st-wr20-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
-                        case 21: Results.DB.ConnectionString = "SERVER=10.42.128.201; DATABASE=st-wr21-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
+#if LOCAL
+                        case 5:  Results.DB.ConnectionString = "SERVER=localhost; DATABASE=st-wr10-r; UID=root; PASSWORD=kraken; CharSet=utf8;"; break;
+                        case 6:  Results.DB.ConnectionString = "SERVER=localhost; DATABASE=st-wr11-r; UID=root; PASSWORD=kraken; CharSet=utf8;"; break;
+                        case 8:  Results.DB.ConnectionString = "SERVER=localhost; DATABASE=st-wr13-r; UID=root; PASSWORD=kraken; CharSet=utf8;"; break;
+                        case 9:  Results.DB.ConnectionString = "SERVER=localhost; DATABASE=st-wr15-r; UID=root; PASSWORD=kraken; CharSet=utf8;"; break;
+                        case 10: Results.DB.ConnectionString = "SERVER=localhost; DATABASE=st-wr14-r; UID=root; PASSWORD=kraken; CharSet=utf8;"; break;
+                        case 11: Results.DB.ConnectionString = "SERVER=localhost; DATABASE=st-wr18-r; UID=root; PASSWORD=kraken; CharSet=utf8;"; break;
+                        case 12: Results.DB.ConnectionString = "SERVER=localhost; DATABASE=st-wr19-r; UID=root; PASSWORD=kraken; CharSet=utf8;"; break;
+                        case 13: Results.DB.ConnectionString = "SERVER=localhost; DATABASE=st-wr20-r; UID=root; PASSWORD=kraken; CharSet=utf8;"; break;
+                        case 14: Results.DB.ConnectionString = "SERVER=localhost; DATABASE=st-wr21-r; UID=root; PASSWORD=kraken; CharSet=utf8;"; break;
+#else
+                        case 5:  Results.DB.ConnectionString = "SERVER=10.42.130.69;  DATABASE=st-wr10-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
+                        case 6:  Results.DB.ConnectionString = "SERVER=10.42.129.27;  DATABASE=st-wr11-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
+                        case 8:  Results.DB.ConnectionString = "SERVER=10.42.130.52;  DATABASE=st-wr13-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
+                        case 9:  Results.DB.ConnectionString = "SERVER=10.42.130.71;  DATABASE=st-wr15-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
+                        case 10: Results.DB.ConnectionString = "SERVER=10.42.130.72;  DATABASE=st-wr14-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
+                        case 11: Results.DB.ConnectionString = "SERVER=10.42.130.165; DATABASE=st-wr18-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
+                        case 12: Results.DB.ConnectionString = "SERVER=10.42.128.159; DATABASE=st-wr19-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
+                        case 13: Results.DB.ConnectionString = "SERVER=10.42.130.76;  DATABASE=st-wr20-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
+                        case 14: Results.DB.ConnectionString = "SERVER=10.42.128.201; DATABASE=st-wr21-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
+#endif
                         default: Results.DB.ConnectionString = string.Empty; break;
                     }
                     Results.DB.DbType = Users.Entities.DBType.MySql;
@@ -860,14 +872,14 @@ namespace ResultsBrowser
                 counter = 0;
                 foreach (var testBenchId in testBenches)
                 {
-                    if (testBenchId == 4)
+                    if (testBenchId == 4 || (dlg.CQCriteria == CQCriteria.BenchAndBatchNr && testBenchId != dlg.IntParameter))
                     {
-                        /// Skip WR9
+                        /// Skip WR9 or other test benches
                         continue;
                     }
 
                     consoleTextBox.Text += string.Format("{0}\r\n", GetBenchName(testBenchId));
-#if false
+#if LOCAL
                     /// Local database copies
                     switch (testBenchId)
                     {
@@ -886,10 +898,10 @@ namespace ResultsBrowser
                     /// Test bench databases
                     switch (testBenchId)
                     {
-                        case 5: Results.DB.ConnectionString = "SERVER=10.42.130.69;  DATABASE=st-wr10-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
-                        case 6: Results.DB.ConnectionString = "SERVER=10.42.129.27;  DATABASE=st-wr11-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
-                        case 8: Results.DB.ConnectionString = "SERVER=10.42.130.52;  DATABASE=st-wr13-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
-                        case 9: Results.DB.ConnectionString = "SERVER=10.42.130.71;  DATABASE=st-wr15-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
+                        case 5:  Results.DB.ConnectionString = "SERVER=10.42.130.69;  DATABASE=st-wr10-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
+                        case 6:  Results.DB.ConnectionString = "SERVER=10.42.129.27;  DATABASE=st-wr11-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
+                        case 8:  Results.DB.ConnectionString = "SERVER=10.42.130.52;  DATABASE=st-wr13-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
+                        case 9:  Results.DB.ConnectionString = "SERVER=10.42.130.71;  DATABASE=st-wr15-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
                         case 10: Results.DB.ConnectionString = "SERVER=10.42.130.72;  DATABASE=st-wr14-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
                         case 11: Results.DB.ConnectionString = "SERVER=10.42.130.165; DATABASE=st-wr18-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
                         case 12: Results.DB.ConnectionString = "SERVER=10.42.128.159; DATABASE=st-wr19-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CharSet=utf8;"; break;
@@ -1041,11 +1053,11 @@ namespace ResultsBrowser
         {
             switch (testBenchId)
             {
-                case 4: return "WR9";
-                case 5: return "WR10";
-                case 6: return "WR11";
-                case 8: return "WR13";
-                case 9: return "WR15";
+                case 4:  return "WR9";
+                case 5:  return "WR10";
+                case 6:  return "WR11";
+                case 8:  return "WR13";
+                case 9:  return "WR15";
                 case 10: return "WR14";
                 case 11: return "WR18";
                 case 12: return "WR19";

Statistics/LocalSettings.cs

@@ -250,13 +250,13 @@ namespace Statistics
             {
                 "SERVER=10.42.130.69; DATABASE=st-wr10-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;",
                 "SERVER=10.42.129.27; DATABASE=st-wr11-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;",
-                "SERVER=10.42.128.61; DATABASE=st-wr13-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;",
-                "SERVER=10.42.130.72; DATABASE=st-wr14-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;",
+                "SERVER=10.42.130.52; DATABASE=st-wr13-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;",
+                "SERVER=10.42.128.61; DATABASE=st-wr14-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;",
                 "SERVER=10.42.130.71; DATABASE=st-wr15-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;",
                 "SERVER=10.42.130.165; DATABASE=st-wr18-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;",
                 "SERVER=10.42.128.159; DATABASE=st-wr19-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;",
                 "SERVER=10.42.130.76; DATABASE=st-wr20-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;",
-                "SERVER=10.42.128.201; DATABASE=st-wr21-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;",
+                "SERVER=10.42.130.156; DATABASE=st-wr21-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;",
                 "SERVER=10.42.130.131; DATABASE=iperlspecial-r; UID=vysledky; PASSWORD=GAqx76QUB6NbnpZP; CHARSET=utf8;",
             };
 

Statistics/StatisticsDlg.cs

@@ -88,19 +88,21 @@ namespace Statistics
 
             for (int i = 0; i < Program.LocalSettings.ConnectionStrings.Length; i++)
             {
-                if (!string.IsNullOrEmpty(Program.LocalSettings.GetConnectionString(i)))
+                string connStr = Program.LocalSettings.GetConnectionString(i);
+
+                if (!string.IsNullOrEmpty(connStr))
                 {
-                    sessionFactories[i] = null;
                     try
                     {
                         sessionFactories[i] = Fluently.Configure()
-                                                      .Database(MySQLConfiguration.Standard.ConnectionString(Program.LocalSettings.GetConnectionString(i)))
+                                                      .Database(MySQLConfiguration.Standard.ConnectionString(connStr))
                                                       .Mappings(m => m.FluentMappings.AddFromAssemblyOf<Results.Entities.Batch>())
                                                       .ExposeConfiguration(BuildSchema)
                                                       .BuildSessionFactory();
                     }
                     catch (Exception)
                     {
+                        sessionFactories[i] = null;
                         MessageBox.Show(string.Format("Cannot open one of database of {0}", Program.LocalSettings.GetBenchName(i)), "Error", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);                
                     }
                 }

Statistics/UserControls/StatisticsCtrl.cs

@@ -1,8 +1,10 @@
 ///
-/// Copyright (c) 2018 Sensus Slovensko a.s.
+/// Copyright (c) 2018-2020 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
+using System.IO;
+using System.Text;
 using System.Windows.Forms;
 using System.Windows.Forms.DataVisualization.Charting;
 using Results.Entities;
@@ -10,10 +12,24 @@ using Statistics.Resources;
 
 namespace Statistics.UserControls
 {
+    class DataPoint
+    {
+        public DateTime StartTime;
+        public double RefError;
+
+        public DataPoint(DateTime startTime, double refError)
+        {
+            StartTime = startTime;
+            RefError = refError;
+        }
+    }
+
+
     public partial class StatisticsCtrl : UserControl
     {
         public int Id;								/// Index of the tab page
         public MidOrWaterMetersCtrl MidCtrl;    /// Reference to the parent control
+        IList<DataPoint> currentData;
 
         public StatisticsCtrl()
         {
@@ -21,6 +37,7 @@ namespace Statistics.UserControls
             chart1.ChartAreas[0].AxisX.LabelStyle.Format = "dd.MM.yy";
             chart1.ChartAreas[0].AxisX.Interval = 1;
             chart1.ChartAreas[0].AxisX.IntervalType = DateTimeIntervalType.Days;
+            currentData = new List<DataPoint>();
         }
 
         private void updateButton_Click(object sender, EventArgs e)
@@ -36,6 +53,8 @@ namespace Statistics.UserControls
 
                 if (results != null)
                 {
+                    currentData.Clear();
+
                     foreach (var r in results)
                     {
                         if (r.ErrorMaster != 0)
@@ -45,6 +64,7 @@ namespace Statistics.UserControls
                                 if (MidCtrl.IsFlowEnabled(i) && (MidCtrl.FlowFrom(i) <= r.FlowMean) && (r.FlowMean <= MidCtrl.FlowTo(i)))
                                 {
                                     chart1.Series[string.Format("Flow {0}", i)].Points.AddXY(r.StartTime, r.ErrorMaster);
+                                    currentData.Add(new DataPoint(r.StartTime, r.ErrorMaster));
                                 }
                             }
                         }
@@ -56,7 +76,21 @@ namespace Statistics.UserControls
 
         private void exportButton_Click(object sender, EventArgs e)
         {
+            SaveFileDialog dlg = new SaveFileDialog();
+            dlg.Filter = "CSV files (*.csv)|*.csv|All files (*.*)|*.*";
 
+            if (dlg.ShowDialog() == DialogResult.OK)
+            {
+                using (TextWriter writer = new StreamWriter(dlg.FileName))
+                {
+                    foreach (var d in currentData)
+                    {
+                        writer.WriteLine("{0:dd.MM.yyyy HH:mm}; {1}", d.StartTime, d.RefError);
+                    }
+                }
+
+                MessageBox.Show(string.Format("Data written to file {0}", dlg.FileName));
+            }
         }
     }
 }

TBF.sln

@@ -71,6 +71,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataStreamInterface", "Data
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResetBatchNr", "ResetBatchNr\ResetBatchNr.csproj", "{D7F5A111-B2DF-4761-9574-AB730DF573A6}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataStreamInterfaceTest", "DataStreamInterfaceTest\DataStreamInterfaceTest.csproj", "{1D1EEF9C-7F41-43D3-BD09-5054D00F7A23}"
+	ProjectSection(ProjectDependencies) = postProject
+		{E6925701-57A6-4167-B5C4-BF670F1DE310} = {E6925701-57A6-4167-B5C4-BF670F1DE310}
+		{7EBEEA14-91C4-48D7-AF0A-7A4BC3FF9A28} = {7EBEEA14-91C4-48D7-AF0A-7A4BC3FF9A28}
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataStreamMeter", "DataStreamMeter\DataStreamMeter.csproj", "{E6925701-57A6-4167-B5C4-BF670F1DE310}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -315,6 +323,26 @@ Global
 		{D7F5A111-B2DF-4761-9574-AB730DF573A6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D7F5A111-B2DF-4761-9574-AB730DF573A6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D7F5A111-B2DF-4761-9574-AB730DF573A6}.Release|x86.ActiveCfg = Release|Any CPU
+		{1D1EEF9C-7F41-43D3-BD09-5054D00F7A23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1D1EEF9C-7F41-43D3-BD09-5054D00F7A23}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1D1EEF9C-7F41-43D3-BD09-5054D00F7A23}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1D1EEF9C-7F41-43D3-BD09-5054D00F7A23}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1D1EEF9C-7F41-43D3-BD09-5054D00F7A23}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1D1EEF9C-7F41-43D3-BD09-5054D00F7A23}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1D1EEF9C-7F41-43D3-BD09-5054D00F7A23}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1D1EEF9C-7F41-43D3-BD09-5054D00F7A23}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{1D1EEF9C-7F41-43D3-BD09-5054D00F7A23}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{1D1EEF9C-7F41-43D3-BD09-5054D00F7A23}.Release|x86.ActiveCfg = Release|Any CPU
+		{E6925701-57A6-4167-B5C4-BF670F1DE310}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E6925701-57A6-4167-B5C4-BF670F1DE310}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E6925701-57A6-4167-B5C4-BF670F1DE310}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E6925701-57A6-4167-B5C4-BF670F1DE310}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E6925701-57A6-4167-B5C4-BF670F1DE310}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E6925701-57A6-4167-B5C4-BF670F1DE310}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E6925701-57A6-4167-B5C4-BF670F1DE310}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E6925701-57A6-4167-B5C4-BF670F1DE310}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{E6925701-57A6-4167-B5C4-BF670F1DE310}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{E6925701-57A6-4167-B5C4-BF670F1DE310}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

TBF/BenchControl/DataEntry/Combined/EntryForm.cs

@@ -18,7 +18,7 @@ namespace TBF.BenchControl.DataEntry.Combined
 		public bool UsesCameras() { return false; }
 
         readonly EntryFormCfg entryFormCfg;
-		IRegisterReader[] regReaders;
+		IRegReader[] regReaders;
 
 		/// <summary>
 		/// Properties set by the Begin and the End form
@@ -98,7 +98,7 @@ namespace TBF.BenchControl.DataEntry.Combined
 		}
 
 		/// <returns>Reference to the operation</returns>
-		public IOperation ShowTestStartFormOp(IRegisterReader[] regReaders)
+		public IOperation ShowTestStartFormOp(IRegReader[] regReaders)
 		{
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.EnterTestStartStates;
@@ -107,7 +107,7 @@ namespace TBF.BenchControl.DataEntry.Combined
 		}
 
 		/// <returns>Reference to the operation</returns>
-		public IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
+		public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
 		{
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.EnterTestEndStates;

TBF/BenchControl/DataEntry/Combined/TestStartEndForm.cs

@@ -20,7 +20,7 @@ namespace TBF.BenchControl.DataEntry.Combined
 
 		/// <summary> Number of water meters </summary>
         public readonly int WaterMetersCount;	/// Main + Aux water meter count as one (combined) water meter
-		readonly IRegisterReader[] regReaders;
+		readonly IRegReader[] regReaders;
 		readonly bool[] disabled;
 
 		// To be retrieved after the form closes
@@ -78,7 +78,7 @@ namespace TBF.BenchControl.DataEntry.Combined
 		/// </summary>
 		/// <param name="waterMetersCount">Number of water meters</param>
 		/// <param name="disabled">Information from CycleBeginningForm about availability of water meters</param>
-		public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, bool[] disabled)
+		public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, bool[] disabled)
 			: this()
 		{
 			endStates = false;
@@ -105,7 +105,7 @@ namespace TBF.BenchControl.DataEntry.Combined
 		/// <param name="refVolume">Reference volume, it is used to verify the end state, show/hide exclamation if necessary</param>
 		/// <param name="errLimLo">Error limit low, it is used to verify the end state, show/hide exclamation if necessary</param>
 		/// <param name="errLimHi">Error limit high, it is used to verify the end state, show/hide exclamation if necessary</param>
-		public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, string[] mainStartStateStr, string[] auxStartStateStr,
+		public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, string[] mainStartStateStr, string[] auxStartStateStr,
 								bool[] disabled, double refVolume, double errLimLo, double errLimHi)
 			: this()
         {

TBF/BenchControl/DataEntry/Fewa/EntryFormNoStartEnd.cs

@@ -18,7 +18,7 @@ namespace TBF.BenchControl.DataEntry.Fewa
 		public bool UsesCameras() { return false; }
 
         readonly EntryFormCfg entryFormCfg;
-		IRegisterReader[] regReaders;
+		IRegReader[] regReaders;
 
 		/// <summary>
 		/// Properties set by the Begin, End and WMStates form
@@ -98,7 +98,7 @@ namespace TBF.BenchControl.DataEntry.Fewa
 		}
 
         /// <returns>Reference to the operation</returns>
-        public IOperation ShowTestStartFormOp(IRegisterReader[] regReaders)
+        public IOperation ShowTestStartFormOp(IRegReader[] regReaders)
         {
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.EnterTestStartStates;
@@ -107,7 +107,7 @@ namespace TBF.BenchControl.DataEntry.Fewa
 		}
 
 		/// <returns>Reference to the operation</returns>
-		public IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
+		public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
 		{
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.EnterTestEndStates;

TBF/BenchControl/DataEntry/Fewa/TestStartEndForm.cs

@@ -20,7 +20,7 @@ namespace TBF.BenchControl.DataEntry.Fewa
 
 		/// <summary> Number of text boxes for serial numbers </summary>
         public readonly int WMsCount;
-		readonly IRegisterReader[] regReaders;
+		readonly IRegReader[] regReaders;
 		readonly bool[] disabled;
 
 		// To be retrieved after the form closes
@@ -98,7 +98,7 @@ namespace TBF.BenchControl.DataEntry.Fewa
 		/// </summary>
 		/// <param name="waterMetersCount">Number of water meters</param>
 		/// <param name="disabled">Information from CycleBeginningForm about availability of water meters</param>
-		public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, bool[] disabled)
+		public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, bool[] disabled)
 			: this()
 		{
 			endStates = false;
@@ -122,7 +122,7 @@ namespace TBF.BenchControl.DataEntry.Fewa
 		/// <param name="refVolume">Reference volume, it is used to verify the end state, show/hide exclamation if necessary</param>
 		/// <param name="errLimLo">Error limit low, it is used to verify the end state, show/hide exclamation if necessary</param>
 		/// <param name="errLimHi">Error limit high, it is used to verify the end state, show/hide exclamation if necessary</param>
-		public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
+		public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
 								double refVolume, double errLimLo, double errLimHi)
 			: this()
         {

TBF/BenchControl/DataEntry/HeatMeters12/EntryForm.cs

@@ -21,7 +21,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
 		public bool UsesCameras() { return false; }
 
         readonly EntryFormCfg entryFormCfg;
-		IRegisterReader[] regReaders;
+		IRegReader[] regReaders;
 
 		/// <summary>
 		/// Properties set by the Begin, End and WMStates form
@@ -116,7 +116,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
 		}
 
         /// <returns>Reference to the operation</returns>
-        public IOperation ShowTestStartFormOp(IRegisterReader[] regReaders)
+        public IOperation ShowTestStartFormOp(IRegReader[] regReaders)
         {
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.EnterTestStartStates;
@@ -125,7 +125,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
 		}
 
 		/// <returns>Reference to the operation</returns>
-		public IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
+		public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
 		{
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.EnterTestEndStates;
@@ -140,7 +140,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
 		}
 
         /// <returns>Reference to the operation</returns>
-		public IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi,
+		public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi,
                                             double refEnergy, double energyErrLimLo, double energyErrLimHi)
         {
             if (currentOp != CurrentOp.None) throw new Exception("Sequence error");

TBF/BenchControl/DataEntry/HeatMeters12/TestStartEndForm.cs

@@ -22,7 +22,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
 
 		/// <summary> Number of text boxes for serial numbers </summary>
         public readonly int WaterMetersCount;
-		readonly IRegisterReader[] regReaders;
+		readonly IRegReader[] regReaders;
 		readonly bool[] disabled;
 
 		// To be retrieved after the form closes
@@ -106,7 +106,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
 		/// </summary>
 		/// <param name="waterMetersCount">Number of water meters</param>
 		/// <param name="disabled">Information from CycleBeginningForm about availability of water meters</param>
-		public TestStartEndForm(EntryFormCfg cfg, int waterMetersCount, IRegisterReader[] regReaders, bool[] disabled)
+		public TestStartEndForm(EntryFormCfg cfg, int waterMetersCount, IRegReader[] regReaders, bool[] disabled)
 			: this()
 		{
 			endStates = false;
@@ -135,7 +135,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
 		/// <param name="refVolume">Reference volume, it is used to verify the end state, show/hide exclamation if necessary</param>
 		/// <param name="errLimLo">Error limit low, it is used to verify the end state, show/hide exclamation if necessary</param>
 		/// <param name="errLimHi">Error limit high, it is used to verify the end state, show/hide exclamation if necessary</param>
-		public TestStartEndForm(EntryFormCfg cfg, int waterMetersCount, IRegisterReader[] regReaders, string[] wmStartStateStr, string[] energyStartStateStr,
+		public TestStartEndForm(EntryFormCfg cfg, int waterMetersCount, IRegReader[] regReaders, string[] wmStartStateStr, string[] energyStartStateStr,
                                 bool[] disabled, double refVolume, double errLimLo, double errLimHi,
                                 double refEnergy, double energyErrLimLo, double energyErrLimHi)
 			: this()

TBF/BenchControl/DataEntry/HeatMeters6/EntryForm.cs

@@ -21,7 +21,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
 		public bool UsesCameras() { return false; }
 
         readonly EntryFormCfg entryFormCfg;
-		IRegisterReader[] regReaders;
+		IRegReader[] regReaders;
 
         /// <summary>
         /// Properties set by the Begin, End and WMStates form
@@ -116,7 +116,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
         }
 
         /// <returns>Reference to the operation</returns>
-        public IOperation ShowTestStartFormOp(IRegisterReader[] regReaders)
+        public IOperation ShowTestStartFormOp(IRegReader[] regReaders)
         {
             if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
             currentOp = CurrentOp.EnterTestStartStates;
@@ -125,7 +125,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
         }
 
         /// <returns>Reference to the operation</returns>
-        public IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
+        public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
         {
             if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
             currentOp = CurrentOp.EnterTestEndStates;
@@ -140,7 +140,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
         }
 
         /// <returns>Reference to the operation</returns>
-		public IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi,
+		public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi,
                                             double refEnergy, double energyErrLimLo, double energyErrLimHi)
         {
             if (currentOp != CurrentOp.None) throw new Exception("Sequence error");

TBF/BenchControl/DataEntry/HeatMeters6/TestStartEndForm.cs

@@ -22,7 +22,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
 
 		/// <summary> Number of text boxes for serial numbers </summary>
         public readonly int WaterMetersCount;
-		readonly IRegisterReader[] regReaders;
+		readonly IRegReader[] regReaders;
 		readonly bool[] disabled;
 
 		// To be retrieved after the form closes
@@ -98,7 +98,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
 		/// </summary>
 		/// <param name="waterMetersCount">Number of water meters</param>
 		/// <param name="disabled">Information from CycleBeginningForm about availability of water meters</param>
-		public TestStartEndForm(EntryFormCfg cfg, int waterMetersCount, IRegisterReader[] regReaders, bool[] disabled)
+		public TestStartEndForm(EntryFormCfg cfg, int waterMetersCount, IRegReader[] regReaders, bool[] disabled)
 			: this()
 		{
 			endStates = false;
@@ -127,7 +127,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
 		/// <param name="refVolume">Reference volume, it is used to verify the end state, show/hide exclamation if necessary</param>
 		/// <param name="errLimLo">Error limit low, it is used to verify the end state, show/hide exclamation if necessary</param>
 		/// <param name="errLimHi">Error limit high, it is used to verify the end state, show/hide exclamation if necessary</param>
-		public TestStartEndForm(EntryFormCfg cfg, int waterMetersCount, IRegisterReader[] regReaders, string[] wmStartStateStr, string[] energyStartStateStr,
+		public TestStartEndForm(EntryFormCfg cfg, int waterMetersCount, IRegReader[] regReaders, string[] wmStartStateStr, string[] energyStartStateStr,
                                 bool[] disabled, double refVolume, double errLimLo, double errLimHi,
                                 double refEnergy, double energyErrLimLo, double energyErrLimHi)
 			: this()

TBF/BenchControl/DataEntry/Munich3/EntryForm.cs

@@ -18,7 +18,7 @@ namespace TBF.BenchControl.DataEntry.Munich3
 		public bool UsesCameras() { return false; }
 
         readonly EntryFormCfg entryFormCfg;
-		IRegisterReader[] regReaders;
+		IRegReader[] regReaders;
 
         /// <summary>
         /// Properties set by the Begin and the End form
@@ -103,7 +103,7 @@ namespace TBF.BenchControl.DataEntry.Munich3
 		}
 
 		/// <returns>Reference to the operation</returns>
-		public IOperation ShowTestStartFormOp(IRegisterReader[] regReaders)
+		public IOperation ShowTestStartFormOp(IRegReader[] regReaders)
 		{
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.EnterTestStartStates;
@@ -112,7 +112,7 @@ namespace TBF.BenchControl.DataEntry.Munich3
 		}
 
 		/// <returns>Reference to the operation</returns>
-		public IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
+		public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
 		{
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.EnterTestEndStates;

TBF/BenchControl/DataEntry/Munich3/TestStartEndForm.cs

@@ -19,7 +19,7 @@ namespace TBF.BenchControl.DataEntry.Munich3
 
 		/// <summary> Number of water meters </summary>
         public readonly int WaterMetersCount;
-		readonly IRegisterReader[] regReaders;
+		readonly IRegReader[] regReaders;
 		readonly bool[] disabled;
 
 		// To be retrieved after the form closes
@@ -62,7 +62,7 @@ namespace TBF.BenchControl.DataEntry.Munich3
 		/// Constructor to fill in start states
 		/// </summary>
 		/// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
-		public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, bool[] disabled)
+		public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, bool[] disabled)
 			: this()
 		{
 			endStates = false;
@@ -81,7 +81,7 @@ namespace TBF.BenchControl.DataEntry.Munich3
         /// Constructor to fill in end states
         /// </summary>
         /// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
-		public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
+		public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
 								double refVolume, double errLimLo, double errLimHi)
 			: this()
         {

TBF/BenchControl/DataEntry/Single/EntryFormNoStartEnd.cs

@@ -18,7 +18,7 @@ namespace TBF.BenchControl.DataEntry.Single
 		public bool UsesCameras() { return false; }
 
         readonly EntryFormCfg entryFormCfg;
-		IRegisterReader[] regReaders;
+		IRegReader[] regReaders;
 
 		/// <summary>
 		/// Properties set by the Begin, End and WMStates form
@@ -98,7 +98,7 @@ namespace TBF.BenchControl.DataEntry.Single
 		}
 
         /// <returns>Reference to the operation</returns>
-        public IOperation ShowTestStartFormOp(IRegisterReader[] regReaders)
+        public IOperation ShowTestStartFormOp(IRegReader[] regReaders)
         {
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.EnterTestStartStates;
@@ -107,7 +107,7 @@ namespace TBF.BenchControl.DataEntry.Single
 		}
 
 		/// <returns>Reference to the operation</returns>
-		public IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
+		public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
 		{
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.EnterTestEndStates;

TBF/BenchControl/DataEntry/Single/TestStartEndForm.cs

@@ -20,7 +20,7 @@ namespace TBF.BenchControl.DataEntry.Single
 
 		/// <summary> Number of text boxes for serial numbers </summary>
         public readonly int WaterMetersCount;
-		readonly IRegisterReader[] regReaders;
+		readonly IRegReader[] regReaders;
 		readonly bool[] disabled;
 
 		// To be retrieved after the form closes
@@ -91,7 +91,7 @@ namespace TBF.BenchControl.DataEntry.Single
 		/// </summary>
 		/// <param name="waterMetersCount">Number of water meters</param>
 		/// <param name="disabled">Information from CycleBeginningForm about availability of water meters</param>
-		public TestStartEndForm(int waterMetersCount, int lineSize, IRegisterReader[] regReaders, bool[] disabled)
+		public TestStartEndForm(int waterMetersCount, int lineSize, IRegReader[] regReaders, bool[] disabled)
             : this(waterMetersCount, lineSize)
 		{
 			endStates = false;
@@ -113,7 +113,7 @@ namespace TBF.BenchControl.DataEntry.Single
 		/// <param name="refVolume">Reference volume, it is used to verify the end state, show/hide exclamation if necessary</param>
 		/// <param name="errLimLo">Error limit low, it is used to verify the end state, show/hide exclamation if necessary</param>
 		/// <param name="errLimHi">Error limit high, it is used to verify the end state, show/hide exclamation if necessary</param>
-		public TestStartEndForm(int waterMetersCount, int lineSize, IRegisterReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
+		public TestStartEndForm(int waterMetersCount, int lineSize, IRegReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
 								double refVolume, double errLimLo, double errLimHi)
             : this(waterMetersCount, lineSize)
         {

TBF/BenchControl/DataEntry/Standard12/EntryFormNoStartEnd.cs

@@ -18,7 +18,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
 		public bool UsesCameras() { return false; }
 
         readonly EntryFormCfg entryFormCfg;
-		IRegisterReader[] regReaders;
+		IRegReader[] regReaders;
 
 		/// <summary>
 		/// Properties set by the Begin, End and WMStates form
@@ -98,7 +98,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
 		}
 
         /// <returns>Reference to the operation</returns>
-		public IOperation ShowTestStartFormOp(IRegisterReader[] regReaders)
+		public IOperation ShowTestStartFormOp(IRegReader[] regReaders)
         {
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.EnterTestStartStates;
@@ -107,7 +107,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
 		}
 
 		/// <returns>Reference to the operation</returns>
-		public IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
+		public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
 		{
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.EnterTestEndStates;

TBF/BenchControl/DataEntry/Standard12/TestStartEndForm.cs

@@ -20,7 +20,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
 
 		/// <summary> Number of text boxes for serial numbers </summary>
         public readonly int WaterMetersCount;
-		readonly IRegisterReader[] regReaders;
+		readonly IRegReader[] regReaders;
 		readonly bool[] disabled;
 
 		// To be retrieved after the form closes
@@ -81,7 +81,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
 		/// </summary>
 		/// <param name="waterMetersCount">Number of water meters</param>
 		/// <param name="disabled">Information from CycleBeginningForm about availability of water meters</param>
-		public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, bool[] disabled)
+		public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, bool[] disabled)
 			: this()
 		{
 			endStates = false;
@@ -105,7 +105,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
 		/// <param name="refVolume">Reference volume, it is used to verify the end state, show/hide exclamation if necessary</param>
 		/// <param name="errLimLo">Error limit low, it is used to verify the end state, show/hide exclamation if necessary</param>
 		/// <param name="errLimHi">Error limit high, it is used to verify the end state, show/hide exclamation if necessary</param>
-		public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
+		public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
 								double refVolume, double errLimLo, double errLimHi)
 			: this()
         {

TBF/BenchControl/DataEntry/Standard24/EntryFormNoStartEnd.cs

@@ -18,7 +18,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		public bool UsesCameras() { return false; }
 
         readonly EntryFormCfg entryFormCfg;
-		IRegisterReader[] regReaders;
+		IRegReader[] regReaders;
 
 		/// <summary>
 		/// Properties set by the Begin, End and WMStates form
@@ -98,7 +98,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		}
 
         /// <returns>Reference to the operation</returns>
-        public IOperation ShowTestStartFormOp(IRegisterReader[] regReaders)
+        public IOperation ShowTestStartFormOp(IRegReader[] regReaders)
         {
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.EnterTestStartStates;
@@ -107,7 +107,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		}
 
 		/// <returns>Reference to the operation</returns>
-		public IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
+		public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
 		{
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.EnterTestEndStates;

TBF/BenchControl/DataEntry/Standard24/TestStartEndForm.cs

@@ -20,7 +20,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 
 		/// <summary> Number of text boxes for serial numbers </summary>
         public readonly int WaterMetersCount;
-		readonly IRegisterReader[] regReaders;
+		readonly IRegReader[] regReaders;
 		readonly bool[] disabled;
 
 		// To be retrieved after the form closes
@@ -98,7 +98,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		/// </summary>
 		/// <param name="waterMetersCount">Number of water meters</param>
 		/// <param name="disabled">Information from CycleBeginningForm about availability of water meters</param>
-		public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, bool[] disabled)
+		public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, bool[] disabled)
 			: this()
 		{
 			endStates = false;
@@ -122,7 +122,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
 		/// <param name="refVolume">Reference volume, it is used to verify the end state, show/hide exclamation if necessary</param>
 		/// <param name="errLimLo">Error limit low, it is used to verify the end state, show/hide exclamation if necessary</param>
 		/// <param name="errLimHi">Error limit high, it is used to verify the end state, show/hide exclamation if necessary</param>
-		public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
+		public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
 								double refVolume, double errLimLo, double errLimHi)
 			: this()
         {

TBF/BenchControl/DataEntry/Standard48/EntryFormNoStartEnd.cs

@@ -18,7 +18,7 @@ namespace TBF.BenchControl.DataEntry.Standard48
 		public bool UsesCameras() { return false; }
 
         readonly EntryFormCfg entryFormCfg;
-		IRegisterReader[] regReaders;
+		IRegReader[] regReaders;
 
 		/// <summary>
 		/// Properties set by the Begin, End and WMStates form
@@ -98,7 +98,7 @@ namespace TBF.BenchControl.DataEntry.Standard48
 		}
 
         /// <returns>Reference to the operation</returns>
-        public IOperation ShowTestStartFormOp(IRegisterReader[] regReaders)
+        public IOperation ShowTestStartFormOp(IRegReader[] regReaders)
         {
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.EnterTestStartStates;
@@ -107,7 +107,7 @@ namespace TBF.BenchControl.DataEntry.Standard48
 		}
 
 		/// <returns>Reference to the operation</returns>
-		public IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
+		public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
 		{
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.EnterTestEndStates;

TBF/BenchControl/DataEntry/Standard48/TestStartEndForm.cs

@@ -20,7 +20,7 @@ namespace TBF.BenchControl.DataEntry.Standard48
 
 		/// <summary> Number of text boxes for serial numbers </summary>
         public readonly int WaterMetersCount;
-		readonly IRegisterReader[] regReaders;
+		readonly IRegReader[] regReaders;
 		readonly bool[] disabled;
 
 		// To be retrieved after the form closes
@@ -106,7 +106,7 @@ namespace TBF.BenchControl.DataEntry.Standard48
 		/// </summary>
 		/// <param name="waterMetersCount">Number of water meters</param>
 		/// <param name="disabled">Information from CycleBeginningForm about availability of water meters</param>
-		public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, bool[] disabled)
+		public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, bool[] disabled)
 			: this()
 		{
 			endStates = false;
@@ -130,7 +130,7 @@ namespace TBF.BenchControl.DataEntry.Standard48
 		/// <param name="refVolume">Reference volume, it is used to verify the end state, show/hide exclamation if necessary</param>
 		/// <param name="errLimLo">Error limit low, it is used to verify the end state, show/hide exclamation if necessary</param>
 		/// <param name="errLimHi">Error limit high, it is used to verify the end state, show/hide exclamation if necessary</param>
-		public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
+		public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
 								double refVolume, double errLimLo, double errLimHi)
 			: this()
         {

TBF/BenchControl/DataEntry/Standard6/EntryFormNoStartEnd.cs

@@ -18,7 +18,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
 		public bool UsesCameras() { return false; }
 
         readonly EntryFormCfg entryFormCfg;
-		IRegisterReader[] regReaders;
+		IRegReader[] regReaders;
 
 		/// <summary>
 		/// Properties set by the Begin, End and WMStates form
@@ -94,7 +94,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
 		}
 
         /// <returns>Reference to the operation</returns>
-        public IOperation ShowTestStartFormOp(IRegisterReader[] regReaders)
+        public IOperation ShowTestStartFormOp(IRegReader[] regReaders)
         {
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.EnterTestStartStates;
@@ -103,7 +103,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
 		}
 
 		/// <returns>Reference to the operation</returns>
-		public IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
+		public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
 		{
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.EnterTestEndStates;

TBF/BenchControl/DataEntry/Standard6/TestStartEndForm.cs

@@ -19,7 +19,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
 
 		/// <summary> Number of water meters </summary>
         public readonly int WaterMetersCount;
-		readonly IRegisterReader[] regReaders;
+		readonly IRegReader[] regReaders;
 		readonly bool[] disabled;
 
 		// To be retrieved after the form closes
@@ -43,7 +43,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
 		/// Constructor to fill in start states
 		/// </summary>
 		/// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
-		public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, bool[] disabled)
+		public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, bool[] disabled)
 		{
 			InitializeComponent();
 			ControlBox = false;
@@ -63,7 +63,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
         /// Constructor to fill in end states
         /// </summary>
         /// <param name="waterMetersCount">Number of text boxes for serial numbers</param>
-		public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
+		public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
 								double refVolume, double errLimLo, double errLimHi)
         {
 			endStates = true;

TBF/BenchControl/DataEntry/StandardCamera/EntryForm.cs

@@ -17,7 +17,7 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
 
 
         readonly EntryFormCfg entryFormCfg;
-		IRegisterReader[] regReaders;
+		IRegReader[] regReaders;
 
 
 		public string[] StartImages
@@ -148,7 +148,7 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
 		}
 
         /// <returns>Reference to the operation</returns>
-        public IOperation ShowTestStartFormOp(IRegisterReader[] regReaders)
+        public IOperation ShowTestStartFormOp(IRegReader[] regReaders)
         {
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.TestStartStates;
@@ -157,7 +157,7 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
 		}
 
 		/// <returns>Reference to the operation</returns>
-		public IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
+		public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
 		{
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.TestEndStates;
@@ -169,7 +169,7 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
 		}
 
 		/// <returns>Reference to the operation</returns>
-		public IOperation ShowDeferredTestEvalFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
+		public IOperation ShowDeferredTestEvalFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
 		{
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.DeferredTestEval;

TBF/BenchControl/DataEntry/StandardCamera/TestStartEndForm.cs

@@ -40,7 +40,7 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
 		/// <summary> Number of text boxes for serial numbers </summary>
 		readonly Tst mode;						/// Start, End or Deferred
 		public readonly int WaterMetersCount;
-		readonly IRegisterReader[] regReaders;		
+		readonly IRegReader[] regReaders;		
 		readonly bool[] disabled;
 		readonly string[] startImages;
 		readonly string[] endImages;
@@ -136,7 +136,7 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
 		/// </summary>
 		/// <param name="waterMetersCount">Number of water meters</param>
 		/// <param name="disabled">Information from CycleBeginningForm about availability of water meters</param>
-		public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, string[] startImages, bool[] disabled)
+		public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, string[] startImages, bool[] disabled)
 			: this()
 		{
 			mode = Tst.Start;
@@ -174,7 +174,7 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
 		/// <param name="refVolume">Reference volume, it is used to verify the end state, show/hide exclamation if necessary</param>
 		/// <param name="errLimLo">Error limit low, it is used to verify the end state, show/hide exclamation if necessary</param>
 		/// <param name="errLimHi">Error limit high, it is used to verify the end state, show/hide exclamation if necessary</param>
-		public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, string[] endImages, double[] wmStartState, string[] wmStartStateStr, bool[] disabled,
+		public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, string[] endImages, double[] wmStartState, string[] wmStartStateStr, bool[] disabled,
 								double refVolume, double errLimLo, double errLimHi)
 			: this()
         {
@@ -210,7 +210,7 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
             WMEndState = new double[waterMetersCount];
 		}
 
-		public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, string[] startImages, string[] endImages,
+		public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, string[] startImages, string[] endImages,
 								bool[] disabled, double refVolume, double errLimLo, double errLimHi)
 			: this()
 		{
@@ -297,7 +297,8 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
 					switch (mode)
 					{
 						case Tst.Start:
-							if (disabled != null && wmPos <= disabled.Length && disabled[wmPos - 1])
+							if ((disabled != null && wmPos <= disabled.Length && disabled[wmPos - 1]) ||
+                                (regReaders != null && wmPos <= regReaders.Length && regReaders[wmPos - 1] == null))
 							{
 								startTextBoxes[i].Enabled = false;
 							}
@@ -309,8 +310,9 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
 							break;
 
 						case Tst.End:
-							if (disabled != null && wmPos <= disabled.Length && disabled[wmPos - 1])
-							{
+                            if ((disabled != null && wmPos <= disabled.Length && disabled[wmPos - 1]) ||
+                                (regReaders != null && wmPos <= regReaders.Length && regReaders[wmPos - 1] == null))
+                            {
 								startTextBoxes[i].Enabled = false;
 								endTextBoxes[i].Enabled = false;
 							}
@@ -324,8 +326,9 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
 							break;
 
 						case Tst.Both:
-							if (disabled != null && wmPos <= disabled.Length && disabled[wmPos - 1])
-							{
+                            if ((disabled != null && wmPos <= disabled.Length && disabled[wmPos - 1]) ||
+                                (regReaders != null && wmPos <= regReaders.Length && regReaders[wmPos - 1] == null))
+                            {
 								startTextBoxes[i].Enabled = false;
 								endTextBoxes[i].Enabled = false;
 							}
@@ -561,8 +564,29 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
 					if (enabledTextBoxes[i] == currentFocusOwner)
 					{
 						/// Change focus to the next enabled text box
-						enabledTextBoxes[(i + 1) % enabledTextBoxes.Count].Focus();
-						return;
+                        var currentTextBox = enabledTextBoxes[(i + 1) % enabledTextBoxes.Count];
+						currentTextBox.Focus();
+                        
+                        /// Load the respective image
+                        for (int j = 0; j < startTextBoxes.Length; j++)
+                        {
+                            if (startTextBoxes[j] == currentTextBox)
+                            {
+                                LoadImage(Tst.Start, j);
+                                return;
+                            }
+                        }
+                        for (int j = 0; j < endTextBoxes.Length; j++)
+                        {
+                            if (endTextBoxes[j] == currentTextBox)
+                            {
+                                LoadImage(Tst.End, j);
+                                return;
+                            }
+                        }
+
+                        /// No image found
+                        return;
 					}
 				}
 			}

TBF/BenchControl/DataEntry/iPerl/EntryForm.cs

@@ -18,7 +18,7 @@ namespace TBF.BenchControl.DataEntry.iPerl
 		public bool UsesCameras() { return false; }
 
         readonly EntryFormCfg entryFormCfg;
-		IRegisterReader[] regReaders;
+		IRegReader[] regReaders;
 
 		/// <summary>
 		/// Properties set by the Begin, End and WMStates form
@@ -98,7 +98,7 @@ namespace TBF.BenchControl.DataEntry.iPerl
 		}
 
         /// <returns>Reference to the operation</returns>
-        public IOperation ShowTestStartFormOp(IRegisterReader[] regReaders)
+        public IOperation ShowTestStartFormOp(IRegReader[] regReaders)
         {
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.EnterTestStartStates;
@@ -107,7 +107,7 @@ namespace TBF.BenchControl.DataEntry.iPerl
 		}
 
 		/// <returns>Reference to the operation</returns>
-		public IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
+		public IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi)
 		{
 			if (currentOp != CurrentOp.None) throw new Exception("Sequence error");
 			currentOp = CurrentOp.EnterTestEndStates;

TBF/BenchControl/DataEntry/iPerl/TestStartEndForm.cs

@@ -20,7 +20,7 @@ namespace TBF.BenchControl.DataEntry.iPerl
 
 		/// <summary> Number of text boxes for serial numbers </summary>
         public readonly int WaterMetersCount;
-		readonly IRegisterReader[] regReaders;
+		readonly IRegReader[] regReaders;
 		readonly bool[] disabled;
 
 		// To be retrieved after the form closes
@@ -89,7 +89,7 @@ namespace TBF.BenchControl.DataEntry.iPerl
 		/// </summary>
 		/// <param name="waterMetersCount">Number of water meters</param>
 		/// <param name="disabled">Information from CycleBeginningForm about availability of water meters</param>
-		public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, bool[] disabled)
+		public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, bool[] disabled)
 			: this()
 		{
 			endStates = false;
@@ -113,7 +113,7 @@ namespace TBF.BenchControl.DataEntry.iPerl
 		/// <param name="refVolume">Reference volume, it is used to verify the end state, show/hide exclamation if necessary</param>
 		/// <param name="errLimLo">Error limit low, it is used to verify the end state, show/hide exclamation if necessary</param>
 		/// <param name="errLimHi">Error limit high, it is used to verify the end state, show/hide exclamation if necessary</param>
-		public TestStartEndForm(int waterMetersCount, IRegisterReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
+		public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, string[] wmStartStateStr, bool[] disabled,
 								double refVolume, double errLimLo, double errLimHi)
 			: this()
         {

TBF/BenchControl/Dummy/Balance/Component.cs

@@ -40,9 +40,8 @@ namespace TBF.BenchControl.Dummy.Balance
         public float BuoyancyPress { get { return 1.013f; } }
         public float BuoyancyHumi { get { return 50.0f; } }
 
-        public IOperation TaringOp(ref Boxes.DoubleBox tara)
+        public IOperation ZeroOp()
         {
-            tara.Val = 0;
             return this;
         }
 

TBF/BenchControl/Elde/Common.cs

@@ -19,7 +19,7 @@ namespace TBF.BenchControl.Elde
         EnduranceCycleStop = 13,
     }
 
-#if FUZHOU_300 || IZRAEL_200 || TORINO_50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || BADGER_VELKA_TRAT || PUCHONG_200 || SLM_50 || GENESIS || MALTA_WSD25 || SLM_END || WARSAW_END || BERLIN || GELSENWASSER || SLM_150 || PETERSBURG_50 || PETERSBURG_200 || DEWA_300 || ROMA_200 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || SENTEC || FUZHOU_100 || CEVAK_200 || IZRAEL_50 || ALZIR_25
+#if ALZIR_25 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || BAHRAIN_50 || BERLIN || CEVAK_200 || DEWA_300 || FEWA_50 || FILIPINY_50 || FUZHOU_100 || FUZHOU_300 || GELSENWASSER || GENESIS || HONGKONG_50 || IZRAEL_25 || IZRAEL_50 || IZRAEL_200 || JUZNA_AFRIKA_50 || KEMPNO_50 || KRAKOW_50 || LUXEMBURG_40 || MALTA_WSD25 || PETERSBURG_50 || PETERSBURG_200 || PUCHONG_200 || ROMA_200 || RUM_MOB || SENTEC || SLM_50 || SLM_150 || SLM_END || TORINO_50 || TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || WARSAW_50 || WARSAW_END || ZAMBIA || ZODINO
     public enum StatusP : ulong
     {
         RefFlowMeterMask  = 0x7,                /// bits 0,1,2
@@ -46,7 +46,7 @@ namespace TBF.BenchControl.Elde
 		ErrorPressMeter4  = 0x8000000000000,	/// bit 51
 		EndurCycleRunning = 0x200000000000000,	/// bit 57
 	}
-#else // DN100 || MUNICH || FUZHOU_150 || TORUN_50 || CEVAK_40 || MURES_40 || FUZHOU_50
+#else // all other benches
     public enum StatusP : ulong
     {
         RefFlowMeterMask  = 0x7,

TBF/BenchControl/Elde/ControlBoardDev.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
 ///
 using System;
 using System.Text;
@@ -110,11 +110,19 @@ namespace TBF.BenchControl.Elde
         public byte MeretProtocol = 0;
 
         // Array length is the reference flowmeters count plus one
-#if DN100 || FUZHOU_150 || FUZHOU_300 || IZRAEL_200 || SLM_150 || SENTEC || CEVAK_200
+#if ALZIR_25 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || BAHRAIN_50 || CEVAK_40 || FEWA_50 || FILIPINY_50 || FUZHOU_50 || FUZHOU_100 || HONGKONG_50 || IZRAEL_25 || JUZNA_AFRIKA_50 || KEMPNO_50 || KRAKOW_50 || LUXEMBURG_40 || MUNICH || MURES_40 || PETERSBURG_50 || SLM_50 || TORINO_50 || TORUN_50 || TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || WARSAW_50 || ZAMBIA || ZODINO
+        public uint[,] RegValveCalib = new uint[8,2] {{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500}};
+  #if IZRAEL_50
+		public byte[] MeretRS485Address = new byte[6];
+  #else
+        public byte[] MeretRS485Address = new byte[4];
+  #endif
+        public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 };
+#elif CEVAK_200 || DN100 || FUZHOU_150 || FUZHOU_300 || IZRAEL_200 || SENTEC
         public uint[,] RegValveCalib = new uint[8,2] {{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500}};
 		public byte[] MeretRS485Address = new byte[4];
         public float[] EtCalib = new float[6] { 1, 1, 1, 1, 1, 1 };
-#elif PUCHONG_200 || GENESIS || BERLIN || GELSENWASSER || PETERSBURG_200 || RUM_MOB
+#elif BERLIN || GELSENWASSER || GENESIS || PETERSBURG_200 || PUCHONG_200 || RUM_MOB || SLM_150
         public uint[,] RegValveCalib = new uint[16, 2] { {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, 
 														 {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500} };
         public byte[] MeretRS485Address = new byte[4];
@@ -129,14 +137,6 @@ namespace TBF.BenchControl.Elde
 														 {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500} };
         public byte[] MeretRS485Address = new byte[5];
         public float[] EtCalib = new float[8] { 1, 1, 1, 1, 1, 1, 1, 1 };
-#elif MUNICH || TORINO_50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TORUN_50 || CEVAK_40 || TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || MURES_40 || FUZHOU_50 || SLM_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || FUZHOU_100 || ALZIR_25
-        public uint[,] RegValveCalib = new uint[8,2] {{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500}};
-#if IZRAEL_50
-		public byte[] MeretRS485Address = new byte[6];
-#else
-        public byte[] MeretRS485Address = new byte[4];
-#endif
-        public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 };
 #elif IZRAEL_50 || SLM_END
         public uint[,] RegValveCalib = new uint[8,2] {{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500}};
         public byte[] MeretRS485Address = new byte[7];      /// Modbus addresses of Pr1, Pr2, Pr3, Pr4, Pr5, Pr6, T9 (Izrael) or Pr1, Pr2, Pr3, Pr4, T9, T10 (SLM END)
@@ -198,7 +198,7 @@ namespace TBF.BenchControl.Elde
         {
             bool pumpPowerChanged = false;
 
-#if DN100 || MUNICH || FUZHOU_150
+#if DN100 || FUZHOU_150 || MUNICH
             if ((FMFreq == null) || (FMFreq.Length != 2))
 			{
 				FMFreq = new float[2];
@@ -286,7 +286,7 @@ namespace TBF.BenchControl.Elde
             cbCommandQueue = new Queue<SendCommandArgs>();
             lastSentFilters = new uint[FiltersCount];
 
-#if DN100 || MUNICH || FUZHOU_150
+#if DN100 || FUZHOU_150 || MUNICH
             FMFreq = new float[2] { 0, 0 };                 /// Nr. of pumps: Fuzhou150=2, Fuzhou300=6, newer=6
 #elif SLM_END || WARSAW_END
             FMFreq = new float[4] { 0, 0, 0, 0 };
@@ -314,15 +314,15 @@ namespace TBF.BenchControl.Elde
         /// <param name="ctrlBrdComponent"></param>
         public void InitializeComponent(
 #if DN100
-			ControlCom2VB.ControlCom2panel ctrlBrdComponent,
-#elif MUNICH || FUZHOU_150
-			ControlComponent3Munich.UserControl1 ctrlBrdComponent,
+            ControlCom2VB.ControlCom2panel ctrlBrdComponent,
+#elif FUZHOU_150 || MUNICH
+            ControlComponent3Munich.UserControl1 ctrlBrdComponent,
 #elif FUZHOU_300
             ControlComponent3F300.UserControl1 ctrlBrdComponent,
-#elif IZRAEL_200 || PUCHONG_200 || GENESIS || BERLIN || GELSENWASSER || SLM_150 || PETERSBURG_200
+#elif BERLIN || GELSENWASSER || GENESIS || IZRAEL_200 || PETERSBURG_200 || PUCHONG_200 || SLM_150
             ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent,
 #else /// all newer benches
-			ControlComponent_Torino2015.UserControl1 ctrlBrdComponent,
+            ControlComponent_Torino2015.UserControl1 ctrlBrdComponent,
 #endif
             UInt128 valvesToInvert,
             double[] tankCapacities)
@@ -380,6 +380,7 @@ namespace TBF.BenchControl.Elde
 		{
             if (DebugLevel == DebugMode.Simulate) return;
 			controlCom.RunDeviceBefore();
+            SyncRoute();
 		}
 
         ///
@@ -599,7 +600,7 @@ namespace TBF.BenchControl.Elde
         /// <param name="refPulses">Number of reference pulses to complete the test</param>
         /// <returns>Created operation</returns>
         public IOperation StartMeasurementOp(OutputPath outputPath, TestMethods method,
-                                             double requiredFlowLo, double requiredFlowHi, int refPulses)
+                                             double requiredFlowLo, double requiredFlowHi, int refPulses, int delayBeforeFlowRegulation = 0)
 		{
 			if (controlBoardCfg.DebugLevel == DebugMode.Simulate)
 			{
@@ -607,7 +608,7 @@ namespace TBF.BenchControl.Elde
 			}
 			else
 			{
-				return new StartMeasurementOp(this, outputPath, method, requiredFlowLo, requiredFlowHi, refPulses);
+				return new StartMeasurementOp(this, outputPath, method, requiredFlowLo, requiredFlowHi, refPulses, delayBeforeFlowRegulation);
 			}
 		}
 
@@ -621,7 +622,7 @@ namespace TBF.BenchControl.Elde
         /// <returns>Created operation</returns>
         public IOperation StartProlongedMeasurementOp(OutputPath outputPath, TestMethods method,
                                                       double requiredFlowLo, double requiredFlowHi,
-                                                      int totalRefPulses, int massRefPulses)
+                                                      int totalRefPulses, int massRefPulses, int delayBeforeFlowRegulation = 0)
         {
             if (controlBoardCfg.DebugLevel == DebugMode.Simulate)
             {
@@ -629,7 +630,7 @@ namespace TBF.BenchControl.Elde
             }
             else
             {
-                return new StartMeasurementOp(this, outputPath, method, requiredFlowLo, requiredFlowHi, totalRefPulses, massRefPulses);
+                return new StartMeasurementOp(this, outputPath, method, requiredFlowLo, requiredFlowHi, totalRefPulses, massRefPulses, delayBeforeFlowRegulation);
             }
         }
 

TBF/BenchControl/Elde/ControlComWrap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2016 Sensus Metering Systems
+/// Copyright (c) 2013-2020 Sensus Metering Systems
 ///
 using System;
 using Dirichlet.Numerics;
@@ -19,13 +19,13 @@ namespace TBF.BenchControl.Elde
         ///
 		public StatusP StatusP { get { return (StatusP)ctrlBrdComponent.StatusP; } }
 
-#if DN100 || MUNICH || FUZHOU_150
+#if DN100 || FUZHOU_150 || MUNICH
         public double ReferenceFreq { get { return 1000.0f * ctrlBrdComponent.referenceFreq; } }     /// Returns in [Hz] 0..2500, nom.=2000
         public double ReferenceFreqs(int i) { return 0; }
 #else
         /// All newer benches
         public double ReferenceFreq { get { return 1000.0 * ctrlBrdComponent.referenceFreq[0]; } }  /// Returns in [Hz] 0..2500, nom.=2000
-                                                                                                    /// 
+                                                                                          /// 
         /// <summary>
         /// In case of I11, I12
         ///     cBrd.referenceFreq[0] = I11 + I12
@@ -43,7 +43,7 @@ namespace TBF.BenchControl.Elde
 
 		public int EtPulses(int wmNr1) { return (int)ctrlBrdComponent.etPulses[wmNr1]; }
 
-#if DN100 || MUNICH || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || TORINO_50 || TORUN_50 || CEVAK_40 || MURES_40 || IZRAEL_200 || MALTA_WSD25
+#if BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || CEVAK_40 || DN100 || IZRAEL_200 || MALTA_WSD25 || MUNICH || MURES_40 || TORINO_50 || TORUN_50
         public int EtPulsesK { get { return 1; }  }
 #else /// all new benches
         public int EtPulsesK { get { return (int)ctrlBrdComponent.etPulsesK; }  }
@@ -74,13 +74,13 @@ namespace TBF.BenchControl.Elde
 		public float Pressure(int prsNr0) { return ctrlBrdComponent.pressure[prsNr0]; }
         public float Temperature(int tmpNr0) { return (tmpNr0 >= 0 && tmpNr0 < ctrlBrdComponent.temperature.Length) ? ctrlBrdComponent.temperature[tmpNr0] : 0; }
 		public RegulValveState RegulValveState(int rvNr1) { return (RegulValveState)ctrlBrdComponent.rValveStatus[rvNr1 - 1]; }
-#if GENESIS || BERLIN || GELSENWASSER || PETERSBURG_200 || DEWA_300 || ROMA_200
+#if BERLIN || DEWA_300 || GELSENWASSER || GENESIS || PETERSBURG_200 || ROMA_200
 		public UInt128 RRoute { get { return ((UInt128)ctrlBrdComponent.rRouteH << 64) | (UInt128)ctrlBrdComponent.rRoute; } }
 #else
         public UInt128 RRoute { get { return ctrlBrdComponent.rRoute; } }
 #endif
 
-#if GENESIS || KEMPNO_50 || KRAKOW_50 || BAHRAIN_50 || BADGER_STREDNA_TRAT || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || SENTEC || FUZHOU_100 || CEVAK_200 || IZRAEL_50 || DEWA_300 || ROMA_200 || PUCHONG_200 || TURA_IPERL_NEW || ALZIR_25 || GELSENWASSER
+#if ALZIR_25 || BADGER_STREDNA_TRAT || BAHRAIN_50 || CEVAK_200 || DEWA_300 || FEWA_50 || FUZHOU_100 || FILIPINY_50 || GELSENWASSER || GENESIS || HONGKONG_50 || IZRAEL_25 || IZRAEL_50 || JUZNA_AFRIKA_50 || KEMPNO_50 || KRAKOW_50 || LUXEMBURG_40 || PUCHONG_200 || ROMA_200 || SENTEC || TURA_IPERL_NEW || WARSAW_50 || ZAMBIA || ZODINO
         public uint DivTime(int id) { return ctrlBrdComponent.divTime[id]; }
         public void SetDivLimit(int divNo, uint limLoPct, uint limHiPct)
         {
@@ -99,7 +99,7 @@ namespace TBF.BenchControl.Elde
         public float ImpulseTime(int wmNr1) { return ctrlBrdComponent.ImpulseTime[wmNr1]; }
 #endif
 
-#if DN100 || MUNICH || FUZHOU_150
+#if DN100 || FUZHOU_150 || MUNICH
         public uint FmState { get { return ctrlBrdComponent.fMState; } }
 #else //if everything newer
 		public uint FmState { get { return ctrlBrdComponent.fMState[0]; } }     /// TODO: index
@@ -113,7 +113,7 @@ namespace TBF.BenchControl.Elde
         }
         public float DivSamples(int time, int divIx0)
         {
-#if MUNICH || IZRAEL_200
+#if IZRAEL_200 || MUNICH
             return ctrlBrdComponent.DIVSamples[time, 0];
 #else
 			return ctrlBrdComponent.DIVSamples[time, divIx0];
@@ -124,7 +124,7 @@ namespace TBF.BenchControl.Elde
 		public float AnalogInput(int adcNr0) { return ctrlBrdComponent.Analogy[adcNr0]; }
 		public uint AnalogInputRaw(int adcNr0, int bank) { return ctrlBrdComponent.AnalogyRaw[adcNr0, bank]; }	/// bank0=RV, bank1=Temp
 
-#if  DN100 || MUNICH || BADGER_MALA_TRAT || BADGER_VELKA_TRAT || FUZHOU_50 || FUZHOU_150 || FUZHOU_300 || IZRAEL_200 || TORINO_50 || TORUN_50 || CEVAK_40 || MURES_40
+#if  BADGER_MALA_TRAT || BADGER_VELKA_TRAT || CEVAK_40 || DN100 || FUZHOU_50 || FUZHOU_150 || FUZHOU_300 || IZRAEL_200 || MUNICH || MURES_40 || TORINO_50 || TORUN_50
         public float TotalRefVolume { get { return ctrlBrdComponent.ReferenceVolume; } }
         public float MassRefVolume { get { return ctrlBrdComponent.ReferenceVolume; } }
 #else   /// all new test benches
@@ -140,7 +140,7 @@ namespace TBF.BenchControl.Elde
 		public uint[] WMeterCont { get { return new uint[3]; } }				/// Dummy
 #endif
 
-#if KEMPNO_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || FUZHOU_100 || CEVAK_200 || IZRAEL_50 || ALZIR_25
+#if ALZIR_25 || CEVAK_200 || FEWA_50 || FILIPINY_50 || FUZHOU_100 || IZRAEL_25 || IZRAEL_50 || JUZNA_AFRIKA_50 || KEMPNO_50 || KRAKOW_50 || LUXEMBURG_40 || ZAMBIA || ZODINO
 		public float ValveOpenCloseTime { get { return ctrlBrdComponent.ValveMoveTime[0]; } }
 #else
         public float ValveOpenCloseTime { get { return 0.001f; } }
@@ -167,34 +167,31 @@ namespace TBF.BenchControl.Elde
         }
 
 
-        ///
         /// Reference to the control board component
-        ///
-#if DN100
-        private ControlCom2VB.ControlCom2panel ctrlBrdComponent;
-#elif MUNICH || FUZHOU_150
-		private ControlComponent3Munich.UserControl1 ctrlBrdComponent;
-#elif FUZHOU_300
-        private ControlComponent3F300.UserControl1 ctrlBrdComponent;
-#elif IZRAEL_200 || PUCHONG_200 || GENESIS || BERLIN || GELSENWASSER || SLM_150 || PETERSBURG_200
-        private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent;
-#else /// newer benches
-        private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
-#endif
-
+        ///   and
         /// <summary>
 		/// Constructor that initializes the control board component reference
 		/// </summary>
 		/// <param name="ctrlBrdComponent"></param>
 #if DN100
+        private ControlCom2VB.ControlCom2panel ctrlBrdComponent;
+        ///
 		public ControlComWrap(ControlCom2VB.ControlCom2panel ctrlBrdComponent)
-#elif MUNICH || FUZHOU_150
-		public ControlComWrap(ControlComponent3Munich.UserControl1 ctrlBrdComponent)
+#elif FUZHOU_150 || MUNICH
+        private ControlComponent3Munich.UserControl1 ctrlBrdComponent;
+        /// 
+        public ControlComWrap(ControlComponent3Munich.UserControl1 ctrlBrdComponent)
 #elif FUZHOU_300
+        private ControlComponent3F300.UserControl1 ctrlBrdComponent;
+        /// 
         public ControlComWrap(ControlComponent3F300.UserControl1 ctrlBrdComponent)
-#elif IZRAEL_200 || PUCHONG_200 || GENESIS || BERLIN || GELSENWASSER || SLM_150 || PETERSBURG_200
+#elif BERLIN || GELSENWASSER || GENESIS || IZRAEL_200 || PETERSBURG_200 || PUCHONG_200 || SLM_150
+        private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent;
+        /// 
         public ControlComWrap(ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent)
 #else /// all newer benches
+        private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
+        /// 
         public ControlComWrap(ControlComponent_Torino2015.UserControl1 ctrlBrdComponent)
 #endif
         {
@@ -239,14 +236,14 @@ namespace TBF.BenchControl.Elde
             //                                              rvCalib[0,0], rvCalib[0,1], rvCalib[1,0], rvCalib[1,1]));
 #if DN100
 			log.FatalFormat("Component: {0}", ControlCom2VB.ControlCom2panel.ProgVersion);
-#elif MUNICH || FUZHOU_150
+#elif FUZHOU_150 || MUNICH
 			log.FatalFormat("Component: {0}", ControlComponent3Munich.UserControl1.ProgVersion);
 #elif FUZHOU_300
         	log.FatalFormat("Component: {0}", ControlComponent3F300.UserControl1.ProgVersion);
-#elif IZRAEL_200 || PUCHONG_200 || GENESIS || BERLIN || GELSENWASSER || SLM_150 || PETERSBURG_200
+#elif BERLIN || GELSENWASSER || GENESIS || IZRAEL_200 || PETERSBURG_200 || PUCHONG_200 || SLM_150
             log.FatalFormat("Component: {0}", ControlComponent_Izrael2014.UserControl1.ProgVersion);
 #else /// newer benches
-        	log.FatalFormat("Component: {0}", ControlComponent_Torino2015.UserControl1.ProgVersion);
+            log.FatalFormat("Component: {0}", ControlComponent_Torino2015.UserControl1.ProgVersion);
 #endif
             log.Fatal("SendCalibData(...)");
 			for (int i = 0; i < rvCalib.GetLength(0); i++)
@@ -263,7 +260,7 @@ namespace TBF.BenchControl.Elde
 
             ctrlBrdComponent.ExternalCom = true;
 
-#if SENTEC || CEVAK_200 || FUZHOU_100 || IZRAEL_25 || ALZIR_25
+#if ALZIR_25 || CEVAK_200 || FUZHOU_100 || IZRAEL_25 || LUXEMBURG_40 || SENTEC
             ctrlBrdComponent.SendCalibData(rvCalib, meretA, (byte)usedCom, tempCalib, etCalib, divEdge, balanceRange, meretProtocol);
 #else
             ctrlBrdComponent.SendCalibData(rvCalib, meretA, (byte)usedCom, tempCalib, etCalib, divEdge, balanceRange);
@@ -296,8 +293,8 @@ namespace TBF.BenchControl.Elde
         delegate void ValveMoveDlgt(int valveNo, RegulValveMode valveMode, float[] valveValue, int stableTime);
         ///
         private void DoValveMove(int valveNo, RegulValveMode valveMode, float[] valveValue, int stableTime)
-		{
-#if DN100 || MUNICH || FUZHOU_150
+        {
+#if DN100 || FUZHOU_150 || MUNICH
             log.InfoFormat("ValveMove(#={0}, md={1}, [{2}, {3}])", valveNo, valveMode, valveValue[0], valveValue[1]);
             ctrlBrdComponent.ValveMove((byte)valveNo, (byte)valveMode, valveValue);
 #else /// all newer benches
@@ -387,7 +384,7 @@ namespace TBF.BenchControl.Elde
                                          (uint)regConst,
                                          (uint)shortImp,
                                          (uint)sendCommandArgs.StopDevs);
-#elif BADGER_MALA_TRAT || BADGER_VELKA_TRAT || FUZHOU_50 || FUZHOU_150 || FUZHOU_300 || IZRAEL_200 || TORINO_50 || TORUN_50 || CEVAK_40 || MURES_40
+#elif BADGER_MALA_TRAT || BADGER_VELKA_TRAT || CEVAK_40 || FUZHOU_50 || FUZHOU_150 || FUZHOU_300 || IZRAEL_200 || MURES_40 || TORINO_50 || TORUN_50
             ///
             /// 64-bit route, single filter conts. (no array)
             ///
@@ -401,7 +398,7 @@ namespace TBF.BenchControl.Elde
                                          (uint)regConst,
                                          (uint)shortImp,
                                          (uint)sendCommandArgs.StopDevs);
-#elif BERLIN || SLM_150 || PETERSBURG_200
+#elif BERLIN || PETERSBURG_200 || SLM_150
             ///
             /// 128-bit route, prolonged method support, single filter conts. (no array)
             ///
@@ -416,7 +413,7 @@ namespace TBF.BenchControl.Elde
                                          (uint)regConst,
                                          (uint)shortImp,
                                          (uint)sendCommandArgs.StopDevs);
-#elif GENESIS || DEWA_300 || ROMA_200 || GELSENWASSER
+#elif DEWA_300 || GELSENWASSER || GENESIS || ROMA_200
             ///
             /// 128-bit route, prolonged method support
             /// 
@@ -431,7 +428,7 @@ namespace TBF.BenchControl.Elde
                                          (uint)regConst,
                                          (uint)shortImp,
                                          (uint)sendCommandArgs.StopDevs);
-#elif JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || SENTEC || FUZHOU_100 || CEVAK_200 || IZRAEL_50 || ALZIR_25
+#elif ALZIR_25 || CEVAK_200 || FEWA_50 || FILIPINY_50 || FUZHOU_100 || HONGKONG_50 || IZRAEL_25 || IZRAEL_50 || JUZNA_AFRIKA_50 || LUXEMBURG_40 ||SENTEC || WARSAW_50 || ZAMBIA || ZODINO
             ///
             /// 64-bit route, prolonged method support
             ///
@@ -445,7 +442,7 @@ namespace TBF.BenchControl.Elde
                                          (uint)regConst,
                                          (uint)shortImp,
                                          (uint)sendCommandArgs.StopDevs);
-#else /// if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || MALTA_WSD25 || SLM_50 || SLM_END || WARSAW_END || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || BADGER_STREDNA_TRAT || PUCHONG_200
+#else /// all other benches
             ///
             /// 64-bit route, prolonged method support, single filter conts. (no array)
             ///

TBF/BenchControl/Elde/Diverter/Diverter.cs

@@ -115,22 +115,20 @@ namespace TBF.BenchControl.Elde.Diverter
                 {
                     divNrFromName = nextIdx;
                 }
-#if GENESIS || PETERSBURG_50 || PETERSBURG_200 || FUZHOU_50 || FUZHOU_150 || FUZHOU_300 || ROMA_200
-            flowMtrNr4Cmd = divNrFromName + 1;
+#if FUZHOU_50 || FUZHOU_150 || FUZHOU_300 || GENESIS || PETERSBURG_50 || PETERSBURG_200 || ROMA_200 || SLM_150
+                flowMtrNr4Cmd = divNrFromName + 1;
 #elif BADGER_STREDNA_TRAT
-            flowMtrNr4Cmd = (divNrFromName == 1) ? 1 : ((divNrFromName == 2) ? 9 : 20);
+                flowMtrNr4Cmd = (divNrFromName == 1) ? 1 : ((divNrFromName == 2) ? 9 : 20);
 #elif BADGER_VELKA_TRAT
-            flowMtrNr4Cmd = ((divNrFromName % 10) == 1) ? 0x11 : (((divNrFromName % 10) == 2) ? 0x22 : 0x33);
-#elif FUZHOU_100
-            flowMtrNr4Cmd = divNrFromName;
+                flowMtrNr4Cmd = ((divNrFromName % 10) == 1) ? 0x11 : (((divNrFromName % 10) == 2) ? 0x22 : 0x33);
 #elif CEVAK_200
-			flowMtrNr4Cmd = (divNrFromName == 4) ? 5 : divNrFromName;
+			    flowMtrNr4Cmd = (divNrFromName == 4) ? 5 : divNrFromName;
 #elif DEWA_300 || PUCHONG_200
-			flowMtrNr4Cmd = divNrFromName + 2;              /// Div1: 1,2,3, Div2: 4, Div3: 5, Div4: 6, Div5: 7
-#elif TURA_IPERL || TURA_IPERL_NEW
-            flowMtrNr4Cmd = divNrFromName + 16 * divNrFromName;
+			    flowMtrNr4Cmd = divNrFromName + 2;              /// Div1: 1,2,3, Div2: 4, Div3: 5, Div4: 6, Div5: 7
 #elif FILIPINY_50
-            flowMtrNr4Cmd = (divNrFromName == 1) ? 1 : 7;
+                flowMtrNr4Cmd = (divNrFromName == 1) ? 1 : 7;
+#elif FUZHOU_100
+                flowMtrNr4Cmd = divNrFromName;
 #elif GELSENWASSER
                 switch (divNrFromName)
                 {
@@ -140,8 +138,10 @@ namespace TBF.BenchControl.Elde.Diverter
                     case 3: flowMtrNr4Cmd = 3; break;
                     case 4: flowMtrNr4Cmd = 5; break;
                 }
-#else
-            flowMtrNr4Cmd = (divNrFromName == 1) ? 1 : 3;
+#elif TURA_IPERL || TURA_IPERL_NEW
+                flowMtrNr4Cmd = divNrFromName + 16 * divNrFromName;
+#else /// all other benches
+                flowMtrNr4Cmd = (divNrFromName == 1) ? 1 : 3;
 #endif
                 diverterToTankOp = new SwitchDiverterOp(controlBoard, true, flowMtrNr4Cmd);
                 diverterToSinkOp = new SwitchDiverterOp(controlBoard, false, flowMtrNr4Cmd);

TBF/BenchControl/Elde/ExecuteCommandOp.cs

@@ -55,7 +55,6 @@ namespace TBF.BenchControl.Elde
 		/// <summary>Start this operation</summary>
 		public void Start()
         {
-			controlBoard.SyncRoute();
             controlBoard.SendCommand(commandOnStartOp, 0, 0, 0, testMethod, StopDevs.None);
 			opState = OpState.StartingCommand;
         }
@@ -98,7 +97,6 @@ namespace TBF.BenchControl.Elde
 		{
 			if (commandOnStopOp != Command.None)
 			{
-				controlBoard.SyncRoute();
                 controlBoard.SendCommand(commandOnStopOp, 0, 0, 0, testMethod, StopDevs.None);
 			}
 		}

TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReader.cs

@@ -8,7 +8,7 @@ using TBF.Boxes;
 
 namespace TBF.BenchControl.Elde.FixedStartRegisterReader
 {
-	public class RegisterReader : ComponentBase, GenericDevices.IRegisterReader, IOperation
+	public class RegisterReader : ComponentBase, GenericDevices.IRegReader, IOperation
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(RegisterReader));
         public override string ToString() { return string.Format("FixedStartRegisterReader({0})", Cfg.ToString(1)); }

TBF/BenchControl/Elde/ReadDiverterTransitionOp.cs

@@ -131,7 +131,6 @@ namespace TBF.BenchControl.Elde
 
         void SendCommand()
         {
-            controlBoard.SyncRoute();
             controlBoard.SendCommand(Command.ReadDivTransition, 0, 0, 0, 0, StopDevs.None);
             cmdSent = true;
         }

TBF/BenchControl/Elde/StartMeasurementOp.cs

@@ -22,8 +22,9 @@ namespace TBF.BenchControl.Elde
         readonly double maximalFlow;
         readonly double reqFlowLo;
         readonly double reqFlowHi;
-		readonly int totalRefPulses;        /// Number of reference pulses for a complete test
-        readonly int massRefPulses;         /// Number of reference pulses for mass collection
+		readonly int totalRefPulses;            /// Number of reference pulses for a complete test
+        readonly int massRefPulses;             /// Number of reference pulses for mass collection
+        readonly int delayBeforeFlowRegulation; /// Delay before flow control starts in seconds
         readonly TestMethods testMethod;
         readonly int diverterNr;
 
@@ -34,13 +35,16 @@ namespace TBF.BenchControl.Elde
 		{
 			StartingTest,
             ResendCommand,
-			TestStarted,
-			ValveMoveToFlow,
+            WaitingBeforeValveMove,
+			StartingFlowRegulation,
 			OpCompleted,
 		}
 		OpState opState;
 
 
+        int delayStartTime;                     /// StateMachine.Time snapshot when delay before flow regulation starts
+
+
         /// <summary>
         /// Starts the measurement.
         /// Events:  MeasurementStarted
@@ -51,8 +55,8 @@ namespace TBF.BenchControl.Elde
 		/// <param name="totalRefPulses">Test duration in number of reference flowmeter pulses</param>
 		/// <param name="filterConstant">Specifies filter for watermeter pulses</param>
         public StartMeasurementOp(ControlBoardDev controlBoard, OutputPath outputPath, TestMethods method,
-                                  double requiredFlowLo, double requiredFlowHi, int refPulses)
-            : this(controlBoard, outputPath, method, requiredFlowLo, requiredFlowHi, refPulses, refPulses)
+                                  double requiredFlowLo, double requiredFlowHi, int refPulses, int delayBeforeFlowRegulation = 0)
+            : this(controlBoard, outputPath, method, requiredFlowLo, requiredFlowHi, refPulses, refPulses, delayBeforeFlowRegulation)
         {
         }
 
@@ -66,7 +70,7 @@ namespace TBF.BenchControl.Elde
 		/// <param name="refPulses">Test duration in number of reference flowmeter pulses</param>
 		/// <param name="filterConstant">Specifies filter for watermeter pulses</param>
 		public StartMeasurementOp(ControlBoardDev controlBoard, OutputPath outputPath, TestMethods method,
-                                  double requiredFlowLo, double requiredFlowHi, int totalRefPulses, int massRefPulses)
+                                  double requiredFlowLo, double requiredFlowHi, int totalRefPulses, int massRefPulses, int delayBeforeFlowRegulation = 0)
         {
 			if (controlBoard == null) throw new ArgumentNullException("controlBoardDev");
 			this.controlBoard = controlBoard;
@@ -100,19 +104,18 @@ namespace TBF.BenchControl.Elde
             nominalFlow = outputPath.FlowMeter.NominalFlow;
             maximalFlow = 1.25 * nominalFlow;
 
-			this.reqFlowLo = requiredFlowLo;
+            this.testMethod = method;
+            this.reqFlowLo = requiredFlowLo;
 			this.reqFlowHi = requiredFlowHi;
-
             this.totalRefPulses = totalRefPulses;
             this.massRefPulses = massRefPulses;
-            this.testMethod = method;
+            this.delayBeforeFlowRegulation = delayBeforeFlowRegulation;
 
 			log.Debug(this.ToString());
         }
 
         void SendStartCommand()
         {
-            controlBoard.SyncRoute();
 #if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || BADGER_VELKA_TRAT || SLM_50
 			int flowMeterIdxAndDiv = flowMeterNr + 16 * diverterNr;
 #elif BADGER_STREDNA_TRAT
@@ -155,7 +158,15 @@ namespace TBF.BenchControl.Elde
                 if ((statusP & StatusP.TestInProgress) != 0)
                 {
                     log.Info("Test started");
-                    opState = OpState.TestStarted;
+                    if (delayBeforeFlowRegulation > 0)
+                    {
+                        delayStartTime = StateMachine.Time;
+                        opState = OpState.WaitingBeforeValveMove;
+                    }
+                    else
+                    {
+                        opState = OpState.StartingFlowRegulation;
+                    }
                 }
                 else
                 {
@@ -170,7 +181,15 @@ namespace TBF.BenchControl.Elde
                 opState = OpState.StartingTest;
                 return Event.None;
             }
-            else if (opState == OpState.TestStarted)
+            else if (opState == OpState.WaitingBeforeValveMove)
+            {
+                if (StateMachine.Time - delayStartTime >= delayBeforeFlowRegulation)
+                {
+                    opState = OpState.StartingFlowRegulation;
+                }
+                return Event.None;
+            }
+            else if (opState == OpState.StartingFlowRegulation)
             {
                 ///
                 /// Done once, issues an appropriate ValveMove(...) command
@@ -185,18 +204,18 @@ namespace TBF.BenchControl.Elde
 
                 double freqLo = 2000.0 * reqFlowLo / nominalFlow;
                 double freqHi = 2000.0 * reqFlowHi / nominalFlow;
-				if (regulValve.IsCoax)
-				{
-					controlBoard.ValveMove(regulValveNr, RegulValveMode.TargetFrequency,
+                if (regulValve.IsCoax)
+                {
+                    controlBoard.ValveMove(regulValveNr, RegulValveMode.TargetFrequency,
                                            new float[2] { (float)((freqLo + freqHi) / 2), (float)((freqLo + freqHi) / 2) },
-										   regulValveStableTime);
-				}
-				else
-				{
-					controlBoard.ValveMove(regulValveNr, RegulValveMode.TargetFrequency,
-										   new float[2] { (float)freqLo, (float)freqHi },
-										   regulValveStableTime);
-				}
+                                           regulValveStableTime);
+                }
+                else
+                {
+                    controlBoard.ValveMove(regulValveNr, RegulValveMode.TargetFrequency,
+                                           new float[2] { (float)freqLo, (float)freqHi },
+                                           regulValveStableTime);
+                }
 
                 opState = OpState.OpCompleted;
                 return Event.None;

TBF/BenchControl/Elde/StopFlowRegulationOp.cs

@@ -34,7 +34,6 @@ namespace TBF.BenchControl.Elde
 
         void SendStopFlowRegulationCommand()
         {
-            controlBoard.SyncRoute();
             controlBoard.SendCommand(Command.Stop, flowMeterNr, 0, 0, 0, StopDevs.RegValveRegulation);
         }
 

TBF/BenchControl/Elde/StopPreviousOp.cs

@@ -42,7 +42,6 @@ namespace TBF.BenchControl.Elde
 
         void SendStopCommand()
         {
-            controlBoard.SyncRoute();
             controlBoard.SendCommand(Command.Stop, 0, 0, 0, TestMethods.Diverter,
                                      StopDevs.Diverter | StopDevs.GatePulse | StopDevs.Reference | StopDevs.RegValveRegulation);
         }

TBF/BenchControl/GenericDevices/IDataEntryForCamera.cs

@@ -20,6 +20,6 @@ namespace TBF.BenchControl.GenericDevices
 		/// Displays form at the end of the test to enter water meter start start.
 		/// </summary>
 		/// <returns>Operation to be used in the sequence</returns>
-		IOperation ShowDeferredTestEvalFormOp(IRegisterReader[] regReaders, double volumeRef, double errLimLo, double errLimHi);
+		IOperation ShowDeferredTestEvalFormOp(IRegReader[] regReaders, double volumeRef, double errLimLo, double errLimHi);
 	}
 }

TBF/BenchControl/GenericDevices/IHasHeatMtrStatesForm.cs

@@ -19,7 +19,7 @@ namespace TBF.BenchControl.GenericDevices
         /// Displays form at the end of the test to enter water meter start start.
         /// </summary>
         /// <returns>Operation to be used in the sequence</returns>
-		IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double refVolume, double errLimLo, double errLimHi,
+		IOperation ShowTestEndFormOp(IRegReader[] regReaders, double refVolume, double errLimLo, double errLimHi,
                                      double refEnergy, double energyErrLimLo, double energyErrLimHi);
     }
 }

TBF/BenchControl/GenericDevices/IHasWMStatesForm.cs

@@ -19,12 +19,12 @@ namespace TBF.BenchControl.GenericDevices
         /// Displays form at the beginning of the test to enter water meter start start.
         /// </summary>
         /// <returns>Operation to be used in the sequence</returns>
-        IOperation ShowTestStartFormOp(IRegisterReader[] regReaders);
+        IOperation ShowTestStartFormOp(IRegReader[] regReaders);
 
 		/// <summary>
 		/// Displays form at the end of the test to enter water meter start start.
 		/// </summary>
 		/// <returns>Operation to be used in the sequence</returns>
-		IOperation ShowTestEndFormOp(IRegisterReader[] regReaders, double volumeRef, double errLimLo, double errLimHi);
+		IOperation ShowTestEndFormOp(IRegReader[] regReaders, double volumeRef, double errLimLo, double errLimHi);
 	}
 }

TBF/BenchControl/GenericDevices/IRegReader.cs

@@ -1,12 +1,12 @@
 ///
-/// Copyright (c) 2013-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
 ///
 using TBF.BenchControl.Generic;
 using TBF.Boxes;
 
 namespace TBF.BenchControl.GenericDevices
 {
-	public interface IRegisterReader : IComponent
+	public interface IRegReader : IComponent
 	{
         Config.Entities.RegisterReaderType RegisterReaderType { get; }
 

TBF/BenchControl/GenericDevices/IRegReaderDatastream.cs

@@ -5,7 +5,7 @@ using System;
 
 namespace TBF.BenchControl.GenericDevices
 {
-    interface IDatastreamReader : IRegisterReader
+    interface IRegReaderDatastream : IRegReader
     {
         bool NoSamples { get; }
         double VolumeLtrStart { get; }

TBF/BenchControl/GenericDevices/IRegReaderLiveCamera.cs

@@ -1,11 +1,11 @@
 ///
-/// Copyright (c) 2017 Sensus Metering Systems
+/// Copyright (c) 2017-2020 Sensus Slovensko a.s.
 ///
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.GenericDevices
 {
-	public interface IRoi : IComponent, IRoiForFixedStart
+	public interface IRegReaderLiveCamera : IRegReaderStillCamera
 	{
 		bool Detected { get; }
 		string ImageFileNamePrefix { get; }		/// Either "detected.jpg" or string.Format("img{0}.jpg", nr) is appended

TBF/BenchControl/GenericDevices/IRegReaderPulses.cs

@@ -0,0 +1,16 @@
+///
+/// Copyright (c) 2020 Sensus Slovensko a.s.
+///
+namespace TBF.BenchControl.GenericDevices
+{
+    interface IRegReaderPulses : IRegReader
+    {
+        int Position { get; }
+        int Filter { get; }
+
+        double PulsesPerLtr { get; }	/// [imp/l] ... water meter or volume measurement part of a heat meter
+        double LtrsPerPulse { get; }	/// [l/imp]
+        
+        int WMPulses { get; }			/// Counted pulses of the water meter
+    }
+}

TBF/BenchControl/GenericDevices/IRegReaderStillCamera.cs

@@ -1,11 +1,11 @@
 ///
-/// Copyright (c) 2017 Sensus Metering Systems
+/// Copyright (c) 2017-2020 Sensus Slovensko a.s.
 ///
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.GenericDevices
 {
-	public interface IRoiForFixedStart : IComponent, IRegisterReader
+	public interface IRegReaderStillCamera : IRegReader
 	{
 		GenericDevices.ICamera Camera { get; }