From e83a699e6bbc8f43024b45bd057c4985e1fc6a35 Mon Sep 17 00:00:00 2001
From: hanqiangqiang <1364346467@qq.com>
Date: Mon, 10 Aug 2026 14:57:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86IO=EF=BC=8C=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E9=87=8F=E4=BA=A7=E6=9C=BA=E4=BF=AE=E6=94=B9=E5=B7=AE=E5=BC=82?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E4=BB=BF=E7=9C=9F=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=A1=AC=E4=BB=B6=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Config/PM/PM1/DeviceModelPM1.xml          | 155 +-----------------
 .../SicModules/Config/PM/PM1/_ioDefinePM1.xml |  14 +-
 .../Config/PM/PM2/DeviceModelPM2.xml          |   2 +-
 .../SicModules/Config/PM/PM2/_ioDefinePM2.xml |  14 +-
 .../SicModules/Config/PM/PM2/interlockPM2.xml |  44 ++---
 .../TMs/Routines/TMRobotPlaceRoutine.cs       |   2 +-
 App/SicSimulator/Config/DevicePM.xml          |   2 +-
 App/SicSimulator/Config/_ioDefinePM.xml       |  14 +-
 App/SicSimulator/Instances/SimulatorSystem.cs |   4 +-
 9 files changed, 51 insertions(+), 200 deletions(-)

diff --git a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
index bc8ecd1..4c57b96 100644
--- a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
+++ b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
@@ -211,155 +211,6 @@
     <IoPressure id="PT2" display="PT2" schematicId="PT2" scBasePath="PM.{module}.PC" unit="mbar" aioType="float" aiOpenDegree="" aiActMode="" aoSetMode="" aiValue="AI_ForelinePress" aoValue="" formatString="0.0" />
   </IoPressures>
   
-    <!--<IoSensorWaterFlowTemp classType="Aitex.Core.RT.Device.Devices.IoSensorWaterFlowTemp" assembly="MECF.Framework.RT.EquipmentLibrary">
-    <IoSensorWaterFlowTemp id="FlowTemp1" module="" display="SHFlow(U1)" schematicId="SHFlowTemp"
-                           unit="℃"
-                           ai="AI_SHFlowTemp"
-                           ao=""
-                           diFlowSW="DI_SHFlowSW"
-                           doWarningLow=""
-                           doWarningHigh=""
-                           doAlarmLow=""
-                           doAlarmHigh="DO_SHFlowTemp"
-                           doActiveLevel="false"
-                           scBasePath="PM.{module}.CoolingWater"
-                           scWarningLow=""
-                           scWarningHigh=""
-                           scAlarmLow=""
-                           scAlarmHigh="SHFlowTemp"
-                           scWarningOffset="WarningOffset"
-                           scFilterDuration="FilterDuration"/>
-
-    <IoSensorWaterFlowTemp id="FlowTemp2" module="" display="TopFlow(U2)" schematicId="ChamTopFlowTemp" unit="℃"
-                           ai="AI_ChamTopFlowTemp"
-                           diFlowSW="DI_ChamTopFlowSW"
-                           doAlarmHigh="DO_ChamTopFlowTemp"
-                           doActiveLevel="false"
-                           scBasePath="PM.{module}.CoolingWater"
-                           scAlarmHigh="ChamTopFlowTemp"
-                           scWarningOffset="WarningOffset"
-                           scFilterDuration="FilterDuration" />
-
-    <IoSensorWaterFlowTemp id="FlowTemp3" module="" display="MiddleFlow1(U3)" schematicId="ChamMiddleFlow1Temp" unit="℃"
-                           ai="AI_ChamMiddleFlow1Temp"
-                           diFlowSW="DI_ChamMiddleFlow1SW"
-                           doAlarmHigh="DO_ChamMiddleFlow1Temp"
-                           doActiveLevel="false"
-                           scBasePath="PM.{module}.CoolingWater"
-                           scAlarmHigh="ChamMiddleFlow1Temp"
-                           scWarningOffset="WarningOffset"
-                           scFilterDuration="FilterDuration"/>
-
-    <IoSensorWaterFlowTemp id="FlowTemp4" module="" display="MiddleFlow2(U4)" schematicId="ChamMiddleFlow2Temp" unit="℃"
-                           ai="AI_ChamMiddleFlow2Temp"
-                           diFlowSW="DI_ChamMiddleFlow2SW"
-                           doAlarmHigh="DO_ChamMiddleFlow2Temp"
-                           doActiveLevel="false"
-                           scBasePath="PM.{module}.CoolingWater"
-                           scAlarmHigh="ChamMiddleFlow2Temp"
-                           scWarningOffset="WarningOffset"
-                           scFilterDuration="FilterDuration" />
-
-    <IoSensorWaterFlowTemp id="FlowTemp5" module="" display="BottomFlow(U5)" schematicId="ChamBottomFlowTemp" unit="℃"
-                           ai="AI_ChamBottomFlowTemp"
-                           diFlowSW="DI_ChamBottomFlowSW"
-                           doAlarmHigh="DO_ChamBottomFlowTemp"
-                           doActiveLevel="false"
-                           scBasePath="PM.{module}.CoolingWater"
-                           scAlarmHigh="ChamBottomFlowTemp"
-                           scWarningOffset="WarningOffset"
-                           scFilterDuration="FilterDuration" />
-
-    <IoSensorWaterFlowTemp id="FlowTemp6" module="" display="Foreline1Flow(U6)" schematicId="Foreline1FlowTemp" unit="℃"
-                           ai="AI_Foreline1FlowTemp"
-                           diFlowSW="DI_Foreline1FlowSW"
-                           doAlarmHigh="DO_SpareFlowTemp"
-                           doActiveLevel="false"
-                           scBasePath="PM.{module}.CoolingWater"
-                           scAlarmHigh="SpareFlowTemp"
-                           scWarningOffset="WarningOffset"
-                           scFilterDuration="FilterDuration" />
-    
-    <IoSensorWaterFlowTemp id="FlowTemp7" module="" display="PowerRod1Flow(U7)" schematicId="PowerRod1FlowTemp" unit="℃"
-                           ai="AI_PowerRod1FlowTemp"
-                           diFlowSW="DI_PowerRod1FlowSW"
-                           doAlarmHigh="DO_PowerRod1FlowTemp"
-                           doActiveLevel="false"
-                           scBasePath="PM.{module}.CoolingWater"
-                           scAlarmHigh="PowerRod1FlowTemp"
-                           scWarningOffset="WarningOffset"
-                           scFilterDuration="FilterDuration" />
-
-    <IoSensorWaterFlowTemp id="FlowTemp8" module="" display="PowerRod2Flow(U8)" schematicId="PowerRod2FlowTemp" unit="℃"
-                           ai="AI_PowerRod2FlowTemp"
-                           diFlowSW="DI_PowerRod2FlowSW"
-                           doAlarmHigh="DO_PowerRod2FlowTemp"
-                           doActiveLevel="false"
-                           scBasePath="PM.{module}.CoolingWater"
-                           scAlarmHigh="PowerRod2FlowTemp"
-                           scWarningOffset="WarningOffset"
-                           scFilterDuration="FilterDuration"/>
-
-    <IoSensorWaterFlowTemp id="FlowTemp9" module="" display="Foreline2Flow(U9)" schematicId="Foreline2FlowTemp" unit="℃"
-                           ai="AI_Foreline2FlowTemp"
-                           diFlowSW="DI_Foreline2FlowSW"
-                           doAlarmHigh="DO_ForelineFlowTemp"
-                           doActiveLevel="false"
-                           scBasePath="PM.{module}.CoolingWater"
-                           scAlarmHigh="ForelineFlowTemp"
-                           scWarningOffset="WarningOffset"
-                           scFilterDuration="FilterDuration" />
-
-    <IoSensorWaterFlowTemp id="FlowTemp10" module="" display="ElectrodeWFlow(U10)" schematicId="ElectrodeWFlowTemp" unit="℃"
-                           ai="AI_ElectrodeWFlowTemp"
-                           diFlowSW="DI_ElectrodeWFlowSW"
-                           doAlarmHigh="DO_ElectrodeWFlowTemp"
-                           doActiveLevel="false"
-                           scBasePath="PM.{module}.CoolingWater"
-                           scAlarmHigh="ElectrodeWFlowTemp"
-                           scWarningOffset="WarningOffset"
-                           scFilterDuration="FilterDuration" />
-
-    <IoSensorWaterFlowTemp id="FlowTemp11" module="" display="TMPump1Flow(U11)" schematicId="TMPump1FlowTemp" unit="℃"
-                           ai="AI_TMPumpFlowTemp"
-                           diFlowSW="DI_TMPumpFlowSW"
-                           doAlarmHigh="DO_TMPump1FlowTemp"
-                           doActiveLevel="false"
-                           scBasePath="PM.{module}.CoolingWater"
-                           scAlarmHigh="TMPump1FlowTemp"
-                           scWarningOffset="WarningOffset"
-                           scFilterDuration="FilterDuration" />
-
-    <IoSensorWaterFlowTemp id="FlowTemp12" module="" display="Spare1(U12)" schematicId="Spare1Temp" unit="℃"
-                           ai="AI_Spare1Temp"
-                           diFlowSW="DI_Spare1FlowSW"
-                           doAlarmHigh="DO_Spare1FlowTemp"
-                           doActiveLevel="false"
-                           scBasePath="PM.{module}.CoolingWater"
-                           scAlarmHigh="Spare1FlowTemp"
-                           scWarningOffset="WarningOffset"
-                           scFilterDuration="FilterDuration" />
-
-    <IoSensorWaterFlowTemp id="FlowTemp13" module="" display="Spare2(U13)" schematicId="Spare2Temp" unit="℃"
-                           ai="AI_Spare2Temp"
-                           diFlowSW="DI_Spare2FlowSW"
-                           doAlarmHigh="DO_Spare2FlowTemp"
-                           doActiveLevel="false"
-                           scBasePath="PM.{module}.CoolingWater"
-                           scAlarmHigh="Spare2FlowTemp"
-                           scWarningOffset="WarningOffset"
-                           scFilterDuration="FilterDuration" />
-
-    <IoSensorWaterFlowTemp id="FlowTemp14" module="" display="TransformerFlow(U14)" schematicId="TransformerFlowTemp" unit="℃"
-                           ai="AI_TransformerFlowTemp"
-                           diFlowSW="DI_TransformerFlowSW"
-                           doAlarmHigh="DO_TransformerFlowTemp"
-                           doActiveLevel="false"
-                           scBasePath="PM.{module}.CoolingWater"
-                           scAlarmHigh="TransformerFlowTemp"
-                           scWarningOffset="WarningOffset"
-                           scFilterDuration="FilterDuration" />
-  </IoSensorWaterFlowTemp>-->
 
   <IoGasBoxTemps classType="Aitex.Core.RT.Device.Devices.IoLineHeater" assembly="MECF.Framework.RT.EquipmentLibrary">
     <IoGasBoxTemp id="HeatTMAPanelTemp"     display="TMAPanelTemp(ATC-1)"     aiHeatTMA="AI_HeatTMAPanel"     scBasePath="PM.{module}.LineHeaterTemp"  scAlarmHigh="加热带温区1" scWarningLog="" doLineHeaterEnable="DO_LineHeaterEnable"/>
@@ -423,7 +274,7 @@
     <IoSensor id="SensorTransformerOTSW"       module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true"  di="DI_TransformerOTSW"           infoText="" warningText="Warning12 TransformerOverTemp  [DI-83]" alarmText="" />
     <IoSensor id="SensorSHLidClosed"           module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_SHLidClosed"               infoText="" warningText="Warning13 SH Lid Opened  [DI-106]" alarmText="" />
     <IoSensor id="SensorMiddleLidClosed"       module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_MiddleLidClosed"           infoText="" warningText="Warning14 Middle Lid Opened  [DI-120]" alarmText="" />
-    <IoSensor id="SensorTMPumpFlowSW"              module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_TMPumpFlowSW"          infoText="" warningText="Warning15  TMPump1 Cooling Water Low Flow -U11  [DI-24]" alarmText="" DisInServiceMode="true"/>
+    <IoSensor id="SensorTMPumpFlowSW"              module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_TMPump1FlowSW"          infoText="" warningText="Warning15  TMPump1 Cooling Water Low Flow -U11  [DI-24]" alarmText="" DisInServiceMode="true"/>
     <IoSensor id="SensorPSUInnerTempHAlarm"    module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true"  di="DI_PSUInnerTempHAlarm"        infoText="" warningText="" alarmText="" />
     <IoSensor id="SensorPSUMiddleTempHAlarm"   module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true"  di="DI_PSUMiddleTempHAlarm"       infoText="" warningText="" alarmText="" />
     <IoSensor id="SensorPSUOuterTempHAlarm"    module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true"  di="DI_PSUOuterTempHAlarm"        infoText="" warningText="" alarmText="" />
@@ -562,7 +413,7 @@
     <IoSensor id="SensorSusceptorAtSafeSpeed"     module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true"  di="DI_SusceptorAtSafeSpeed"     infoText="Information6 Susceptor At Safe Speed [DI-13]" warningText="" alarmText="" />
     <IoSensor id="SensorChamLidPushButtonLocal"   module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_ChamLidPushButtonLocal"   infoText="Information7 Chamer Lid Push Button On Local Mode [DI-49]" warningText="" alarmText="" />
     <IoSensor id="SensorConfinementRingDown"      module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true"  di="DI_ConfinementRingDown"      infoText="Information8 Confinement Ring At Down position [DI-50]" warningText="" alarmText="" />
-    <IoSensor id="SensorReactorSuspectorCheck"    module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true"  di="DI_ReactorSuspectorCheck"    infoText="Information9 ReactorSuspectorCheck [DI-51]" warningText="" alarmText="" />
+    <IoSensor id="SensorReactorSuspectorCheck"    module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true"  di="DI_PMGasDetectorFault2SW"    infoText="Information9 ReactorSuspectorCheck [DI-51]" warningText="" alarmText="" />
     <IoSensor id="SensorManualLidOPLocal"         module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true"  di="DI_ManualLidOPLocal"         infoText="Information10 ManualLidOP.Local[DI-88]" warningText="" alarmText="" />
     <IoSensor id="SensorManualLidUpPB"            module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true"  di="DI_ManualLidUpPB"            infoText="Information11 ManualLidUp.PB[DI-89]" warningText="" alarmText="" />
     <IoSensor id="SensorManualLidDownPB"          module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true"  di="DI_ManualLidDownPB"          infoText="Information12 ManualLidDown.PB[DI-90]" warningText="" alarmText="" />
@@ -689,7 +540,7 @@
 					 aiPowerRod1FlowTemp="AI_PowerRod1FlowTemp"
 					 aiPowerRod2FlowTemp="AI_PowerRod2FlowTemp"
 					 aiElectrodeWFlowTemp="AI_ElectrodeWFlowTemp"
-					 aiTMPump1FlowTemp="AI_TMPumpFlowTemp"
+					 aiTMPump1FlowTemp="AI_TMPump1FlowTemp"
 					 aiTMPump2FlowTemp="AI_Foreline1FlowTemp"
 					 aiTransformerFlowTemp="AI_TransformerFlowTemp"
 					 aiForelineFlowTemp="AI_Foreline2FlowTemp"
diff --git a/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml b/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml
index 6453dbe..8b0453d 100644
--- a/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml
+++ b/App/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml
@@ -27,7 +27,7 @@
       <DI_ITEM Index="21" Name="DI_PowerRod2FlowSW" BufferOffset="21" Addr="21" Description="" />
       <DI_ITEM Index="22" Name="DI_Foreline2FlowSW" BufferOffset="22" Addr="22" Description="" />
       <DI_ITEM Index="23" Name="DI_ElectrodeWFlowSW" BufferOffset="23" Addr="23" Description="" />
-      <DI_ITEM Index="24" Name="DI_TMPumpFlowSW" BufferOffset="24" Addr="24" Description="" />
+      <DI_ITEM Index="24" Name="DI_TMPump1FlowSW" BufferOffset="24" Addr="24" Description="" />
       <DI_ITEM Index="25" Name="DI_TransformerFlowSW" BufferOffset="25" Addr="25" Description="" />
       <DI_ITEM Index="26" Name="DI_ChamMiddleFlow2SW" BufferOffset="26" Addr="26" Description="" />
       <DI_ITEM Index="27" Name="DI_InletTotalFlowLowSW" BufferOffset="27" Addr="27" Description="" />
@@ -44,11 +44,13 @@
       <DI_ITEM Index="40" Name="DI_PumpExhaustDPSW" BufferOffset="40" Addr="40" Description="" />
       <DI_ITEM Index="41" Name="DI_ScrubberIntlkSW" BufferOffset="41" Addr="41" Description="" />
       <DI_ITEM Index="42" Name="DI_FacilityIntlkSW" BufferOffset="42" Addr="42" Description="" />
+      <DI_ITEM Index="43" Name="DI_PMH2SeDetector2SW" BufferOffset="43" Addr="43" Description="" />
+      <DI_ITEM Index="44" Name="DI_PMSO2Detector2SW" BufferOffset="44" Addr="44" Description="" />
       <DI_ITEM Index="45" Name="DI_ServoDriverFaultSW" BufferOffset="45" Addr="45" Description="" />
       <DI_ITEM Index="48" Name="DI_ReactorWaterLeakSW" BufferOffset="48" Addr="48" Description="" />
       <DI_ITEM Index="49" Name="DI_ChamLidPushButtonLocal" BufferOffset="49" Addr="49" Description="" />
       <DI_ITEM Index="50" Name="DI_ConfinementRingDown" BufferOffset="50" Addr="50" Description="" />
-      <DI_ITEM Index="51" Name="DI_ReactorSuspectorCheck" BufferOffset="51" Addr="51" Description="" />
+      <DI_ITEM Index="51" Name="DI_PMGasDetectorFault2SW" BufferOffset="51" Addr="51" Description="" />
       <DI_ITEM Index="52" Name="DI_PMSO2Detector1SW" BufferOffset="52" Addr="52" Description="" />
       <DI_ITEM Index="55" Name="DI_GN2InletPressSW" BufferOffset="55" Addr="55" Description="" />
       <DI_ITEM Index="56" Name="DI_GBH2SDetectorSW" BufferOffset="56" Addr="56" Description="" />
@@ -64,8 +66,6 @@
       <DI_ITEM Index="71" Name="DI_PumpCabDoorClosed" BufferOffset="71" Addr="71" Description="" />
       <DI_ITEM Index="72" Name="DI_FacilityWarningSW" BufferOffset="72" Addr="72" Description="" />
       <DI_ITEM Index="73" Name="DI_PMH2SDetector2SW" BufferOffset="73" Addr="73" Description="" />
-      <DI_ITEM Index="74" Name="DI_PMH2SeDetector2SW" BufferOffset="74" Addr="74" Description="" />
-      <DI_ITEM Index="75" Name="DI_PMSO2Detector2SW" BufferOffset="75" Addr="75" Description="" />
       <DI_ITEM Index="76" Name="DI_MainCBStatusSW" BufferOffset="76" Addr="76" Description="" />
       <DI_ITEM Index="77" Name="DI_PowerRackWaterLeakSW" BufferOffset="77" Addr="77" Description="" />
       <DI_ITEM Index="78" Name="DI_UPS1Enable" BufferOffset="78" Addr="78" Description="" />
@@ -475,12 +475,12 @@
       <AI_ITEM Index="4" Name="AI_ChamTopFlowTemp" BufferOffset="4" Addr="4" Description="" />
       <AI_ITEM Index="5" Name="AI_ChamMiddleFlow1Temp" BufferOffset="5" Addr="5" Description="" />
       <AI_ITEM Index="6" Name="AI_ChamBottomFlowTemp" BufferOffset="6" Addr="6" Description="" />
-      <AI_ITEM Index="7" Name="AI_TMPump2FlowTemp" BufferOffset="7" Addr="7" Description="" />
+      <AI_ITEM Index="7" Name="AI_Foreline1FlowTemp" BufferOffset="7" Addr="7" Description="" />
       <AI_ITEM Index="8" Name="AI_PowerRod1FlowTemp" BufferOffset="8" Addr="8" Description="" />
       <AI_ITEM Index="9" Name="AI_PowerRod2FlowTemp" BufferOffset="9" Addr="9" Description="" />
-      <AI_ITEM Index="10" Name="AI_ForelineFlowTemp" BufferOffset="10" Addr="10" Description="" />
+      <AI_ITEM Index="10" Name="AI_Foreline2FlowTemp" BufferOffset="10" Addr="10" Description="" />
       <AI_ITEM Index="11" Name="AI_ElectrodeWFlowTemp" BufferOffset="11" Addr="11" Description="" />
-      <AI_ITEM Index="12" Name="AI_TMPumpFlowTemp" BufferOffset="12" Addr="12" Description="" />
+      <AI_ITEM Index="12" Name="AI_TMPump1FlowTemp" BufferOffset="12" Addr="12" Description="" />
       <AI_ITEM Index="13" Name="AI_TransformerFlowTemp" BufferOffset="13" Addr="13" Description="" />
       <AI_ITEM Index="14" Name="AI_ChamMiddleFlow2Temp" BufferOffset="14" Addr="14" Description="" />
       <AI_ITEM Index="15" Name="AI_TMBufferFlowTemp" BufferOffset="15" Addr="15" Description="" />
diff --git a/App/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml b/App/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml
index 3e65336..bbd8299 100644
--- a/App/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml
+++ b/App/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml
@@ -343,7 +343,7 @@
 					 aiPowerRod1FlowTemp="AI_PowerRod1FlowTemp"
 					 aiPowerRod2FlowTemp="AI_PowerRod2FlowTemp"
 					 aiElectrodeWFlowTemp="AI_ElectrodeWFlowTemp"
-					 aiTMPump1FlowTemp="AI_TMPumpFlowTemp"
+					 aiTMPump1FlowTemp="AI_TMPump1FlowTemp"
 					 aiTMPump2FlowTemp="AI_Foreline1FlowTemp"
 					 aiTransformerFlowTemp="AI_TransformerFlowTemp"
 					 aiForelineFlowTemp="AI_Foreline2FlowTemp"
diff --git a/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml b/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml
index 6453dbe..8b0453d 100644
--- a/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml
+++ b/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml
@@ -27,7 +27,7 @@
       <DI_ITEM Index="21" Name="DI_PowerRod2FlowSW" BufferOffset="21" Addr="21" Description="" />
       <DI_ITEM Index="22" Name="DI_Foreline2FlowSW" BufferOffset="22" Addr="22" Description="" />
       <DI_ITEM Index="23" Name="DI_ElectrodeWFlowSW" BufferOffset="23" Addr="23" Description="" />
-      <DI_ITEM Index="24" Name="DI_TMPumpFlowSW" BufferOffset="24" Addr="24" Description="" />
+      <DI_ITEM Index="24" Name="DI_TMPump1FlowSW" BufferOffset="24" Addr="24" Description="" />
       <DI_ITEM Index="25" Name="DI_TransformerFlowSW" BufferOffset="25" Addr="25" Description="" />
       <DI_ITEM Index="26" Name="DI_ChamMiddleFlow2SW" BufferOffset="26" Addr="26" Description="" />
       <DI_ITEM Index="27" Name="DI_InletTotalFlowLowSW" BufferOffset="27" Addr="27" Description="" />
@@ -44,11 +44,13 @@
       <DI_ITEM Index="40" Name="DI_PumpExhaustDPSW" BufferOffset="40" Addr="40" Description="" />
       <DI_ITEM Index="41" Name="DI_ScrubberIntlkSW" BufferOffset="41" Addr="41" Description="" />
       <DI_ITEM Index="42" Name="DI_FacilityIntlkSW" BufferOffset="42" Addr="42" Description="" />
+      <DI_ITEM Index="43" Name="DI_PMH2SeDetector2SW" BufferOffset="43" Addr="43" Description="" />
+      <DI_ITEM Index="44" Name="DI_PMSO2Detector2SW" BufferOffset="44" Addr="44" Description="" />
       <DI_ITEM Index="45" Name="DI_ServoDriverFaultSW" BufferOffset="45" Addr="45" Description="" />
       <DI_ITEM Index="48" Name="DI_ReactorWaterLeakSW" BufferOffset="48" Addr="48" Description="" />
       <DI_ITEM Index="49" Name="DI_ChamLidPushButtonLocal" BufferOffset="49" Addr="49" Description="" />
       <DI_ITEM Index="50" Name="DI_ConfinementRingDown" BufferOffset="50" Addr="50" Description="" />
-      <DI_ITEM Index="51" Name="DI_ReactorSuspectorCheck" BufferOffset="51" Addr="51" Description="" />
+      <DI_ITEM Index="51" Name="DI_PMGasDetectorFault2SW" BufferOffset="51" Addr="51" Description="" />
       <DI_ITEM Index="52" Name="DI_PMSO2Detector1SW" BufferOffset="52" Addr="52" Description="" />
       <DI_ITEM Index="55" Name="DI_GN2InletPressSW" BufferOffset="55" Addr="55" Description="" />
       <DI_ITEM Index="56" Name="DI_GBH2SDetectorSW" BufferOffset="56" Addr="56" Description="" />
@@ -64,8 +66,6 @@
       <DI_ITEM Index="71" Name="DI_PumpCabDoorClosed" BufferOffset="71" Addr="71" Description="" />
       <DI_ITEM Index="72" Name="DI_FacilityWarningSW" BufferOffset="72" Addr="72" Description="" />
       <DI_ITEM Index="73" Name="DI_PMH2SDetector2SW" BufferOffset="73" Addr="73" Description="" />
-      <DI_ITEM Index="74" Name="DI_PMH2SeDetector2SW" BufferOffset="74" Addr="74" Description="" />
-      <DI_ITEM Index="75" Name="DI_PMSO2Detector2SW" BufferOffset="75" Addr="75" Description="" />
       <DI_ITEM Index="76" Name="DI_MainCBStatusSW" BufferOffset="76" Addr="76" Description="" />
       <DI_ITEM Index="77" Name="DI_PowerRackWaterLeakSW" BufferOffset="77" Addr="77" Description="" />
       <DI_ITEM Index="78" Name="DI_UPS1Enable" BufferOffset="78" Addr="78" Description="" />
@@ -475,12 +475,12 @@
       <AI_ITEM Index="4" Name="AI_ChamTopFlowTemp" BufferOffset="4" Addr="4" Description="" />
       <AI_ITEM Index="5" Name="AI_ChamMiddleFlow1Temp" BufferOffset="5" Addr="5" Description="" />
       <AI_ITEM Index="6" Name="AI_ChamBottomFlowTemp" BufferOffset="6" Addr="6" Description="" />
-      <AI_ITEM Index="7" Name="AI_TMPump2FlowTemp" BufferOffset="7" Addr="7" Description="" />
+      <AI_ITEM Index="7" Name="AI_Foreline1FlowTemp" BufferOffset="7" Addr="7" Description="" />
       <AI_ITEM Index="8" Name="AI_PowerRod1FlowTemp" BufferOffset="8" Addr="8" Description="" />
       <AI_ITEM Index="9" Name="AI_PowerRod2FlowTemp" BufferOffset="9" Addr="9" Description="" />
-      <AI_ITEM Index="10" Name="AI_ForelineFlowTemp" BufferOffset="10" Addr="10" Description="" />
+      <AI_ITEM Index="10" Name="AI_Foreline2FlowTemp" BufferOffset="10" Addr="10" Description="" />
       <AI_ITEM Index="11" Name="AI_ElectrodeWFlowTemp" BufferOffset="11" Addr="11" Description="" />
-      <AI_ITEM Index="12" Name="AI_TMPumpFlowTemp" BufferOffset="12" Addr="12" Description="" />
+      <AI_ITEM Index="12" Name="AI_TMPump1FlowTemp" BufferOffset="12" Addr="12" Description="" />
       <AI_ITEM Index="13" Name="AI_TransformerFlowTemp" BufferOffset="13" Addr="13" Description="" />
       <AI_ITEM Index="14" Name="AI_ChamMiddleFlow2Temp" BufferOffset="14" Addr="14" Description="" />
       <AI_ITEM Index="15" Name="AI_TMBufferFlowTemp" BufferOffset="15" Addr="15" Description="" />
diff --git a/App/Modules/SicModules/Config/PM/PM2/interlockPM2.xml b/App/Modules/SicModules/Config/PM/PM2/interlockPM2.xml
index 44fbf19..38e7a2e 100644
--- a/App/Modules/SicModules/Config/PM/PM2/interlockPM2.xml
+++ b/App/Modules/SicModules/Config/PM/PM2/interlockPM2.xml
@@ -190,7 +190,7 @@
 		<Limit di="PM2.DI_SCR2Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-324"/>
 		<Limit di="PM2.DI_SCR3Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-325"/>
 		<Limit di="PM2.DI_Foreline2FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-22"/>
-		<Limit di="PM2.DI_TMPumpFlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
+		<Limit di="PM2.DI_TMPump1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
 		<Limit di="PM2.DI_Spare1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-26"/>
 		<Limit di="PM2.DI_DryPump2Running" value="true" tip="" tip.zh-CN="" tip.en-US="DI-66"/>
 		<Limit di="PM2.DI_DryPump2Alarm" value="true" tip="" tip.zh-CN="" tip.en-US="DI-37"/>
@@ -263,7 +263,7 @@
 		<Limit di="PM2.DI_SCR2Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-324"/>
 		<Limit di="PM2.DI_SCR3Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-325"/>
 		<Limit di="PM2.DI_Foreline2FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-22"/>
-		<Limit di="PM2.DI_TMPumpFlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
+		<Limit di="PM2.DI_TMPump1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
 		<Limit di="PM2.DI_Spare1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-26"/>
 		<Limit di="PM2.DI_DryPump2Running" value="true" tip="" tip.zh-CN="" tip.en-US="DI-66"/>
 		<Limit di="PM2.DI_DryPump2Alarm" value="true" tip="" tip.zh-CN="" tip.en-US="DI-37"/>
@@ -336,7 +336,7 @@
 		<Limit di="PM2.DI_SCR2Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-324"/>
 		<Limit di="PM2.DI_SCR3Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-325"/>
 		<Limit di="PM2.DI_Foreline2FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-22"/>
-		<Limit di="PM2.DI_TMPumpFlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
+		<Limit di="PM2.DI_TMPump1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
 		<Limit di="PM2.DI_Spare1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-26"/>
 		<Limit di="PM2.DI_DryPump2Running" value="true" tip="" tip.zh-CN="" tip.en-US="DI-66"/>
 		<Limit di="PM2.DI_DryPump2Alarm" value="true" tip="" tip.zh-CN="" tip.en-US="DI-37"/>
@@ -409,7 +409,7 @@
 		<Limit di="PM2.DI_SCR2Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-324"/>
 		<Limit di="PM2.DI_SCR3Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-325"/>
 		<Limit di="PM2.DI_Foreline2FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-22"/>
-		<Limit di="PM2.DI_TMPumpFlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
+		<Limit di="PM2.DI_TMPump1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
 		<Limit di="PM2.DI_Spare1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-26"/>
 		<Limit di="PM2.DI_DryPump2Running" value="true" tip="" tip.zh-CN="" tip.en-US="DI-66"/>
 		<Limit di="PM2.DI_DryPump2Alarm" value="true" tip="" tip.zh-CN="" tip.en-US="DI-37"/>
@@ -482,7 +482,7 @@
 		<Limit di="PM2.DI_SCR2Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-324"/>
 		<Limit di="PM2.DI_SCR3Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-325"/>
 		<Limit di="PM2.DI_Foreline2FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-22"/>
-		<Limit di="PM2.DI_TMPumpFlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
+		<Limit di="PM2.DI_TMPump1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
 		<Limit di="PM2.DI_Spare1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-26"/>
 		<Limit di="PM2.DI_DryPump2Running" value="true" tip="" tip.zh-CN="" tip.en-US="DI-66"/>
 		<Limit di="PM2.DI_DryPump2Alarm" value="true" tip="" tip.zh-CN="" tip.en-US="DI-37"/>
@@ -555,7 +555,7 @@
 		<Limit di="PM2.DI_SCR2Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-324"/>
 		<Limit di="PM2.DI_SCR3Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-325"/>
 		<Limit di="PM2.DI_Foreline2FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-22"/>
-		<Limit di="PM2.DI_TMPumpFlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
+		<Limit di="PM2.DI_TMPump1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
 		<Limit di="PM2.DI_Spare1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-26"/>
 		<Limit di="PM2.DI_DryPump2Running" value="true" tip="" tip.zh-CN="" tip.en-US="DI-66"/>
 		<Limit di="PM2.DI_DryPump2Alarm" value="true" tip="" tip.zh-CN="" tip.en-US="DI-37"/>
@@ -628,7 +628,7 @@
 		<Limit di="PM2.DI_SCR2Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-324"/>
 		<Limit di="PM2.DI_SCR3Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-325"/>
 		<Limit di="PM2.DI_Foreline2FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-22"/>
-		<Limit di="PM2.DI_TMPumpFlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
+		<Limit di="PM2.DI_TMPump1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
 		<Limit di="PM2.DI_Spare1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-26"/>
 		<Limit di="PM2.DI_DryPump2Running" value="true" tip="" tip.zh-CN="" tip.en-US="DI-66"/>
 		<Limit di="PM2.DI_DryPump2Alarm" value="true" tip="" tip.zh-CN="" tip.en-US="DI-37"/>
@@ -701,7 +701,7 @@
 		<Limit di="PM2.DI_SCR3Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-325"/>
 		<Limit di="PM2.DI_ConfinementRingUp" value="true" tip="" tip.zh-CN="" tip.en-US="DI-12"/>
 		<Limit di="PM2.DI_Foreline2FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-22"/>
-		<Limit di="PM2.DI_TMPumpFlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
+		<Limit di="PM2.DI_TMPump1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
 		<Limit di="PM2.DI_Spare1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-26"/>
 		<Limit di="PM2.DI_DryPump2Running" value="true" tip="" tip.zh-CN="" tip.en-US="DI-66"/>
 		<Limit di="PM2.DI_DryPump2Alarm" value="true" tip="" tip.zh-CN="" tip.en-US="DI-37"/>
@@ -774,7 +774,7 @@
 		<Limit di="PM2.DI_SCR3Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-325"/>
 		<Limit di="PM2.DI_ConfinementRingUp" value="true" tip="" tip.zh-CN="" tip.en-US="DI-12"/>
 		<Limit di="PM2.DI_Foreline2FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-22"/>
-		<Limit di="PM2.DI_TMPumpFlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
+		<Limit di="PM2.DI_TMPump1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
 		<Limit di="PM2.DI_Spare1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-26"/>
 		<Limit di="PM2.DI_DryPump2Running" value="true" tip="" tip.zh-CN="" tip.en-US="DI-66"/>
 		<Limit di="PM2.DI_DryPump2Alarm" value="true" tip="" tip.zh-CN="" tip.en-US="DI-37"/>
@@ -923,7 +923,7 @@
 		<Limit di="PM2.DI_SCR2Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-324"/>
 		<Limit di="PM2.DI_SCR3Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-325"/>
 		<Limit do="PM2.DO_CleanRoutineSuscessed" value="true" tip="" tip.zh-CN="" tip.en-US="DO-173" ignoreReverse="true"/>
-		<Limit di="PM2.DI_TMPumpFlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
+		<Limit di="PM2.DI_TMPump1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
 		<Limit di="PM2.DI_Spare1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-26"/>
 		<Limit di="PM2.DI_DryPump2Running" value="true" tip="" tip.zh-CN="" tip.en-US="DI-66"/>
 		<Limit di="PM2.DI_DryPump2Alarm" value="true" tip="" tip.zh-CN="" tip.en-US="DI-37"/>
@@ -999,7 +999,7 @@
 		<Limit di="PM2.DI_SCR2Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-324"/>
 		<Limit di="PM2.DI_SCR3Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-325"/>
 		<Limit do="PM2.DO_CleanRoutineSuscessed" value="true" tip="" tip.zh-CN="" tip.en-US="DO-173" ignoreReverse="true"/>
-		<Limit di="PM2.DI_TMPumpFlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
+		<Limit di="PM2.DI_TMPump1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
 		<Limit di="PM2.DI_Spare1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-26"/>
 		<Limit di="PM2.DI_DryPump2Running" value="true" tip="" tip.zh-CN="" tip.en-US="DI-66"/>
 		<Limit di="PM2.DI_DryPump2Alarm" value="true" tip="" tip.zh-CN="" tip.en-US="DI-37"/>
@@ -1075,7 +1075,7 @@
 		<Limit di="PM2.DI_SCR2Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-324"/>
 		<Limit di="PM2.DI_SCR3Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-325"/>
 		<Limit do="PM2.DO_CleanRoutineSuscessed" value="true" tip="" tip.zh-CN="" tip.en-US="DO-173" ignoreReverse="true"/>
-		<Limit di="PM2.DI_TMPumpFlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
+		<Limit di="PM2.DI_TMPump1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
 		<Limit di="PM2.DI_Spare1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-26"/>
 		<Limit di="PM2.DI_DryPump2Running" value="true" tip="" tip.zh-CN="" tip.en-US="DI-66"/>
 		<Limit di="PM2.DI_DryPump2Alarm" value="true" tip="" tip.zh-CN="" tip.en-US="DI-37"/>
@@ -1151,7 +1151,7 @@
 		<Limit di="PM2.DI_SCR2Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-324"/>
 		<Limit di="PM2.DI_SCR3Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-325"/>
 		<Limit do="PM2.DO_CleanRoutineSuscessed" value="true" tip="" tip.zh-CN="" tip.en-US="DO-173" ignoreReverse="true"/>
-		<Limit di="PM2.DI_TMPumpFlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
+		<Limit di="PM2.DI_TMPump1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
 		<Limit di="PM2.DI_Spare1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-26"/>
 		<Limit di="PM2.DI_DryPump2Running" value="true" tip="" tip.zh-CN="" tip.en-US="DI-66"/>
 		<Limit di="PM2.DI_DryPump2Alarm" value="true" tip="" tip.zh-CN="" tip.en-US="DI-37"/>
@@ -1346,7 +1346,7 @@
 		<Limit do="PM2.DO_ElectrodeWFlowTemp" value="true" tip="" tip.zh-CN="" tip.en-US="DO-204"/>
 		<Limit do="PM2.DO_TMPump1FlowTemp" value="true" tip="" tip.zh-CN="" tip.en-US="DO-205"/>
 		<Limit do="PM2.DO_TransformerFlowTemp" value="true" tip="" tip.zh-CN="" tip.en-US="DO-206"/>
-		<Limit di="PM2.DI_TMPumpFlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
+		<Limit di="PM2.DI_TMPump1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
 		<Limit di="PM2.DI_Spare1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-26"/>
 		<Limit di="PM2.DI_ChamMiddleFlow2SW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-46"/>
 		<Limit di="PM2.DI_DryPump2Running" value="true" tip="" tip.zh-CN="" tip.en-US="DI-66"/>
@@ -1419,7 +1419,7 @@
 		<Limit di="PM2.DI_SCR1Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-323"/>
 		<Limit di="PM2.DI_SCR2Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-324"/>
 		<Limit di="PM2.DI_SCR3Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-325"/>
-		<Limit di="PM2.DI_TMPumpFlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
+		<Limit di="PM2.DI_TMPump1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
 		<Limit di="PM2.DI_Spare1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-26"/>
 		<Limit di="PM2.DI_DryPump2Running" value="true" tip="" tip.zh-CN="" tip.en-US="DI-66"/>
 		<Limit di="PM2.DI_DryPump2Alarm" value="true" tip="" tip.zh-CN="" tip.en-US="DI-37"/>
@@ -1490,7 +1490,7 @@
 		<Limit di="PM2.DI_SCR1Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-323"/>
 		<Limit di="PM2.DI_SCR2Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-324"/>
 		<Limit di="PM2.DI_SCR3Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-325"/>
-		<Limit di="PM2.DI_TMPumpFlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
+		<Limit di="PM2.DI_TMPump1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
 		<Limit di="PM2.DI_Spare1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-26"/>
 		<Limit di="PM2.DI_DryPump2Running" value="true" tip="" tip.zh-CN="" tip.en-US="DI-66"/>
 		<Limit di="PM2.DI_DryPump2Alarm" value="true" tip="" tip.zh-CN="" tip.en-US="DI-37"/>
@@ -1561,7 +1561,7 @@
 		<Limit di="PM2.DI_SCR1Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-323"/>
 		<Limit di="PM2.DI_SCR2Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-324"/>
 		<Limit di="PM2.DI_SCR3Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-325"/>
-		<Limit di="PM2.DI_TMPumpFlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
+		<Limit di="PM2.DI_TMPump1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
 		<Limit di="PM2.DI_Spare1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-26"/>
 		<Limit di="PM2.DI_DryPump2Running" value="true" tip="" tip.zh-CN="" tip.en-US="DI-66"/>
 		<Limit di="PM2.DI_DryPump2Alarm" value="true" tip="" tip.zh-CN="" tip.en-US="DI-37"/>
@@ -2625,7 +2625,7 @@
 		<Limit pollbool="PM2.IsService" value="false" tip="" tip.zh-CN="" tip.en-US="" ignoreReverse="true"/>
 		<Limit do="PM2.DO_CleanRoutineSuscessed" value="true" tip="" tip.zh-CN="" tip.en-US="DO-173" ignoreReverse="true"/>
 		<Limit di="PM2.DI_Foreline2FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-22"/>
-		<Limit di="PM2.DI_TMPumpFlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
+		<Limit di="PM2.DI_TMPump1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
 		<Limit di="PM2.DI_Spare1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-26"/>
 		<Limit di="PM2.DI_DryPump2Running" value="true" tip="" tip.zh-CN="" tip.en-US="DI-66"/>
 		<Limit di="PM2.DI_DryPump2Alarm" value="true" tip="" tip.zh-CN="" tip.en-US="DI-37"/>
@@ -2748,7 +2748,7 @@
 		<Limit di="PM2.DI_SCR3Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-325"/>
 		<Limit do="PM2.DO_CleanRoutineSuscessed" value="true" tip="" tip.zh-CN="" tip.en-US="DO-173" ignoreReverse="true"/>
 		<Limit di="PM2.DI_Foreline2FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-22"/>
-		<Limit di="PM2.DI_TMPumpFlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
+		<Limit di="PM2.DI_TMPump1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
 		<Limit di="PM2.DI_Spare1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-26"/>
 		<Limit di="PM2.DI_DryPump2Alarm" value="true" tip="" tip.zh-CN="" tip.en-US="DI-37"/>
 		<Limit di="PM2.DI_TCSAlarm" value="true" tip="" tip.zh-CN="" tip.en-US="DI-43"/>
@@ -2876,7 +2876,7 @@
 		<Limit di="PM2.DI_SCR1Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-323"/>
 		<Limit di="PM2.DI_SCR2Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-324"/>
 		<Limit di="PM2.DI_SCR3Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-325"/>
-		<Limit di="PM2.DI_TMPumpFlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
+		<Limit di="PM2.DI_TMPump1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
 		<Limit di="PM2.DI_Spare1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-26"/>
 		<Limit di="PM2.DI_DryPump2Running" value="true" tip="" tip.zh-CN="" tip.en-US="DI-66"/>
 		<Limit di="PM2.DI_DryPump2Alarm" value="true" tip="" tip.zh-CN="" tip.en-US="DI-37"/>
@@ -2948,7 +2948,7 @@
 		<Limit di="PM2.DI_SCR1Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-323"/>
 		<Limit di="PM2.DI_SCR2Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-324"/>
 		<Limit di="PM2.DI_SCR3Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-325"/>
-		<Limit di="PM2.DI_TMPumpFlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
+		<Limit di="PM2.DI_TMPump1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
 		<Limit di="PM2.DI_Spare1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-26"/>
 		<Limit di="PM2.DI_DryPump2Running" value="true" tip="" tip.zh-CN="" tip.en-US="DI-66"/>
 		<Limit di="PM2.DI_DryPump2Alarm" value="true" tip="" tip.zh-CN="" tip.en-US="DI-37"/>
@@ -3020,7 +3020,7 @@
 		<Limit di="PM2.DI_SCR1Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-323"/>
 		<Limit di="PM2.DI_SCR2Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-324"/>
 		<Limit di="PM2.DI_SCR3Alarm" value="false" tip="" tip.zh-CN="" tip.en-US="DI-325"/>
-		<Limit di="PM2.DI_TMPumpFlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
+		<Limit di="PM2.DI_TMPump1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-24"/>
 		<Limit di="PM2.DI_Spare1FlowSW" value="true" tip="" tip.zh-CN="" tip.en-US="DI-26"/>
 		<Limit di="PM2.DI_DryPump2Running" value="true" tip="" tip.zh-CN="" tip.en-US="DI-66"/>
 		<Limit di="PM2.DI_DryPump2Alarm" value="true" tip="" tip.zh-CN="" tip.en-US="DI-37"/>
diff --git a/App/Modules/SicModules/TMs/Routines/TMRobotPlaceRoutine.cs b/App/Modules/SicModules/TMs/Routines/TMRobotPlaceRoutine.cs
index 5c3468c..42fea77 100644
--- a/App/Modules/SicModules/TMs/Routines/TMRobotPlaceRoutine.cs
+++ b/App/Modules/SicModules/TMs/Routines/TMRobotPlaceRoutine.cs
@@ -231,7 +231,7 @@ namespace SicModules.TMs.Routines
                     ExecuteRoutine((int)RoutineStep.OpenSlitValve, _openSlitValveRoutine);
                 }
 
-                //如果是PM腔，放盘前检查传感器DI_ReactorSuspectorCheck
+                //如果是PM腔，放盘前检查传感器DI_PMGasDetectorFault2SW
                 //如果有，则不能放盘
                 if (ModuleHelper.IsPm(_target))
                 {
diff --git a/App/SicSimulator/Config/DevicePM.xml b/App/SicSimulator/Config/DevicePM.xml
index 6298fdc..8c07032 100644
--- a/App/SicSimulator/Config/DevicePM.xml
+++ b/App/SicSimulator/Config/DevicePM.xml
@@ -24,7 +24,7 @@
       
       --><!--<Random type="AI" ioName="AI_MoSourceFlowTemp"       baseValue="21" />
       <Random type="AI" ioName="AI_PMPumpFlowTemp"         baseValue="22" />
-      <Random type="AI" ioName="AI_TMpumpFlowTemp"         baseValue="23" />
+      <Random type="AI" ioName="AI_TMPump1FlowTemp"         baseValue="23" />
       <Random type="AI" ioName="AI_HeatingCoilFlowTemp"    baseValue="24" />
       <Random type="AI" ioName="AI_HeaterFlowTemp"         baseValue="25" />
       <Random type="AI" ioName="AI_ChillerFlowTemp"        baseValue="26" />
diff --git a/App/SicSimulator/Config/_ioDefinePM.xml b/App/SicSimulator/Config/_ioDefinePM.xml
index 6453dbe..8b0453d 100644
--- a/App/SicSimulator/Config/_ioDefinePM.xml
+++ b/App/SicSimulator/Config/_ioDefinePM.xml
@@ -27,7 +27,7 @@
       <DI_ITEM Index="21" Name="DI_PowerRod2FlowSW" BufferOffset="21" Addr="21" Description="" />
       <DI_ITEM Index="22" Name="DI_Foreline2FlowSW" BufferOffset="22" Addr="22" Description="" />
       <DI_ITEM Index="23" Name="DI_ElectrodeWFlowSW" BufferOffset="23" Addr="23" Description="" />
-      <DI_ITEM Index="24" Name="DI_TMPumpFlowSW" BufferOffset="24" Addr="24" Description="" />
+      <DI_ITEM Index="24" Name="DI_TMPump1FlowSW" BufferOffset="24" Addr="24" Description="" />
       <DI_ITEM Index="25" Name="DI_TransformerFlowSW" BufferOffset="25" Addr="25" Description="" />
       <DI_ITEM Index="26" Name="DI_ChamMiddleFlow2SW" BufferOffset="26" Addr="26" Description="" />
       <DI_ITEM Index="27" Name="DI_InletTotalFlowLowSW" BufferOffset="27" Addr="27" Description="" />
@@ -44,11 +44,13 @@
       <DI_ITEM Index="40" Name="DI_PumpExhaustDPSW" BufferOffset="40" Addr="40" Description="" />
       <DI_ITEM Index="41" Name="DI_ScrubberIntlkSW" BufferOffset="41" Addr="41" Description="" />
       <DI_ITEM Index="42" Name="DI_FacilityIntlkSW" BufferOffset="42" Addr="42" Description="" />
+      <DI_ITEM Index="43" Name="DI_PMH2SeDetector2SW" BufferOffset="43" Addr="43" Description="" />
+      <DI_ITEM Index="44" Name="DI_PMSO2Detector2SW" BufferOffset="44" Addr="44" Description="" />
       <DI_ITEM Index="45" Name="DI_ServoDriverFaultSW" BufferOffset="45" Addr="45" Description="" />
       <DI_ITEM Index="48" Name="DI_ReactorWaterLeakSW" BufferOffset="48" Addr="48" Description="" />
       <DI_ITEM Index="49" Name="DI_ChamLidPushButtonLocal" BufferOffset="49" Addr="49" Description="" />
       <DI_ITEM Index="50" Name="DI_ConfinementRingDown" BufferOffset="50" Addr="50" Description="" />
-      <DI_ITEM Index="51" Name="DI_ReactorSuspectorCheck" BufferOffset="51" Addr="51" Description="" />
+      <DI_ITEM Index="51" Name="DI_PMGasDetectorFault2SW" BufferOffset="51" Addr="51" Description="" />
       <DI_ITEM Index="52" Name="DI_PMSO2Detector1SW" BufferOffset="52" Addr="52" Description="" />
       <DI_ITEM Index="55" Name="DI_GN2InletPressSW" BufferOffset="55" Addr="55" Description="" />
       <DI_ITEM Index="56" Name="DI_GBH2SDetectorSW" BufferOffset="56" Addr="56" Description="" />
@@ -64,8 +66,6 @@
       <DI_ITEM Index="71" Name="DI_PumpCabDoorClosed" BufferOffset="71" Addr="71" Description="" />
       <DI_ITEM Index="72" Name="DI_FacilityWarningSW" BufferOffset="72" Addr="72" Description="" />
       <DI_ITEM Index="73" Name="DI_PMH2SDetector2SW" BufferOffset="73" Addr="73" Description="" />
-      <DI_ITEM Index="74" Name="DI_PMH2SeDetector2SW" BufferOffset="74" Addr="74" Description="" />
-      <DI_ITEM Index="75" Name="DI_PMSO2Detector2SW" BufferOffset="75" Addr="75" Description="" />
       <DI_ITEM Index="76" Name="DI_MainCBStatusSW" BufferOffset="76" Addr="76" Description="" />
       <DI_ITEM Index="77" Name="DI_PowerRackWaterLeakSW" BufferOffset="77" Addr="77" Description="" />
       <DI_ITEM Index="78" Name="DI_UPS1Enable" BufferOffset="78" Addr="78" Description="" />
@@ -475,12 +475,12 @@
       <AI_ITEM Index="4" Name="AI_ChamTopFlowTemp" BufferOffset="4" Addr="4" Description="" />
       <AI_ITEM Index="5" Name="AI_ChamMiddleFlow1Temp" BufferOffset="5" Addr="5" Description="" />
       <AI_ITEM Index="6" Name="AI_ChamBottomFlowTemp" BufferOffset="6" Addr="6" Description="" />
-      <AI_ITEM Index="7" Name="AI_TMPump2FlowTemp" BufferOffset="7" Addr="7" Description="" />
+      <AI_ITEM Index="7" Name="AI_Foreline1FlowTemp" BufferOffset="7" Addr="7" Description="" />
       <AI_ITEM Index="8" Name="AI_PowerRod1FlowTemp" BufferOffset="8" Addr="8" Description="" />
       <AI_ITEM Index="9" Name="AI_PowerRod2FlowTemp" BufferOffset="9" Addr="9" Description="" />
-      <AI_ITEM Index="10" Name="AI_ForelineFlowTemp" BufferOffset="10" Addr="10" Description="" />
+      <AI_ITEM Index="10" Name="AI_Foreline2FlowTemp" BufferOffset="10" Addr="10" Description="" />
       <AI_ITEM Index="11" Name="AI_ElectrodeWFlowTemp" BufferOffset="11" Addr="11" Description="" />
-      <AI_ITEM Index="12" Name="AI_TMPumpFlowTemp" BufferOffset="12" Addr="12" Description="" />
+      <AI_ITEM Index="12" Name="AI_TMPump1FlowTemp" BufferOffset="12" Addr="12" Description="" />
       <AI_ITEM Index="13" Name="AI_TransformerFlowTemp" BufferOffset="13" Addr="13" Description="" />
       <AI_ITEM Index="14" Name="AI_ChamMiddleFlow2Temp" BufferOffset="14" Addr="14" Description="" />
       <AI_ITEM Index="15" Name="AI_TMBufferFlowTemp" BufferOffset="15" Addr="15" Description="" />
diff --git a/App/SicSimulator/Instances/SimulatorSystem.cs b/App/SicSimulator/Instances/SimulatorSystem.cs
index a7e4b37..1905b69 100644
--- a/App/SicSimulator/Instances/SimulatorSystem.cs
+++ b/App/SicSimulator/Instances/SimulatorSystem.cs
@@ -152,7 +152,7 @@ namespace SicSimulator.Instances
             IO.DI[$"{mod}.DI_PowerRod2FlowSW"].Value = true;
             IO.DI[$"{mod}.DI_Foreline2FlowSW"].Value = true;
             IO.DI[$"{mod}.DI_ElectrodeWFlowSW"].Value = true;
-            IO.DI[$"{mod}.DI_TMPumpFlowSW"].Value = true;
+            IO.DI[$"{mod}.DI_TMPump1FlowSW"].Value = true;
             IO.DI[$"{mod}.DI_Foreline1FlowSW"].Value = true;
             IO.DI[$"{mod}.DI_TransformerFlowSW"].Value = true;
             IO.DI[$"{mod}.DI_GBH2DetectorSW"].Value = true;
@@ -311,7 +311,7 @@ namespace SicSimulator.Instances
             IO.AI[$"{mod}.AI_PowerRod2FlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ;
             //IO.AI[$"{mod}.AI_Foreline1FlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ;
             IO.AI[$"{mod}.AI_ElectrodeWFlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ;
-            IO.AI[$"{mod}.AI_TMPumpFlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ;
+            IO.AI[$"{mod}.AI_TMPump1FlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ;
             IO.AI[$"{mod}.AI_TransformerFlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ;
             //IO.AI[$"{mod}.AI_Spare1Temp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ;
             //IO.AI[$"{mod}.AI_Spare2Temp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ;