From e3c8d1e0baa6607dec9afd5d598f3c0e2a7cb14d Mon Sep 17 00:00:00 2001 From: hanqiangqiang <1364346467@qq.com> Date: Tue, 4 Aug 2026 14:58:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=95=B4=E7=90=86IO=E5=88=97?= =?UTF-8?q?=E8=A1=A8=20=E4=BF=AE=E6=94=B9=E4=BB=BF=E7=9C=9F=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC=EF=BC=8C=E6=B0=B4=E6=B8=A9=E4=BB=BF=E7=9C=9F?= =?UTF-8?q?=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 | 4 +- .../SicModules/Config/PM/PM1/_ioDefinePM1.xml | 33 +++++++-------- .../SicModules/Config/PM/PM1/interlockPM1.xml | 12 +++--- .../SicModules/Config/PM/PM2/_ioDefinePM2.xml | 10 ++--- .../SicModules/Config/PM/PM2/interlockPM2.xml | 12 +++--- App/SicSimulator/Config/_ioDefinePM.xml | 16 ++++---- App/SicSimulator/Instances/SimulatorSystem.cs | 41 ++++++++----------- App/SicUI/Models/PMs/PMOperationViewModel.cs | 2 +- .../Devices/IoInterLock.cs | 4 +- 9 files changed, 65 insertions(+), 69 deletions(-) diff --git a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml index 460c2ce..a73f932 100644 --- a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml +++ b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml @@ -253,7 +253,7 @@ - + @@ -303,7 +303,7 @@ - + @@ -22,12 +22,12 @@ - + - + - + @@ -240,7 +240,7 @@ - + @@ -356,7 +356,7 @@ - + @@ -449,7 +449,7 @@ - + @@ -478,7 +478,7 @@ - + @@ -556,8 +556,8 @@ - - + + @@ -733,6 +733,8 @@ + + @@ -751,13 +753,12 @@ - - - + + + - - - + + diff --git a/App/Modules/SicModules/Config/PM/PM1/interlockPM1.xml b/App/Modules/SicModules/Config/PM/PM1/interlockPM1.xml index 2c6b672..22b6449 100644 --- a/App/Modules/SicModules/Config/PM/PM1/interlockPM1.xml +++ b/App/Modules/SicModules/Config/PM/PM1/interlockPM1.xml @@ -922,7 +922,7 @@ - + @@ -998,7 +998,7 @@ - + @@ -1074,7 +1074,7 @@ - + @@ -1150,7 +1150,7 @@ - + @@ -2623,7 +2623,7 @@ - + @@ -2746,7 +2746,7 @@ - + diff --git a/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml b/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml index c429bf9..462e698 100644 --- a/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml +++ b/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml @@ -20,7 +20,7 @@ - + @@ -230,7 +230,7 @@ - + @@ -341,7 +341,7 @@ - + @@ -434,7 +434,7 @@ - + @@ -463,7 +463,7 @@ - + diff --git a/App/Modules/SicModules/Config/PM/PM2/interlockPM2.xml b/App/Modules/SicModules/Config/PM/PM2/interlockPM2.xml index 6a51b25..ca75148 100644 --- a/App/Modules/SicModules/Config/PM/PM2/interlockPM2.xml +++ b/App/Modules/SicModules/Config/PM/PM2/interlockPM2.xml @@ -922,7 +922,7 @@ - + @@ -998,7 +998,7 @@ - + @@ -1074,7 +1074,7 @@ - + @@ -1150,7 +1150,7 @@ - + @@ -2623,7 +2623,7 @@ - + @@ -2746,7 +2746,7 @@ - + diff --git a/App/SicSimulator/Config/_ioDefinePM.xml b/App/SicSimulator/Config/_ioDefinePM.xml index ca2b02f..9b54309 100644 --- a/App/SicSimulator/Config/_ioDefinePM.xml +++ b/App/SicSimulator/Config/_ioDefinePM.xml @@ -14,7 +14,7 @@ - + @@ -22,12 +22,12 @@ - + - + - + @@ -240,7 +240,7 @@ - + @@ -356,7 +356,7 @@ - + @@ -449,7 +449,7 @@ - + @@ -478,7 +478,7 @@ - + diff --git a/App/SicSimulator/Instances/SimulatorSystem.cs b/App/SicSimulator/Instances/SimulatorSystem.cs index 2041339..b25d040 100644 --- a/App/SicSimulator/Instances/SimulatorSystem.cs +++ b/App/SicSimulator/Instances/SimulatorSystem.cs @@ -19,7 +19,7 @@ namespace SicSimulator.Instances public void Initialize() { - //SetDefaultValue("PM1"); + SetDefaultValue("PM1"); //SetDefaultValue("PM2"); //SetTMDefaultValue("TM"); @@ -98,7 +98,7 @@ namespace SicSimulator.Instances private void SetDefaultValue(string mod) { - //SetWaterTemp(mod); + SetWaterTemp(mod); IO.DI[$"{mod}.DI_ConfinementRingDone"].Value = true; IO.DI[$"{mod}.DI_DryPumpAlarm"].Value = true; @@ -134,7 +134,7 @@ namespace SicSimulator.Instances IO.DI[$"{mod}.DI_SHGasConnectorLoosen"].Value = false; IO.DI[$"{mod}.DI_SHGasConnectorTighten"].Value = true; - IO.DO[$"{mod}.DO_CleanRoutineSucceed"].Value = true; + IO.DO[$"{mod}.DO_CleanRoutineSuscessed"].Value = true; IO.DI[$"{mod}.DI_PSUEnableFB"].Value = true; IO.AO[$"{mod}.AO_ValveModeSetpoint"].Value = (float)2; @@ -160,7 +160,7 @@ namespace SicSimulator.Instances IO.DI[$"{mod}.DI_Foreline1FlowSW"].Value = true; IO.DI[$"{mod}.DI_TransformerFlowSW"].Value = true; IO.DI[$"{mod}.DI_GBH2DetectorSW"].Value = true; - IO.DI[$"{mod}.DI_GBHCLDetectorSW"].Value = true; + IO.DI[$"{mod}.DI_ArInletPressSW"].Value = true; IO.DI[$"{mod}.DI_GBDoorClosed"].Value = true; IO.DI[$"{mod}.DI_PumpExhaustPressSW"].Value = true; IO.DI[$"{mod}.DI_PMATMSW"].Value = true; @@ -253,23 +253,20 @@ namespace SicSimulator.Instances IO.DI[$"{mod}.DI_ChamMiddleFlow1SW"].Value = true; IO.DI[$"{mod}.DI_ChamMiddleFlow2SW"].Value = true; IO.DI[$"{mod}.DI_PumpExhaustDPSW"].Value = true; - IO.DI[$"{mod}.DI_Spare2FlowSW"].Value = true; - IO.DI[$"{mod}.DI_Spare1FlowSW"].Value = true; + IO.DI[$"{mod}.DI_H2PressureSW"].Value = true; - IO.DI[$"{mod}.DI_TCSAlarm"].Value = true; - IO.DI[$"{mod}.DI_GBExhaustDPSW"].Value = true; - IO.DI[$"{mod}.DI_PMAExhaustDPSW"].Value = true; - IO.DI[$"{mod}.DI_ServoDriverFaultSW"].Value = true; + IO.DI[$"{mod}.DI_GBSO2DetectorSW"].Value = true; + IO.DI[$"{mod}.DI_PMAExhaustDPSW"].Value = true; IO.DI[$"{mod}.DI_ServoDriverFaultSW"].Value = true; IO.DI[$"{mod}.DI_GN2InletPressSW"].Value = true; IO.DI[$"{mod}.DI_ArInletPressSW"].Value = true; IO.DI[$"{mod}.DI_FacilityWarningSW"].Value = true; - IO.DI[$"{mod}.DI_GBNH3DetectorSW"].Value = true; - IO.DI[$"{mod}.DI_PMNH3DetectorSW"].Value = true; + IO.DI[$"{mod}.DI_GBExhaustDPLowSW"].Value = true; + IO.DI[$"{mod}.DI_GBSmokeDetectorSW"].Value = true; //IO.DI[$"{mod}.DI_InletTotalTempHighSW"].Value = true; //IO.DI[$"{mod}.DI_DryPumpFlowSW"].Value = true; @@ -277,7 +274,7 @@ namespace SicSimulator.Instances IO.DO[$"{mod}.DO_UPSEnable"].Value = true; IO.DO[$"{mod}.DO_UPSLowBattery"].Value = true; - IO.DI[$"{mod}.DI_SuspectorCheck"].Value = false; + IO.DI[$"{mod}.DI_GasPipeTempCtrlAlarm"].Value = true; @@ -292,18 +289,16 @@ namespace SicSimulator.Instances IO.DO[$"{mod}.DO_ChamMiddleFlow1Temp"].Value = true; IO.DO[$"{mod}.DO_ChamBottomFlowTemp"].Value = true; - IO.DO[$"{mod}.DO_SpareFlowTemp"].Value = true; - IO.DO[$"{mod}.DO_Spare1FlowTemp"].Value = true; + IO.DO[$"{mod}.DO_PowerRod1FlowTemp"].Value = true; IO.DO[$"{mod}.DO_PowerRod2FlowTemp"].Value = true; IO.DO[$"{mod}.DO_ElectrodeWFlowTemp"].Value = true; - IO.DO[$"{mod}.DO_Spare1FlowTemp"].Value = true; + IO.DO[$"{mod}.DO_TransformerFlowTemp"].Value = true; IO.DO[$"{mod}.DO_HeaterEnable"].Value = true; IO.DO[$"{mod}.DO_EPV2"].Value = true; - IO.DI[$"{mod}.DI_ReactorHCLDetectorSW"].Value = true; } private void SetWaterTemp(string mod) @@ -315,16 +310,16 @@ namespace SicSimulator.Instances IO.AI[$"{mod}.AI_ChamTopFlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ; IO.AI[$"{mod}.AI_ChamMiddleFlow1Temp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ; IO.AI[$"{mod}.AI_ChamBottomFlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ; - IO.AI[$"{mod}.AI_Foreline2FlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ; + //IO.AI[$"{mod}.AI_Foreline2FlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ; IO.AI[$"{mod}.AI_PowerRod1FlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ; IO.AI[$"{mod}.AI_PowerRod2FlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ; - IO.AI[$"{mod}.AI_Foreline1FlowTemp"].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_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()); ; - IO.AI[$"{mod}.AI_SpareFlowTemp"].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()); ; + //IO.AI[$"{mod}.AI_SpareFlowTemp"].Value = (float)(WaterTempBase * _rnd.NextDouble()); ; #endregion Water Flow } @@ -344,7 +339,7 @@ namespace SicSimulator.Instances MonitorValve("PM1"); //MonitorValve("PM2"); - //MonitorFlowRamp("PM1"); + MonitorFlowRamp("PM1"); //MonitorFlowRamp("PM2"); //MonitorGasConnector("PM1"); //MonitorLid("PM1"); diff --git a/App/SicUI/Models/PMs/PMOperationViewModel.cs b/App/SicUI/Models/PMs/PMOperationViewModel.cs index 7462243..9eeaf0d 100644 --- a/App/SicUI/Models/PMs/PMOperationViewModel.cs +++ b/App/SicUI/Models/PMs/PMOperationViewModel.cs @@ -1476,7 +1476,7 @@ namespace SicUI.Models.PMs } if (!CleanRoutineSucceed.Value) { - ShowChoosenDialog("3.Make sure the DO_CleanRoutineSucceed[DO-173]!"); + ShowChoosenDialog("3.Make sure the DO_CleanRoutineSuscessed[DO-173]!"); return; } diff --git a/Framework/MECF.Framework.RT.EquipmentLibrary/Devices/IoInterLock.cs b/Framework/MECF.Framework.RT.EquipmentLibrary/Devices/IoInterLock.cs index ea542fa..14e759a 100644 --- a/Framework/MECF.Framework.RT.EquipmentLibrary/Devices/IoInterLock.cs +++ b/Framework/MECF.Framework.RT.EquipmentLibrary/Devices/IoInterLock.cs @@ -402,12 +402,12 @@ namespace Aitex.Core.RT.Device.Devices reason = String.Empty; if (!_doLidCloseRoutineSucceed.Check(eValue, out reason)) { - EV.PostWarningLog(Module, $"Can not set [DO-173]DO_CleanRoutineSucceed to {eValue}，Reason：" + reason); + EV.PostWarningLog(Module, $"Can not set [DO-173]DO_CleanRoutineSuscessed to {eValue}，Reason：" + reason); return false; } if (!_doLidCloseRoutineSucceed.SetValue(eValue, out reason)) { - EV.PostWarningLog(Module, $"Can not set [DO-173]DO_CleanRoutineSucceed to {eValue}，Reason：" + reason); + EV.PostWarningLog(Module, $"Can not set [DO-173]DO_CleanRoutineSuscessed to {eValue}，Reason：" + reason); return false; }