Merge branch 'develop' of http://112.124.35.216:65000/Sic-Software/MoS2 into develop

# Conflicts:
#	App/SicSimulator/Instances/SimulatorSystem.cs
This commit is contained in:
SIC1016\caipeilun
2026-08-19 10:27:39 +08:00
11 changed files with 96 additions and 70 deletions
@@ -457,7 +457,7 @@
<IoSensor id="SensorScrubberIntlkSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_ScrubberIntlkSW" infoText="" warningText="" alarmText="Alarm27 Scrubber System Error [DI-41]" />
<IoSensor id="SensorFacilityIntlkSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_FacilityIntlkSW" infoText="" warningText="" alarmText="Alarm28 Facility Error [DI-42]" />
<IoSensor id="SensorPMH2SeDetector2SW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_PMH2SeDetector2SW" infoText="" warningText="" alarmText="Alarm29 PMH2Se Leak Detect2 [DI-43]" />
<IoSensor id="SensorPMSO2Detector2SW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_PMSO2Detector2SW" infoText="" warningText="" alarmText="Alarm30 PMSO2 Leak Detect2 [DI-43]" />
<IoSensor id="SensorPMSO2Detector2SW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_PMSO2Detector2SW" infoText="" warningText="" alarmText="Alarm30 PMSO2 Leak Detect2 [DI-44]" />
<IoSensor id="SensorServoDriverFaultSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_ServoDriverFaultSW" infoText="" warningText="" alarmText="Alarm31 Rotation Servo Driver Error [DI-45]" />
<IoSensor id="SensorChamMiddleFlow2SW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_ChamMiddleFlow2SW" infoText="" warningText="" alarmText="Alarm32 Chamber Middle2 Cooling Water Flow Abnormal U4[DI-46]" />
<IoSensor id="SensorSpare2FlowSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_Spare2FlowSW" infoText="" warningText="Warning8 Spare2 Flow Low -U13 [DI-47]" alarmText="" />
@@ -466,7 +466,7 @@
<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="SensorPMGasDetectorFault2SW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_PMGasDetectorFault2SW" infoText="" warningText="" alarmText="Alarm33 PMGasDetectorFault2 [DI-51]" />
<IoSensor id="SensorPMSO2Detector1SW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_PMSO2Detector1SW" infoText="" warningText="" alarmText="Alarm34 PMSO2Leak Detect1 [DI-52]" />
<IoSensor id="SensorGN2InletPressSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="true" di="DI_GN2InletPressSW" infoText="" warningText="" alarmText="Alarm35 Gasbox N2 Pressure Low [DI-55]" />
<IoSensor id="SensorGN2InletPressSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_GN2InletPressSW" infoText="" warningText="" alarmText="Alarm35 Gasbox N2 Pressure Low [DI-55]" />
<IoSensor id="SensorGBH2SDetectorSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_GBH2SDetectorSW" infoText="" warningText="" alarmText="Alarm36 GBH2S Leak Detect1 [DI-56]" />
<IoSensor id="SensorGBH2SeDetectorSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_GBH2SeDetectorSW" infoText="" warningText="" alarmText="Alarm37 GBH2Se Leak Detect1 [DI-57]" />
<IoSensor id="SensorGBSmokeDetectorSW" module="" display="" schematicId="" unit="" aioType="" textOutTrigValue="false" di="DI_GBSmokeDetectorSW" infoText="" warningText="" alarmText="Alarm38 GBSmokeDetector [DI-58]" />