修复流气tolerance bug

Venus/Framework/Common/Tolerance/RecipeToleranceChecker.cs

@@ -37,7 +37,7 @@ namespace Aitex.Core.RT.Tolerance
             {
                 if (_stopwatch.ElapsedMilliseconds > _toleranceObjects[i].DelayTime)
                 {
-                    if ((feedBacks[i] < _toleranceObjects[i].WarningMin || feedBacks[i] > _toleranceObjects[i].WarningMax && _toleranceObjects[i].WarningFlag == false))
+                    if ((feedBacks[i] < _toleranceObjects[i].WarningMin || feedBacks[i] > _toleranceObjects[i].WarningMax) && _toleranceObjects[i].WarningFlag == false)
                     {
                         _toleranceObjects[i].WarningFlag = true;
                         LOG.Write(eEvent.WARN_PM_TOLERANCE, _Module, $"{_toleranceObjects[i].Name}:Currnt Value:{feedBacks[i]},Over Range {_toleranceObjects[i].WarningMin}-{_toleranceObjects[i].WarningMax}");

Venus/Venus_RT/Devices/JetKepler2200APM.cs

@@ -263,6 +263,7 @@ namespace Venus_RT.Devices
                 return true;
             }
         }
+
         public override bool PendulumValveIsOpen()
         {
             return _pendulumValve.IsOpen;

Venus/Venus_RT/Modules/PMs/ProcessDefine.cs

@@ -588,50 +588,38 @@ namespace Venus_RT.Modules.PMs
             Chamber.FlowGas(0, ProcessUnit.Gas1);
             if (ProcessUnit.Gas1 >= 1)
             {
-                Chamber.OpenValve(ValveType.PV11, true);
-                if (ProcessUnit.ToleranceMode != ToleranceMode.None)
-                {
-                    toleranceObjects.Add(new ToleranceObject("Gas1", ProcessUnit.Gas1, ProcessUnit.Gas1WarningRange, ProcessUnit.Gas1AlarmRange, ProcessUnit.ToleranceDelayTime_ms, ProcessUnit.ToleranceMode));
-                }
+                Chamber.OpenValve(ValveType.PV11, true);              
             }
             Chamber.FlowGas(1, ProcessUnit.Gas2);
             if (ProcessUnit.Gas2 >= 1)
             {
-                Chamber.OpenValve(ValveType.PV21, true);
-                if (ProcessUnit.ToleranceMode != ToleranceMode.None)
-                {
-                    toleranceObjects.Add(new ToleranceObject("Gas2", ProcessUnit.Gas2, ProcessUnit.Gas2WarningRange, ProcessUnit.Gas2AlarmRange, ProcessUnit.ToleranceDelayTime_ms, ProcessUnit.ToleranceMode));
-                }
+                Chamber.OpenValve(ValveType.PV21, true);             
             }
             Chamber.FlowGas(2, ProcessUnit.Gas3);
             if (ProcessUnit.Gas3 >= 1)
             {
-                Chamber.OpenValve(ValveType.PV31, true);
-                if (ProcessUnit.ToleranceMode != ToleranceMode.None)
-                {
-                    toleranceObjects.Add(new ToleranceObject("Gas3", ProcessUnit.Gas3, ProcessUnit.Gas3WarningRange, ProcessUnit.Gas3AlarmRange, ProcessUnit.ToleranceDelayTime_ms, ProcessUnit.ToleranceMode));
-                }
+                Chamber.OpenValve(ValveType.PV31, true);            
             }
             Chamber.FlowGas(3, ProcessUnit.Gas4);
             if (ProcessUnit.Gas4 >= 1)
             {
-                Chamber.OpenValve(ValveType.PV41, true);
-                if (ProcessUnit.ToleranceMode != ToleranceMode.None)
-                {
-                    toleranceObjects.Add(new ToleranceObject("Gas4", ProcessUnit.Gas4, ProcessUnit.Gas4WarningRange, ProcessUnit.Gas4AlarmRange, ProcessUnit.ToleranceDelayTime_ms, ProcessUnit.ToleranceMode));
-                }
+                Chamber.OpenValve(ValveType.PV41, true);              
             }
+
             Chamber.FlowGas(4, ProcessUnit.Gas5);
             Chamber.FlowGas(5, ProcessUnit.Gas6);
-            if (ProcessUnit.Gas5 >= 1 && ProcessUnit.ToleranceMode != ToleranceMode.None && ProcessUnit.ToleranceDelayTime_ms > 0)
+
+            if (ProcessUnit.ToleranceMode != ToleranceMode.None)
             {
+                toleranceObjects.Add(new ToleranceObject("Gas1", ProcessUnit.Gas1, ProcessUnit.Gas1WarningRange, ProcessUnit.Gas1AlarmRange, ProcessUnit.ToleranceDelayTime_ms, ProcessUnit.ToleranceMode));
+                toleranceObjects.Add(new ToleranceObject("Gas2", ProcessUnit.Gas2, ProcessUnit.Gas2WarningRange, ProcessUnit.Gas2AlarmRange, ProcessUnit.ToleranceDelayTime_ms, ProcessUnit.ToleranceMode));
+                toleranceObjects.Add(new ToleranceObject("Gas3", ProcessUnit.Gas3, ProcessUnit.Gas3WarningRange, ProcessUnit.Gas3AlarmRange, ProcessUnit.ToleranceDelayTime_ms, ProcessUnit.ToleranceMode));
+                toleranceObjects.Add(new ToleranceObject("Gas4", ProcessUnit.Gas4, ProcessUnit.Gas4WarningRange, ProcessUnit.Gas4AlarmRange, ProcessUnit.ToleranceDelayTime_ms, ProcessUnit.ToleranceMode));
                 toleranceObjects.Add(new ToleranceObject("Gas5", ProcessUnit.Gas5, ProcessUnit.Gas5WarningRange, ProcessUnit.Gas5AlarmRange, ProcessUnit.ToleranceDelayTime_ms, ProcessUnit.ToleranceMode));
-            }
-            if (ProcessUnit.Gas6 >= 1 && ProcessUnit.ToleranceMode != ToleranceMode.None && ProcessUnit.ToleranceDelayTime_ms > 0)
-            {
                 toleranceObjects.Add(new ToleranceObject("Gas6", ProcessUnit.Gas6, ProcessUnit.Gas6WarningRange, ProcessUnit.Gas6AlarmRange, ProcessUnit.ToleranceDelayTime_ms, ProcessUnit.ToleranceMode));
-
             }
+
+
             if (ProcessUnit.ToleranceMode != ToleranceMode.None)
             {
                 _GasFlowToleranceChecker.Start(toleranceObjects);