DataEntry.Standard6 supports 8 water meters (Badger), ver. 2.18.1989

Config/Config.csproj

@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;BADGER_STREDNA_TRAT;LANG_CS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -28,7 +28,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;BADGER_STREDNA_TRAT;LANG_CS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>

Config/Data.cs

@@ -14,12 +14,18 @@ namespace Config
 		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
+#elif DN100 || 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 BADGER_STREDNA_TRAT
+		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 FUZHOU_300 || FUZHOU_150 || IZRAEL_200 || GENESIS || SLM_150 || PETERSBURG_200
 		public const int WMsCount = 6;
 		public const int LineSize = 6;

Results/Entities/TestRslt.cs

@@ -135,6 +135,7 @@ namespace Results.Entities
 		public virtual double TargetTime()	 { return TestData.TargetTime; }
 		public virtual string Method()		 { return TestData.Method; }
         public virtual string RefFlowmeter() { return (Components != null) ? Components.Flowmeter : string.Empty; }
+        public virtual string Scale()        { return (Components != null) ? Components.Scale : string.Empty; }
         public virtual bool IsRelErrTest()   { return (MethodClass != null) ? (MethodClass.Contains("FixedStart") || MethodClass.Contains("FlyingStart") || MethodClass.Contains("CombinedWithDetection") || MethodClass.Contains("DiverterTest")) : true; }
         public virtual bool IsPMaxTest()     { return (MethodClass != null) ? (MethodClass.Contains("PMaxTest") || MethodClass.Contains("LeakTest")) : true; }
         public virtual bool IsStartStop()    { return (MethodClass != null) ? MethodClass.Contains("FixedStart") : true; }

Results/ItemID.cs

@@ -318,6 +318,19 @@ namespace Results
         TimeBtwnMassMsrmnts,            /// 270
         TestTimeCorrection,             /// 271
 
+        ThreeState,                     /// 272
+
+        Conduct,                        /// 273
+        Conduct_start,                  /// 274
+        Conduct_end,                    /// 275
+        Conduct_avg,                    /// 276
+        Conduct_min,                    /// 277
+        Conduct_max,                    /// 278
+
+        InfoFlags,						/// 279
+
+        Scale,                          /// 280
+
         Count,
     }
 }

Results/Results.csproj

@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;BADGER_STREDNA_TRAT;LANG_CS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -27,7 +27,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;BADGER_STREDNA_TRAT;LANG_CS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>

Results/WMeterRsltItemSpec.cs

@@ -325,6 +325,7 @@ namespace Results
                                                                                                                                                                       : ((w.GetMeterTestRslt(t) == null) ? "" : w.GetMeterTestRslt(t).PassedColorStr(f))));
 
             AllItems.Add(new WMeterRsltItemSpec(ItemID.RefFlowmeter,       "Ref. flowmeter", Quantity.String, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) != null) ? FormatStr(f, w.GetTestRslt(t).RefFlowmeter()) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Scale,              "Scale",          Quantity.String, ItemCategory.TestResult,  (w, t, u, f, p) => (w.GetTestRslt(t) != null) ? FormatStr(f, w.GetTestRslt(t).Scale()) : string.Empty));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.ResultOrErrorFlags, "Winiki lub E",   Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.PassedOrErrorFlagsStr())));    /// PL specific result
 
             ///

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;BADGER_STREDNA_TRAT;LANG_CS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -31,7 +31,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH</DefineConstants>
+    <DefineConstants>TRACE;BADGER_STREDNA_TRAT;LANG_CS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>

TBF/BenchControl/BenchInfo/Extended/Component.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2018 Sensus Slovensko a.s.
+/// Copyright (c) 2018-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -29,6 +29,7 @@ namespace TBF.BenchControl.BenchInfo.Extended
         public string Address4 { get { return myCfg.Address4; } }
         public string Address5 { get { return myCfg.Address5; } }
         public RemoteDBUse RemoteDBUse { get { return myCfg.RemoteDBUse; } }
+        public int FlowAdjustmentTimeout { get { return myCfg.FlowAdjustmentTimeout; } }
 
 		public Component()
 		{

TBF/BenchControl/BenchInfo/Extended/ComponentCfg.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2018 Sensus Slovensko a.s.
+/// Copyright (c) 2018-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -33,6 +33,7 @@ namespace TBF.BenchControl.BenchInfo.Extended
 		public string ApprovalDate;
 		public string ApprovedBy;
         public RemoteDBUse RemoteDBUse;
+        public int FlowAdjustmentTimeout;
 
 		/// Private parameterless constructor invoked by all other (public) constructors
 		ComponentCfg() {}
@@ -64,6 +65,7 @@ namespace TBF.BenchControl.BenchInfo.Extended
             ApprovedBy = string.Empty;
 
             RemoteDBUse = RemoteDBUse.LocalDBOnly;
+            FlowAdjustmentTimeout = 300;        /// timeout = 5 minutes
         }
 
         string[] paramNames = new string[]
@@ -79,6 +81,7 @@ namespace TBF.BenchControl.BenchInfo.Extended
             "Approval date",
             "Approved by",
             "Remote DB use",
+            "Flow adjustment timeout [s] (0=off)",
         };
         public string ParamName(int i) { return paramNames[i]; }
         public int ParamsCount() { return paramNames.Length; }
@@ -117,6 +120,7 @@ namespace TBF.BenchControl.BenchInfo.Extended
                 case 8: return ApprovalDate;
                 case 9: return ApprovedBy;
                 case 10: return RemoteDBUse.ToDescription();
+                case 11: return FlowAdjustmentTimeout.ToString();
                 default: return string.Empty;
             }
         }
@@ -154,6 +158,7 @@ namespace TBF.BenchControl.BenchInfo.Extended
                     }
                     return CfgUpdateFlags.Error;
 
+                case 11: FlowAdjustmentTimeout = int.Parse(strValue); return CfgUpdateFlags.RestartRqrd;
                 default: return CfgUpdateFlags.None;
             }
         }
@@ -176,6 +181,7 @@ namespace TBF.BenchControl.BenchInfo.Extended
                 case 9:
                     return true;
                 case 1:
+                case 11:
                     if (int.TryParse(strValue, out idummy) && (idummy >= 0)) return true;
                     break;
                 case 10:
@@ -206,6 +212,7 @@ namespace TBF.BenchControl.BenchInfo.Extended
             prms.ApprovalDate = this.ApprovalDate;
             prms.ApprovedBy = this.ApprovedBy;
             prms.RemoteDBUse = this.RemoteDBUse;
+            prms.FlowAdjustmentTimeout = this.FlowAdjustmentTimeout;
         }
 
         public Config.Entities.IParamsProvider Clone()

TBF/BenchControl/BenchInfo/Munich/Component.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -32,6 +32,7 @@ namespace TBF.BenchControl.BenchInfo.Munich
 #if ORACLE_DB
         public int MaxTestIndex { get { return 0; } }
 #endif
+        public int FlowAdjustmentTimeout { get { return 300; } }
 
 		public Component()
 		{

TBF/BenchControl/BenchInfo/iPerl/Component.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2018 Sensus Slovensko a.s.
+/// Copyright (c) 2018-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -31,6 +31,7 @@ namespace TBF.BenchControl.BenchInfo.iPerl
         public RemoteDBUse RemoteDBUse { get { return myCfg.RemoteDBUse; } }
         public Side Side { get { return myCfg.Side; } }
         public int MaxTestIndex { get { return myCfg.MaxTestIndex; } }       /// (MaxPruefindex % 100) value when to reject water meters completely if they are NOK
+        public int FlowAdjustmentTimeout { get { return myCfg.FlowAdjustmentTimeout; } }
 
 		public Component()
 		{

TBF/BenchControl/BenchInfo/iPerl/ComponentCfg.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2018 Sensus Slovensko a.s.
+/// Copyright (c) 2018-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -36,6 +36,7 @@ namespace TBF.BenchControl.BenchInfo.iPerl
         public RemoteDBUse RemoteDBUse;
         public Side Side;
         public int MaxTestIndex;       /// (MaxPruefindex % 100) value when to reject water meters completely if they are NOK
+        public int FlowAdjustmentTimeout;
 
 		/// Private parameterless constructor invoked by all other (public) constructors
 		ComponentCfg() {}
@@ -69,6 +70,7 @@ namespace TBF.BenchControl.BenchInfo.iPerl
             RemoteDBUse = RemoteDBUse.LocalDBOnly;
             Side = Side.Left;
             MaxTestIndex = 4;
+            FlowAdjustmentTimeout = 300;        /// timeout = 5 minutes
         }
 
         string[] paramNames = new string[]
@@ -86,6 +88,7 @@ namespace TBF.BenchControl.BenchInfo.iPerl
             "Remote DB use",
             Strings.Side,
             "Max.test index",
+            "Flow adjustment timeout [s] (0=off)",
         };
         public string ParamName(int i) { return paramNames[i]; }
         public int ParamsCount() { return paramNames.Length; }
@@ -132,6 +135,7 @@ namespace TBF.BenchControl.BenchInfo.iPerl
                 case 10: return RemoteDBUse.ToDescription();
                 case 11: return Side.ToDescription();
                 case 12: return MaxTestIndex.ToString();
+                case 13: return FlowAdjustmentTimeout.ToString();
                 default: return string.Empty;
             }
         }
@@ -188,6 +192,7 @@ namespace TBF.BenchControl.BenchInfo.iPerl
                     return CfgUpdateFlags.Error;
 
 				case 12: MaxTestIndex = int.Parse(strValue); return CfgUpdateFlags.RestartRqrd;
+                case 13: FlowAdjustmentTimeout = int.Parse(strValue); return CfgUpdateFlags.RestartRqrd;
                 default: return CfgUpdateFlags.None;
             }
         }
@@ -211,6 +216,7 @@ namespace TBF.BenchControl.BenchInfo.iPerl
                     return true;
                 case 1:
                 case 12:
+                case 13:
                     if (int.TryParse(strValue, out idummy) && (idummy >= 0)) return true;
                     break;
                 case 10:
@@ -249,6 +255,7 @@ namespace TBF.BenchControl.BenchInfo.iPerl
             prms.RemoteDBUse = this.RemoteDBUse;
             prms.Side = this.Side;
             prms.MaxTestIndex = this.MaxTestIndex;
+            prms.FlowAdjustmentTimeout = this.FlowAdjustmentTimeout;
         }
 
         public Config.Entities.IParamsProvider Clone()

TBF/BenchControl/DataEntry/Standard6/CycleBeginningForm.Designer.cs

@@ -62,6 +62,14 @@ namespace TBF.BenchControl.DataEntry.Standard6
             this.remarkComboBox3 = new System.Windows.Forms.ComboBox();
             this.remarkComboBox4 = new System.Windows.Forms.ComboBox();
             this.remarkComboBox5 = new System.Windows.Forms.ComboBox();
+            this.remarkComboBox7 = new System.Windows.Forms.ComboBox();
+            this.remarkComboBox8 = new System.Windows.Forms.ComboBox();
+            this.comboBox8 = new System.Windows.Forms.ComboBox();
+            this.checkBox8 = new System.Windows.Forms.CheckBox();
+            this.label8 = new System.Windows.Forms.Label();
+            this.comboBox7 = new System.Windows.Forms.ComboBox();
+            this.checkBox7 = new System.Windows.Forms.CheckBox();
+            this.label7 = new System.Windows.Forms.Label();
             this.SuspendLayout();
             // 
             // okButton
@@ -252,11 +260,71 @@ namespace TBF.BenchControl.DataEntry.Standard6
             this.remarkComboBox5.FormattingEnabled = true;
             this.remarkComboBox5.Name = "remarkComboBox5";
             // 
+            // remarkComboBox7
+            // 
+            resources.ApplyResources(this.remarkComboBox7, "remarkComboBox7");
+            this.remarkComboBox7.FormattingEnabled = true;
+            this.remarkComboBox7.Name = "remarkComboBox7";
+            // 
+            // remarkComboBox8
+            // 
+            resources.ApplyResources(this.remarkComboBox8, "remarkComboBox8");
+            this.remarkComboBox8.FormattingEnabled = true;
+            this.remarkComboBox8.Name = "remarkComboBox8";
+            // 
+            // comboBox8
+            // 
+            resources.ApplyResources(this.comboBox8, "comboBox8");
+            this.comboBox8.FormattingEnabled = true;
+            this.comboBox8.Name = "comboBox8";
+            this.comboBox8.SelectedIndexChanged += new System.EventHandler(this.comboBox8_SelectedIndexChanged);
+            this.comboBox8.TextChanged += new System.EventHandler(this.comboBox8_TextChanged);
+            this.comboBox8.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox8_KeyPress);
+            // 
+            // checkBox8
+            // 
+            resources.ApplyResources(this.checkBox8, "checkBox8");
+            this.checkBox8.Name = "checkBox8";
+            this.checkBox8.UseVisualStyleBackColor = true;
+            // 
+            // label8
+            // 
+            resources.ApplyResources(this.label8, "label8");
+            this.label8.Name = "label8";
+            // 
+            // comboBox7
+            // 
+            resources.ApplyResources(this.comboBox7, "comboBox7");
+            this.comboBox7.FormattingEnabled = true;
+            this.comboBox7.Name = "comboBox7";
+            this.comboBox7.SelectedIndexChanged += new System.EventHandler(this.comboBox7_SelectedIndexChanged);
+            this.comboBox7.TextChanged += new System.EventHandler(this.comboBox7_TextChanged);
+            this.comboBox7.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox7_KeyPress);
+            // 
+            // checkBox7
+            // 
+            resources.ApplyResources(this.checkBox7, "checkBox7");
+            this.checkBox7.Name = "checkBox7";
+            this.checkBox7.UseVisualStyleBackColor = true;
+            // 
+            // label7
+            // 
+            resources.ApplyResources(this.label7, "label7");
+            this.label7.Name = "label7";
+            // 
             // CycleBeginningForm
             // 
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.DarkGoldenrod;
+            this.Controls.Add(this.remarkComboBox7);
+            this.Controls.Add(this.remarkComboBox8);
+            this.Controls.Add(this.comboBox8);
+            this.Controls.Add(this.checkBox8);
+            this.Controls.Add(this.label8);
+            this.Controls.Add(this.comboBox7);
+            this.Controls.Add(this.checkBox7);
+            this.Controls.Add(this.label7);
             this.Controls.Add(this.remarkComboBox5);
             this.Controls.Add(this.remarkComboBox4);
             this.Controls.Add(this.remarkComboBox3);
@@ -329,5 +397,13 @@ namespace TBF.BenchControl.DataEntry.Standard6
         private System.Windows.Forms.ComboBox remarkComboBox3;
         private System.Windows.Forms.ComboBox remarkComboBox4;
         private System.Windows.Forms.ComboBox remarkComboBox5;
+        private System.Windows.Forms.ComboBox remarkComboBox7;
+        private System.Windows.Forms.ComboBox remarkComboBox8;
+        private System.Windows.Forms.ComboBox comboBox8;
+        private System.Windows.Forms.CheckBox checkBox8;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.ComboBox comboBox7;
+        private System.Windows.Forms.CheckBox checkBox7;
+        private System.Windows.Forms.Label label7;
     }
 }

TBF/BenchControl/DataEntry/Standard6/CycleBeginningForm.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -42,9 +42,10 @@ namespace TBF.BenchControl.DataEntry.Standard6
             InitializeComponent();
 			ControlBox = false;
 
-            comboBoxes = new ComboBox[] { comboBox1, comboBox2, comboBox3, comboBox4, comboBox5, comboBox6 };
-            checkBoxes = new CheckBox[] { checkBox1, checkBox2, checkBox3, checkBox4, checkBox5, checkBox6 };
-            remarkBoxes = new ComboBox[] { remarkComboBox1, remarkComboBox2, remarkComboBox3, remarkComboBox4, remarkComboBox5, remarkComboBox6 };
+            comboBoxes = new ComboBox[] { comboBox1, comboBox2, comboBox3, comboBox4, comboBox5, comboBox6, comboBox7, comboBox8 };
+            checkBoxes = new CheckBox[] { checkBox1, checkBox2, checkBox3, checkBox4, checkBox5, checkBox6, checkBox7, checkBox8 };
+            remarkBoxes = new ComboBox[] { remarkComboBox1, remarkComboBox2, remarkComboBox3, remarkComboBox4,
+                                           remarkComboBox5, remarkComboBox6, remarkComboBox7, remarkComboBox8 };
 
 			this.WaterMetersCount = waterMetersCount;
             this.RemarksEnabled = remarksEnabled;
@@ -77,13 +78,15 @@ namespace TBF.BenchControl.DataEntry.Standard6
 
 			if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
 			{
-                if (WaterMetersCount >= 1) comboBox1.Items.Add((Program.LocalSettings.LastSNTexts[0] == null) ? string.Empty : Program.LocalSettings.LastSNTexts[0]);
-                if (WaterMetersCount >= 2) comboBox2.Items.Add((Program.LocalSettings.LastSNTexts[1] == null) ? string.Empty : Program.LocalSettings.LastSNTexts[1]);
-                if (WaterMetersCount >= 3) comboBox3.Items.Add((Program.LocalSettings.LastSNTexts[2] == null) ? string.Empty : Program.LocalSettings.LastSNTexts[2]);
-                if (WaterMetersCount >= 4) comboBox4.Items.Add((Program.LocalSettings.LastSNTexts[3] == null) ? string.Empty : Program.LocalSettings.LastSNTexts[3]);
-                if (WaterMetersCount >= 5) comboBox5.Items.Add((Program.LocalSettings.LastSNTexts[4] == null) ? string.Empty : Program.LocalSettings.LastSNTexts[4]);
-                if (WaterMetersCount >= 6) comboBox6.Items.Add((Program.LocalSettings.LastSNTexts[5] == null) ? string.Empty : Program.LocalSettings.LastSNTexts[5]);
-			}
+                if (WaterMetersCount > 0) comboBox1.Items.Add((Program.LocalSettings.LastSNTexts[0] == null) ? string.Empty : Program.LocalSettings.LastSNTexts[0]);
+                if (WaterMetersCount > 1) comboBox2.Items.Add((Program.LocalSettings.LastSNTexts[1] == null) ? string.Empty : Program.LocalSettings.LastSNTexts[1]);
+                if (WaterMetersCount > 2) comboBox3.Items.Add((Program.LocalSettings.LastSNTexts[2] == null) ? string.Empty : Program.LocalSettings.LastSNTexts[2]);
+                if (WaterMetersCount > 3) comboBox4.Items.Add((Program.LocalSettings.LastSNTexts[3] == null) ? string.Empty : Program.LocalSettings.LastSNTexts[3]);
+                if (WaterMetersCount > 4) comboBox5.Items.Add((Program.LocalSettings.LastSNTexts[4] == null) ? string.Empty : Program.LocalSettings.LastSNTexts[4]);
+                if (WaterMetersCount > 5) comboBox6.Items.Add((Program.LocalSettings.LastSNTexts[5] == null) ? string.Empty : Program.LocalSettings.LastSNTexts[5]);
+                if (WaterMetersCount > 6) comboBox5.Items.Add((Program.LocalSettings.LastSNTexts[6] == null) ? string.Empty : Program.LocalSettings.LastSNTexts[6]);
+                if (WaterMetersCount > 7) comboBox6.Items.Add((Program.LocalSettings.LastSNTexts[7] == null) ? string.Empty : Program.LocalSettings.LastSNTexts[7]);
+            }
 
             if (WaterMetersCount >= 1) { enabledComboBoxes.Add(comboBox1); } else { comboBox1.Visible = false; label1.Visible = false; checkBox1.Visible = false; }
             if (WaterMetersCount >= 2) { enabledComboBoxes.Add(comboBox2); } else { comboBox2.Visible = false; label2.Visible = false; checkBox2.Visible = false; }
@@ -91,6 +94,8 @@ namespace TBF.BenchControl.DataEntry.Standard6
             if (WaterMetersCount >= 4) { enabledComboBoxes.Add(comboBox4); } else { comboBox4.Visible = false; label4.Visible = false; checkBox4.Visible = false; }
             if (WaterMetersCount >= 5) { enabledComboBoxes.Add(comboBox5); } else { comboBox5.Visible = false; label5.Visible = false; checkBox5.Visible = false; }
             if (WaterMetersCount >= 6) { enabledComboBoxes.Add(comboBox6); } else { comboBox6.Visible = false; label6.Visible = false; checkBox6.Visible = false; }
+            if (WaterMetersCount >= 7) { enabledComboBoxes.Add(comboBox7); } else { comboBox7.Visible = false; label7.Visible = false; checkBox7.Visible = false; }
+            if (WaterMetersCount >= 8) { enabledComboBoxes.Add(comboBox8); } else { comboBox8.Visible = false; label8.Visible = false; checkBox8.Visible = false; }
 
             if (RemarksEnabled)
             {
@@ -100,6 +105,8 @@ namespace TBF.BenchControl.DataEntry.Standard6
                 if (WaterMetersCount >= 4) { remarkComboBox4.Visible = true; }
                 if (WaterMetersCount >= 5) { remarkComboBox5.Visible = true; }
                 if (WaterMetersCount >= 6) { remarkComboBox6.Visible = true; }
+                if (WaterMetersCount >= 7) { remarkComboBox7.Visible = true; }
+                if (WaterMetersCount >= 8) { remarkComboBox8.Visible = true; }
             }
 
             Height = 177 + WaterMetersCount * 46;
@@ -122,7 +129,9 @@ namespace TBF.BenchControl.DataEntry.Standard6
 			label4.Text = Strings.Water_Meter + " 4";
 			label5.Text = Strings.Water_Meter + " 5";
 			label6.Text = Strings.Water_Meter + " 6";
-		}
+            label7.Text = Strings.Water_Meter + " 7";
+            label8.Text = Strings.Water_Meter + " 8";
+        }
 
 
 		private void okButton_Click(object sender, EventArgs e)
@@ -165,6 +174,8 @@ namespace TBF.BenchControl.DataEntry.Standard6
 		private void comboBox4_TextChanged(object sender, EventArgs e) { checkBox4.Checked = true; }
 		private void comboBox5_TextChanged(object sender, EventArgs e) { checkBox5.Checked = true; }
 		private void comboBox6_TextChanged(object sender, EventArgs e) { checkBox6.Checked = true; }
+        private void comboBox7_TextChanged(object sender, EventArgs e) { checkBox7.Checked = true; }
+        private void comboBox8_TextChanged(object sender, EventArgs e) { checkBox8.Checked = true; }
 
 		private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
 		{
@@ -214,6 +225,22 @@ namespace TBF.BenchControl.DataEntry.Standard6
 					UpdateAllCombos();
 			}
 		}
+        private void comboBox7_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+            {
+                if (comboBox7.Text.Equals(Program.LocalSettings.LastSNTexts[6]))
+                    UpdateAllCombos();
+            }
+        }
+        private void comboBox8_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (Program.LocalSettings.LastSNTextsCount == WaterMetersCount)
+            {
+                if (comboBox8.Text.Equals(Program.LocalSettings.LastSNTexts[7]))
+                    UpdateAllCombos();
+            }
+        }
 
 
 		private void clearButton_Click(object sender, EventArgs e)
@@ -284,5 +311,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
 		private void comboBox4_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox4); }
 		private void comboBox5_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox5); }
 		private void comboBox6_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox6); }
-	}
+        private void comboBox7_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox7); }
+        private void comboBox8_KeyPress(object sndr, KeyPressEventArgs e) { ProcKeyPress(sndr, e, comboBox8); }
+    }
 }

TBF/BenchControl/DataEntry/Standard6/CycleBeginningForm.resx

@@ -148,7 +148,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;okButton.ZOrder" xml:space="preserve">
-    <value>29</value>
+    <value>37</value>
   </data>
   <data name="comboBox1.Font" type="System.Drawing.Font, System.Drawing">
     <value>Verdana, 14.25pt</value>
@@ -172,7 +172,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;comboBox1.ZOrder" xml:space="preserve">
-    <value>25</value>
+    <value>33</value>
   </data>
   <data name="checkBox1.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -199,7 +199,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;checkBox1.ZOrder" xml:space="preserve">
-    <value>27</value>
+    <value>35</value>
   </data>
   <data name="label1.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -211,7 +211,7 @@
     <value>27, 146</value>
   </data>
   <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>147, 23</value>
+    <value>146, 23</value>
   </data>
   <data name="label1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -229,7 +229,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
-    <value>28</value>
+    <value>36</value>
   </data>
   <data name="clearButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Right</value>
@@ -262,7 +262,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;clearButton.ZOrder" xml:space="preserve">
-    <value>26</value>
+    <value>34</value>
   </data>
   <data name="comboBox2.Font" type="System.Drawing.Font, System.Drawing">
     <value>Verdana, 14.25pt</value>
@@ -286,7 +286,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;comboBox2.ZOrder" xml:space="preserve">
-    <value>22</value>
+    <value>30</value>
   </data>
   <data name="checkBox2.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -316,7 +316,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;checkBox2.ZOrder" xml:space="preserve">
-    <value>23</value>
+    <value>31</value>
   </data>
   <data name="label2.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -331,7 +331,7 @@
     <value>27, 192</value>
   </data>
   <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>147, 23</value>
+    <value>146, 23</value>
   </data>
   <data name="label2.TabIndex" type="System.Int32, mscorlib">
     <value>9</value>
@@ -349,7 +349,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
-    <value>24</value>
+    <value>32</value>
   </data>
   <data name="comboBox3.Font" type="System.Drawing.Font, System.Drawing">
     <value>Verdana, 14.25pt</value>
@@ -373,7 +373,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;comboBox3.ZOrder" xml:space="preserve">
-    <value>19</value>
+    <value>27</value>
   </data>
   <data name="checkBox3.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -403,7 +403,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;checkBox3.ZOrder" xml:space="preserve">
-    <value>20</value>
+    <value>28</value>
   </data>
   <data name="label3.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -418,7 +418,7 @@
     <value>27, 238</value>
   </data>
   <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>147, 23</value>
+    <value>146, 23</value>
   </data>
   <data name="label3.TabIndex" type="System.Int32, mscorlib">
     <value>12</value>
@@ -436,7 +436,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
-    <value>21</value>
+    <value>29</value>
   </data>
   <data name="comboBox4.Font" type="System.Drawing.Font, System.Drawing">
     <value>Verdana, 14.25pt</value>
@@ -460,7 +460,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;comboBox4.ZOrder" xml:space="preserve">
-    <value>16</value>
+    <value>24</value>
   </data>
   <data name="checkBox4.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -490,7 +490,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;checkBox4.ZOrder" xml:space="preserve">
-    <value>17</value>
+    <value>25</value>
   </data>
   <data name="label4.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -505,7 +505,7 @@
     <value>27, 284</value>
   </data>
   <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>147, 23</value>
+    <value>146, 23</value>
   </data>
   <data name="label4.TabIndex" type="System.Int32, mscorlib">
     <value>15</value>
@@ -523,7 +523,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
-    <value>18</value>
+    <value>26</value>
   </data>
   <data name="comboBox5.Font" type="System.Drawing.Font, System.Drawing">
     <value>Verdana, 14.25pt</value>
@@ -547,7 +547,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;comboBox5.ZOrder" xml:space="preserve">
-    <value>13</value>
+    <value>21</value>
   </data>
   <data name="checkBox5.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -577,7 +577,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;checkBox5.ZOrder" xml:space="preserve">
-    <value>14</value>
+    <value>22</value>
   </data>
   <data name="label5.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -592,7 +592,7 @@
     <value>27, 330</value>
   </data>
   <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>147, 23</value>
+    <value>146, 23</value>
   </data>
   <data name="label5.TabIndex" type="System.Int32, mscorlib">
     <value>18</value>
@@ -610,7 +610,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label5.ZOrder" xml:space="preserve">
-    <value>15</value>
+    <value>23</value>
   </data>
   <data name="comboBox6.Font" type="System.Drawing.Font, System.Drawing">
     <value>Verdana, 14.25pt</value>
@@ -634,7 +634,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;comboBox6.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>18</value>
   </data>
   <data name="checkBox6.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -664,7 +664,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;checkBox6.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>19</value>
   </data>
   <data name="label6.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -679,7 +679,7 @@
     <value>27, 376</value>
   </data>
   <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>147, 23</value>
+    <value>146, 23</value>
   </data>
   <data name="label6.TabIndex" type="System.Int32, mscorlib">
     <value>21</value>
@@ -697,7 +697,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
-    <value>12</value>
+    <value>20</value>
   </data>
   <data name="orderComboBox.Font" type="System.Drawing.Font, System.Drawing">
     <value>Verdana, 14.25pt</value>
@@ -721,7 +721,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;orderComboBox.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>17</value>
   </data>
   <data name="orderLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -754,7 +754,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;orderLabel.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>16</value>
   </data>
   <data name="snLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -787,7 +787,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;snLabel.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>15</value>
   </data>
   <data name="remarkLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -823,7 +823,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;remarkLabel.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>14</value>
   </data>
   <data name="remarkComboBox6.Font" type="System.Drawing.Font, System.Drawing">
     <value>Verdana, 14.25pt</value>
@@ -850,7 +850,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;remarkComboBox6.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>13</value>
   </data>
   <data name="remarkComboBox1.Font" type="System.Drawing.Font, System.Drawing">
     <value>Verdana, 14.25pt</value>
@@ -877,7 +877,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;remarkComboBox1.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>12</value>
   </data>
   <data name="remarkComboBox2.Font" type="System.Drawing.Font, System.Drawing">
     <value>Verdana, 14.25pt</value>
@@ -904,7 +904,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;remarkComboBox2.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>11</value>
   </data>
   <data name="remarkComboBox3.Font" type="System.Drawing.Font, System.Drawing">
     <value>Verdana, 14.25pt</value>
@@ -931,7 +931,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;remarkComboBox3.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>10</value>
   </data>
   <data name="remarkComboBox4.Font" type="System.Drawing.Font, System.Drawing">
     <value>Verdana, 14.25pt</value>
@@ -958,7 +958,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;remarkComboBox4.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>9</value>
   </data>
   <data name="remarkComboBox5.Font" type="System.Drawing.Font, System.Drawing">
     <value>Verdana, 14.25pt</value>
@@ -985,8 +985,236 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;remarkComboBox5.ZOrder" xml:space="preserve">
+    <value>8</value>
+  </data>
+  <data name="remarkComboBox7.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Verdana, 14.25pt</value>
+  </data>
+  <data name="remarkComboBox7.Location" type="System.Drawing.Point, System.Drawing">
+    <value>453, 419</value>
+  </data>
+  <data name="remarkComboBox7.Size" type="System.Drawing.Size, System.Drawing">
+    <value>421, 31</value>
+  </data>
+  <data name="remarkComboBox7.TabIndex" type="System.Int32, mscorlib">
+    <value>46</value>
+  </data>
+  <data name="remarkComboBox7.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="&gt;&gt;remarkComboBox7.Name" xml:space="preserve">
+    <value>remarkComboBox7</value>
+  </data>
+  <data name="&gt;&gt;remarkComboBox7.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;remarkComboBox7.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;remarkComboBox7.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="remarkComboBox8.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Verdana, 14.25pt</value>
+  </data>
+  <data name="remarkComboBox8.Location" type="System.Drawing.Point, System.Drawing">
+    <value>453, 465</value>
+  </data>
+  <data name="remarkComboBox8.Size" type="System.Drawing.Size, System.Drawing">
+    <value>421, 31</value>
+  </data>
+  <data name="remarkComboBox8.TabIndex" type="System.Int32, mscorlib">
+    <value>45</value>
+  </data>
+  <data name="remarkComboBox8.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="&gt;&gt;remarkComboBox8.Name" xml:space="preserve">
+    <value>remarkComboBox8</value>
+  </data>
+  <data name="&gt;&gt;remarkComboBox8.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;remarkComboBox8.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;remarkComboBox8.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="comboBox8.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Verdana, 14.25pt</value>
+  </data>
+  <data name="comboBox8.Location" type="System.Drawing.Point, System.Drawing">
+    <value>196, 465</value>
+  </data>
+  <data name="comboBox8.Size" type="System.Drawing.Size, System.Drawing">
+    <value>163, 31</value>
+  </data>
+  <data name="comboBox8.TabIndex" type="System.Int32, mscorlib">
+    <value>44</value>
+  </data>
+  <data name="&gt;&gt;comboBox8.Name" xml:space="preserve">
+    <value>comboBox8</value>
+  </data>
+  <data name="&gt;&gt;comboBox8.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;comboBox8.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;comboBox8.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="checkBox8.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="checkBox8.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Verdana, 27.75pt</value>
+  </data>
+  <data name="checkBox8.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="checkBox8.Location" type="System.Drawing.Point, System.Drawing">
+    <value>400, 471</value>
+  </data>
+  <data name="checkBox8.Size" type="System.Drawing.Size, System.Drawing">
+    <value>15, 14</value>
+  </data>
+  <data name="checkBox8.TabIndex" type="System.Int32, mscorlib">
+    <value>43</value>
+  </data>
+  <data name="&gt;&gt;checkBox8.Name" xml:space="preserve">
+    <value>checkBox8</value>
+  </data>
+  <data name="&gt;&gt;checkBox8.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;checkBox8.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;checkBox8.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="label8.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label8.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Verdana, 14.25pt</value>
+  </data>
+  <data name="label8.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="label8.Location" type="System.Drawing.Point, System.Drawing">
+    <value>27, 468</value>
+  </data>
+  <data name="label8.Size" type="System.Drawing.Size, System.Drawing">
+    <value>146, 23</value>
+  </data>
+  <data name="label8.TabIndex" type="System.Int32, mscorlib">
+    <value>42</value>
+  </data>
+  <data name="label8.Text" xml:space="preserve">
+    <value>Water meter 8</value>
+  </data>
+  <data name="&gt;&gt;label8.Name" xml:space="preserve">
+    <value>label8</value>
+  </data>
+  <data name="&gt;&gt;label8.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label8.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;label8.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="comboBox7.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Verdana, 14.25pt</value>
+  </data>
+  <data name="comboBox7.Location" type="System.Drawing.Point, System.Drawing">
+    <value>196, 419</value>
+  </data>
+  <data name="comboBox7.Size" type="System.Drawing.Size, System.Drawing">
+    <value>163, 31</value>
+  </data>
+  <data name="comboBox7.TabIndex" type="System.Int32, mscorlib">
+    <value>41</value>
+  </data>
+  <data name="&gt;&gt;comboBox7.Name" xml:space="preserve">
+    <value>comboBox7</value>
+  </data>
+  <data name="&gt;&gt;comboBox7.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;comboBox7.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;comboBox7.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="checkBox7.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="checkBox7.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Verdana, 27.75pt</value>
+  </data>
+  <data name="checkBox7.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="checkBox7.Location" type="System.Drawing.Point, System.Drawing">
+    <value>400, 426</value>
+  </data>
+  <data name="checkBox7.Size" type="System.Drawing.Size, System.Drawing">
+    <value>15, 14</value>
+  </data>
+  <data name="checkBox7.TabIndex" type="System.Int32, mscorlib">
+    <value>40</value>
+  </data>
+  <data name="&gt;&gt;checkBox7.Name" xml:space="preserve">
+    <value>checkBox7</value>
+  </data>
+  <data name="&gt;&gt;checkBox7.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;checkBox7.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;checkBox7.ZOrder" xml:space="preserve">
+    <value>6</value>
+  </data>
+  <data name="label7.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label7.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Verdana, 14.25pt</value>
+  </data>
+  <data name="label7.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="label7.Location" type="System.Drawing.Point, System.Drawing">
+    <value>27, 422</value>
+  </data>
+  <data name="label7.Size" type="System.Drawing.Size, System.Drawing">
+    <value>146, 23</value>
+  </data>
+  <data name="label7.TabIndex" type="System.Int32, mscorlib">
+    <value>39</value>
+  </data>
+  <data name="label7.Text" xml:space="preserve">
+    <value>Water meter 7</value>
+  </data>
+  <data name="&gt;&gt;label7.Name" xml:space="preserve">
+    <value>label7</value>
+  </data>
+  <data name="&gt;&gt;label7.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label7.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;label7.ZOrder" xml:space="preserve">
+    <value>7</value>
+  </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -997,7 +1225,7 @@
     <value>True</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>1039, 429</value>
+    <value>1039, 521</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
     <value>Batch data</value>

TBF/BenchControl/DataEntry/Standard6/CycleEndForm.Designer.cs

@@ -53,6 +53,12 @@ namespace TBF.BenchControl.DataEntry.Standard6
             this.remarkTextBox5 = new System.Windows.Forms.TextBox();
             this.remarkTextBox6 = new System.Windows.Forms.TextBox();
             this.batchRemarkButton = new System.Windows.Forms.Button();
+            this.remarkTextBox8 = new System.Windows.Forms.TextBox();
+            this.remarkTextBox7 = new System.Windows.Forms.TextBox();
+            this.textBox8 = new System.Windows.Forms.TextBox();
+            this.label8 = new System.Windows.Forms.Label();
+            this.textBox7 = new System.Windows.Forms.TextBox();
+            this.label7 = new System.Windows.Forms.Label();
             this.SuspendLayout();
             // 
             // textBox2
@@ -69,7 +75,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
             this.label2.Location = new System.Drawing.Point(26, 110);
             this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(147, 23);
+            this.label2.Size = new System.Drawing.Size(146, 23);
             this.label2.TabIndex = 0;
             this.label2.Text = "Water meter 2";
             // 
@@ -87,7 +93,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
             this.label1.Location = new System.Drawing.Point(26, 64);
             this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(147, 23);
+            this.label1.Size = new System.Drawing.Size(146, 23);
             this.label1.TabIndex = 0;
             this.label1.Text = "Water meter 1";
             // 
@@ -119,7 +125,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
             this.label3.Location = new System.Drawing.Point(26, 156);
             this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(147, 23);
+            this.label3.Size = new System.Drawing.Size(146, 23);
             this.label3.TabIndex = 0;
             this.label3.Text = "Water meter 3";
             // 
@@ -137,7 +143,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
             this.label4.Location = new System.Drawing.Point(26, 202);
             this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(147, 23);
+            this.label4.Size = new System.Drawing.Size(146, 23);
             this.label4.TabIndex = 0;
             this.label4.Text = "Water meter 4";
             // 
@@ -155,7 +161,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
             this.label5.Location = new System.Drawing.Point(26, 248);
             this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(147, 23);
+            this.label5.Size = new System.Drawing.Size(146, 23);
             this.label5.TabIndex = 0;
             this.label5.Text = "Water meter 5";
             // 
@@ -173,7 +179,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
             this.label6.Location = new System.Drawing.Point(26, 294);
             this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(147, 23);
+            this.label6.Size = new System.Drawing.Size(146, 23);
             this.label6.TabIndex = 0;
             this.label6.Text = "Water meter 6";
             // 
@@ -199,7 +205,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
             this.remarkLabel.AutoSize = true;
             this.remarkLabel.Location = new System.Drawing.Point(396, 24);
             this.remarkLabel.Name = "remarkLabel";
-            this.remarkLabel.Size = new System.Drawing.Size(211, 23);
+            this.remarkLabel.Size = new System.Drawing.Size(210, 23);
             this.remarkLabel.TabIndex = 10;
             this.remarkLabel.Text = "Water meter remark:";
             // 
@@ -257,12 +263,70 @@ namespace TBF.BenchControl.DataEntry.Standard6
             this.batchRemarkButton.UseVisualStyleBackColor = true;
             this.batchRemarkButton.Click += new System.EventHandler(this.batchRemarkButton_Click);
             // 
+            // remarkTextBox8
+            // 
+            this.remarkTextBox8.Location = new System.Drawing.Point(400, 383);
+            this.remarkTextBox8.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.remarkTextBox8.Name = "remarkTextBox8";
+            this.remarkTextBox8.Size = new System.Drawing.Size(421, 31);
+            this.remarkTextBox8.TabIndex = 22;
+            // 
+            // remarkTextBox7
+            // 
+            this.remarkTextBox7.Location = new System.Drawing.Point(400, 337);
+            this.remarkTextBox7.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.remarkTextBox7.Name = "remarkTextBox7";
+            this.remarkTextBox7.Size = new System.Drawing.Size(421, 31);
+            this.remarkTextBox7.TabIndex = 21;
+            // 
+            // textBox8
+            // 
+            this.textBox8.Location = new System.Drawing.Point(200, 383);
+            this.textBox8.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.textBox8.Name = "textBox8";
+            this.textBox8.Size = new System.Drawing.Size(159, 31);
+            this.textBox8.TabIndex = 19;
+            // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.Location = new System.Drawing.Point(26, 386);
+            this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(146, 23);
+            this.label8.TabIndex = 17;
+            this.label8.Text = "Water meter 6";
+            // 
+            // textBox7
+            // 
+            this.textBox7.Location = new System.Drawing.Point(200, 337);
+            this.textBox7.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.textBox7.Name = "textBox7";
+            this.textBox7.Size = new System.Drawing.Size(159, 31);
+            this.textBox7.TabIndex = 20;
+            // 
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.Location = new System.Drawing.Point(26, 340);
+            this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(146, 23);
+            this.label7.TabIndex = 18;
+            this.label7.Text = "Water meter 5";
+            // 
             // CycleEndForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 23F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.DarkGoldenrod;
-            this.ClientSize = new System.Drawing.Size(1001, 349);
+            this.ClientSize = new System.Drawing.Size(1001, 441);
+            this.Controls.Add(this.remarkTextBox8);
+            this.Controls.Add(this.remarkTextBox7);
+            this.Controls.Add(this.textBox8);
+            this.Controls.Add(this.label8);
+            this.Controls.Add(this.textBox7);
+            this.Controls.Add(this.label7);
             this.Controls.Add(this.batchRemarkButton);
             this.Controls.Add(this.remarkTextBox6);
             this.Controls.Add(this.remarkTextBox5);
@@ -322,6 +386,12 @@ namespace TBF.BenchControl.DataEntry.Standard6
         private System.Windows.Forms.TextBox remarkTextBox5;
         private System.Windows.Forms.TextBox remarkTextBox6;
         private System.Windows.Forms.Button batchRemarkButton;
+        private System.Windows.Forms.TextBox remarkTextBox8;
+        private System.Windows.Forms.TextBox remarkTextBox7;
+        private System.Windows.Forms.TextBox textBox8;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.TextBox textBox7;
+        private System.Windows.Forms.Label label7;
 
 	}
 }

TBF/BenchControl/DataEntry/Standard6/CycleEndForm.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2017 Sensus Slovensko a.s.
+/// Copyright (c) 2017-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Windows.Forms;
@@ -40,10 +40,11 @@ namespace TBF.BenchControl.DataEntry.Standard6
             InitializeComponent();
 			ControlBox = false;
 
-            labels = new Label[] { label1,  label2,  label3,  label4,  label5,  label6 };
-            stateBoxes = new TextBox[] { textBox1,  textBox2,  textBox3,  textBox4,  textBox5,  textBox6 };
-            remarkBoxes = new TextBox[] { remarkTextBox1, remarkTextBox2, remarkTextBox3,
-                                          remarkTextBox4, remarkTextBox5, remarkTextBox6 };
+            labels = new Label[] { label1, label2, label3, label4, label5, label6, label7, label8 };
+            stateBoxes = new TextBox[] { textBox1, textBox2, textBox3, textBox4,
+                                         textBox5, textBox6, textBox7, textBox8 };
+            remarkBoxes = new TextBox[] { remarkTextBox1, remarkTextBox2, remarkTextBox3, remarkTextBox4,
+                                          remarkTextBox5, remarkTextBox6, remarkTextBox7, remarkTextBox8 };
             textBoxesCount = stateBoxes.Length;
             this.WaterMetersCount = textBoxesCount;
 

TBF/BenchControl/DataEntry/Standard6/TestStartEndForm.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2017 Sensus Metering Systems
+/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Windows.Forms;
@@ -103,6 +103,8 @@ namespace TBF.BenchControl.DataEntry.Standard6
 			if (WaterMetersCount < 4) groupBox4.Visible = false;
 			if (WaterMetersCount < 5) groupBox5.Visible = false;
 			if (WaterMetersCount < 6) groupBox6.Visible = false;
+            if (WaterMetersCount < 7) groupBox7.Visible = false;
+            if (WaterMetersCount < 8) groupBox8.Visible = false;
 
 			if (endStates)
 			{
@@ -112,6 +114,8 @@ namespace TBF.BenchControl.DataEntry.Standard6
 				if (WaterMetersCount >= 4) wmStartStateTextBox4.Text = WMStartStateStr[3];
 				if (WaterMetersCount >= 5) wmStartStateTextBox5.Text = WMStartStateStr[4];
 				if (WaterMetersCount >= 6) wmStartStateTextBox6.Text = WMStartStateStr[5];
+                if (WaterMetersCount >= 7) wmStartStateTextBox7.Text = WMStartStateStr[6];
+                if (WaterMetersCount >= 8) wmStartStateTextBox8.Text = WMStartStateStr[7];
 
 				wmEndStateTextBox1.Enabled = (disabled.Length >= 1 && !disabled[0]);
 				wmEndStateTextBox2.Enabled = (disabled.Length >= 2 && !disabled[1]);
@@ -119,7 +123,9 @@ namespace TBF.BenchControl.DataEntry.Standard6
 				wmEndStateTextBox4.Enabled = (disabled.Length >= 4 && !disabled[3]);
 				wmEndStateTextBox5.Enabled = (disabled.Length >= 5 && !disabled[4]);
 				wmEndStateTextBox6.Enabled = (disabled.Length >= 6 && !disabled[5]);
-			}
+                wmEndStateTextBox7.Enabled = (disabled.Length >= 7 && !disabled[6]);
+                wmEndStateTextBox8.Enabled = (disabled.Length >= 8 && !disabled[7]);
+            }
 			else
 			{
 				wmStartStateTextBox1.Enabled = (disabled.Length >= 1 && !disabled[0]);
@@ -128,7 +134,9 @@ namespace TBF.BenchControl.DataEntry.Standard6
 				wmStartStateTextBox4.Enabled = (disabled.Length >= 4 && !disabled[3]);
 				wmStartStateTextBox5.Enabled = (disabled.Length >= 5 && !disabled[4]);
 				wmStartStateTextBox6.Enabled = (disabled.Length >= 6 && !disabled[5]);
-			}
+                wmStartStateTextBox7.Enabled = (disabled.Length >= 7 && !disabled[6]);
+                wmStartStateTextBox8.Enabled = (disabled.Length >= 8 && !disabled[7]);
+            }
 		}
 
 		void Localize()
@@ -141,6 +149,8 @@ namespace TBF.BenchControl.DataEntry.Standard6
 			groupBox4.Text = Strings.Water_Meter + " 4";
 			groupBox5.Text = Strings.Water_Meter + " 5";
 			groupBox6.Text = Strings.Water_Meter + " 6";
+            groupBox7.Text = Strings.Water_Meter + " 7";
+            groupBox8.Text = Strings.Water_Meter + " 8";
 
 			wmStateLabel1.Text = Strings.WMState;
 			wmStateLabel2.Text = Strings.WMState;
@@ -148,6 +158,8 @@ namespace TBF.BenchControl.DataEntry.Standard6
 			wmStateLabel4.Text = Strings.WMState;
 			wmStateLabel5.Text = Strings.WMState;
 			wmStateLabel6.Text = Strings.WMState;
+            wmStateLabel7.Text = Strings.WMState;
+            wmStateLabel8.Text = Strings.WMState;
 
 			startLabel.Text = Strings.Start;
 			endLabel.Text = Strings.End;
@@ -168,7 +180,9 @@ namespace TBF.BenchControl.DataEntry.Standard6
                     if (wmEndStateTextBox4.Enabled && WaterMetersCount >= 4) WMEndState[3] = Utils.ParseUDouble(wmEndStateTextBox4.Text);
                     if (wmEndStateTextBox5.Enabled && WaterMetersCount >= 5) WMEndState[4] = Utils.ParseUDouble(wmEndStateTextBox5.Text);
                     if (wmEndStateTextBox6.Enabled && WaterMetersCount >= 6) WMEndState[5] = Utils.ParseUDouble(wmEndStateTextBox6.Text);
-				}
+                    if (wmEndStateTextBox7.Enabled && WaterMetersCount >= 7) WMEndState[6] = Utils.ParseUDouble(wmEndStateTextBox7.Text);
+                    if (wmEndStateTextBox8.Enabled && WaterMetersCount >= 8) WMEndState[7] = Utils.ParseUDouble(wmEndStateTextBox8.Text);
+                }
 				else
 				{
                     if (wmStartStateTextBox1.Enabled && WaterMetersCount >= 1) { WMStartStateStr[0] = wmStartStateTextBox1.Text; WMStartState[0] = Utils.ParseUDouble(wmStartStateTextBox1.Text); }
@@ -177,7 +191,9 @@ namespace TBF.BenchControl.DataEntry.Standard6
                     if (wmStartStateTextBox4.Enabled && WaterMetersCount >= 4) { WMStartStateStr[3] = wmStartStateTextBox4.Text; WMStartState[3] = Utils.ParseUDouble(wmStartStateTextBox4.Text); }
                     if (wmStartStateTextBox5.Enabled && WaterMetersCount >= 5) { WMStartStateStr[4] = wmStartStateTextBox5.Text; WMStartState[4] = Utils.ParseUDouble(wmStartStateTextBox5.Text); }
                     if (wmStartStateTextBox6.Enabled && WaterMetersCount >= 6) { WMStartStateStr[5] = wmStartStateTextBox6.Text; WMStartState[5] = Utils.ParseUDouble(wmStartStateTextBox6.Text); }
-				}
+                    if (wmStartStateTextBox7.Enabled && WaterMetersCount >= 7) { WMStartStateStr[6] = wmStartStateTextBox5.Text; WMStartState[6] = Utils.ParseUDouble(wmStartStateTextBox7.Text); }
+                    if (wmStartStateTextBox8.Enabled && WaterMetersCount >= 8) { WMStartStateStr[7] = wmStartStateTextBox6.Text; WMStartState[7] = Utils.ParseUDouble(wmStartStateTextBox8.Text); }
+                }
 			}
             catch (Exception e)
             {
@@ -292,83 +308,153 @@ namespace TBF.BenchControl.DataEntry.Standard6
 			exclamation6.Visible = fixedErrorLimits ? ((err < warningLimLo) || (warningLimHi < err)) : ((err < -6) || (+6 < err));
 		}
 
-		private void wmStartStateTextBox1_KeyPress(object sender, KeyPressEventArgs e)
-		{
-			if (e.KeyChar == '\r')
-			{
-				if (wmStartStateTextBox2.Enabled) wmStartStateTextBox2.Focus();
-				else if (wmStartStateTextBox3.Enabled) wmStartStateTextBox3.Focus();
-				else if (wmStartStateTextBox4.Enabled) wmStartStateTextBox4.Focus();
-				else if (wmStartStateTextBox5.Enabled) wmStartStateTextBox5.Focus();
-				else if (wmStartStateTextBox6.Enabled) wmStartStateTextBox6.Focus();
-			}
-			else if (e.KeyChar == '+') okButton_Click(sender, e);
-		}
+        private void wmEndStateTextBox7_TextChanged(object sender, EventArgs e)
+        {
+            double err = 0;
+            try
+            {
+                double endState = Utils.ParseUDouble(wmEndStateTextBox7.Text);
+                double startState = Utils.ParseUDouble(wmStartStateTextBox7.Text);
+                err = 100.0 * (endState - startState - refVolume) / refVolume;
+            }
+            catch { err = 1000.0f; };
 
-		private void wmStartStateTextBox2_KeyPress(object sender, KeyPressEventArgs e)
-		{
-			if (e.KeyChar == '\r')
-			{
-				if (wmStartStateTextBox3.Enabled) wmStartStateTextBox3.Focus();
-				else if (wmStartStateTextBox4.Enabled) wmStartStateTextBox4.Focus();
-				else if (wmStartStateTextBox5.Enabled) wmStartStateTextBox5.Focus();
-				else if (wmStartStateTextBox6.Enabled) wmStartStateTextBox6.Focus();
-				else if (wmStartStateTextBox1.Enabled) wmStartStateTextBox1.Focus();
-			}
-			else if (e.KeyChar == '+') okButton_Click(sender, e);
-		}
+            exclamation7.Visible = fixedErrorLimits ? ((err < warningLimLo) || (warningLimHi < err)) : ((err < -6) || (+6 < err));
+        }
 
-		private void wmStartStateTextBox3_KeyPress(object sender, KeyPressEventArgs e)
-		{
-			if (e.KeyChar == '\r')
-			{
-				if (wmStartStateTextBox4.Enabled) wmStartStateTextBox4.Focus();
-				else if (wmStartStateTextBox5.Enabled) wmStartStateTextBox5.Focus();
-				else if (wmStartStateTextBox6.Enabled) wmStartStateTextBox6.Focus();
-				else if (wmStartStateTextBox1.Enabled) wmStartStateTextBox1.Focus();
-				else if (wmStartStateTextBox2.Enabled) wmStartStateTextBox2.Focus();
-			}
-			else if (e.KeyChar == '+') okButton_Click(sender, e);
-		}
+        private void wmEndStateTextBox8_TextChanged(object sender, EventArgs e)
+        {
+            double err = 0;
+            try
+            {
+                double endState = Utils.ParseUDouble(wmEndStateTextBox8.Text);
+                double startState = Utils.ParseUDouble(wmStartStateTextBox8.Text);
+                err = 100.0 * (endState - startState - refVolume) / refVolume;
+            }
+            catch { err = 1000.0f; };
 
-		private void wmStartStateTextBox4_KeyPress(object sender, KeyPressEventArgs e)
-		{
-			if (e.KeyChar == '\r')
-			{
-				if (wmStartStateTextBox5.Enabled) wmStartStateTextBox5.Focus();
-				else if (wmStartStateTextBox6.Enabled) wmStartStateTextBox6.Focus();
-				else if (wmStartStateTextBox1.Enabled) wmStartStateTextBox1.Focus();
-				else if (wmStartStateTextBox2.Enabled) wmStartStateTextBox2.Focus();
-				else if (wmStartStateTextBox3.Enabled) wmStartStateTextBox3.Focus();
-			}
-			else if (e.KeyChar == '+') okButton_Click(sender, e);
-		}
+            exclamation8.Visible = fixedErrorLimits ? ((err < warningLimLo) || (warningLimHi < err)) : ((err < -6) || (+6 < err));
+        }
 
-		private void wmStartStateTextBox5_KeyPress(object sender, KeyPressEventArgs e)
-		{
-			if (e.KeyChar == '\r')
-			{
-				if (wmStartStateTextBox6.Enabled) wmStartStateTextBox6.Focus();
-				else if (wmStartStateTextBox1.Enabled) wmStartStateTextBox1.Focus();
-				else if (wmStartStateTextBox2.Enabled) wmStartStateTextBox2.Focus();
-				else if (wmStartStateTextBox3.Enabled) wmStartStateTextBox3.Focus();
-				else if (wmStartStateTextBox4.Enabled) wmStartStateTextBox4.Focus();
-			}
-			else if (e.KeyChar == '+') okButton_Click(sender, e);
-		}
+        private void wmStartStateTextBox1_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            if (e.KeyChar == '\r')
+            {
+                if (wmStartStateTextBox2.Enabled) wmStartStateTextBox2.Focus();
+                else if (wmStartStateTextBox3.Enabled) wmStartStateTextBox3.Focus();
+                else if (wmStartStateTextBox4.Enabled) wmStartStateTextBox4.Focus();
+                else if (wmStartStateTextBox5.Enabled) wmStartStateTextBox5.Focus();
+                else if (wmStartStateTextBox6.Enabled) wmStartStateTextBox6.Focus();
+                else if (wmStartStateTextBox7.Enabled) wmStartStateTextBox7.Focus();
+                else if (wmStartStateTextBox8.Enabled) wmStartStateTextBox8.Focus();
+            }
+            else if (e.KeyChar == '+') okButton_Click(sender, e);
+        }
 
-		private void wmStartStateTextBox6_KeyPress(object sender, KeyPressEventArgs e)
-		{
-			if (e.KeyChar == '\r')
-			{
-				if (wmStartStateTextBox1.Enabled) wmStartStateTextBox1.Focus();
-				else if (wmStartStateTextBox2.Enabled) wmStartStateTextBox2.Focus();
-				else if (wmStartStateTextBox3.Enabled) wmStartStateTextBox3.Focus();
-				else if (wmStartStateTextBox4.Enabled) wmStartStateTextBox4.Focus();
-				else if (wmStartStateTextBox5.Enabled) wmStartStateTextBox5.Focus();
-			}
-			else if (e.KeyChar == '+') okButton_Click(sender, e);
-		}
+        private void wmStartStateTextBox2_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            if (e.KeyChar == '\r')
+            {
+                if (wmStartStateTextBox3.Enabled) wmStartStateTextBox3.Focus();
+                else if (wmStartStateTextBox4.Enabled) wmStartStateTextBox4.Focus();
+                else if (wmStartStateTextBox5.Enabled) wmStartStateTextBox5.Focus();
+                else if (wmStartStateTextBox6.Enabled) wmStartStateTextBox6.Focus();
+                else if (wmStartStateTextBox7.Enabled) wmStartStateTextBox7.Focus();
+                else if (wmStartStateTextBox8.Enabled) wmStartStateTextBox8.Focus();
+                else if (wmStartStateTextBox1.Enabled) wmStartStateTextBox1.Focus();
+            }
+            else if (e.KeyChar == '+') okButton_Click(sender, e);
+        }
+
+        private void wmStartStateTextBox3_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            if (e.KeyChar == '\r')
+            {
+                if (wmStartStateTextBox4.Enabled) wmStartStateTextBox4.Focus();
+                else if (wmStartStateTextBox5.Enabled) wmStartStateTextBox5.Focus();
+                else if (wmStartStateTextBox6.Enabled) wmStartStateTextBox6.Focus();
+                else if (wmStartStateTextBox7.Enabled) wmStartStateTextBox7.Focus();
+                else if (wmStartStateTextBox8.Enabled) wmStartStateTextBox8.Focus();
+                else if (wmStartStateTextBox1.Enabled) wmStartStateTextBox1.Focus();
+                else if (wmStartStateTextBox2.Enabled) wmStartStateTextBox2.Focus();
+            }
+            else if (e.KeyChar == '+') okButton_Click(sender, e);
+        }
+
+        private void wmStartStateTextBox4_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            if (e.KeyChar == '\r')
+            {
+                if (wmStartStateTextBox5.Enabled) wmStartStateTextBox5.Focus();
+                else if (wmStartStateTextBox6.Enabled) wmStartStateTextBox6.Focus();
+                else if (wmStartStateTextBox7.Enabled) wmStartStateTextBox7.Focus();
+                else if (wmStartStateTextBox8.Enabled) wmStartStateTextBox8.Focus();
+                else if (wmStartStateTextBox1.Enabled) wmStartStateTextBox1.Focus();
+                else if (wmStartStateTextBox2.Enabled) wmStartStateTextBox2.Focus();
+                else if (wmStartStateTextBox3.Enabled) wmStartStateTextBox3.Focus();
+            }
+            else if (e.KeyChar == '+') okButton_Click(sender, e);
+        }
+
+        private void wmStartStateTextBox5_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            if (e.KeyChar == '\r')
+            {
+                if (wmStartStateTextBox6.Enabled) wmStartStateTextBox6.Focus();
+                else if (wmStartStateTextBox7.Enabled) wmStartStateTextBox7.Focus();
+                else if (wmStartStateTextBox8.Enabled) wmStartStateTextBox8.Focus();
+                else if (wmStartStateTextBox1.Enabled) wmStartStateTextBox1.Focus();
+                else if (wmStartStateTextBox2.Enabled) wmStartStateTextBox2.Focus();
+                else if (wmStartStateTextBox3.Enabled) wmStartStateTextBox3.Focus();
+                else if (wmStartStateTextBox4.Enabled) wmStartStateTextBox4.Focus();
+            }
+            else if (e.KeyChar == '+') okButton_Click(sender, e);
+        }
+
+        private void wmStartStateTextBox6_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            if (e.KeyChar == '\r')
+            {
+                if (wmStartStateTextBox7.Enabled) wmStartStateTextBox7.Focus();
+                else if (wmStartStateTextBox8.Enabled) wmStartStateTextBox8.Focus();
+                else if (wmStartStateTextBox1.Enabled) wmStartStateTextBox1.Focus();
+                else if (wmStartStateTextBox2.Enabled) wmStartStateTextBox2.Focus();
+                else if (wmStartStateTextBox3.Enabled) wmStartStateTextBox3.Focus();
+                else if (wmStartStateTextBox4.Enabled) wmStartStateTextBox4.Focus();
+                else if (wmStartStateTextBox5.Enabled) wmStartStateTextBox5.Focus();
+            }
+            else if (e.KeyChar == '+') okButton_Click(sender, e);
+        }
+
+        private void wmStartStateTextBox7_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            if (e.KeyChar == '\r')
+            {
+                if (wmStartStateTextBox8.Enabled) wmStartStateTextBox8.Focus();
+                else if (wmStartStateTextBox1.Enabled) wmStartStateTextBox1.Focus();
+                else if (wmStartStateTextBox2.Enabled) wmStartStateTextBox2.Focus();
+                else if (wmStartStateTextBox3.Enabled) wmStartStateTextBox3.Focus();
+                else if (wmStartStateTextBox4.Enabled) wmStartStateTextBox4.Focus();
+                else if (wmStartStateTextBox5.Enabled) wmStartStateTextBox5.Focus();
+                else if (wmStartStateTextBox6.Enabled) wmStartStateTextBox6.Focus();
+            }
+            else if (e.KeyChar == '+') okButton_Click(sender, e);
+        }
+
+        private void wmStartStateTextBox8_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            if (e.KeyChar == '\r')
+            {
+                if (wmStartStateTextBox1.Enabled) wmStartStateTextBox1.Focus();
+                else if (wmStartStateTextBox2.Enabled) wmStartStateTextBox2.Focus();
+                else if (wmStartStateTextBox3.Enabled) wmStartStateTextBox3.Focus();
+                else if (wmStartStateTextBox4.Enabled) wmStartStateTextBox4.Focus();
+                else if (wmStartStateTextBox5.Enabled) wmStartStateTextBox5.Focus();
+                else if (wmStartStateTextBox6.Enabled) wmStartStateTextBox6.Focus();
+                else if (wmStartStateTextBox7.Enabled) wmStartStateTextBox7.Focus();
+            }
+            else if (e.KeyChar == '+') okButton_Click(sender, e);
+        }
 
 		private void wmEndStateTextBox1_KeyPress(object sender, KeyPressEventArgs e)
 		{
@@ -379,7 +465,9 @@ namespace TBF.BenchControl.DataEntry.Standard6
 				else if (wmEndStateTextBox4.Enabled) wmEndStateTextBox4.Focus();
 				else if (wmEndStateTextBox5.Enabled) wmEndStateTextBox5.Focus();
 				else if (wmEndStateTextBox6.Enabled) wmEndStateTextBox6.Focus();
-			}
+                else if (wmEndStateTextBox7.Enabled) wmEndStateTextBox7.Focus();
+                else if (wmEndStateTextBox8.Enabled) wmEndStateTextBox8.Focus();
+            }
 			else if (e.KeyChar == '+') okButton_Click(sender, e);
 		}
 
@@ -391,7 +479,9 @@ namespace TBF.BenchControl.DataEntry.Standard6
 				else if (wmEndStateTextBox4.Enabled) wmEndStateTextBox4.Focus();
 				else if (wmEndStateTextBox5.Enabled) wmEndStateTextBox5.Focus();
 				else if (wmEndStateTextBox6.Enabled) wmEndStateTextBox6.Focus();
-				else if (wmEndStateTextBox1.Enabled) wmEndStateTextBox1.Focus();
+                else if (wmEndStateTextBox7.Enabled) wmEndStateTextBox7.Focus();
+                else if (wmEndStateTextBox8.Enabled) wmEndStateTextBox8.Focus();
+                else if (wmEndStateTextBox1.Enabled) wmEndStateTextBox1.Focus();
 			}
 			else if (e.KeyChar == '+') okButton_Click(sender, e);
 		}
@@ -403,7 +493,9 @@ namespace TBF.BenchControl.DataEntry.Standard6
 				if (wmEndStateTextBox4.Enabled) wmEndStateTextBox4.Focus();
 				else if (wmEndStateTextBox5.Enabled) wmEndStateTextBox5.Focus();
 				else if (wmEndStateTextBox6.Enabled) wmEndStateTextBox6.Focus();
-				else if (wmEndStateTextBox1.Enabled) wmEndStateTextBox1.Focus();
+                else if (wmEndStateTextBox7.Enabled) wmEndStateTextBox7.Focus();
+                else if (wmEndStateTextBox8.Enabled) wmEndStateTextBox8.Focus();
+                else if (wmEndStateTextBox1.Enabled) wmEndStateTextBox1.Focus();
 				else if (wmEndStateTextBox2.Enabled) wmEndStateTextBox2.Focus();
 			}
 			else if (e.KeyChar == '+') okButton_Click(sender, e);
@@ -415,7 +507,9 @@ namespace TBF.BenchControl.DataEntry.Standard6
 			{
 				if (wmEndStateTextBox5.Enabled) wmEndStateTextBox5.Focus();
 				else if (wmEndStateTextBox6.Enabled) wmEndStateTextBox6.Focus();
-				else if (wmEndStateTextBox1.Enabled) wmEndStateTextBox1.Focus();
+                else if (wmEndStateTextBox7.Enabled) wmEndStateTextBox7.Focus();
+                else if (wmEndStateTextBox8.Enabled) wmEndStateTextBox8.Focus();
+                else if (wmEndStateTextBox1.Enabled) wmEndStateTextBox1.Focus();
 				else if (wmEndStateTextBox2.Enabled) wmEndStateTextBox2.Focus();
 				else if (wmEndStateTextBox3.Enabled) wmEndStateTextBox3.Focus();
 			}
@@ -427,7 +521,9 @@ namespace TBF.BenchControl.DataEntry.Standard6
 			if (e.KeyChar == '\r')
 			{
 				if (wmEndStateTextBox6.Enabled) wmEndStateTextBox6.Focus();
-				else if (wmEndStateTextBox1.Enabled) wmEndStateTextBox1.Focus();
+                else if (wmEndStateTextBox7.Enabled) wmEndStateTextBox7.Focus();
+                else if (wmEndStateTextBox8.Enabled) wmEndStateTextBox8.Focus();
+                else if (wmEndStateTextBox1.Enabled) wmEndStateTextBox1.Focus();
 				else if (wmEndStateTextBox2.Enabled) wmEndStateTextBox2.Focus();
 				else if (wmEndStateTextBox3.Enabled) wmEndStateTextBox3.Focus();
 				else if (wmEndStateTextBox4.Enabled) wmEndStateTextBox4.Focus();
@@ -439,13 +535,45 @@ namespace TBF.BenchControl.DataEntry.Standard6
 		{
 			if (e.KeyChar == '\r')
 			{
-				if (wmEndStateTextBox1.Enabled) wmEndStateTextBox1.Focus();
-				else if (wmEndStateTextBox2.Enabled) wmEndStateTextBox2.Focus();
+				if (wmEndStateTextBox7.Enabled) wmEndStateTextBox7.Focus();
+                else if (wmEndStateTextBox8.Enabled) wmEndStateTextBox8.Focus();
+                else if (wmEndStateTextBox1.Enabled) wmEndStateTextBox1.Focus();
+                else if (wmEndStateTextBox2.Enabled) wmEndStateTextBox2.Focus();
 				else if (wmEndStateTextBox3.Enabled) wmEndStateTextBox3.Focus();
 				else if (wmEndStateTextBox4.Enabled) wmEndStateTextBox4.Focus();
 				else if (wmEndStateTextBox5.Enabled) wmEndStateTextBox5.Focus();
 			}
 			else if (e.KeyChar == '+') okButton_Click(sender, e);
 		}
-	}
+
+        private void wmEndStateTextBox7_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            if (e.KeyChar == '\r')
+            {
+                if (wmEndStateTextBox8.Enabled) wmEndStateTextBox8.Focus();
+                else if (wmEndStateTextBox1.Enabled) wmEndStateTextBox1.Focus();
+                else if (wmEndStateTextBox2.Enabled) wmEndStateTextBox2.Focus();
+                else if (wmEndStateTextBox3.Enabled) wmEndStateTextBox3.Focus();
+                else if (wmEndStateTextBox4.Enabled) wmEndStateTextBox4.Focus();
+                else if (wmEndStateTextBox5.Enabled) wmEndStateTextBox5.Focus();
+                else if (wmEndStateTextBox6.Enabled) wmEndStateTextBox6.Focus();
+            }
+            else if (e.KeyChar == '+') okButton_Click(sender, e);
+        }
+
+        private void wmEndStateTextBox8_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            if (e.KeyChar == '\r')
+            {
+                if (wmEndStateTextBox1.Enabled) wmEndStateTextBox1.Focus();
+                else if (wmEndStateTextBox2.Enabled) wmEndStateTextBox2.Focus();
+                else if (wmEndStateTextBox3.Enabled) wmEndStateTextBox3.Focus();
+                else if (wmEndStateTextBox4.Enabled) wmEndStateTextBox4.Focus();
+                else if (wmEndStateTextBox5.Enabled) wmEndStateTextBox5.Focus();
+                else if (wmEndStateTextBox6.Enabled) wmEndStateTextBox6.Focus();
+                else if (wmEndStateTextBox7.Enabled) wmEndStateTextBox7.Focus();
+            }
+            else if (e.KeyChar == '+') okButton_Click(sender, e);
+        }
+    }
 }

TBF/BenchControl/GenericDevices/IBenchInfo.cs

@@ -19,5 +19,6 @@ namespace TBF.BenchControl.GenericDevices
         string Address4 { get; }
         string Address5 { get; }
         RemoteDBUse RemoteDBUse { get; }
+        int FlowAdjustmentTimeout { get; }
     }
 }

TBF/BenchControl/Network/Comet/Ambient/Ambient.cs

@@ -149,7 +149,11 @@ namespace TBF.BenchControl.Network.Comet.Ambient
                         state = State.Idle;
                     }
 				}
-			}
+
+                UpdateProcessData(temperature, pressure, humidity);
+
+                log.InfoFormat("Ambient: temperature = {0:F1} C, humidity = {1:F1} %, pressure = {2:F0} mbar", temperature, humidity, 1000 * pressure);
+            }
 			catch (Exception e)
 			{
 				DebugLevel = DebugMode.FailureDuringOperation;
@@ -220,6 +224,13 @@ namespace TBF.BenchControl.Network.Comet.Ambient
 
 		public void StopDevice2() { }
 
+        void UpdateProcessData(float temperature, float pressure, float humidity)
+        {
+            TBF.BenchControl.Sequences.ProcessData.AmbTemp.Val = temperature;
+            TBF.BenchControl.Sequences.ProcessData.AmbPress.Val = pressure;
+            TBF.BenchControl.Sequences.ProcessData.AmbHumi.Val = humidity;
+        }
+
 		///
 		/// Boxes for the operation result
 		///

TBF/BenchControl/Output/FileWriters/Enhanced/Writer.cs

@@ -296,12 +296,15 @@ namespace TBF.BenchControl.Output.FileWriters.Enhanced
 
 				wrtr.Write(leftColumn[i]);
 
+#if BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT
+                wrtr.Write(new string(' ', maxLen - leftColumn[i].Length + 3));
+#else
                 if (!writerCfg.EliminateSpaces)
                 {
                     wrtr.Write(new string(' ', maxLen - leftColumn[i].Length + 3));
                 }
                 wrtr.Write(separatorStr);
-
+#endif
                 wrtr.WriteLine(rightColumn[i]);
 			}
 
@@ -386,7 +389,9 @@ namespace TBF.BenchControl.Output.FileWriters.Enhanced
 
             string horizontalLine = new String('-', totalWidth);
 
+#if !BADGER_MALA_TRAT && !BADGER_STREDNA_TRAT && !BADGER_VELKA_TRAT
             if (!writerCfg.EliminateSpaces)
+#endif
             {
                 wr.WriteLine(horizontalLine);		/// Horizontal line above the header
             }
@@ -413,7 +418,9 @@ namespace TBF.BenchControl.Output.FileWriters.Enhanced
                 }
 			}
 
+#if !BADGER_MALA_TRAT && !BADGER_STREDNA_TRAT && !BADGER_VELKA_TRAT
             if (!writerCfg.EliminateSpaces)
+#endif
             {
                 wr.WriteLine(horizontalLine);		/// Horizontal line between the header and the body
             }
@@ -459,7 +466,9 @@ namespace TBF.BenchControl.Output.FileWriters.Enhanced
 				}
 			}
 
+#if !BADGER_MALA_TRAT && !BADGER_STREDNA_TRAT && !BADGER_VELKA_TRAT
             if (!writerCfg.EliminateSpaces)
+#endif
             {
                 wr.WriteLine(horizontalLine);		/// Horizontal line below the body
             }

TBF/BenchControl/Sequences/ProcessData.cs

@@ -1,4 +1,7 @@
-using System;
+///
+/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
+///
+using System;
 using System.Collections.Generic;
 using TBF.BenchControl.GenericDevices;
 using TBF.Boxes;
@@ -7,13 +10,22 @@ namespace TBF.BenchControl.Sequences
 {
 	public class ProcessData
 	{
+        ///
+        /// References to components initialized on StateMachine start-up
+        ///
         public static IBackupAndSecurity BackupAndSecurity;
         public static IBenchInfo BenchInfo;
 		public static IErrorFlags ErrorFlagsComp;
         public static Output.DB.SensusOracle.Database OracleDB;
+
         public static IList<Output.SensusTestInfo> RawTestInfos;    /// Incomplete raw test infos from Oracle DB
         public static Output.SensusTestInfo[] CompleteTestInfos;    /// Complete TBF test infos obtained as a best mathch
 
+        /// 
+        /// Safe wrappers
+        ///
+        public int FlowAdjustmentTimeout { get { return BenchInfo != null ? BenchInfo.FlowAdjustmentTimeout : 300; } }
+
 		public static FloatBox  AmbTemp = new FloatBox() { Name = "Ambient Temperature", Format = "F1" };				/// [Celsius]
 		public static FloatBox  AmbPress = new FloatBox() { Name = "Ambient Pressure", Format = "F0", Factor = 1000 };	/// [bar], printed by ToString() in [mbar]
 		public static FloatBox  AmbHumi = new FloatBox() { Name = "Ambient Humidity", Format = "F1" };					/// [%]

TBF/BenchControl/Sequences/SequenceBase.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -28,7 +28,6 @@ namespace TBF.BenchControl.Sequences
 		protected static readonly ILog summaryResults = LogManager.GetLogger("SummaryResults");
 
 
-        public const int FlowSettingTimeoutSec = 300;           /// Flow setting timeout = 5 min.
         public const int StableMassMsrmntTimeoutSec = 300;      /// Stable mass measurement timeout = 5 min.
         public const int CountWhenSendingRdDivCmd = 1;          /// Passed to cBrd.ReadDiverterTransitionOp()
         public const int CountWhenReadingDiv = 3;               /// Passed to cBrd.ReadDiverterTransitionOp()

TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs

@@ -220,7 +220,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment
             State.Create(string.Format("{0}({1}) : Setting the flow", test.Method, test.Name))
 				 .AddOperation(checkUiOp)
                  .AddOperations(readTempPressOps)
-                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowSettingTimeoutSec))
+                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowAdjustmentTimeout))
 				 .EnterState();
 			do {
 				e = StateMachine.WaitRunDevsRunOps();

TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs

@@ -244,7 +244,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
 				 .AddOperation(checkUiOp)
                  .AddOperations(readTempPressOps)
                  .AddOperations(measureOperations)
-                 .AddOperation(outPath.RegulValve.SetFlowAndMeasureOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowSettingTimeoutSec, (float)test.TolerRed))
+                 .AddOperation(outPath.RegulValve.SetFlowAndMeasureOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowAdjustmentTimeout, (float)test.TolerRed))
 				 .EnterState();
 			do {
 				e = StateMachine.WaitRunDevsRunOps();
@@ -449,7 +449,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
                      .AddOperation(checkUiOp)
                      .AddOperations(readTempPressOps)
                      .AddOperations(measureOperations)
-                     .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowSettingTimeoutSec))
+                     .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowAdjustmentTimeout))
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
@@ -471,7 +471,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
 				 .AddOperation(checkUiOp)
                  .AddOperations(readTempPressOps)
                  .AddOperations(measureOperations)
-                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, qfrom_detected, qto_detected, RefFlow, FlowSettingTimeoutSec))
+                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, qfrom_detected, qto_detected, RefFlow, FlowAdjustmentTimeout))
 			     //.AddOp(pOut.RegulValve.SetPositionOp(35.0f, 38.0f, uint.MaxValue))
 				 .EnterState();
 			do {

TBF/BenchControl/TestMethods/DiverterTest/DiverterTestSeq.cs

@@ -259,7 +259,7 @@ namespace TBF.BenchControl.TestMethods.DiverterTest
             //------------------------------------------------
             State.Create(string.Format("{0}({1}) : Setting the flow", test.Method, test.Name))
                  .AddOperation(checkUiOp)
-                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowSettingTimeoutSec))
+                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowAdjustmentTimeout))
                  .AddOperations(readTempPressOps)
 				 .EnterState();
             do {

TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs

@@ -155,7 +155,7 @@ namespace TBF.BenchControl.TestMethods.Endurance
             State.Create(string.Format("{0}({1}) : Setting the flow", test.Method, test.Name))
                  .AddOperation(checkUiOp)
                  .AddOperations(readTempPressOps)
-                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowSettingTimeoutSec))
+                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowAdjustmentTimeout))
                  .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();

TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs

@@ -321,7 +321,7 @@ namespace TBF.BenchControl.TestMethods.FixedStart
             State.Create(string.Format("{0}({1}) : Setting the flow", test.Method, test.Name))
                  .AddOperation(checkUiOp)
                  .AddOperations(readTempPressOps)
-                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowSettingTimeoutSec))
+                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowAdjustmentTimeout))
 				 .AddOperation(heatMetersPromptOp)
 				 .EnterState();
             do {

TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs

@@ -225,7 +225,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
 			State.Create("FixedStartAdvanced : Setting the flow")
 				 .AddOperation(checkUiOp)
                  .AddOperations(readTempPressOps)
-                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowSettingTimeoutSec))
+                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowAdjustmentTimeout))
 				 .EnterState();
 			do {
 				e = StateMachine.WaitRunDevsRunOps();

TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/FixedStartDeferredEvaluationSeq.cs

@@ -350,7 +350,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEvaluation
             State.Create(string.Format("{0}({1}) : Setting the flow", test.Method, test.Name))
                  .AddOperation(checkUiOp)
                  .AddOperations(readTempPressOps)
-                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowSettingTimeoutSec))
+                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowAdjustmentTimeout))
 				 .AddOperation(heatMetersPromptOp)
 				 .EnterState();
             do {

TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs

@@ -332,7 +332,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
             State.Create(string.Format("{0}({1}) : Setting the flow", test.Method, test.Name))
                  .AddOperation(checkUiOp)
                  .AddOperations(readTempPressOps)
-                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowSettingTimeoutSec))
+                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowAdjustmentTimeout))
 				 .AddOperation(heatMetersPromptOp)
 				 .EnterState();
             do {

TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs

@@ -270,7 +270,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
             State.Create(string.Format("{0}({1}) : Setting the flow", test.Method, test.Name))
                  .AddOperation(checkUiOp)
                  .AddOperations(readTempPressOps)
-                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowSettingTimeoutSec))
+                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowAdjustmentTimeout))
 				 .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();

TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs

@@ -214,7 +214,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
             State.Create(string.Format("{0}({1}) : Setting the flow", test.Method, test.Name))
 				 .AddOperation(checkUiOp)
                  .AddOperations(readTempPressOps)
-                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowSettingTimeoutSec))
+                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowAdjustmentTimeout))
 				 .AddOperation(heatMetersPromptOp)
 				 .EnterState();
 			do {

TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs

@@ -299,7 +299,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
             State.Create(string.Format("{0}({1}) : Setting the flow", test.Method, test.Name))
                  .AddOperation(checkUiOp)
                  .AddOperations(readTempPressOps)
-                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowSettingTimeoutSec))
+                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowAdjustmentTimeout))
 				 .AddOperation(heatMetersPromptOp)
 				 .EnterState();
 			do {

TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs

@@ -312,7 +312,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
             State.Create(string.Format("{0}({1}) : Setting the flow", test.Method, test.Name))
                  .AddOperation(checkUiOp)
                  .AddOperations(readTempPressOps)
-                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowSettingTimeoutSec))
+                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowAdjustmentTimeout))
 				 .AddOperation(heatMetersPromptOp)
 				 .EnterState();
             do {

TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs

@@ -300,7 +300,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
             //------------------------------------------------
             State.Create(string.Format("{0}({1}) : Setting the flow", test.Method, test.Name))
                  .AddOperation(checkUiOp)
-                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowSettingTimeoutSec))
+                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowAdjustmentTimeout))
                  .AddOperations(readTempPressOps)
                  .AddOperation(heatMetersPromptOp)
 				 .EnterState();

TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs

@@ -292,7 +292,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
             //------------------------------------------------
             State.Create(string.Format("{0}({1}) : Setting the flow", test.Method, test.Name))
                  .AddOperation(checkUiOp)
-                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowSettingTimeoutSec))
+                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowAdjustmentTimeout))
                  .AddOperations(readTempPressOps)
                  .AddOperation(heatMetersPromptOp)
 				 .EnterState();

TBF/BenchControl/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs

@@ -231,7 +231,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection
             State.Create(string.Format("{0}({1}) : Setting the flow", test.Method, test.Name))
                  .AddOperation(checkUiOp)
                  .AddOperations(readTempPressOps)
-                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowSettingTimeoutSec))
+                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowAdjustmentTimeout))
 				 .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();

TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs

@@ -218,7 +218,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTest
             State.Create(string.Format("{0}({1}) : Setting the flow", test.Method, test.Name))
 				 .AddOperation(checkUiOp)
                  .AddOperations(readTempPressOps)
-                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowSettingTimeoutSec))
+                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowAdjustmentTimeout))
 				 .EnterState();
 			do {
 				e = StateMachine.WaitRunDevsRunOps();

TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs

@@ -220,7 +220,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
             State.Create(string.Format("{0}({1}) : Setting the flow", test.Method, test.Name))
 				 .AddOperation(checkUiOp)
                  .AddOperations(readTempPressOps)
-                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowSettingTimeoutSec))
+                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowAdjustmentTimeout))
 				 .EnterState();
 			do {
 				e = StateMachine.WaitRunDevsRunOps();

TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs

@@ -145,7 +145,7 @@ namespace TBF.BenchControl.TestMethods.RoiDetection
 			State.Create(string.Format("{0}({1}) : Setting the flow", test.Method, test.Name))
 				 .AddOperation(checkUiOp)
                  .AddOperations(readTempPressOps)
-                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowSettingTimeoutSec))
+                 .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowAdjustmentTimeout))
 				 .EnterState();
 			do {
 				e = StateMachine.WaitRunDevsRunOps();

TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs

@@ -206,7 +206,7 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest
 				 .AddOperation(checkUiOp)
                  .AddOperations(readTempPressOps)
                  .AddOperations(measureOperations)
-                 .AddOperation(outPath.RegulValve.SetFlowAndMeasureOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowSettingTimeoutSec, (float)test.TolerRed))
+                 .AddOperation(outPath.RegulValve.SetFlowAndMeasureOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowAdjustmentTimeout, (float)test.TolerRed))
 				 .EnterState();
 			do {
 				e = StateMachine.WaitRunDevsRunOps();

TBF/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Sensus")]
 [assembly: AssemblyProduct("TestBenchFramework")]
-[assembly: AssemblyCopyright("Copyright © 2013 - 2019 Sensus Slovensko, a.s.")]
+[assembly: AssemblyCopyright("Copyright © 2013 - 2022 Sensus Slovensko, a.s.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.18.1328.0")]
-[assembly: AssemblyFileVersion("2.18.1328.0")]
+[assembly: AssemblyVersion("2.18.1989.0")]
+[assembly: AssemblyFileVersion("2.18.1989.0")]

TBF/TBF.csproj

@@ -39,7 +39,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH;CAMERA</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;BADGER_STREDNA_TRAT;LANG_CS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -49,7 +49,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH;CAMERA</DefineConstants>
+    <DefineConstants>TRACE;BADGER_STREDNA_TRAT;LANG_CS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -58,7 +58,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;MUNICH;CAMERA</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;BADGER_STREDNA_TRAT;LANG_CS</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
@@ -67,7 +67,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;MUNICH;CAMERA</DefineConstants>
+    <DefineConstants>TRACE;BADGER_STREDNA_TRAT;LANG_CS</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -97,8 +97,9 @@
     <SignManifests>false</SignManifests>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ControlComponent3Munich">
-      <HintPath>..\packages\ControlBoard\Munich\ControlComponent3Munich.dll</HintPath>
+    <Reference Include="ControlComponent3U, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ControlBoard\Badger-stredna-trat\ControlComponent3U.dll</HintPath>
     </Reference>
     <Reference Include="FluentNHibernate">
       <HintPath>..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll</HintPath>

TBF/UI/MainWnd.Designer.cs

@@ -54,9 +54,9 @@ namespace TBF.UI
             this.horizontalSplitContainer = new System.Windows.Forms.SplitContainer();
             this.mainTabControl = new System.Windows.Forms.TabControl();
             this.homeTabPage = new System.Windows.Forms.TabPage();
-            this.ctrlBrdComponent = new ControlComponent3Munich.UserControl1();
+			this.ctrlBrdComponent = new ControlComponent_Torino2015.UserControl1();
             this.processTabPage = new System.Windows.Forms.TabPage();
-            this.processTabPageCtrl = new TBF.UI.Process.ProcessTabPageCtrl6();
+            this.processTabPageCtrl = new TBF.UI.Process.ProcessTabPageCtrl24();
             this.insertTabPage = new System.Windows.Forms.TabPage();
             this.resultsTabPage = new System.Windows.Forms.TabPage();
             this.resultsTabPageCtrl = new TBF.UI.Results.ResultsTabPageCtrl();
@@ -697,10 +697,10 @@ namespace TBF.UI
 #elif IZRAEL_200 || PUCHONG_200 || GENESIS || BERLIN || SLM_150 || PETERSBURG_200
         private ControlComponent_Izrael2014.UserControl1 ctrlBrdComponent;
 		private Process.ProcessTabPageCtrl6 processTabPageCtrl;
-#elif BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || SLM_END || WARSAW_END || RUM_MOB || SENTEC || CEVAK_200 || DEWA_300
+#elif BADGER_MALA_TRAT || BADGER_VELKA_TRAT || SLM_END || WARSAW_END || RUM_MOB || SENTEC || CEVAK_200 || DEWA_300
         private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
 		private Process.ProcessTabPageCtrl6 processTabPageCtrl;
-#elif TORINO_50 || TORUN_50 || CEVAK_40 || MURES_40 || FUZHOU_50 || MALTA_WSD25 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || FUZHOU_100
+#elif BADGER_STREDNA_TRAT || TORINO_50 || TORUN_50 || CEVAK_40 || MURES_40 || FUZHOU_50 || MALTA_WSD25 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || FUZHOU_100
 		private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
 		private Process.ProcessTabPageCtrl24 processTabPageCtrl;
 #elif  TURA_SPECIAL || SLM_50

TBF/UI/Process/ProcessTabPageCtrl24.cs

@@ -196,6 +196,11 @@ namespace TBF.UI.Process
 				}
 				textBoxesCount = wmsCount;
 			}
+
+            if (wmsCount <= 12)
+            {
+                label104.Visible = label119.Visible = label120.Visible = label121.Visible = label122.Visible = false;
+            }
 		}
 
 		private void ProcessTabPageCtrl_Load(object sender, EventArgs e)