From ea8a78922d765ebe1767739ad74cc5fa38b865d1 Mon Sep 17 00:00:00 2001
From: "SIC1016\\caipeilun" <123456>
Date: Mon, 4 Sep 2023 16:48:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9EinterlockV75=20=E5=B1=8F?=
=?UTF-8?q?=E8=94=BD=E9=87=8D=E5=A4=8Dinterlock?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../SicModules/Config/PM/PM1/interlockPM1.xml | 3 +
.../SicModules/Config/PM/PM2/interlockPM2.xml | 3 +
Modules/SicModules/PMs/PMModuleDevice.cs | 210 +++++++++---------
3 files changed, 111 insertions(+), 105 deletions(-)
diff --git a/Modules/SicModules/Config/PM/PM1/interlockPM1.xml b/Modules/SicModules/Config/PM/PM1/interlockPM1.xml
index 4181bff..a398ef8 100644
--- a/Modules/SicModules/Config/PM/PM1/interlockPM1.xml
+++ b/Modules/SicModules/Config/PM/PM1/interlockPM1.xml
@@ -1152,6 +1152,9 @@
+
+
+
diff --git a/Modules/SicModules/Config/PM/PM2/interlockPM2.xml b/Modules/SicModules/Config/PM/PM2/interlockPM2.xml
index a793cac..b71daed 100644
--- a/Modules/SicModules/Config/PM/PM2/interlockPM2.xml
+++ b/Modules/SicModules/Config/PM/PM2/interlockPM2.xml
@@ -1152,6 +1152,9 @@
+
+
+
diff --git a/Modules/SicModules/PMs/PMModuleDevice.cs b/Modules/SicModules/PMs/PMModuleDevice.cs
index 2ff4470..786d5a7 100644
--- a/Modules/SicModules/PMs/PMModuleDevice.cs
+++ b/Modules/SicModules/PMs/PMModuleDevice.cs
@@ -2639,121 +2639,121 @@ namespace SicModules.PMs
//}
//14.DOR Vac (DO48 V75常闭)[V76常闭]
- if (V75 != null)
- {
- V75.FuncCheckInterLock = (setValue) =>
- {
- if (setValue)
- {
- if (V76 != null)
- {
- if (V76.Status)
- {
- EV.PostWarningLog(Module, "Condition:V76 should be closed");
- return false;
- }
- }
- else
- {
- EV.PostWarningLog(Module, "Condition:V76 should be not null");
- return false;
- }
- }
+ //if (V75 != null)
+ //{
+ // V75.FuncCheckInterLock = (setValue) =>
+ // {
+ // if (setValue)
+ // {
+ // if (V76 != null)
+ // {
+ // if (V76.Status)
+ // {
+ // EV.PostWarningLog(Module, "Condition:V76 should be closed");
+ // return false;
+ // }
+ // }
+ // else
+ // {
+ // EV.PostWarningLog(Module, "Condition:V76 should be not null");
+ // return false;
+ // }
+ // }
- return true;
- };
+ // return true;
+ // };
- //返回True，表明条件满足，强制关阀
- V75.FuncForceOpen = (curStatue) =>
- {
- if (curStatue)
- {
- //满足条件，强制执行
- if (V76 != null)
- {
- if (V76.Status)
- {
- return true;
- }
- }
- else
- {
- return false;
- }
- }
+ // //返回True，表明条件满足，强制关阀
+ // V75.FuncForceOpen = (curStatue) =>
+ // {
+ // if (curStatue)
+ // {
+ // //满足条件，强制执行
+ // if (V76 != null)
+ // {
+ // if (V76.Status)
+ // {
+ // return true;
+ // }
+ // }
+ // else
+ // {
+ // return false;
+ // }
+ // }
- return false;
- };
- }
+ // return false;
+ // };
+ //}
- //15.DOR Refill (DO49 V76常闭)
- if (V76 != null)
- {
- V76.FuncCheckInterLock = (setValue) =>
- {
- if (setValue)
- {
- if (SensorPMATMSW != null && _pmInterLock != null && V75 != null)
- {
- if (SensorPMATMSW.Value) //DI9=1
- {
- EV.PostWarningLog(Module, "Condition:DI-4 PM AT ATM ");
- return false;
- }
+ ////15.DOR Refill (DO49 V76常闭)
+ //if (V76 != null)
+ //{
+ // V76.FuncCheckInterLock = (setValue) =>
+ // {
+ // if (setValue)
+ // {
+ // if (SensorPMATMSW != null && _pmInterLock != null && V75 != null)
+ // {
+ // if (SensorPMATMSW.Value) //DI9=1
+ // {
+ // EV.PostWarningLog(Module, "Condition:DI-4 PM AT ATM ");
+ // return false;
+ // }
- if (!_pmInterLock.DoLidOpenRoutineSucceed)
- {
- EV.PostWarningLog(Module, "Condition:Purge Routine Succeed should be on ");
- return false;
- }
+ // if (!_pmInterLock.DoLidOpenRoutineSucceed)
+ // {
+ // EV.PostWarningLog(Module, "Condition:Purge Routine Succeed should be on ");
+ // return false;
+ // }
- if (V75.Status)
- {
- EV.PostWarningLog(Module, "Condition:V75 should be Closed!");
- return false;
- }
- }
- else
- {
- EV.PostWarningLog(Module, "Condition:SensorPMATMSW should be not null");
- return false;
- }
- }
+ // if (V75.Status)
+ // {
+ // EV.PostWarningLog(Module, "Condition:V75 should be Closed!");
+ // return false;
+ // }
+ // }
+ // else
+ // {
+ // EV.PostWarningLog(Module, "Condition:SensorPMATMSW should be not null");
+ // return false;
+ // }
+ // }
- return true;
- };
+ // return true;
+ // };
- //返回True，表明条件满足，强制关阀
- V76.FuncForceOpen = (curStatue) =>
- {
- if (curStatue)
- {
- //满足条件，强制执行
- if (SensorPMATMSW != null)
- {
- if (SensorPMATMSW.Value)
- {
- return true;
- }
- }
+ // //返回True，表明条件满足，强制关阀
+ // V76.FuncForceOpen = (curStatue) =>
+ // {
+ // if (curStatue)
+ // {
+ // //满足条件，强制执行
+ // if (SensorPMATMSW != null)
+ // {
+ // if (SensorPMATMSW.Value)
+ // {
+ // return true;
+ // }
+ // }
- //V76和V75只能开一个
- if (V75 != null)
- {
- if (V75.Status)
- {
- return true;
- }
- }
- else
- {
- return false;
- }
- }
+ // //V76和V75只能开一个
+ // if (V75 != null)
+ // {
+ // if (V75.Status)
+ // {
+ // return true;
+ // }
+ // }
+ // else
+ // {
+ // return false;
+ // }
+ // }
- return false;
- };
- }
+ // return false;
+ // };
+ //}
//16.17.PM pump bypass valve force open (DO52 V27) Checked
if (V27 != null)