Changes for Xylem Nanjing, ver. 3.1.1676
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using log4net;
|
||||
using Common;
|
||||
using Config.Entities;
|
||||
using Results.Entities;
|
||||
using TBF.Rig.Sequences;
|
||||
@@ -95,37 +96,39 @@ namespace TBF.Rig.Various.ErrorFlags
|
||||
bool E36 = ProcessData.ConductStat.Min < errorsCfg.TestParams.Conductivity_min
|
||||
|| ProcessData.ConductStat.Max > errorsCfg.TestParams.Conductivity_max;
|
||||
|
||||
const sbyte info = (sbyte)ErrorFlagsMode.Info;
|
||||
const sbyte on = (sbyte)ErrorFlagsMode.On;
|
||||
const sbyte stop = (sbyte)ErrorFlagsMode.Stop;
|
||||
|
||||
long errorFlags = 0;
|
||||
sbyte on = (sbyte)ErrorFlagsMode.On;
|
||||
if (E1 && (errorsCfg.TestParams.E1 == on)) errorFlags |= (long)ErrorFlagMask.E1;
|
||||
if (E2 && (errorsCfg.TestParams.E2 == on)) errorFlags |= (long)ErrorFlagMask.E2;
|
||||
if (E3 && (errorsCfg.TestParams.E3 == on)) errorFlags |= (long)ErrorFlagMask.E3;
|
||||
if (E4 && (errorsCfg.TestParams.E4 == on)) errorFlags |= (long)ErrorFlagMask.E4;
|
||||
if (E5 && (errorsCfg.TestParams.E5 == on)) errorFlags |= (long)ErrorFlagMask.E5;
|
||||
if (E6 && (errorsCfg.TestParams.E6 == on)) errorFlags |= (long)ErrorFlagMask.E6;
|
||||
if (E7 && (errorsCfg.TestParams.E7 == on)) errorFlags |= (long)ErrorFlagMask.E7;
|
||||
if (E8 && (errorsCfg.TestParams.E8 == on)) errorFlags |= (long)ErrorFlagMask.E8;
|
||||
if (E9 && (errorsCfg.TestParams.E9 == on)) errorFlags |= (long)ErrorFlagMask.E9;
|
||||
if (E10 && (errorsCfg.TestParams.E10 == on)) errorFlags |= (long)ErrorFlagMask.E10;
|
||||
if (E11 && (errorsCfg.TestParams.E11 == on)) errorFlags |= (long)ErrorFlagMask.E11;
|
||||
if (E12 && (errorsCfg.TestParams.E12 == on)) errorFlags |= (long)ErrorFlagMask.E12;
|
||||
if (E13 && (errorsCfg.TestParams.E13 == on)) errorFlags |= (long)ErrorFlagMask.E13;
|
||||
if (E14 && (errorsCfg.TestParams.E14 == on)) errorFlags |= (long)ErrorFlagMask.E14;
|
||||
if (E1 && (errorsCfg.TestParams.E1 == on || errorsCfg.TestParams.E1 == stop)) errorFlags |= (long)ErrorFlagMask.E1;
|
||||
if (E2 && (errorsCfg.TestParams.E2 == on || errorsCfg.TestParams.E2 == stop)) errorFlags |= (long)ErrorFlagMask.E2;
|
||||
if (E3 && (errorsCfg.TestParams.E3 == on || errorsCfg.TestParams.E3 == stop)) errorFlags |= (long)ErrorFlagMask.E3;
|
||||
if (E4 && (errorsCfg.TestParams.E4 == on || errorsCfg.TestParams.E4 == stop)) errorFlags |= (long)ErrorFlagMask.E4;
|
||||
if (E5 && (errorsCfg.TestParams.E5 == on || errorsCfg.TestParams.E5 == stop)) errorFlags |= (long)ErrorFlagMask.E5;
|
||||
if (E6 && (errorsCfg.TestParams.E6 == on || errorsCfg.TestParams.E6 == stop)) errorFlags |= (long)ErrorFlagMask.E6;
|
||||
if (E7 && (errorsCfg.TestParams.E7 == on || errorsCfg.TestParams.E7 == stop)) errorFlags |= (long)ErrorFlagMask.E7;
|
||||
if (E8 && (errorsCfg.TestParams.E8 == on || errorsCfg.TestParams.E8 == stop)) errorFlags |= (long)ErrorFlagMask.E8;
|
||||
if (E9 && (errorsCfg.TestParams.E9 == on || errorsCfg.TestParams.E9 == stop)) errorFlags |= (long)ErrorFlagMask.E9;
|
||||
if (E10 && (errorsCfg.TestParams.E10 == on || errorsCfg.TestParams.E10 == stop)) errorFlags |= (long)ErrorFlagMask.E10;
|
||||
if (E11 && (errorsCfg.TestParams.E11 == on || errorsCfg.TestParams.E11 == stop)) errorFlags |= (long)ErrorFlagMask.E11;
|
||||
if (E12 && (errorsCfg.TestParams.E12 == on || errorsCfg.TestParams.E12 == stop)) errorFlags |= (long)ErrorFlagMask.E12;
|
||||
if (E13 && (errorsCfg.TestParams.E13 == on || errorsCfg.TestParams.E13 == stop)) errorFlags |= (long)ErrorFlagMask.E13;
|
||||
if (E14 && (errorsCfg.TestParams.E14 == on || errorsCfg.TestParams.E14 == stop)) errorFlags |= (long)ErrorFlagMask.E14;
|
||||
/// E15, E16, E17, E18, E19, E20 skipped
|
||||
if (E21 && (errorsCfg.TestParams.E21 == on)) errorFlags |= (long)ErrorFlagMask.E21;
|
||||
if (E36 && (errorsCfg.TestParams.E36 == on)) errorFlags |= (long)ErrorFlagMask.E36;
|
||||
if (E21 && (errorsCfg.TestParams.E21 == on || errorsCfg.TestParams.E21 == stop)) errorFlags |= (long)ErrorFlagMask.E21;
|
||||
if (E36 && (errorsCfg.TestParams.E36 == on || errorsCfg.TestParams.E36 == stop)) errorFlags |= (long)ErrorFlagMask.E36;
|
||||
|
||||
long _infoFlags = 0;
|
||||
sbyte info = (sbyte)ErrorFlagsMode.Info;
|
||||
if (E1 && (errorsCfg.TestParams.E1 == info)) _infoFlags |= (long)ErrorFlagMask.E1;
|
||||
if (E2 && (errorsCfg.TestParams.E2 == info)) _infoFlags |= (long)ErrorFlagMask.E2;
|
||||
if (E3 && (errorsCfg.TestParams.E3 == info)) _infoFlags |= (long)ErrorFlagMask.E3;
|
||||
if (E4 && (errorsCfg.TestParams.E4 == info)) _infoFlags |= (long)ErrorFlagMask.E4;
|
||||
if (E5 && (errorsCfg.TestParams.E5 == info)) _infoFlags |= (long)ErrorFlagMask.E5;
|
||||
if (E6 && (errorsCfg.TestParams.E6 == info)) _infoFlags |= (long)ErrorFlagMask.E6;
|
||||
if (E7 && (errorsCfg.TestParams.E7 == info)) _infoFlags |= (long)ErrorFlagMask.E7;
|
||||
if (E8 && (errorsCfg.TestParams.E8 == info)) _infoFlags |= (long)ErrorFlagMask.E8;
|
||||
if (E9 && (errorsCfg.TestParams.E9 == info)) _infoFlags |= (long)ErrorFlagMask.E9;
|
||||
if (E1 && (errorsCfg.TestParams.E1 == info)) _infoFlags |= (long)ErrorFlagMask.E1;
|
||||
if (E2 && (errorsCfg.TestParams.E2 == info)) _infoFlags |= (long)ErrorFlagMask.E2;
|
||||
if (E3 && (errorsCfg.TestParams.E3 == info)) _infoFlags |= (long)ErrorFlagMask.E3;
|
||||
if (E4 && (errorsCfg.TestParams.E4 == info)) _infoFlags |= (long)ErrorFlagMask.E4;
|
||||
if (E5 && (errorsCfg.TestParams.E5 == info)) _infoFlags |= (long)ErrorFlagMask.E5;
|
||||
if (E6 && (errorsCfg.TestParams.E6 == info)) _infoFlags |= (long)ErrorFlagMask.E6;
|
||||
if (E7 && (errorsCfg.TestParams.E7 == info)) _infoFlags |= (long)ErrorFlagMask.E7;
|
||||
if (E8 && (errorsCfg.TestParams.E8 == info)) _infoFlags |= (long)ErrorFlagMask.E8;
|
||||
if (E9 && (errorsCfg.TestParams.E9 == info)) _infoFlags |= (long)ErrorFlagMask.E9;
|
||||
if (E10 && (errorsCfg.TestParams.E10 == info)) _infoFlags |= (long)ErrorFlagMask.E10;
|
||||
if (E11 && (errorsCfg.TestParams.E11 == info)) _infoFlags |= (long)ErrorFlagMask.E11;
|
||||
if (E12 && (errorsCfg.TestParams.E12 == info)) _infoFlags |= (long)ErrorFlagMask.E12;
|
||||
@@ -175,8 +178,14 @@ namespace TBF.Rig.Various.ErrorFlags
|
||||
else if (((mtrQ3.Error > mtrQ3.ErrLimHi() / 2) && (mtrQ2.Error > mtrQ2.ErrLimHi() / 2) && (mtrQ1.Error > mtrQ1.ErrLimHi() / 2)) ||
|
||||
((mtrQ3.Error < mtrQ3.ErrLimLo() / 2) && (mtrQ2.Error < mtrQ2.ErrLimLo() / 2) && (mtrQ1.Error < mtrQ1.ErrLimLo() / 2)))
|
||||
{
|
||||
if (errorsCfg.TestParams.E15 == (sbyte)ErrorFlagsMode.Info) _infoIndicators |= (long)ErrorFlagMask.E15; /// Set E15
|
||||
if (errorsCfg.TestParams.E15 == (sbyte)ErrorFlagsMode.On) errorIndicators |= (long)ErrorFlagMask.E15; /// Set E15
|
||||
if (errorsCfg.TestParams.E15 == (sbyte)ErrorFlagsMode.Info)
|
||||
{
|
||||
_infoIndicators |= (long)ErrorFlagMask.E15; /// Set E15
|
||||
}
|
||||
if (errorsCfg.TestParams.E15 == (sbyte)ErrorFlagsMode.On || errorsCfg.TestParams.E15 == (sbyte)ErrorFlagsMode.Stop)
|
||||
{
|
||||
errorIndicators |= (long)ErrorFlagMask.E15; /// Set E15
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var mtr in meterTestRslts)
|
||||
|
||||
Reference in New Issue
Block a user