diff --git a/Results/Entities/WaterMeter.cs b/Results/Entities/WaterMeter.cs
index e4c2b6900..c469c7a80 100644
--- a/Results/Entities/WaterMeter.cs
+++ b/Results/Entities/WaterMeter.cs
@@ -130,12 +130,38 @@ namespace Results.Entities
return (errorFlagsMode != ErrorFlagsMode.Off) ? (eFlagsFromTests | ErrorFlags) : 0;
}
- public virtual string ErrorFlagstStr()
+ ///
+ /// Convert combined errorFlags of all tests to string
+ ///
+ /// ErrorFlags string
+ public virtual string ErrorFlagsStr()
{
ErrorFlagsMode errorFlagsMode;
return Utils.ErrorFlagsStr(ErrorFlagsFromTestsAndWM(out errorFlagsMode));
}
+ ///
+ /// Convert failed tests and combined errorFlags of all tests to string
+ ///
+ /// ErrorFlagsEx string
+ public virtual string ErrorFlagsStrEx()
+ {
+ StringBuilder errFlgsStr = new StringBuilder();
+ foreach (var mtr in MeterTestRslts)
+ {
+ if (mtr.Evaluate() && mtr.TestDone && !mtr.Passed)
+ {
+ errFlgsStr.Append(mtr.Name());
+ errFlgsStr.Append(" ");
+ }
+ }
+
+ ErrorFlagsMode errorFlagsMode;
+ errFlgsStr.Append(Utils.ErrorFlagsStr(ErrorFlagsFromTestsAndWM(out errorFlagsMode)));
+
+ return errFlgsStr.ToString();
+ }
+
public virtual bool PassedFromTests()
{
ErrorFlagsMode eFlagsMode;
diff --git a/Results/ItemID.cs b/Results/ItemID.cs
index 85592bff3..d2c918c2c 100644
--- a/Results/ItemID.cs
+++ b/Results/ItemID.cs
@@ -220,6 +220,8 @@ namespace Results
T_line_min, /// 190
T_line_max, /// 191
+ ErrorFlagsEx, /// 192
+
Count,
}
}
diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs
index d2c9f41e0..b5bdec5d4 100644
--- a/Results/Properties/AssemblyInfo.cs
+++ b/Results/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.18.855.0")]
-[assembly: AssemblyFileVersion("2.18.855.0")]
+[assembly: AssemblyVersion("2.18.864.0")]
+[assembly: AssemblyFileVersion("2.18.864.0")]
diff --git a/Results/WMeterRsltItemSpec.cs b/Results/WMeterRsltItemSpec.cs
index 98735ba7d..346a29be6 100644
--- a/Results/WMeterRsltItemSpec.cs
+++ b/Results/WMeterRsltItemSpec.cs
@@ -290,7 +290,7 @@ namespace Results
#endif
AllItems.Add(new WMeterRsltItemSpec(ItemID.Passed, Strings.Result, Quantity.Boolean, ItemCategory.MeterResult, (w, t, u, f, p) => string.IsNullOrEmpty(t) ? w.PassedColorStr() : ((w.GetMeterTestRslt(t) == null) ? "" : w.GetMeterTestRslt(t).PassedColorStr())));
- AllItems.Add(new WMeterRsltItemSpec(ItemID.ResultOrErrorFlags, "Winiki lub E", Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, string.IsNullOrEmpty(w.ErrorFlagstStr()) ? (w.WaterMeterData.Text4 + w.PassedColorStr()) : w.ErrorFlagstStr()))); /// PL specific result
+ AllItems.Add(new WMeterRsltItemSpec(ItemID.ResultOrErrorFlags, "Winiki lub E", Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, string.IsNullOrEmpty(w.ErrorFlagsStr()) ? (w.WaterMeterData.Text4 + w.PassedColorStr()) : w.ErrorFlagsStr()))); /// PL specific result
///
/// Water meter info
@@ -381,8 +381,9 @@ namespace Results
#endif
AllItems.Add(new WMeterRsltItemSpec(ItemID.TestDone, Strings.Test_done + "()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) != null && w.GetMeterTestRslt(t).TestDone) ? Strings.Yes : Strings.No));
AllItems.Add(new WMeterRsltItemSpec(ItemID.TestPassed, Strings.Test_passed + "()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) != null && w.GetMeterTestRslt(t).Passed) ? Strings.Yes : Strings.No));
- AllItems.Add(new WMeterRsltItemSpec(ItemID.ErrorFlags, Strings.Error_flags + "()", Quantity.String, ItemCategory.TestResult, (w, t, u, f, p) => FormatStr(f, (w.GetTestRslt(t) != null) ? w.GetTestRslt(t).ErrorFlagsStr() : w.ErrorFlagstStr())));
- AllItems.Add(new WMeterRsltItemSpec(ItemID.E1, "E1 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0001) != 0) ? Strings.Yes : Strings.No));
+ AllItems.Add(new WMeterRsltItemSpec(ItemID.ErrorFlags, Strings.Error_flags + "()", Quantity.String, ItemCategory.TestResult, (w, t, u, f, p) => FormatStr(f, (w.GetTestRslt(t) != null) ? w.GetTestRslt(t).ErrorFlagsStr() : w.ErrorFlagsStr())));
+ AllItems.Add(new WMeterRsltItemSpec(ItemID.ErrorFlagsEx, Strings.Error_flags + "Ex", Quantity.String, ItemCategory.MeterResult, (w, t, u, f, p) => FormatStr(f, w.ErrorFlagsStrEx())));
+ AllItems.Add(new WMeterRsltItemSpec(ItemID.E1, "E1 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0001) != 0) ? Strings.Yes : Strings.No));
AllItems.Add(new WMeterRsltItemSpec(ItemID.E2, "E2 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0002) != 0) ? Strings.Yes : Strings.No));
AllItems.Add(new WMeterRsltItemSpec(ItemID.E3, "E3 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0004) != 0) ? Strings.Yes : Strings.No));
AllItems.Add(new WMeterRsltItemSpec(ItemID.E4, "E4 ()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetTestRslt(t) != null && (w.GetTestRslt(t).ErrorFlags & 0x0008) != 0) ? Strings.Yes : Strings.No));
diff --git a/TBF/BenchControl/Various/ErrorFlags/TestParams.cs b/TBF/BenchControl/Various/ErrorFlags/TestParams.cs
index b16970f2b..2965404ff 100644
--- a/TBF/BenchControl/Various/ErrorFlags/TestParams.cs
+++ b/TBF/BenchControl/Various/ErrorFlags/TestParams.cs
@@ -50,7 +50,26 @@ namespace TBF.BenchControl.Various.ErrorFlags
public override void InitializeAll()
{
- Mode = ErrorFlagsMode.On;
+ Mode = ErrorFlagsMode.Info;
+#if IPERL
+ E1 = true;
+ E2 = false;
+ E3 = true;
+ E4 = false;
+ E5 = false;
+ E6 = false;
+ E7 = false;
+ E8 = false;
+ E9 = false;
+ E10 = false;
+ E11 = false;
+ E12 = false;
+ E13 = false;
+ E14 = false;
+ E15 = false;
+ E16 = false;
+ E21 = true;
+#else
E1 = true;
E2 = true;
E3 = true;
@@ -68,8 +87,8 @@ namespace TBF.BenchControl.Various.ErrorFlags
E15 = true;
E16 = true;
E21 = true;
-
- Delta_Q_pct = 2.5f; /// [%]
+#endif
+ Delta_Q_pct = 5.0f; /// [%]
Delta_T = 10.0f; /// [°C]
Delta_Tup_Tdn = 10.0f; /// [°C]
TestTime_min = 0; /// [s]
diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index 953ab987e..e439bb286 100644
--- a/TBF/Properties/AssemblyInfo.cs
+++ b/TBF/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
-[assembly: AssemblyVersion("2.18.861.0")]
-[assembly: AssemblyFileVersion("2.18.861.0")]
+[assembly: AssemblyVersion("2.18.864.0")]
+[assembly: AssemblyFileVersion("2.18.864.0")]