diff --git a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
index 14fc5a1..bc8ecd1 100644
--- a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
+++ b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
@@ -72,7 +72,7 @@
-
+
@@ -198,17 +198,168 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml b/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml
index ec9faaf..6453dbe 100644
--- a/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml
+++ b/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml
@@ -568,7 +568,7 @@
-
+
@@ -669,20 +669,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -718,20 +718,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -760,7 +760,7 @@
-
+
diff --git a/App/Modules/SicModules/Config/PM/PM1/interlockPM1.xml b/App/Modules/SicModules/Config/PM/PM1/interlockPM1.xml
index 22b6449..b64dcad 100644
--- a/App/Modules/SicModules/Config/PM/PM1/interlockPM1.xml
+++ b/App/Modules/SicModules/Config/PM/PM1/interlockPM1.xml
@@ -3124,7 +3124,7 @@
-
+
diff --git a/App/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml b/App/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml
index d02e38a..3e65336 100644
--- a/App/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml
+++ b/App/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml
@@ -72,7 +72,7 @@
-
+
diff --git a/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml b/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml
index ec9faaf..6453dbe 100644
--- a/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml
+++ b/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml
@@ -568,7 +568,7 @@
-
+
@@ -669,20 +669,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -718,20 +718,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -760,7 +760,7 @@
-
+
diff --git a/App/Modules/SicModules/Config/PM/PM2/interlockPM2.xml b/App/Modules/SicModules/Config/PM/PM2/interlockPM2.xml
index ca75148..44fbf19 100644
--- a/App/Modules/SicModules/Config/PM/PM2/interlockPM2.xml
+++ b/App/Modules/SicModules/Config/PM/PM2/interlockPM2.xml
@@ -3124,7 +3124,7 @@
-
+
diff --git a/App/SicSimulator/Config/_ioDefinePM.xml b/App/SicSimulator/Config/_ioDefinePM.xml
index 4210fe9..6453dbe 100644
--- a/App/SicSimulator/Config/_ioDefinePM.xml
+++ b/App/SicSimulator/Config/_ioDefinePM.xml
@@ -568,7 +568,7 @@
-
+
@@ -669,20 +669,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -718,23 +718,25 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -754,11 +756,10 @@
-
-
+
+
-
-
+
diff --git a/App/SicSimulator/Instances/SimulatorSystem.cs b/App/SicSimulator/Instances/SimulatorSystem.cs
index 34ac978..a7e4b37 100644
--- a/App/SicSimulator/Instances/SimulatorSystem.cs
+++ b/App/SicSimulator/Instances/SimulatorSystem.cs
@@ -330,7 +330,7 @@ namespace SicSimulator.Instances
MonitorSlitValveFlow();
MonitorTMValve();
- //MonitorPm("PM1");
+ MonitorPm("PM1");
//MonitorPm("PM2");
MonitorValve("PM1");
//MonitorValve("PM2");
@@ -445,7 +445,7 @@ namespace SicSimulator.Instances
private void MonitorPm(string pm)
{
- IO.AI[$"{pm}.AI_TVmode"].Value = IO.AO[$"{pm}.AO_ValveModeSetpoint"].Value;
+ IO.AI[$"{pm}.AI_ValveMode"].Value = IO.AO[$"{pm}.AO_ValveModeSetpoint"].Value;
IO.AI[$"{pm}.AI_HeartBeat"].Value = IO.AO[$"{pm}.AO_HeartBeat"].Value;
IO.AI[$"{pm}.AI_ActualPositon"].Value = IO.AO[$"{pm}.AO_SetpointPositon"].Value;
@@ -476,18 +476,18 @@ namespace SicSimulator.Instances
}
}
}
- else
- {
- //判断是否有进气(V89到V97是否有开阀)
- if (IO.DI[$"{pm}.DI_InnerGasFinalFB(V89)"].Value || IO.DI[$"{pm}.DI_MiddleGasFinalFB(V90)"].Value || IO.DI[$"{pm}.DI_OpticPurgeFinalFB(V91)"].Value || IO.DI[$"{pm}.DI_GasRingPurgeFinalFB(V92)"].Value
- || IO.DI[$"{pm}.DI_ChamberPurgeFinalFB(V93)"].Value || IO.DI[$"{pm}.DI_RotationUpPurgeFinalFB(V94)"].Value || IO.DI[$"{pm}.DI_ConfinementRingFinalFB(V95)"].Value || IO.DI[$"{pm}.DI_HeaterWFFinalFB(V96)"].Value)
- {
- if (IO.AI[$"{pm}.AI_ActualPressure"].Value < 1200)
- {
- IO.AI[$"{pm}.AI_ActualPressure"].Value += 10;
- }
- }
- }
+ //else
+ //{
+ // //判断是否有进气(V89到V97是否有开阀)
+ // if (IO.DI[$"{pm}.DO_FinalInnerGas(V89)"].Value || IO.DI[$"{pm}.DI_MiddleGasFinalFB(V90)"].Value || IO.DI[$"{pm}.DI_OpticPurgeFinalFB(V91)"].Value || IO.DI[$"{pm}.DI_GasRingPurgeFinalFB(V92)"].Value
+ // || IO.DI[$"{pm}.DI_ChamberPurgeFinalFB(V93)"].Value || IO.DI[$"{pm}.DI_RotationUpPurgeFinalFB(V94)"].Value || IO.DI[$"{pm}.DI_ConfinementRingFinalFB(V95)"].Value || IO.DI[$"{pm}.DI_HeaterWFFinalFB(V96)"].Value)
+ // {
+ // if (IO.AI[$"{pm}.AI_ActualPressure"].Value < 1200)
+ // {
+ // IO.AI[$"{pm}.AI_ActualPressure"].Value += 10;
+ // }
+ // }
+ //}
//蝶阀Ramp有Bug,设置AO值可以化解
if (IO.AI[$"{pm}.AI_ActualPressure"].Value >= 1100)
@@ -498,14 +498,14 @@ namespace SicSimulator.Instances
IO.AI[$"{pm}.AI_ChamPress"].Value = IO.AI[$"{pm}.AI_ActualPressure"].Value;
//V27自动打开
- if (IO.AI[$"{pm}.AI_ChamPress"].Value > 1020 && IO.DO[$"{pm}.DO_PumpBypass(V27)"].Value != true)
- {
- IO.DO[$"{pm}.DO_PumpBypass(V27)"].Value = true;
- }
- if (IO.AI[$"{pm}.AI_ChamPress"].Value < 900 && IO.DO[$"{pm}.DO_PumpBypass(V27)"].Value)
- {
- IO.DO[$"{pm}.DO_PumpBypass(V27)"].Value = false;
- }
+ //if (IO.AI[$"{pm}.AI_ChamPress"].Value > 1020 && IO.DO[$"{pm}.DO_PMLeakTestIsolate(V27)"].Value != true)
+ //{
+ // IO.DO[$"{pm}.DO_PMLeakTestIsolate(V27)"].Value = true;
+ //}
+ //if (IO.AI[$"{pm}.AI_ChamPress"].Value < 900 && IO.DO[$"{pm}.DO_PMLeakTestIsolate(V27)"].Value)
+ //{
+ // IO.DO[$"{pm}.DO_PMLeakTestIsolate(V27)"].Value = false;
+ //}
//设置PT2的压力比PT1的小20