jiangjy 3 weeks ago
parent
commit
685bfecd5f

+ 3 - 2
Furnace/FurnaceRT/Config/IO/ELK/DeviceModelPM.xml

@@ -776,6 +776,7 @@
 		<IoPressureMeter id="VG21" display="VG21"  schematicId="VG21" unit="Torr" aiFeedback="AI_VG21Pressure"  physical="0,15000" scale="0,1000" aioType="float"/>
 		<IoPressureMeter id="VG22" display="VG22"  schematicId="VG22" unit="Torr" aiFeedback="AI_VG22Pressure"  physical="0,15000" scale="0,1000" aioType="float"/>
 		<IoPressureMeter id="VG33" display="VG33"  schematicId="VG33" unit="Torr" aiFeedback="AI_VG33Pressure"  physical="0,15000" scale="0,1000" aioType="float"/>
+		<IoPressureMeter id="VG32" display="VG32"  schematicId="VG32" unit="Torr" aiFeedback="AI_VG32Pressure"  physical="0,15000" scale="0,1000" aioType="float"/>
 
 		<IoPressureMeter id="N24PurgePressure" display="N24PurgePressure"  schematicId="N24PurgePressure" unit="psig" aiFeedback="AI_N24PurgePressure"  physical="0,15000" scale="0,150" aioType="float"/>
 		<IoPressureMeter id="N25PurgePressure" display="N25PurgePressure"  schematicId="N25PurgePressure" unit="psig" aiFeedback="AI_N25PurgePressure"  physical="0,15000" scale="0,150" aioType="float"/>
@@ -783,8 +784,8 @@
 		<IoPressureMeter id="N27PurgePressure" display="N27PurgePressure"  schematicId="N27PurgePressure" unit="psig" aiFeedback="AI_N27PurgePressure"  physical="0,15000" scale="0,150" aioType="float"/>
 		<IoPressureMeter id="Tank1Pressure" display="Tank1Pressure"  schematicId="Tank1Pressure" unit="kpa" aiFeedback="AI_Tank1Pressure"  physical="1500,7500" scale="0,1" aioType="float"/>
 		<IoPressureMeter id="Tank2Pressure" display="Tank2Pressure"  schematicId="Tank2Pressure" unit="kpa" aiFeedback="AI_Tank2Pressure"  physical="1500,7500" scale="0,1" aioType="float"/>
-		<IoPressureMeter id="VG32Pressure" display="VG32Pressure"  schematicId="VG32Pressure" unit="Pa" aiFeedback="AI_VG32Pressure"  physical="1500,7500" scale="0,1" aioType="float"/>
-		<IoPressureMeter id="VG33Pressure" display="VG33Pressure"  schematicId="VG33Pressure" unit="Pa" aiFeedback="AI_VG33Pressure"  physical="1500,7500" scale="0,1" aioType="float" />
+		
+		<IoPressureMeter id="LoadingAreaExhaustMS321" display="LoadingAreaExhaustMS321"  schematicId="LoadingAreaExhaustMS321" unit="Pa" aiFeedback="AI_LoadingAreaExhaustMS321"  physical="1500,7500" scale="0,1" aioType="float" />
 
 
 

+ 2 - 1
Furnace/FurnaceRT/Config/IO/ELK/_ioDefinePM.xml

@@ -1379,7 +1379,8 @@
 		<AI_ITEM Index="65"     Name="AI_GasBoxExhaustMS2"                                      BufferOffset="65"                                      Addr="D5130"                      Description="gas box exhaust MS2"                       />
 		<AI_ITEM Index="66"     Name="AI_ScavengerExhaustMS3"                                      BufferOffset="66"                                      Addr="D5132"                      Description="scavenger exhaust MS3"                       />
 		<AI_ITEM Index="67"     Name="AI_ExhaustBoxExhaustMS4"                                      BufferOffset="67"                                      Addr="D5134"                      Description="exhaust box exhaust MS4"                       />
-		<AI_ITEM Index="68"     Name="AI_LoadingAreaExhaustMS5"                                      BufferOffset="68"                                      Addr="D5136"                      Description="loading area exhaust MS5"                       />
+		<AI_ITEM Index="68"     Name="AI_LoadingAreaExhaustMS321"                                      BufferOffset="68"                                      Addr="D5136"                      Description="loading area Pressure MS321"                       />
+		<AI_ITEM Index="69"     Name="AI_LoadingAreaExhaustMS5"                                      BufferOffset="69"                                      Addr="D5138"                      Description="loading area exhaust MS5"                       />
 		<AI_ITEM Index="70"     Name="AI_CommonExhaustMS7"                                      BufferOffset="70"                                      Addr="D5140"                      Description="common exhaust MS7"                       />
 		<AI_ITEM Index="71"     Name="AI_LSCUpExhaustMS8"                                      BufferOffset="71"                                      Addr="D5142"                      Description="LSC-up exhaust MS8"                       />
 		<AI_ITEM Index="72"     Name="AI_LSCUpExhaustMS9"                                      BufferOffset="72"                                      Addr="D5144"                      Description="LSC-up exhaust MS9"                       />

+ 8 - 0
Furnace/FurnaceRT/Equipments/PMs/PMModuleDevice.cs

@@ -1362,12 +1362,20 @@ namespace FurnaceRT.Equipments.PMs
         public IoPressureMeter VG21 { get; set; }
         [Tag("VG22")]
         public IoPressureMeter VG22 { get; set; }
+        [Tag("VG33")]
+        public IoPressureMeter VG33 { get; set; }
+        [Tag("VG32")]
+        public IoPressureMeter VG32 { get; set; }
         [Tag("PG12")]
         public IoPressureMeter PG12 { get; set; }
         [Tag("PG13")]
         public IoPressureMeter PG13 { get; set; }
         [Tag("PS13")]
         public IoPressureMeter PS13 { get; set; }
+
+        [Tag("LoadingAreaExhaustMS321")]
+        public IoPressureMeter LoadingAreaExhaustMS321 { get; set; }
+
         [Tag("N24PurgePressure")]
         public IoPressureMeter N24PurgePressure { get; set; }
         [Tag("N25PurgePressure")]

+ 1 - 1
Furnace/FurnaceRT/Equipments/PMs/PMN2Purge.cs

@@ -136,7 +136,7 @@ namespace FurnaceRT.Equipments.PMs
         }
         private void ProcessPhase(R_TRIG r_TRIG, string modeKey)
         {
-            r_TRIG.CLK = CheckConditionInTime(modeKey, (int)_stabilityTime * 1000, () => _n2PurgeSequenceStatus[modeKey].Invoke());
+            r_TRIG.CLK = _n2PurgeSequenceStatus[modeKey].Invoke();
             if (r_TRIG.Q)
             {
                 LOG.Info($"N2PurgeMode Trigger {modeKey}!,O2:{GetO2Density()},time:{_allTimeDict[modeKey].ElapsedMilliseconds}");