Reconfigured for iPearlSpecial-Camera

Config/Config.csproj

@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;SENTEC</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK</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;SENTEC</DefineConstants>
+    <DefineConstants>TRACE;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>

Config/Data.cs

@@ -26,6 +26,12 @@ namespace Config
 		public const int CompoundWMsCount = 3;
 		public const int HeatMetersCount = 0;
         public const int MaxPartNr = 3;
+#elif FUZHOU100
+		public const int WMsCount = 10;
+		public const int LineSize = 10;
+		public const int CompoundWMsCount = 1;
+		public const int HeatMetersCount = 0;
+        public const int MaxPartNr = WMsCount / LineSize;
 #elif TORINO50 || BADGER_MALA_TRAT || BERLIN
 		public const int WMsCount = 6;
 		public const int LineSize = 6;

Results/Entities/TestRslt.cs

@@ -26,8 +26,10 @@ namespace Results.Entities
 		public virtual int FlowSetTime { get; set; }        /// [s]     Measurement time in seconds
 		public virtual double TestTime { get; set; }        /// [s]     Measurement time in seconds
 		public virtual double PulsesMaster { get; set; }
-        public virtual double ConstMasterRaw { get; set; }  /// [l/pls] Liters per pulse of the master flow meter uncorrected
-        public virtual double ConstMaster { get; set; }     /// [l/pls] Liters per pulse of the master flow meter
+        public virtual double ConstMasterRaw { get; set; }  /// [l/pls] Liters per pulse of the master flow meter uncorrected.
+        public virtual double ConstMasterCorr { get; set; } /// [l/pls] Liters per pulse of the master flow meter corrected by a correction table.
+        public virtual double ConstMaster { get; set; }     /// [l/pls] Liters per pulse of the master flow meter calculated from a mass measurement.
+                                                            ///         When mass measurement is not available, corrected by a correction table.
         public virtual double MassStartRaw { get; set; }	/// [kg]
 		public virtual double MassStart { get; set; }		/// [kg]
 		public virtual double MassEndRaw { get; set; }		/// [kg]
@@ -40,7 +42,7 @@ namespace Results.Entities
 		public virtual double FlowVolume { get; set; }		/// [m3/h]
 		public virtual double VolumeCTV { get; set; }       /// [l]    Volume conventional true value
 		public virtual double VolumeMaster { get; set; }    /// [l]    Volume from the master flow meter
-		public virtual double ErrorMaster { get; set; }		/// [%]
+		public virtual double ErrorMaster { get; set; }		/// [%]    Error of the master flow meter
 
         public virtual float  DiverterStart { get; set; }   /// [s]    Diverter switch time when test starts
         public virtual float  DivStart10 { get; set; }      /// [s]    Diverter switch time when test starts at level 10 (e.g. 10%) (not mapped to DB)
@@ -107,7 +109,7 @@ namespace Results.Entities
 		public virtual float FlowMean { get; set; }			/// [m3/h] mean flow from the reference flowmeter
 		public virtual float FlowStart { get; set; }		/// [m3/h] flow at the start of test from the reference flowmeter
 		public virtual float FlowEnd { get; set; }			/// [m3/h] flow at the end of test from the reference flowmeter
-        public virtual float FlowMin { get; set; }			/// [m3/h] not mapped to DB
+        public virtual float FlowMin { get; set; }			/// [m3/h]
         public virtual float FlowMax { get; set; }			/// [m3/h] 
 
         public virtual float Custom1  { get; set; }			/// [°C] T ref hi mean

Results/ItemID.cs

@@ -251,6 +251,7 @@ namespace Results
         Flow_ctv_start,                 /// 217
         Flow_ctv_end,                   /// 218
         ConstMasterRaw,                 /// 219  ConstMaster (like 194) uncorrected
+        Reference_error_corr,           /// 220  Reference flow meter error after correction using correction curve
 
         Count,
     }

Results/Mappings/TestRsltMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2017 Sensus Metering Systems
+/// Copyright (c) 2015-2018 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 using Results.Entities;

Results/Results.csproj

@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;SENTEC</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK</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;SENTEC</DefineConstants>
+    <DefineConstants>TRACE;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>

Results/WMeterRsltItemSpec.cs

@@ -307,6 +307,7 @@ namespace Results
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Error_limit_Hi,  Strings.ErrLimHi + "()",    Quantity.Error, ItemCategory.TestData, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", w.GetTestRslt(t).ErrLimHi())));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Uncertainty,     Strings.Uncertainty + "()", Quantity.Error, ItemCategory.TestData, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", w.GetTestRslt(t).Uncertainty())));
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_error, string.Format("{0} rel.ref. ()", Strings.VName_Error), Strings.Tooltip_E_rel_ref, Quantity.Error, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", w.GetTestRslt(t).ErrorMaster)));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_error_corr, string.Format("{0} ref.corr. ()", Strings.VName_Error), "Relative error of the reference flow meter after correction using correction curve", Quantity.Error, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) == null) ? "" : FormatDbl(u, f, p, "V2", Config.Formulas.ErrorFromVolumes(w.GetTestRslt(t).ConstMasterCorr, w.GetTestRslt(t).ConstMaster))));
 #if TURA_IPERL || TURA_SPECIAL
             AllItems.Add(new WMeterRsltItemSpec(ItemID.Error, string.Format("{0} rel. ()", Strings.VName_Error), Strings.Tooltip_E_rel, Quantity.Error, ItemCategory.MeterResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "0" : FormatDbl(u, f, p, "V2", w.GetMeterTestRslt(t).Error)));
 #else

ResultsBrowser/ResultsBrowser.csproj

@@ -21,7 +21,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;SENTEC</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK</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;SENTEC</DefineConstants>
+    <DefineConstants>TRACE;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>

TBF/BenchControl/Elde/Common.cs

@@ -19,7 +19,7 @@ namespace TBF.BenchControl.Elde
         EnduranceCycleStop = 13,
     }
 
-#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TURA_IPERL || TURA_SPECIAL || BADGER_VELKA_TRAT || PUCHONG_PT200 || SLM_50 || GENESIS || MALTA_WSD25 || SLM_END || WARSAW_END || BERLIN || SLM_150 || PETERSBURG_50 || PETERSBURG_200 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || JUZNA_AFRIKA_50 || ZAMBIA || SENTEC
+#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TURA_IPERL || TURA_SPECIAL || BADGER_VELKA_TRAT || PUCHONG_PT200 || SLM_50 || GENESIS || MALTA_WSD25 || SLM_END || WARSAW_END || BERLIN || SLM_150 || PETERSBURG_50 || PETERSBURG_200 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || JUZNA_AFRIKA_50 || ZAMBIA || SENTEC || FUZHOU100
     public enum StatusP : ulong
     {
         RefFlowMeterMask  = 0x7,                /// bits 0,1,2

TBF/BenchControl/Elde/ControlBoardDev.cs

@@ -137,7 +137,7 @@ namespace TBF.BenchControl.Elde
 														 {100,500}, {100,500}, {100,500}, {100,500} };
         public byte[] MeretRS485Address = new byte[4];
         public float[] EtCalib = new float[7] { 1, 1, 1, 1, 1, 1, 1 };
-#elif MUNICH || TORINO50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TORUN_PT50_2015 || CEVAK_PT40_272 || TURA_IPERL || TURA_SPECIAL || MURES_PT40 || FUZHOU_40 || SLM_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || ZAMBIA
+#elif MUNICH || TORINO50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TORUN_PT50_2015 || CEVAK_PT40_272 || TURA_IPERL || TURA_SPECIAL || MURES_PT40 || FUZHOU_40 || SLM_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || ZAMBIA || FUZHOU100
         public uint[,] RegValveCalib = new uint[8,2] {{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500}};
 		public byte[] MeretRS485Address = new byte[4];
 		public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 };
@@ -314,11 +314,10 @@ namespace TBF.BenchControl.Elde
 		{
 			int divertersCount = BenchControl.Elde.Diverter.Diverter.DivertersCount;
 
-			DiverterEdge = new uint[divertersCount * 2];
+			DiverterEdge = new uint[divertersCount];
 			for (int i = 0; i < divertersCount; i++)
 			{
-				DiverterEdge[2 * i]     = (uint)BenchControl.Elde.Diverter.Diverter.Diverters[i].ThresholdGate;
-                DiverterEdge[2 * i + 1] = (uint)BenchControl.Elde.Diverter.Diverter.Diverters[i].ThresholdGate;
+				DiverterEdge[i] = (uint)BenchControl.Elde.Diverter.Diverter.Diverters[i].ThresholdGate;
                 controlCom.SetDivLimit(i, (uint)BenchControl.Elde.Diverter.Diverter.Diverters[i].ThresholdLo,
                                           (uint)BenchControl.Elde.Diverter.Diverter.Diverters[i].ThresholdHi);
 			}

TBF/BenchControl/Elde/ControlComWrap.cs

@@ -35,7 +35,7 @@ namespace TBF.BenchControl.Elde
 
 		public int EtPulses(int wmNr1) { return (int)ctrlBrdComponent.etPulses[wmNr1]; }
 
-#if GENESIS || BERLIN || SLM_150 || PETERSBURG_50 || PETERSBURG_200 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || JUZNA_AFRIKA_50 || ZAMBIA || SENTEC
+#if GENESIS || BERLIN || SLM_150 || PETERSBURG_50 || PETERSBURG_200 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50 || JUZNA_AFRIKA_50 || ZAMBIA || SENTEC || FUZHOU100
         public int EtPulsesK { get { return (int)ctrlBrdComponent.etPulsesK; }  }
 #else
         public int EtPulsesK { get { return 1; }  }
@@ -53,7 +53,7 @@ namespace TBF.BenchControl.Elde
         public UInt128 RRoute { get { return ctrlBrdComponent.rRoute; } }
 #endif
 
-#if GENESIS || KEMPNO_50 || KRAKOW_50 || BAHRAIN_50 || BADGER_STREDNA_TRAT || JUZNA_AFRIKA_50 || ZAMBIA || SENTEC
+#if GENESIS || KEMPNO_50 || KRAKOW_50 || BAHRAIN_50 || BADGER_STREDNA_TRAT || JUZNA_AFRIKA_50 || ZAMBIA || SENTEC || FUZHOU100
         public uint DivTime(int id) { return ctrlBrdComponent.divTime[id]; }
         public void SetDivLimit(int divNo, uint limLoPct, uint limHiPct)
         {
@@ -84,7 +84,14 @@ namespace TBF.BenchControl.Elde
             //return ctrlBrdComponent.RValvePosition[rvNr1 - 1];
             return ctrlBrdComponent.Analogy[rvNr1 - 1];             /// Fixes bug: RValvePosition returns 0 all the time
         }
-        public float DivSamples(int time, int divIx0) { return ctrlBrdComponent.DIVSamples[time, divIx0]; } /// Time unit is 2 ms
+        public float DivSamples(int time, int divIx0)
+		{
+#if MUNICH
+			return ctrlBrdComponent.DIVSamples[time, 0];
+#else
+			return ctrlBrdComponent.DIVSamples[time, divIx0];
+#endif
+		} /// Time unit is 2 ms
 		public int ScopeSamples(int i, int j, int k) { return ctrlBrdComponent.ScopeSamples[i, j, k]; }
 		public ulong DigitalInputs { get { return (ulong)ctrlBrdComponent.Vstupy; } }
 		public float AnalogInput(int adcNr0) { return ctrlBrdComponent.Analogy[adcNr0]; }
@@ -106,7 +113,7 @@ namespace TBF.BenchControl.Elde
 		public uint[] WMeterCont { get { return new uint[3]; } }				/// Dummy
 #endif
 
-#if KEMPNO_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || ZAMBIA
+#if KEMPNO_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || ZAMBIA || FUZHOU100
 		public float ValveOpenCloseTime { get { return ctrlBrdComponent.ValveMoveTime[0]; } }
 #else
         public float ValveOpenCloseTime { get { return 0.001f; } }
@@ -372,7 +379,7 @@ namespace TBF.BenchControl.Elde
             uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses };
             ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)(route & (UInt128)0xFFFFFFFFFFFFFFFF), (ulong)(route >> 64), pulsesArr, (uint)testMethods,
                                          Convert.ToSingle(filterConstants[0]), fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs);
-#elif JUZNA_AFRIKA_50 || ZAMBIA || SENTEC
+#elif JUZNA_AFRIKA_50 || ZAMBIA || SENTEC || FUZHOU100
             uint[] pulsesArr = new uint[] { (uint)totalRefPulses, (uint)massRefPulses };
             ctrlBrdComponent.SendCommand((uint)cmd, (byte)refFlowMeterNr, (ulong)route, pulsesArr, (uint)testMethods,
                                          filterConstants, fmFreq, (uint)regConst, (uint)shortImp, (uint)stopDevs);

TBF/BenchControl/Elde/Diverter/Diverter.cs

@@ -92,7 +92,11 @@ namespace TBF.BenchControl.Elde.Diverter
 			}
 
 
-            int divNrFromName = int.Parse(Name.Substring(3));
+            int divNrFromName;
+            if (!int.TryParse(Name.Substring(3), out divNrFromName))
+            {
+                divNrFromName = nextIdx;
+            }
 #if GENESIS || PETERSBURG_50 || PETERSBURG_200 || FUZHOU_40 || FUZHOU150 || FUZHOU300
             flowMtrNr4Cmd = divNrFromName + 1;
 #elif BADGER_STREDNA_TRAT

TBF/BenchControl/Elde/RegulValveCoax/SetFlowOp.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2017 Sensus Metering Systems
+/// Copyright (c) 2017-2018 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -104,7 +104,7 @@ namespace TBF.BenchControl.Elde.RegulValveCoax
 
             this.finalReqFlowLo = requiredFlowLo;
             this.finalReqFlowHi = requiredFlowHi;
-            this.reqFlowAve = (requiredFlowLo + requiredFlowHi) / 2.0f;
+            this.reqFlowAve = (requiredFlowLo + requiredFlowHi) / 2;
             this.pidCoef = pidCoef;
 			this.measuredFlow = measuredFlow;
             this.reTryCommands = reTryCmds;
@@ -193,14 +193,14 @@ namespace TBF.BenchControl.Elde.RegulValveCoax
 
             if (regulValve.RegulValveCfg.StoredPositionReuse && FetchTargetPosition(reqFlowAve, out targetPositionLo, out targetPositionHi))
 			{
-                log.InfoFormat("SetFlowOp:Start() rv#={0} flowMtr#={1} TARGET: flowLo={2} flowHi={3} FETCHED: posLo={4} posHi={5}",
+                log.WarnFormat("Start() rv#={0} flowMtr#={1} TARGET: flowLo={2} flowHi={3} FETCHED: posLo={4} posHi={5}",
                                 regulValveNr, flowMeterNr, currentReqFlowLo, currentReqFlowHi, targetPositionLo, targetPositionHi);
 
 				opState = OpState.ValveMoveToPosition1;
 			}
 			else
 			{
-                log.InfoFormat("SetFlowOp:Start() rv#={0} flowMtr#={1} TARGET: flowLo={2} flowHi={3}",
+                log.WarnFormat("Start() rv#={0} flowMtr#={1} TARGET: flowLo={2} flowHi={3}",
                                 regulValveNr, flowMeterNr, currentReqFlowLo, currentReqFlowHi);
 
 				opState = OpState.ValveMoveToFlow1;
@@ -234,7 +234,7 @@ namespace TBF.BenchControl.Elde.RegulValveCoax
                 if (flow <= reqFlowAve) currentReqFlowHi = finalReqFlowHi;
             }
 
-            log.InfoFormat("SetFlowOp:Run() rv#={0} pos={1}% freq={2} flow={3} curFlLo={4} curFlHi={5} state={6}",
+            log.InfoFormat("Run() rv#={0} pos={1}% freq={2} flow={3} curFlLo={4} curFlHi={5} state={6}",
 							regulValveNr, rvPosition.ToString("F1"), flowMtrFreq.ToString("F1"), flow.ToString("F3"), currentReqFlowLo.ToString("F3"), currentReqFlowHi.ToString("F3"), opState);
 
 
@@ -244,14 +244,14 @@ namespace TBF.BenchControl.Elde.RegulValveCoax
 
 				if (regulValve.RegulValveCfg.StoredPositionReuse && FetchTargetPosition(reqFlowAve, out targetPositionLo, out targetPositionHi))
 				{
-                    log.InfoFormat("  Run(): rv#={0} flowMtr#={1} TARGET: flowLo={2} flowHi={3} FETCHED: posLo={4} posHi={5}",
+                    log.InfoFormat("  Run() rv#={0} flowMtr#={1} TARGET: flowLo={2} flowHi={3} FETCHED: posLo={4} posHi={5}",
 									regulValveNr, flowMeterNr, currentReqFlowLo.ToString("F3"), currentReqFlowHi.ToString("F3"), targetPositionLo, targetPositionHi);
 
 					opState = OpState.ValveMoveToPosition1;
 				}
 				else
 				{
-                    log.InfoFormat("  Run(): rv#={0} flowMtr#={1} TARGET: flowLo={2} flowHi={3}",
+                    log.InfoFormat("  Run() rv#={0} flowMtr#={1} TARGET: flowLo={2} flowHi={3}",
 									regulValveNr, flowMeterNr, currentReqFlowLo.ToString("F3"), currentReqFlowHi.ToString("F3"));
 
 					opState = OpState.ValveMoveToFlow1;
@@ -279,7 +279,7 @@ namespace TBF.BenchControl.Elde.RegulValveCoax
 			{
 				/// Issues the appropriate ValveMove(...) command
 				controlBoard.ValveMove(regulValveNr, RegulValveMode.TargetPosition,
-									   new float[2] { targetPositionLo, targetPositionHi },
+									   new float[2] { (targetPositionLo + targetPositionHi) / 2, (targetPositionLo + targetPositionHi) / 2 },
 									   regulValve.StableTime);
 
 				opState = OpState.SettingPosition;
@@ -314,7 +314,7 @@ namespace TBF.BenchControl.Elde.RegulValveCoax
 										   new float[2] { (targetPositionLo + targetPositionHi) / 2, (targetPositionLo + targetPositionHi) / 2 },
 										   regulValve.StableTime);
 
-                    log.InfoFormat("  SetFlowOp: ValveMove({0}, Position, {1}, {2}, {3})",
+                    log.InfoFormat("  Run() ValveMove({0}, Position, {1}, {2}, {3})",
                                     regulValveNr, (targetPositionLo + targetPositionHi) / 2, (targetPositionLo + targetPositionHi) / 2, regulValve.StableTime);
 
                     opState = OpState.ValveMoveToPosition3;
@@ -355,14 +355,15 @@ namespace TBF.BenchControl.Elde.RegulValveCoax
 					return Event.OpArgumentError;
 				}
 
-				log.InfoFormat("  Run(): rv#={0} flowMtr#={1} TARGET: flowLo={2} flowHi={3}",
-								regulValveNr, flowMeterNr, currentReqFlowLo.ToString("F3"), currentReqFlowHi.ToString("F3"));
-
 				float freqLo = 2000.0f * currentReqFlowLo / nominalFlow;
 				float freqHi = 2000.0f * currentReqFlowHi / nominalFlow;
 				controlBoard.ValveMove(regulValveNr, RegulValveMode.TargetFrequency,
-									   new float[2] { freqLo, freqHi },
+									   new float[2] { (freqLo + freqHi) / 2, (freqLo + freqHi) / 2 },
 									   regulValve.StableTime);
+				log.WarnFormat("  Run() ValveMove({0}, Freq., {1}, {2}, {3}) flowMtr#={4} TARGET: flowLo={5} flowHi={6}",
+									   regulValveNr, (freqLo + freqHi) / 2, (freqLo + freqHi) / 2,
+									   regulValve.StableTime,
+									   flowMeterNr, currentReqFlowLo.ToString("F3"), currentReqFlowHi.ToString("F3"));
 
 				opState = OpState.ValveMoveToFlow3;
 				log.DebugFormat("  return Event.None");
@@ -389,11 +390,13 @@ namespace TBF.BenchControl.Elde.RegulValveCoax
 					float freqLo = 2000.0f * currentReqFlowLo / nominalFlow;
 					float freqHi = 2000.0f * currentReqFlowHi / nominalFlow;
 					controlBoard.ValveMove(regulValveNr, RegulValveMode.TargetFrequency,
-										   new float[2] { (freqLo + freqHi) / 2.0f, (freqLo + freqHi) / 2.0f },
+										   new float[2] { (freqLo + freqHi) / 2, (freqLo + freqHi) / 2 },
 										   regulValve.StableTime);
 
-                    log.InfoFormat("  SetFlowOp: ValveMove({0}, Frequency, {1}, {2}, {3})",
-                                    regulValveNr, (freqLo + freqHi) / 2.0f, (freqLo + freqHi) / 2.0f, regulValve.StableTime);
+					log.WarnFormat("  Run() ValveMove({0}, Frequency, {1}, {2}, {3}) flowMtr#={4} TARGET: flowLo={5} flowHi={6}",
+									regulValveNr, (freqLo + freqHi) / 2, (freqLo + freqHi) / 2,
+									regulValve.StableTime,
+									flowMeterNr, currentReqFlowLo.ToString("F3"), currentReqFlowHi.ToString("F3"));
 
 					opState = OpState.ValveMoveToFlow3;
 					log.DebugFormat("  return Event.None");
@@ -422,14 +425,14 @@ namespace TBF.BenchControl.Elde.RegulValveCoax
 							{
 								/// update the stored valve position
 								StoreTargetPosition(reqFlowAve, (rvPosition + storedPosition) / 2.0f);
-								log.InfoFormat("  Run(): rv#={0} reqFlow={1} pos={2}% stored={3} <--- Updating a stored position",
+								log.InfoFormat("  Run() rv#={0} reqFlow={1} pos={2}% stored={3} <--- Updating a stored position",
 												regulValveNr, reqFlowAve, rvPosition.ToString("F1"), storedPosition);
 							}
 							else
 							{
 								/// store the valve position
 								StoreTargetPosition(reqFlowAve, rvPosition);
-								log.InfoFormat("  Run(): rv#={0} reqFlow={1} pos={2}% <--- Storing a new position",
+								log.InfoFormat("  Run() rv#={0} reqFlow={1} pos={2}% <--- Storing a new position",
 												regulValveNr, reqFlowAve, rvPosition.ToString("F1"));
 							}
 						}
@@ -481,6 +484,8 @@ namespace TBF.BenchControl.Elde.RegulValveCoax
             controlBoard.SendCommand(Command.Stop, flowMeterNr, controlBoard.Route,
 									 50000, 50000, tm,
                                      0.0f, (int)pidCoef, 0, sd);
+
+			log.WarnFormat("Stop() SendCommand(Stop, {0}, ...)", flowMeterNr);
         }
 	}
 }

TBF/BenchControl/Elde/StartMeasurementOp.cs

@@ -1,8 +1,9 @@
 ///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
+/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
 ///
 using System;
 using log4net;
+using TBF.BenchControl.GenericDevices;
 
 namespace TBF.BenchControl.Elde
 {
@@ -13,14 +14,13 @@ namespace TBF.BenchControl.Elde
 
 		/// Set by the constructor
 		readonly ControlBoardDev controlBoard;
-		readonly Elde.RegulValve.RegulValve regulValve;
+		readonly IRegulValve regulValve;
 		readonly int regulValveNr;
         readonly int regulValveStableTime;
 		readonly int flowMeterNr;
 		readonly float nominalFlow;
 		readonly float reqFlowLo;
 		readonly float reqFlowHi;
-		readonly float reqFlowAve;
 		readonly float pidCoef;
 		readonly int totalRefPulses;        /// Number of reference pulses for a complete test
         readonly int massRefPulses;         /// Number of reference pulses for mass collection
@@ -79,19 +79,20 @@ namespace TBF.BenchControl.Elde
             if (outputPath.FlowMeter == null) throw new ArgumentNullException("Flow meter is missing");
 			flowMeterNr = outputPath.FlowMeter.Idx1;
 
-			if (outputPath.RegulValve is Elde.RegulValve.RegulValve)
+			this.regulValve = outputPath.RegulValve;
+			if (regulValve is Elde.RegulValve.RegulValve)
 			{
                 Elde.RegulValve.RegulValve rv = outputPath.RegulValve as Elde.RegulValve.RegulValve;
                 regulValveNr = rv.Idx1;
                 regulValveStableTime = rv.StableTime;
             }
-            else if (outputPath.RegulValve is Elde.RegulValveCoax.RegulValve)
+			else if (regulValve is Elde.RegulValveCoax.RegulValve)
             {
                 Elde.RegulValveCoax.RegulValve rv = outputPath.RegulValve as Elde.RegulValveCoax.RegulValve;
                 regulValveNr = rv.Idx1;
                 regulValveStableTime = rv.StableTime;
             }
-            else if (!(outputPath.RegulValve is Dummy.RegulValve.RegulValve))
+			else if (!(regulValve is Dummy.RegulValve.RegulValve))
 			{
 				throw new ArgumentNullException("Regulation valve is not compatible with Elde Control Board");
 			}
@@ -105,7 +106,6 @@ namespace TBF.BenchControl.Elde
 
 			this.reqFlowLo = requiredFlowLo;
 			this.reqFlowHi = requiredFlowHi;
-			this.reqFlowAve = (reqFlowLo + reqFlowHi) / 2.0f;
 			this.pidCoef = outputPath.PidCoef;
 
             this.totalRefPulses = totalRefPulses;
@@ -189,9 +189,18 @@ namespace TBF.BenchControl.Elde
 
                 float freqLo = 2000.0f * reqFlowLo / nominalFlow;
                 float freqHi = 2000.0f * reqFlowHi / nominalFlow;
-                controlBoard.ValveMove(regulValveNr, RegulValveMode.TargetFrequency,
-                                       new float[2] { freqLo, freqHi },
-                                       regulValveStableTime);
+				if (regulValve.IsCoax)
+				{
+					controlBoard.ValveMove(regulValveNr, RegulValveMode.TargetFrequency,
+										   new float[2] { (freqLo + freqHi) / 2, (freqLo + freqHi) / 2 },
+										   regulValveStableTime);
+				}
+				else
+				{
+					controlBoard.ValveMove(regulValveNr, RegulValveMode.TargetFrequency,
+										   new float[2] { freqLo, freqHi },
+										   regulValveStableTime);
+				}
 
                 opState = OpState.OpCompleted;
                 return Event.None;

TBF/BenchControl/Sequences/SequenceBase.cs

@@ -578,7 +578,6 @@ namespace TBF.BenchControl.Sequences
 					State.Create("SequenceBase.Transition() : Test stopped -> Stopping the pump")
 						.AddOperation(checkUiOp)
 						.AddOperation(StateMachine.ControlBoard.UpdateTankWeightOp())
-						.AddOperation((inPath.Pump is GenericDevices.IPumpFM) ? (inPath.Pump as GenericDevices.IPumpFM).TurnOffOp() : null)
 						.AddOperation(StateMachine.ControlBoard.SetValvesOp(null, inPath.Pump))
 						.EnterState();
 					do
@@ -586,7 +585,7 @@ namespace TBF.BenchControl.Sequences
 						e = StateMachine.WaitRunDevsRunOps();
 						if (e.Contains(Event.Error)) return Event.Error;
 					}
-					while (!e.Contains(Event.ValvesSet) || ((inPath.Pump is GenericDevices.IPumpFM) && !e.Contains(Event.TurnPumpOnOffDone)));
+					while (!e.Contains(Event.ValvesSet));
 				}
 			}
 			else if (context == TransitionContext.BeforeTest)

TBF/BenchControl/StateMachine.cs

@@ -226,7 +226,10 @@ namespace TBF.BenchControl
 				{
 					SequenceBase.RegulValves.Add(cmpnt as IRegulValve);
 				}
-                if (cmpnt is IPumpFM) SequenceBase.PumpsWithFM.Add(cmpnt as IPumpFM);
+                if (cmpnt is IPumpFM && !(cmpnt is Elde.PumpTandem.Pump))
+                {
+                    SequenceBase.PumpsWithFM.Add(cmpnt as IPumpFM);
+                }
                 if (cmpnt is IWaterMeter) SequenceBase.WaterMeters.Add(cmpnt as IWaterMeter);
 				if (cmpnt is ICamera) SequenceBase.Cameras.Add(cmpnt as ICamera);
 				if (cmpnt is GenericDevices.IAmbient) Ambient = cmpnt as GenericDevices.IAmbient;

TBF/BenchControl/TbfComponents.cs

@@ -170,7 +170,10 @@ namespace TBF.BenchControl
 		public static IComponentCfg CmpntCfgFromCmpntEntity(Component entity)
 		{
             IComponentFactory cmpntFactory = CmpntFactoryFromClassName(entity.ClassName);
-            return (cmpntFactory != null) ? cmpntFactory.CmpntCfgFromCmpntEntity(entity) : null;
+            if (cmpntFactory == null) return null;
+
+            try { return cmpntFactory.CmpntCfgFromCmpntEntity(entity); }
+            catch { return null; }
 		}
 
 

TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs

@@ -380,11 +380,12 @@ namespace TBF.BenchControl.TestMethods.Adjustment
 					tstRslt.FlowMass     = 0;                                                           /// [kg/h]
 					tstRslt.FlowVolume   = 3.6 * LtrPerRefPulse * cBrd.EtPulses(0) / tstRslt.TestTime;	/// [m3/h]
                     tstRslt.Buoyancy     = Config.Formulas.Buoyancy();
-					tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster;                               /// [l] volume from the master flow meter
-                    tstRslt.ConstMasterRaw = outPath.FlowMeter.LtrPerPulse;                                     /// Uncorrected master flowmeter coefficient
-					tstRslt.ConstMaster  = outPath.FlowMeter.LtrPerPulseCorrected(tstRslt.FlowVolume, rangeIx);	/// Calculate master flowmeter coefficient
-					tstRslt.VolumeCTV    = tstRslt.ConstMaster * tstRslt.PulsesMaster;					        /// [l] 1000.0f is because density is in [kg/m3]
-					tstRslt.ErrorMaster  = 0.0f;														        /// Cannot be determined without the collected water mass measurement
+					tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster;                                   /// [l] volume from the master flow meter
+                    tstRslt.ConstMasterRaw  = outPath.FlowMeter.LtrPerPulse;                                        /// Uncorrected master flowmeter coefficient
+                    tstRslt.ConstMasterCorr = outPath.FlowMeter.LtrPerPulseCorrected(tstRslt.FlowVolume, rangeIx);  /// Corrected master pulses per liter
+                    tstRslt.ConstMaster     = tstRslt.ConstMasterCorr;                                              /// Corrected master pulses per liter
+					tstRslt.VolumeCTV    = tstRslt.ConstMaster * tstRslt.PulsesMaster;					            /// [l] 1000.0f is because density is in [kg/m3]
+					tstRslt.ErrorMaster  = 0.0f;														            /// Cannot be determined without the collected water mass measurement
 
 					tstRslt.FlowMean = (float)RefFlowStat.Average;
 					tstRslt.FlowStart = (float)RefFlowStat.First;

TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2017 Sensus Metering Systems
+/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -31,9 +31,9 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
 			if (test.Part < 1 || test.Part > Config.Data.CompoundWMsCount)
 			{
 				UiBridge.Bridge.OnError(this, string.Format("Test 'Part' should be 1 .. {0}", Config.Data.CompoundWMsCount));
-				IList<Event> retval = new List<Event>(1);
-				retval.Add(Event.ConfigurationError);
-				return retval;
+				IList<Event> retv = new List<Event>(1);
+				retv.Add(Event.ConfigurationError);
+				return retv;
 			}
 
 			if (debugLevel == Config.Entities.DebugMode.Simulate)
@@ -73,17 +73,14 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
 				Bridge.OnActivity(this, string.Format("Simulating {0}", test.Name));
 				//------------------------------------------------
 
-				State.Create(string.Format("CombinedWithDetection : Simulating {0}", test.Name))
+				State.Create(string.Format("{0}({1}) : Simulating {1}", test.Method, test.Name))
 					.AddOperation(checkUiOp)
 					.EnterState();
 				e = StateMachine.WaitRunDevsRunOps();
 
-				Event retVal = Event.Done;
-				if (TestAndLogUiCmdStop(test, e)) retVal = Event.UiCmdStop;
-
 				/// Create a list with one item 'retVal' (default is Event.Done) and return it
 				IList<Event> retListSim = new List<Event>(1);
-				retListSim.Add(retVal);
+				retListSim.Add(TestAndLogUiCmdStop(test, e) ? Event.UiCmdStop : Event.Done);
 				return retListSim;
 			}
 
@@ -94,7 +91,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
 			int[] lastWMPulses = new int[2 * Config.Data.CompoundWMsCount];
 
             //--------------------------------
-            State.Create("CombinedWithDetection : stopTest diverter gate etc")
+            State.Create(string.Format("{0}({1}) : stopTest diverter gate etc", test.Method, test.Name))
 				.AddOperation(checkUiOp)
 				.AddOperation(cBrd.StopPreviousOp())
 				.EnterState();
@@ -112,7 +109,28 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
             ///   float timeHr = volumeLtr / (1000.0f * targetFlow);
             ///   float timeSec = 3600.0f * timeHr;
             ///   int refPulses = (int)(timeSec * (2000.0f * targetFlow / pOut.FlowMeter.NominalFlow));
-            int totalPulses = (int)(test.Volume / LtrPerRefPulse + 0.5f); 
+            int totalPulses = (int)(test.Volume / LtrPerRefPulse + 0.5f);
+
+            int rangeIx = 0;                   /// Default range, used for non-Elde flowmeters
+            if (outPath.FlowMeter is Elde.FlowMeter.FlowMeter)
+            {
+                Elde.FlowMeter.FlowMeter eldeFM = outPath.FlowMeter as Elde.FlowMeter.FlowMeter;
+                rangeIx = -1;                   /// Indicates invalid range
+                for (int r = 0; r <= 5; r++)
+                {
+                    if (eldeFM.RangeEnabled(r) && eldeFM.GetTempLo(r) <= test.TempLimLo
+                                               && eldeFM.GetTempHi(r) >= test.TempLimHi)
+                    {
+                        rangeIx = r;
+                    }
+                }
+
+                if (rangeIx == -1)
+                {
+                    Bridge.OnError(this, Strings.Flow_meter_temperature_range_does_not_fit_this_test_conditions);
+                    goto stopTest;
+                }
+            }
              
             processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this, false);
             
@@ -133,7 +151,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
             if (!test.DoDraining)         /// Do not skip emptying if test.Emptying==true
             {
                 //--------------------------------
-				State.Create("CombinedWithDetection : Mesuring mass of water in the tank")
+				State.Create(string.Format("{0}({1}) : Mesuring mass of water in the tank", test.Method, test.Name))
                     .AddOperation(checkUiOp)
                     .AddOperation(outPath.Scale.ReadMassOp(ref Mass))
                     .EnterState();
@@ -204,7 +222,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
             //------------------------------------------------
             Bridge.OnActivity(this, Strings.Switching_flow_detection);
             //------------------------------------------------
-            State.Create("CombinedWithDetection : Start the pump")
+            State.Create(string.Format("{0}({1}) : Start the pump", test.Method, test.Name))
 				.AddOperation(checkUiOp)
                 .AddOperations(measureOperations)
 				.AddOperation((inPath.Pump is GenericDevices.IPumpFM) ? (inPath.Pump as GenericDevices.IPumpFM).TurnOnOp(test.PumpPower) : null)
@@ -220,7 +238,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
 			while (!e.Contains(Event.ValvesSet));
 
             //--------------------------------
-            State.Create("CombinedWithDetection : Set the initial flow")
+            State.Create(string.Format("{0}({1}) : Set the initial flow", test.Method, test.Name))
 				.AddOperation(checkUiOp)
                 .AddOperations(measureOperations)
 				.AddOperation(outPath.RegulValve.SetFlowAndMeasureOp(outPath.FlowMeter, test.Qfrom, test.Qto, outPath.PidCoef, RefFlow, 600, (float)test.TolerRed))    /// timeout = 10 min.
@@ -234,7 +252,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
 				if (e.Contains(Event.RegulValveTimeOut))
 				{
 					Bridge.OnError(this, Strings.Flow_adjustment_failed);
-					goto error;
+					goto stopTest;
 				}
 			}
 			while (!e.Contains(Event.FlowReached));
@@ -274,7 +292,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
 			do
 			{
 				//--------------------------------
-                State.Create("CombinedWithDetection : Change the RV position")
+                State.Create(string.Format("{0}({1}) : Change the RV position", test.Method, test.Name))
 					.AddOperation(checkUiOp)
                     .AddOperations(measureOperations)
                     .AddOperation(outPath.RegulValve.ChangeRegulValvePositionOp(rvPulse))
@@ -406,7 +424,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
 			if (goBackToInitFlow)
             {
                 //--------------------------------
-                State.Create("CombinedWithDetection : Switching flow detected, going back")
+                State.Create(string.Format("{0}({1}) : Switching flow detected, going back", test.Method, test.Name))
                     .AddOperation(checkUiOp)
                     .AddOperations(measureOperations)
 					.AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, outPath.PidCoef, RefFlow, 600))    /// timeout = 10 min.
@@ -421,14 +439,14 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
 					if (e.Contains(Event.RegulValveTimeOut))
 					{
 						Bridge.OnError(this, Strings.Flow_adjustment_failed);
-						goto error;
+						goto stopTest;
 					}
 				}
                 while (!e.Contains(Event.FlowReached));
             }
 
 			//--------------------------------
-			State.Create("CombinedWithDetection : Going to the test flow")
+			State.Create(string.Format("{0}({1}) : Going to the test flow", test.Method, test.Name))
 				//State.Create("set_RV_position",
 				.AddOperation(checkUiOp)
                 .AddOperations(measureOperations)
@@ -619,9 +637,10 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
                 double density       = Config.Formulas.WaterDensityFromTemp((tstRslt.TempUpMean + tstRslt.TempDownMean) / 2.0, Program.LocalSettings.RealDensity, Program.LocalSettings.AtTemperature);
                 tstRslt.VolumeCTV    = 1000.0 * tstRslt.Buoyancy * (tstRslt.MassEnd - tstRslt.MassStart) / density;	/// [l] 1000.0f is because density is in [kg/m3]
 				tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster;									    /// [l] volume from the master flow meter
-                tstRslt.ConstMasterRaw = outPath.FlowMeter.LtrPerPulse;                                             /// Uncorrected master flowmeter coefficient
-                tstRslt.ConstMaster = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster;				    /// Corrected master pulses per liter
-                tstRslt.ErrorMaster  = Config.Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV);
+                tstRslt.ConstMasterRaw  = outPath.FlowMeter.LtrPerPulse;                                            /// Uncorrected master flowmeter coefficient
+                tstRslt.ConstMasterCorr = outPath.FlowMeter.LtrPerPulseCorrected(tstRslt.FlowVolume, rangeIx);      /// Corrected master pulses per liter
+                tstRslt.ConstMaster     = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster;				/// Calculated master pulses per liter
+                tstRslt.ErrorMaster     = Config.Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV);
 
 				tstRslt.FlowMean = (float)RefFlowStat.Average;
 				tstRslt.FlowStart = (float)RefFlowStat.First;
@@ -729,7 +748,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
             if (isLastRepetition)
             {
                 /// Stop the pump
-                State.Create("CombinedWithDetection : Test(s) completed -> Stopping the pump")
+                State.Create(string.Format("{0}({1}) : Test(s) completed -> Stopping the pump", test.Method, test.Name))
                     .AddOperation(checkUiOp)
                     .AddOperation(cBrd.SetValvesOp(null, inPath.Pump))
                     .AddOperation((inPath != null && inPath.Pump is GenericDevices.IPumpFM) ? (inPath.Pump as GenericDevices.IPumpFM).TurnOffOp() : null)
@@ -750,7 +769,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
         //====================================
         stopTest:
 
-            State.Create("CombinedWithDetection : User selected STOP -> Closing the valves")
+            State.Create(string.Format("{0}({1}) : User selected STOP -> Closing the valves", test.Method, test.Name))
 				.AddOperation(checkUiOp)
 				.AddOperation((inPath != null && inPath.Pump is GenericDevices.IPumpFM) ? (inPath.Pump as GenericDevices.IPumpFM).TurnOffOp() : null)
 				.AddOperation(cBrd.SetValvesOp(StateMachine.DefaultValvesOpen, StateMachine.DefaultValvesClose))

TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs

@@ -361,14 +361,15 @@ namespace TBF.BenchControl.TestMethods.Endurance
                         tstRslt.MassStart    = 0;
                         tstRslt.MassEndRaw   = 0;
                         tstRslt.MassEnd      = 0;
-                        tstRslt.FlowMass     = 0;																    /// [kg/h]
-                        tstRslt.FlowVolume   = 3.6 * LtrPerRefPulse * tstRslt.PulsesMaster / tstRslt.TestTime;	/// [m3/h]
+                        tstRslt.FlowMass     = 0;																        /// [kg/h]
+                        tstRslt.FlowVolume   = 3.6 * LtrPerRefPulse * tstRslt.PulsesMaster / tstRslt.TestTime;	        /// [m3/h]
                         tstRslt.Buoyancy     = Config.Formulas.Buoyancy();
-                        tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster;							    /// [l] volume from the master flow meter
-                        tstRslt.ConstMasterRaw = outPath.FlowMeter.LtrPerPulse;                                     /// Uncorrected master flowmeter coefficient
-                        tstRslt.ConstMaster = outPath.FlowMeter.LtrPerPulseCorrected(tstRslt.FlowVolume, rangeIx);  /// Corrected master pulses per liter
+                        tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster;							        /// [l] volume from the master flow meter
+                        tstRslt.ConstMasterRaw  = outPath.FlowMeter.LtrPerPulse;                                        /// Uncorrected master flowmeter coefficient
+                        tstRslt.ConstMasterCorr = outPath.FlowMeter.LtrPerPulseCorrected(tstRslt.FlowVolume, rangeIx);  /// Corrected master pulses per liter
+                        tstRslt.ConstMaster  = tstRslt.ConstMasterCorr;                                                 /// Corrected master pulses per liter
                         tstRslt.VolumeCTV    = tstRslt.ConstMaster * tstRslt.PulsesMaster;						        /// [l] 1000.0f is because density is in [kg/m3]				
-                        tstRslt.ErrorMaster  = 0.0;																    /// Cannot be determined without a mass measurement
+                        tstRslt.ErrorMaster  = 0.0;																        /// Cannot be determined without a mass measurement
 
 						tstRslt.FlowMean = (float)RefFlowStat.Average;
 						tstRslt.FlowStart = (float)RefFlowStat.First;

TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs

@@ -754,8 +754,8 @@ namespace TBF.BenchControl.TestMethods.FixedStart
 
 
             double flowVolume = 3.6 * LtrPerRefPulse * Convert.ToDouble(endPulses - startPulses) / cBrd.TTime;
-            double constMaster = outPath.FlowMeter.LtrPerPulseCorrected(flowVolume, rangeIx);
-            double volumeCTV = constMaster * Convert.ToDouble(endPulses - startPulses);
+            double constMasterCorr = outPath.FlowMeter.LtrPerPulseCorrected(flowVolume, rangeIx);
+            double volumeCTV = constMasterCorr * Convert.ToDouble(endPulses - startPulses);
             double refEnergy = Energy.Sum * volumeCTV / VolumeForEnergy.Sum;					/// [J]=[J]*[l]/[l]
 
 
@@ -907,8 +907,9 @@ namespace TBF.BenchControl.TestMethods.FixedStart
                 tstRslt.FlowVolume   = flowVolume;	                                /// [m3/h]
                 tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster;		/// [l] volume from the master flow meter
                 tstRslt.Buoyancy     = Config.Formulas.Buoyancy();
-                tstRslt.ConstMasterRaw = outPath.FlowMeter.LtrPerPulse;                                     /// Uncorrected master flowmeter coefficient
-                tstRslt.ConstMaster = constMaster;                                 /// Corrected master pulses per liter
+                tstRslt.ConstMasterRaw = outPath.FlowMeter.LtrPerPulse;             /// Uncorrected master flowmeter coefficient
+                tstRslt.ConstMasterCorr = constMasterCorr;                          /// Corrected master pulses per liter
+                tstRslt.ConstMaster  = constMasterCorr;                             /// Corrected master pulses per liter
                 tstRslt.VolumeCTV    = tstRslt.ConstMaster * tstRslt.PulsesMaster;	/// [l] 1000.0f is because density is in [kg/m3]
                 tstRslt.ErrorMaster  = 0;
 

TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs

@@ -45,6 +45,28 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
 			///   int refPulses = (int)(timeSec * (2000.0f * targetFlow / pOut.FlowMeter.NominalFlow));
 			int totalPulses = (int)(test.Volume / LtrPerRefPulse + 0.5f);
 
+            int rangeIx = 0;                   /// Default range, used for non-Elde flowmeters
+            if (outPath.FlowMeter is Elde.FlowMeter.FlowMeter)
+            {
+                Elde.FlowMeter.FlowMeter eldeFM = outPath.FlowMeter as Elde.FlowMeter.FlowMeter;
+                rangeIx = -1;                   /// Indicates invalid range
+                for (int r = 0; r <= 5; r++)
+                {
+                    if (eldeFM.RangeEnabled(r) && eldeFM.GetTempLo(r) <= test.TempLimLo
+                                               && eldeFM.GetTempHi(r) >= test.TempLimHi)
+                    {
+                        rangeIx = r;
+                    }
+                }
+
+                if (rangeIx == -1)
+                {
+                    Bridge.OnError(this, Strings.Flow_meter_temperature_range_does_not_fit_this_test_conditions);
+                    retVal = Event.UiCmdStop;
+                    goto stopTest;
+                }
+            }
+
 			processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this, false);
 
 		//====================================
@@ -514,10 +536,11 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
 				tstRslt.FlowMass     = 3600.0 * (tstRslt.MassEnd - tstRslt.MassStart) / tstRslt.TestTime; /// [kg/h]
 				tstRslt.FlowVolume   = 3.6 * LtrPerRefPulse * tstRslt.PulsesMaster / tstRslt.TestTime;
 				tstRslt.Buoyancy     = buoyancy;
-				tstRslt.VolumeCTV    = volumeCTV;													/// [kg]   calculated before displaying 'End state' dialog
-				tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster;						/// [l] volume from the master flow meter
-                tstRslt.ConstMasterRaw = outPath.FlowMeter.LtrPerPulse;                                     /// Uncorrected master flowmeter coefficient
-                tstRslt.ConstMaster = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster;	/// Corrected master pulses per liter
+				tstRslt.VolumeCTV    = volumeCTV;													            /// [kg]   calculated before displaying 'End state' dialog
+				tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster;						            /// [l] volume from the master flow meter
+                tstRslt.ConstMasterRaw  = outPath.FlowMeter.LtrPerPulse;                                        /// Uncorrected master flowmeter coefficient
+                tstRslt.ConstMasterCorr = outPath.FlowMeter.LtrPerPulseCorrected(tstRslt.FlowVolume, rangeIx);  /// Corrected master pulses per liter
+                tstRslt.ConstMaster     = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster;	        /// Calculated master pulses per liter
                 tstRslt.ErrorMaster  = Config.Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV);
 
 				tstRslt.FlowMean = (float)RefFlowStat.Average;

TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/FixedStartDeferredEvaluationSeq.cs

@@ -68,6 +68,28 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEvaluation
             ///   int refPulses = (int)(timeSec * (2000.0f * targetFlow / pOut.FlowMeter.NominalFlow));
             int totalPulses = (int)(test.Volume / LtrPerRefPulse + 0.5f);
 
+            int rangeIx = 0;                   /// Default range, used for non-Elde flowmeters
+            if (outPath.FlowMeter is Elde.FlowMeter.FlowMeter)
+            {
+                Elde.FlowMeter.FlowMeter eldeFM = outPath.FlowMeter as Elde.FlowMeter.FlowMeter;
+                rangeIx = -1;                   /// Indicates invalid range
+                for (int r = 0; r <= 5; r++)
+                {
+                    if (eldeFM.RangeEnabled(r) && eldeFM.GetTempLo(r) <= test.TempLimLo
+                                               && eldeFM.GetTempHi(r) >= test.TempLimHi)
+                    {
+                        rangeIx = r;
+                    }
+                }
+
+                if (rangeIx == -1)
+                {
+                    Bridge.OnError(this, Strings.Flow_meter_temperature_range_does_not_fit_this_test_conditions);
+                    retVal = Event.UiCmdStop;
+                    goto stopTestWOTransitionAfter;
+                }
+            }
+
             processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this, heatMetersTestParams != null);
 
 
@@ -945,9 +967,10 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEvaluation
                 tstRslt.FlowVolume   = 3.6 * LtrPerRefPulse * tstRslt.PulsesMaster / tstRslt.TestTime;	    /// [m3/h]
                 tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster;							    /// [l] volume from the master flow meter
 				tstRslt.Buoyancy     = buoyancy;
-				tstRslt.VolumeCTV    = volumeCTV;															/// [l] 1000.0f is because density is in [kg/m3]
-                tstRslt.ConstMasterRaw = outPath.FlowMeter.LtrPerPulse;                                     /// Uncorrected master flowmeter coefficient
-                tstRslt.ConstMaster = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster;		    /// Corrected master pulses per liter
+				tstRslt.VolumeCTV    = volumeCTV;															    /// [l] 1000.0f is because density is in [kg/m3]
+                tstRslt.ConstMasterRaw  = outPath.FlowMeter.LtrPerPulse;                                        /// Uncorrected master flowmeter coefficient
+                tstRslt.ConstMasterCorr = outPath.FlowMeter.LtrPerPulseCorrected(tstRslt.FlowVolume, rangeIx);  /// Corrected master pulses per liter
+                tstRslt.ConstMaster     = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster;		    /// Calculated master pulses per liter
                 tstRslt.ErrorMaster  = Config.Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV);
 
 				tstRslt.FlowMean = (float)RefFlowStat.Average;

TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs

@@ -47,6 +47,28 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
             ///   int refPulses = (int)(timeSec * (2000.0f * targetFlow / pOut.FlowMeter.NominalFlow));
             int totalPulses = (int)(test.Volume / LtrPerRefPulse + 0.5f);
 
+            int rangeIx = 0;                   /// Default range, used for non-Elde flowmeters
+            if (outPath.FlowMeter is Elde.FlowMeter.FlowMeter)
+            {
+                Elde.FlowMeter.FlowMeter eldeFM = outPath.FlowMeter as Elde.FlowMeter.FlowMeter;
+                rangeIx = -1;                   /// Indicates invalid range
+                for (int r = 0; r <= 5; r++)
+                {
+                    if (eldeFM.RangeEnabled(r) && eldeFM.GetTempLo(r) <= test.TempLimLo
+                                               && eldeFM.GetTempHi(r) >= test.TempLimHi)
+                    {
+                        rangeIx = r;
+                    }
+                }
+
+                if (rangeIx == -1)
+                {
+                    Bridge.OnError(this, Strings.Flow_meter_temperature_range_does_not_fit_this_test_conditions);
+                    retVal = Event.UiCmdStop;
+                    goto stopTestWOTransitionAfter;
+                }
+            }
+
             processDataLoggingOp = new TBF.BenchControl.Operations.ProcessDataLoggingOp(processDataLogger, this, heatMetersTestParams != null);
 
 
@@ -973,9 +995,10 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
                 tstRslt.FlowVolume   = 3.6 * LtrPerRefPulse * tstRslt.PulsesMaster / tstRslt.TestTime;	    /// [m3/h]
                 tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster;							    /// [l] volume from the master flow meter
 				tstRslt.Buoyancy     = buoyancy;
-				tstRslt.VolumeCTV    = volumeCTV;															/// [l] 1000.0f is because density is in [kg/m3]
-                tstRslt.ConstMasterRaw = outPath.FlowMeter.LtrPerPulse;                                     /// Uncorrected master flowmeter coefficient
-                tstRslt.ConstMaster = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster;		    /// Corrected master pulses per liter
+				tstRslt.VolumeCTV    = volumeCTV;															    /// [l] 1000.0f is because density is in [kg/m3]
+                tstRslt.ConstMasterRaw  = outPath.FlowMeter.LtrPerPulse;                                        /// Uncorrected master flowmeter coefficient
+                tstRslt.ConstMasterCorr = outPath.FlowMeter.LtrPerPulseCorrected(tstRslt.FlowVolume, rangeIx);  /// Corrected master pulses per liter
+                tstRslt.ConstMaster     = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster;		    /// Calculated master pulses per liter
                 tstRslt.ErrorMaster  = Config.Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV);
 
 				tstRslt.FlowMean = (float)RefFlowStat.Average;

TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs

@@ -530,9 +530,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
 				tstRslt.FlowMass     = 0;																/// [kg/h]
 				tstRslt.FlowVolume   = 3.6 * LtrPerRefPulse * tstRslt.PulsesMaster / tstRslt.TestTime;	/// [m3/h]
                 tstRslt.Buoyancy     = Config.Formulas.Buoyancy();
-				tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster;							    /// [l] volume from the master flow meter
-                tstRslt.ConstMasterRaw = outPath.FlowMeter.LtrPerPulse;                                     /// Uncorrected master flowmeter coefficient
-                tstRslt.ConstMaster = outPath.FlowMeter.LtrPerPulseCorrected(tstRslt.FlowVolume, rangeIx); /// Corrected master pulses per liter
+				tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster;							        /// [l] volume from the master flow meter
+                tstRslt.ConstMasterRaw  = outPath.FlowMeter.LtrPerPulse;                                        /// Uncorrected master flowmeter coefficient
+                tstRslt.ConstMasterCorr = outPath.FlowMeter.LtrPerPulseCorrected(tstRslt.FlowVolume, rangeIx);  /// Corrected master pulses per liter
+                tstRslt.ConstMaster  = tstRslt.ConstMasterCorr;
 				tstRslt.VolumeCTV    = tstRslt.ConstMaster * tstRslt.PulsesMaster;						    /// [l] 1000.0f is because density is in [kg/m3]				
 				tstRslt.ErrorMaster  = 0.0;																    /// Cannot be determined without a mass measurement
 

TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs

@@ -113,6 +113,28 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
                 goto stopTestWOStoppingDivGateEtc;
 			}
 
+            int rangeIx = 0;                   /// Default range, used for non-Elde flowmeters
+            if (outPath.FlowMeter is Elde.FlowMeter.FlowMeter)
+            {
+                Elde.FlowMeter.FlowMeter eldeFM = outPath.FlowMeter as Elde.FlowMeter.FlowMeter;
+                rangeIx = -1;                   /// Indicates invalid range
+                for (int r = 0; r <= 5; r++)
+                {
+                    if (eldeFM.RangeEnabled(r) && eldeFM.GetTempLo(r) <= test.TempLimLo
+                                               && eldeFM.GetTempHi(r) >= test.TempLimHi)
+                    {
+                        rangeIx = r;
+                    }
+                }
+
+                if (rangeIx == -1)
+                {
+                    Bridge.OnError(this, Strings.Flow_meter_temperature_range_does_not_fit_this_test_conditions);
+                    retVal = Event.UiCmdStop;
+                    goto stopTestWOStoppingDivGateEtc;
+                }
+            }
+
 		//====================================
         loop:
 
@@ -793,9 +815,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
                     double density       = Config.Formulas.WaterDensityFromTemp((tstRslt.TempUpMean + tstRslt.TempDownMean) / 2.0, Program.LocalSettings.RealDensity, Program.LocalSettings.AtTemperature);
 	                tstRslt.VolumeCTV    = 1000.0 * tstRslt.Buoyancy * (tstRslt.MassEnd - tstRslt.MassStart) / density; /// [l] 1000.0f is because density is in [kg/m3]
 					tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster;										/// [l] volume from the master flow meter
-                    tstRslt.ConstMasterRaw = outPath.FlowMeter.LtrPerPulse;                                             /// Uncorrected master flowmeter coefficient
-                    tstRslt.ConstMaster = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster;					/// Corrected master pulses per liter
-                    tstRslt.ErrorMaster  = Config.Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV);
+                    tstRslt.ConstMasterRaw  = outPath.FlowMeter.LtrPerPulse;                                            /// Uncorrected master flowmeter coefficient
+                    tstRslt.ConstMasterCorr = outPath.FlowMeter.LtrPerPulseCorrected(tstRslt.FlowVolume, rangeIx);      /// Corrected master pulses per liter
+                    tstRslt.ConstMaster     = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster;				/// Calculated master pulses per liter
+                    tstRslt.ErrorMaster     = Config.Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV);
 
                     tstRslt.DiverterStart = switchTimeStart.Val;
                     tstRslt.DivStart10 = 0;
@@ -821,7 +844,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
 					tstRslt.MassEndRaw   = 0;
 					tstRslt.MassEnd      = 0;
 					tstRslt.FlowMass     = 0;
-                    tstRslt.ConstMasterRaw = outPath.FlowMeter.LtrPerPulse;             /// Uncorrected master flowmeter coefficient
+                    tstRslt.ConstMasterRaw  = outPath.FlowMeter.LtrPerPulse;            /// Uncorrected master flowmeter coefficient
+                    tstRslt.ConstMasterCorr = outPath.FlowMeter.LtrPerPulseCorrected(tstRslt.FlowVolume, rangeIx);  /// Corrected master pulses per liter
                     tstRslt.ConstMaster = tstResRepet1.ConstMaster;                     /// Master constant ( pulses per liter) from the first repetition (=against the scale)
                     tstRslt.VolumeMaster = tstRslt.ConstMaster * tstRslt.PulsesMaster;	/// [l] volume from the master flow meter
                     tstRslt.VolumeCTV    = tstRslt.VolumeMaster;	                    /// [l] 1000.0f is because density is in [kg/m3]				

TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs

@@ -125,6 +125,28 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
 			int targetTotalPulses = (int)(test.Volume / LtrPerRefPulse + 0.5f);
             int targetMassPulses = (int)(volumeToTank / LtrPerRefPulse + 0.5f);
 
+            int rangeIx = 0;                   /// Default range, used for non-Elde flowmeters
+            if (outPath.FlowMeter is Elde.FlowMeter.FlowMeter)
+            {
+                Elde.FlowMeter.FlowMeter eldeFM = outPath.FlowMeter as Elde.FlowMeter.FlowMeter;
+                rangeIx = -1;                   /// Indicates invalid range
+                for (int r = 0; r <= 5; r++)
+                {
+                    if (eldeFM.RangeEnabled(r) && eldeFM.GetTempLo(r) <= test.TempLimLo
+                                               && eldeFM.GetTempHi(r) >= test.TempLimHi)
+                    {
+                        rangeIx = r;
+                    }
+                }
+
+                if (rangeIx == -1)
+                {
+                    Bridge.OnError(this, Strings.Flow_meter_temperature_range_does_not_fit_this_test_conditions);
+                    retVal = Event.UiCmdStop;
+                    goto stopTestWOStoppingDivGateEtc;
+                }
+            }
+
 		//====================================
         loop:
 			/// Start the test, initialize test results
@@ -792,8 +814,9 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
                 tstRslt.Buoyancy     = Formulas.Buoyancy();
                 double density       = Formulas.WaterDensityFromTemp((tstRslt.TempUpMean + tstRslt.TempDownMean) / 2.0, Program.LocalSettings.RealDensity, Program.LocalSettings.AtTemperature);
                 double collectedVoluemCTV = 1000.0 * tstRslt.Buoyancy * (tstRslt.MassEnd - tstRslt.MassStart) / density;   /// [l] 1000.0f is because density is in [kg/m3]
-                tstRslt.ConstMasterRaw = outPath.FlowMeter.LtrPerPulse;                     /// Uncorrected master flowmeter coefficient
-                tstRslt.ConstMaster  = collectedVoluemCTV / massPulses;			            /// Corrected master pulses per liter
+                tstRslt.ConstMasterRaw  = outPath.FlowMeter.LtrPerPulse;                                        /// Uncorrected master flowmeter coefficient
+                tstRslt.ConstMasterCorr = outPath.FlowMeter.LtrPerPulseCorrected(tstRslt.FlowVolume, rangeIx);  /// Corrected master pulses per liter
+                tstRslt.ConstMaster     = collectedVoluemCTV / massPulses;			                            /// Calculated master pulses per liter
                 tstRslt.VolumeCTV    = tstRslt.ConstMaster * totalPulses;
                 tstRslt.VolumeMaster = LtrPerRefPulse * totalPulses;						/// [l] volume from the master flow meter
                 tstRslt.ErrorMaster  = Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV);

TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs

@@ -168,6 +168,28 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
             LtrPerRefPulse = outPath.FlowMeter.LtrPerPulse;
 			int totalPulses = (int)(test.Volume / LtrPerRefPulse + 0.5f);
 
+            int rangeIx = 0;                   /// Default range, used for non-Elde flowmeters
+            if (outPath.FlowMeter is Elde.FlowMeter.FlowMeter)
+            {
+                Elde.FlowMeter.FlowMeter eldeFM = outPath.FlowMeter as Elde.FlowMeter.FlowMeter;
+                rangeIx = -1;                   /// Indicates invalid range
+                for (int r = 0; r <= 5; r++)
+                {
+                    if (eldeFM.RangeEnabled(r) && eldeFM.GetTempLo(r) <= test.TempLimLo
+                                               && eldeFM.GetTempHi(r) >= test.TempLimHi)
+                    {
+                        rangeIx = r;
+                    }
+                }
+
+                if (rangeIx == -1)
+                {
+                    Bridge.OnError(this, Strings.Flow_meter_temperature_range_does_not_fit_this_test_conditions);
+                    retVal = Event.UiCmdStop;
+                    goto stopTestWOStoppingDivGateEtc;
+                }
+            }
+
 			if (test.Volume > outPath.Scale.Capacity * Constants.TankFullFactor)
 			{
 				Bridge.OnError(this, Strings.Test_volume_exceeds_the_scale_capacity);
@@ -841,7 +863,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
                 tstRslt.VolumeCTV    = 1000.0 * tstRslt.Buoyancy * (tstRslt.MassEnd - tstRslt.MassStart) / density; /// [l] 1000.0f is because density is in [kg/m3]
 				tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster;										/// [l] volume from the master flow meter
                 tstRslt.ConstMasterRaw = outPath.FlowMeter.LtrPerPulse;                                             /// Uncorrected master flowmeter coefficient
-                tstRslt.ConstMaster  = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster;					/// Corrected master pulses per liter
+                tstRslt.ConstMasterCorr = outPath.FlowMeter.LtrPerPulseCorrected(tstRslt.FlowVolume, rangeIx);      /// Corrected master pulses per liter
+                tstRslt.ConstMaster = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster;					/// Calculated master pulses per liter
                 tstRslt.ErrorMaster  = Config.Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV);
 
 				tstRslt.FlowMean = (float)RefFlowStat.Average;

TBF/BenchControl/Various/ErrorFlags/Errors.cs

@@ -1,9 +1,8 @@
 ///
-/// Copyright (c) 2017 Sensus Metering Systems
+/// Copyright (c) 2017-2018 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
-using System.Text;
 using log4net;
 using Results.Entities;
 using TBF.BenchControl.Sequences;
@@ -77,7 +76,7 @@ namespace TBF.BenchControl.Various.ErrorFlags
             bool E10 = false;
             if (diverter)
             {
-                E9 = (Math.Abs(switchTimeStart - switchTimeEnd) > errorsCfg.TestParams.Coef_E9 * (switchTimeStart + switchTimeEnd));
+                E9 = (Math.Abs(switchTimeStart - switchTimeEnd) > errorsCfg.TestParams.Coef_E9 * (switchTimeStart + switchTimeEnd) + errorsCfg.TestParams.Offset_E9);
                 E10 = ((switchTimeStart + switchTimeEnd) > errorsCfg.TestParams.Coef_E10 * testRslt.TestTime);
             }
 
@@ -86,7 +85,7 @@ namespace TBF.BenchControl.Various.ErrorFlags
             if (startStopValve)
             {
                 E11 = ((switchTimeStart + switchTimeEnd) > errorsCfg.TestParams.Coef_E11 * testRslt.TestTime);
-                E12 = (Math.Abs(switchTimeStart - switchTimeEnd) > errorsCfg.TestParams.Coef_E12 * (switchTimeStart + switchTimeEnd));
+                E12 = (Math.Abs(switchTimeStart - switchTimeEnd) > errorsCfg.TestParams.Coef_E12 * (switchTimeStart + switchTimeEnd) + errorsCfg.TestParams.Offset_E12);
             }
 
             /// Ambient temperature

TBF/BenchControl/Various/ErrorFlags/TestParams.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2017 Sensus Metering Systems
+/// Copyright (c) 2017-2018 Sensus Slovensko a.s.
 ///
 using System.IO;
 using System.Xml.Serialization;
@@ -47,6 +47,8 @@ namespace TBF.BenchControl.Various.ErrorFlags
 		public float Coef_E10;				/// Coefficient used in E10, default 0.04
 		public float Coef_E11;				/// Coefficient used in E11, default 0.1
 		public float Coef_E12;				/// Coefficient used in E12, default 1
+        public float Offset_E9;             /// [s] default 0 (no offset)
+        public float Offset_E12;            /// [s] default 0 (no offset)
 
 		public override void InitializeAll()
 		{
@@ -102,7 +104,9 @@ namespace TBF.BenchControl.Various.ErrorFlags
 			Coef_E10 = 0.04f;
 			Coef_E11 = 0.1f;
 			Coef_E12 = 1.0f;
-		}
+            Offset_E9 = 0;          /// [s]
+            Offset_E12 = 0;         /// [s]
+        }
 
 		string[] paramNames = new string[]
 		{
@@ -138,7 +142,9 @@ namespace TBF.BenchControl.Various.ErrorFlags
 			"Coef.E9",
 			"Coef.E10",
 			"Coef.E11",
-			"Coef.E12"
+			"Coef.E12",
+            "Offset E9 [s]",
+            "Offset E12 [s]",
 		};
 		public override string ParamName(int i) { return paramNames[i]; }
 		public override int ParamsCount() { return paramNames.Length; }
@@ -179,6 +185,8 @@ namespace TBF.BenchControl.Various.ErrorFlags
 				case 28: return Coef_E10.ToString();
 				case 29: return Coef_E11.ToString();
 				case 30: return Coef_E12.ToString();
+                case 31: return Offset_E9.ToString();
+                case 32: return Offset_E12.ToString();
 
 				default: return string.Empty;
 			}
@@ -230,6 +238,8 @@ namespace TBF.BenchControl.Various.ErrorFlags
                 case 28: Coef_E10 = Utils.ParseUFloat(strValue); return CfgUpdateFlags.None;
                 case 29: Coef_E11 = Utils.ParseUFloat(strValue); return CfgUpdateFlags.None;
                 case 30: Coef_E12 = Utils.ParseUFloat(strValue); return CfgUpdateFlags.None;
+                case 31: Offset_E9 = Utils.ParseUFloat(strValue); return CfgUpdateFlags.None;
+                case 32: Offset_E12 = Utils.ParseUFloat(strValue); return CfgUpdateFlags.None;
 
                 default: return CfgUpdateFlags.None;
 			}
@@ -283,6 +293,8 @@ namespace TBF.BenchControl.Various.ErrorFlags
                 case 28:
                 case 29:
                 case 30:
+                case 31:
+                case 32:
                     if (Utils.TryParseUFloat(strValue, out fdummy)) return true;
 					break;
 
@@ -329,7 +341,9 @@ namespace TBF.BenchControl.Various.ErrorFlags
 			prms.Coef_E10 = this.Coef_E10;
 			prms.Coef_E11 = this.Coef_E11;
 			prms.Coef_E12 = this.Coef_E12;
-		}
+            prms.Offset_E9 = this.Offset_E9;
+            prms.Offset_E12 = this.Offset_E12;
+        }
 
 		public IParamsProvider Clone()
 		{

TBF/ComponentsManagerDlg.cs

@@ -188,35 +188,28 @@ namespace TBF
 
 		void DrawOne(Component cmpnt)
 		{
-			IComponentCfg cmpCfg = TbfComponents.CmpntCfgFromCmpntEntity(cmpnt);
+            ListViewItem lvi = new ListViewItem(cmpnt.Name);
+            lvi.Tag = cmpnt;
+            lvi.SubItems.Add(string.IsNullOrEmpty(cmpnt.ClassName) ? string.Empty : cmpnt.ClassName);
+            lvi.SubItems.Add(string.IsNullOrEmpty(cmpnt.ParentName) ? string.Empty : cmpnt.ParentName);
 
-			if (cmpCfg != null)
+            IComponentCfg cmpCfg = TbfComponents.CmpntCfgFromCmpntEntity(cmpnt);
+            if (cmpCfg != null)
 			{
-				ListViewItem lvi = new ListViewItem(cmpCfg.Name);
-				lvi.SubItems.Add(cmpCfg.Factory.ClassName);
-				lvi.SubItems.Add(cmpCfg.ParentName);
-				lvi.SubItems.Add(cmpCfg.DebugLevel.ToDescription());
+                lvi.SubItems.Add(cmpCfg.DebugLevel.ToDescription());
 				lvi.SubItems.Add(cmpCfg.LogLevel.ToDescription());
 				lvi.SubItems.Add(cmpCfg.ToString(1));
 
-				lvi.Tag = cmpnt;
-
-				listViewEx.Items.Add(lvi);
 			}
 			else
 			{
-				ListViewItem lvi = new ListViewItem(cmpnt.Name);
-				lvi.SubItems.Add(string.IsNullOrEmpty(cmpnt.ClassName) ? string.Empty : cmpnt.ClassName);
-				lvi.SubItems.Add(string.IsNullOrEmpty(cmpnt.ParentName) ? string.Empty : cmpnt.ParentName);
 				lvi.SubItems.Add("---");
 				lvi.SubItems.Add("---");
 				lvi.SubItems.Add("Not a component");
-
-				lvi.Tag = cmpnt;
-
-				listViewEx.Items.Add(lvi);
 			}
-		}
+
+            listViewEx.Items.Add(lvi);
+        }
 
         ///
         /// Save DB changes, return true when DB changes saved OK

TBF/Forms/UpgradeSelectionDlg.Designer.cs

@@ -41,7 +41,7 @@
             this.label2 = new System.Windows.Forms.Label();
             this.pressureRepresentationButton = new System.Windows.Forms.Button();
             this.upgradeDb_24_29_Button = new System.Windows.Forms.Button();
-            this.upgradeDb_218_219_Button = new System.Windows.Forms.Button();
+            this.upgradeDb_218_220_Button = new System.Windows.Forms.Button();
             this.upgradeDb_NFC_button = new System.Windows.Forms.Button();
             this.SuspendLayout();
             // 
@@ -172,15 +172,15 @@
             this.upgradeDb_24_29_Button.UseVisualStyleBackColor = true;
             this.upgradeDb_24_29_Button.Click += new System.EventHandler(this.upgradeDb_24_29_Button_Click);
             // 
-            // upgradeDb_218_219_Button
+            // upgradeDb_218_220_Button
             // 
-            this.upgradeDb_218_219_Button.Location = new System.Drawing.Point(12, 337);
-            this.upgradeDb_218_219_Button.Name = "upgradeDb_218_219_Button";
-            this.upgradeDb_218_219_Button.Size = new System.Drawing.Size(260, 34);
-            this.upgradeDb_218_219_Button.TabIndex = 9;
-            this.upgradeDb_218_219_Button.Text = "Upgrade database from ver. 2.18 to ver. 2.19";
-            this.upgradeDb_218_219_Button.UseVisualStyleBackColor = true;
-            this.upgradeDb_218_219_Button.Click += new System.EventHandler(this.upgradeDb_218_219_Button_Click);
+            this.upgradeDb_218_220_Button.Location = new System.Drawing.Point(12, 337);
+            this.upgradeDb_218_220_Button.Name = "upgradeDb_218_220_Button";
+            this.upgradeDb_218_220_Button.Size = new System.Drawing.Size(260, 34);
+            this.upgradeDb_218_220_Button.TabIndex = 9;
+            this.upgradeDb_218_220_Button.Text = "Upgrade database from ver. 2.18 to ver. 2.20";
+            this.upgradeDb_218_220_Button.UseVisualStyleBackColor = true;
+            this.upgradeDb_218_220_Button.Click += new System.EventHandler(this.upgradeDb_218_220_Button_Click);
             // 
             // upgradeDb_NFC_button
             // 
@@ -198,7 +198,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(284, 480);
             this.Controls.Add(this.upgradeDb_NFC_button);
-            this.Controls.Add(this.upgradeDb_218_219_Button);
+            this.Controls.Add(this.upgradeDb_218_220_Button);
             this.Controls.Add(this.upgradeDb_24_29_Button);
             this.Controls.Add(this.pressureRepresentationButton);
             this.Controls.Add(this.label2);
@@ -234,7 +234,7 @@
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.Button pressureRepresentationButton;
         private System.Windows.Forms.Button upgradeDb_24_29_Button;
-        private System.Windows.Forms.Button upgradeDb_218_219_Button;
+        private System.Windows.Forms.Button upgradeDb_218_220_Button;
         private System.Windows.Forms.Button upgradeDb_NFC_button;
 
     }

TBF/Forms/UpgradeSelectionDlg.cs

@@ -555,7 +555,7 @@ namespace TBF.Forms
         }
 
         ///---------------------------------------------------------------------
-        private void upgradeDb_218_219_Button_Click(object sender, EventArgs e)
+        private void upgradeDb_218_220_Button_Click(object sender, EventArgs e)
         {
             if (!upgradeConfigDBCheckBox.Checked && !upgradeResultsDBCheckBox.Checked)
             {
@@ -566,7 +566,7 @@ namespace TBF.Forms
             string[] commands = new string[]
             {
                 "ALTER TABLE `metertestrslt` ADD `RegReaderType` INT NOT NULL DEFAULT '0' AFTER `CompoundMeterId`;",
-                "ALTER TABLE `testrslt` ADD `MethodClass` VARCHAR(255) NULL DEFAULT NULL AFTER `RepetitionNr`, ADD `ConstMasterRaw` DOUBLE NOT NULL DEFAULT '1' AFTER `PulsesMaster`;",
+                "ALTER TABLE `testrslt` ADD `MethodClass` VARCHAR(255) NULL DEFAULT NULL AFTER `RepetitionNr`, ADD `ConstMasterRaw` DOUBLE NOT NULL DEFAULT '1' AFTER `PulsesMaster`, ADD `ConstMasterCorr` DOUBLE NOT NULL DEFAULT '1' AFTER `ConstMasterRaw`;",
                 "ALTER TABLE `watermeterdata` ADD `Medium` VARCHAR(255) NULL DEFAULT NULL AFTER `ApprovalInfoAux`;",
             };
 
@@ -576,7 +576,7 @@ namespace TBF.Forms
             {
                 ActivityEnd();
                 MessageBox.Show("DB succesfully upgraded", "Confirmation", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                upgradeDb_218_219_Button.Enabled = false;
+                upgradeDb_218_220_Button.Enabled = false;
             }
         }
 

TBF/MainWnd.Designer.cs

@@ -678,7 +678,7 @@ namespace TBF
 #elif TURA_SPECIAL || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || BADGER_VELKA_TRAT || SLM_END || WARSAW_END || RUM_MOB || SENTEC
         private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
 		private TBF.Screens.ProcessTabPageCtrl6 processTabPageCtrl;
-#elif TORINO50 || TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || MALTA_WSD25 || SLM_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || ZAMBIA
+#elif TORINO50 || TORUN_PT50_2015 || CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || MALTA_WSD25 || SLM_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || ZAMBIA || FUZHOU100
 		private ControlComponent_Torino2015.UserControl1 ctrlBrdComponent;
 		private TBF.Screens.ProcessTabPageCtrl24 processTabPageCtrl;
 #elif TURA_IPERL

TBF/MainWnd.cs

@@ -344,6 +344,7 @@ namespace TBF
 			{
 				case ActivityEventArgs.Update.Activity:
 					activityLabel.Text = args.Activity;
+					if (string.IsNullOrEmpty(messageLabel.Text)) messageLabel.ForeColor = Color.Black;
 					break;
 				case ActivityEventArgs.Update.Message:
 					messageLabel.Text = args.Message;
@@ -620,7 +621,7 @@ namespace TBF
                 emergencyStopModelessDlg.Visible = false;
             }
 
-            if (BenchControl.StateMachine.Running && CycleRunning)
+			if (BenchControl.StateMachine.Running && (messageLabel.ForeColor != Color.Red) && CycleRunning)
             {
                 MessageBox.Show(Strings.Finish_the_session_please, string.Empty, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
 				if (e is FormClosingEventArgs)

TBF/Properties/AssemblyInfo.cs

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

TBF/Resources/Strings.de.resx

@@ -1443,4 +1443,7 @@
   <data name="Pressure" xml:space="preserve">
     <value>Druck</value>
   </data>
+  <data name="Flow_adjustment_failed" xml:space="preserve">
+    <value>Durchfluss nicht erreicht</value>
+  </data>
 </root>

TBF/SampleConfig/config.xml

@@ -3,31 +3,25 @@
   <Language>en</Language>
   <TestBenches>
     <DatabaseSettings>
-      <BenchName>SENTEC</BenchName>
+      <BenchName>Test Bench</BenchName>
       <IsRealBench>true</IsRealBench>
       <ProceduresDBSettings>
         <DbType>MySql</DbType>
-        <ConnectionString>SERVER=localhost; DATABASE=sentec; UID=root; PASSWORD=; CHARSET=utf8;</ConnectionString>
+        <ConnectionString>SERVER=localhost; DATABASE=testbench; UID=root; PASSWORD=; CHARSET=utf8;</ConnectionString>
       </ProceduresDBSettings>
       <WaterMetersDBSettings>
         <DbType>MySql</DbType>
-        <ConnectionString>SERVER=localhost; DATABASE=sentec-r; UID=root; PASSWORD=; CHARSET=utf8;</ConnectionString>
+        <ConnectionString>SERVER=localhost; DATABASE=testbench-r; UID=root; PASSWORD=; CHARSET=utf8;</ConnectionString>
       </WaterMetersDBSettings>
-      <UsersDBSettings>
-        <DbType>MySql</DbType>
-        <ConnectionString />
-      </UsersDBSettings>
     </DatabaseSettings>
   </TestBenches>
-  <LoginMethod>UserName</LoginMethod>
-  <LastBench>SENTEC</LastBench>
+  <LastBench>Test Bench</LastBench>
   <BatchNr>1</BatchNr>
-  <RealDensity>998.2008</RealDensity>
+  <RealDensity>988.2008</RealDensity>
   <AtTemperature>20</AtTemperature>
   <RightPaneHorizSplitterDistance>25</RightPaneHorizSplitterDistance>
-  <TopPaneVerticalSplitterDistance>596</TopPaneVerticalSplitterDistance>
-  <MainWndLeft>76</MainWndLeft>
-  <MainWndTop>21</MainWndTop>
+  <MainWndLeft>75</MainWndLeft>
+  <MainWndTop>5</MainWndTop>
   <MainWndWidth>1250</MainWndWidth>
   <MainWndHeight>750</MainWndHeight>
   <ManiWndMaximized>false</ManiWndMaximized>
@@ -35,10 +29,6 @@
   <ComponentsDlgTop>100</ComponentsDlgTop>
   <ComponentsDlgWidth>850</ComponentsDlgWidth>
   <ComponentsDlgHeight>500</ComponentsDlgHeight>
-  <PopupResultsLeft>0</PopupResultsLeft>
-  <PopupResultsTop>0</PopupResultsTop>
-  <PopupResultsWidth>0</PopupResultsWidth>
-  <PopupResultsHeight>0</PopupResultsHeight>
   <PathsDlgLeft>0</PathsDlgLeft>
   <PathsDlgTop>0</PathsDlgTop>
   <PathsDlgWidth>0</PathsDlgWidth>
@@ -63,10 +53,6 @@
   <OneProcedureDlgHeight>0</OneProcedureDlgHeight>
   <PrintOrderLeft>0</PrintOrderLeft>
   <PrintOrderTop>0</PrintOrderTop>
-  <EnduranceDlgLeft>0</EnduranceDlgLeft>
-  <EnduranceDlgTop>0</EnduranceDlgTop>
-  <EnduranceDlgWidth>0</EnduranceDlgWidth>
-  <EnduranceDlgHeight>0</EnduranceDlgHeight>
   <PrintOrderOnlyGoodResult>false</PrintOrderOnlyGoodResult>
   <PrintOrderOnlyLastResult>false</PrintOrderOnlyLastResult>
   <ResultsConfigMeters>Vertically</ResultsConfigMeters>

TBF/SampleConfig/log4netConfig.xml

@@ -60,11 +60,10 @@
 	<logger name="NHibernate"> <level value="ERROR" /> </logger>
 	<logger name="TBF.BenchControl.StateMachine"> <level value="INFO" /> </logger>
 	<logger name="TBF.BenchControl.State"> <level value="WARN" /> </logger>
-	<logger name="TBF.BenchControl.Elde.ControlComWrap"> <level value="WARN" /> </logger>
+	<logger name="TBF.BenchControl.Elde.ControlComdWrap"> <level value="WARN" /> </logger>
 	<logger name="TBF.BenchControl.Elde.Pump"> <level value="WARN" /> </logger>
 	<logger name="TBF.BenchControl.Elde.PumpWithFM"> <level value="WARN" /> </logger>
 	<logger name="TBF.BenchControl.MettlerToledo"> <level value="WARN" /> </logger>
 	<logger name="TBF.BenchControl.Fomulas"> <level value="FATAL" /> </logger>
 	<logger name="TBF.BenchControl.Elde.StartMeasurementOp"> <level value="WARN" /> </logger>
-	<logger name="TBF.BenchControl.Modbus"> <level value="DEBUG" /> </logger>
 </log4net>

TBF/Screens/ProcessTabPageCtrl24.cs

@@ -524,8 +524,8 @@ namespace TBF.Screens
 			tOutLabel.Text = tRes.TempDownMean.ToString("F2");
 			tDivLabel.Text = tRes.TempDivMean.ToString("F2");
 
-			prInLabel.Text = tRes.PressUpMean.ToString("F1");
-			prOutLabel.Text = tRes.PressDownMean.ToString("F1");
+			prInLabel.Text = tRes.PressUpMean.ToString("F2");
+			prOutLabel.Text = tRes.PressDownMean.ToString("F2");
 
 			massLabel.Text = ProcessData.Mass.ToString();
 			massDiffLabel.Text = (tRes.MassEnd - tRes.MassStart).ToString("F3");

TBF/Screens/ProcessTabPageCtrl48.cs

@@ -457,7 +457,7 @@ namespace TBF.Screens
 			tDivLabel.Text = ProcessData.TempDiv.ToString();
 
 			prInLabel.Text = ProcessData.PressUp.ToString();
-            prOutLabel.Text = ProcessData.PressDown.ToString();
+			prOutLabel.Text = ProcessData.PressDown.ToString();
 			
 			massLabel.Text = ProcessData.Mass.ToString();
 
@@ -553,8 +553,8 @@ namespace TBF.Screens
 			tOutLabel.Text = tRes.TempDownMean.ToString("F2");
 			tDivLabel.Text = tRes.TempDivMean.ToString("F2");
 
-			prInLabel.Text = tRes.PressUpMean.ToString("F1");
-			prOutLabel.Text = tRes.PressDownMean.ToString("F1");
+			prInLabel.Text = tRes.PressUpMean.ToString("F2");
+			prOutLabel.Text = tRes.PressDownMean.ToString("F2");
 
 			massLabel.Text = ProcessData.Mass.ToString();
 			massDiffLabel.Text = (tRes.MassEnd - tRes.MassStart).ToString("F3");

TBF/Screens/ProcessTabPageCtrl6.cs

@@ -460,8 +460,8 @@ namespace TBF.Screens
 			tOutLabel.Text = ProcessData.TempDown.ToString();
 			tDivLabel.Text = ProcessData.TempDiv.ToString();
 
-			prUpLabel.Text = Config.Units.ConvertTo(Config.Unit.bar, ProcessData.PressUp.Val).ToString();
-			prDownLabel.Text = Config.Units.ConvertTo(Config.Unit.bar, ProcessData.PressDown.Val).ToString();
+			prUpLabel.Text = ProcessData.PressUp.ToString();
+			prDownLabel.Text = ProcessData.PressDown.ToString();
 
 			massLabel.Text = ProcessData.Mass.ToString();
 
@@ -557,8 +557,8 @@ namespace TBF.Screens
 			tOutLabel.Text = tRes.TempDownMean.ToString("F2");
 			tDivLabel.Text = tRes.TempDivMean.ToString("F2");
 
-			prUpLabel.Text = tRes.PressUpMean.ToString("F1");
-			prDownLabel.Text = tRes.PressDownMean.ToString("F1");
+			prUpLabel.Text = tRes.PressUpMean.ToString("F2");
+			prDownLabel.Text = tRes.PressDownMean.ToString("F2");
 
 			massLabel.Text = ProcessData.Mass.ToString();
 			massDiffLabel.Text = (tRes.MassEnd - tRes.MassStart).ToString("F3");

TBF/TBF.csproj

@@ -39,7 +39,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;SENTEC;STABLE_MASS_EXTRAS</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK;CAMERA</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;SENTEC;STABLE_MASS_EXTRAS</DefineConstants>
+    <DefineConstants>TRACE;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK;CAMERA</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;SENTEC;STABLE_MASS_EXTRAS</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK;CAMERA</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;SENTEC;STABLE_MASS_EXTRAS</DefineConstants>
+    <DefineConstants>TRACE;TURA_SPECIAL;IPERL;ORACLE_DB;LANG_SK;CAMERA</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -97,8 +97,9 @@
     <SignManifests>false</SignManifests>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ControlComponent3U">
-      <HintPath>..\packages\ControlBoard\Sentec\ControlComponent3U.dll</HintPath>
+    <Reference Include="ControlComponent3U, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ControlBoard\iPerlST-special\ControlComponent3U.dll</HintPath>
     </Reference>
     <Reference Include="FluentNHibernate">
       <HintPath>..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll</HintPath>

TBF/UiControls/BenchControlPanel.cs

@@ -248,7 +248,7 @@ namespace TBF.UiControls
 		
 		private void emptyTank1Btn_Click(object sender, EventArgs e)
 		{
-#if TURA_IPERL || TURA_SPECIAL
+#if TURA_IPERL
             /// Prevent 'Stop draining' by password
             if (drain1Highlighted && !Users.GlobalData.CurrentUser.IsMemberOf(Users.Grp.GID.TestingSpecialists))
             {
@@ -265,7 +265,7 @@ namespace TBF.UiControls
 		
 		private void emptyTank2Btn_Click(object sender, EventArgs e)
 		{
-#if TURA_IPERL || TURA_SPECIAL
+#if TURA_IPERL
             /// Prevent 'Stop draining' by password
             if (drain1Highlighted && !Users.GlobalData.CurrentUser.IsMemberOf(Users.Grp.GID.TestingSpecialists))
             {
@@ -282,7 +282,7 @@ namespace TBF.UiControls
 		
 		private void emptyTank3Btn_Click(object sender, EventArgs e)
 		{
-#if TURA_IPERL || TURA_SPECIAL
+#if TURA_IPERL
             /// Prevent 'Stop draining' by password
             if (drain1Highlighted && !Users.GlobalData.CurrentUser.IsMemberOf(Users.Grp.GID.TestingSpecialists))
             {