diff --git a/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml b/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml index 462e698..a3988df 100644 --- a/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml +++ b/App/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml @@ -3,69 +3,76 @@ - + + + - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - + - - - - - - - + + + + + + + + - - - + + + + + + + - + - - + + @@ -97,53 +104,56 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -184,14 +194,14 @@ - - - - - - - - + + + + + + + + @@ -237,6 +247,7 @@ + @@ -281,15 +292,15 @@ - - - - - - - - - + + + + + + + + + @@ -326,6 +337,7 @@ + @@ -339,8 +351,11 @@ - + + + + @@ -474,48 +489,50 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -530,13 +547,17 @@ - - - - - - - + + + + + + + + + + + @@ -549,98 +570,99 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -659,41 +681,41 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -711,6 +733,8 @@ + + @@ -720,147 +744,149 @@ - - - - - - - - - - + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/App/Modules/SicModules/Config/TM/DeviceModelSystem.xml b/App/Modules/SicModules/Config/TM/DeviceModelSystem.xml index ecd7a56..dd9befd 100644 --- a/App/Modules/SicModules/Config/TM/DeviceModelSystem.xml +++ b/App/Modules/SicModules/Config/TM/DeviceModelSystem.xml @@ -114,7 +114,7 @@ - + diff --git a/App/Modules/SicModules/Config/TM/IODefinePlatform.xml b/App/Modules/SicModules/Config/TM/IODefinePlatform.xml index 6d59738..b0077d9 100644 --- a/App/Modules/SicModules/Config/TM/IODefinePlatform.xml +++ b/App/Modules/SicModules/Config/TM/IODefinePlatform.xml @@ -185,8 +185,8 @@ - - + + diff --git a/App/Modules/SicModules/Config/TM/interlock.xml b/App/Modules/SicModules/Config/TM/interlock.xml index 2c56112..5f38440 100644 --- a/App/Modules/SicModules/Config/TM/interlock.xml +++ b/App/Modules/SicModules/Config/TM/interlock.xml @@ -228,13 +228,13 @@ - + - + diff --git a/App/SicSimulator/Config/IODefinePlatform.xml b/App/SicSimulator/Config/IODefinePlatform.xml index 6d59738..b0077d9 100644 --- a/App/SicSimulator/Config/IODefinePlatform.xml +++ b/App/SicSimulator/Config/IODefinePlatform.xml @@ -185,8 +185,8 @@ - - + + diff --git a/App/SicSimulator/Instances/SimulatorSystem.cs b/App/SicSimulator/Instances/SimulatorSystem.cs index 5dca0d3..cf3535c 100644 --- a/App/SicSimulator/Instances/SimulatorSystem.cs +++ b/App/SicSimulator/Instances/SimulatorSystem.cs @@ -324,10 +324,10 @@ namespace SicSimulator.Instances { try { - //MonitorPressureTM(); - //MonitorPressureLoad(); + MonitorPressureTM(); + MonitorPressureLoad(); //MonitorPressureUnLoad(); - //MonitorSlitValveFlow(); + MonitorSlitValveFlow(); MonitorTMValve(); //MonitorPm("PM1"); @@ -514,8 +514,8 @@ namespace SicSimulator.Instances private void MonitorPressureLoad() { - IO.DI["DI_LoadLidLocked"].Value = IO.DO["DO_LoadLidLock"].Value; - IO.DI["DI_LoadLidUnlocked"].Value = IO.DO["DO_LoadLidUnlock"].Value; + //IO.DI["DI_LoadLidLocked"].Value = IO.DO["DO_LoadLidLock"].Value; + //IO.DI["DI_LoadLidUnlocked"].Value = IO.DO["DO_LoadLidUnlock"].Value; IO.DI["DI_LoadPressureATM"].Value = IO.AI["AI_LoadPressure"].Value > 960; IO.DI["DI_LoadPressureVAC"].Value = IO.AI["AI_LoadPressure"].Value < 310; @@ -631,12 +631,12 @@ namespace SicSimulator.Instances bool isSlowVent = IO.DI["DI_TMVentFB"].Value; bool isFastPump = IO.DI["DI_TMFastPumpFB"].Value; - if (IO.DI["DI_ReactorADoorOpened"].Value || IO.DI["PM1.DI_TMPressBalanceFB(V70)"].Value) + if (IO.DI["DI_ReactorADoorOpened"].Value || IO.DI["PM1.DI_PMTMBalanceFB(V70)"].Value) { IO.AI["AI_TMPressure1"].Value = Convert.ToInt16(IO.AI[$"PM1.AI_ChamPress"].Value); return; } - if (IO.DI["DI_ReactorBDoorOpened"].Value || IO.DI["PM2.DI_TMPressBalanceFB(V70)"].Value) + if (IO.DI["DI_ReactorBDoorOpened"].Value || IO.DI["PM2.DI_PMTMBalanceFB(V70)"].Value) { IO.AI["AI_TMPressure1"].Value = Convert.ToInt16(IO.AI[$"PM2.AI_ChamPress"].Value); return;