diff --git a/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml b/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
index 15ac326..60c31e3 100644
--- a/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
+++ b/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
@@ -75,11 +75,11 @@
+
-
@@ -121,6 +121,8 @@
+
+
@@ -711,9 +713,6 @@
-
-
-
diff --git a/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml b/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml
index f2d91c7..2087c53 100644
--- a/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml
+++ b/Modules/SicModules/Config/PM/PM1/_ioDefinePM1.xml
@@ -107,7 +107,7 @@
-
+
@@ -138,6 +138,8 @@
+
+
@@ -312,7 +314,7 @@
-
+
@@ -692,17 +694,17 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
diff --git a/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml b/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml
index e3ceb3c..ed5c56a 100644
--- a/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml
+++ b/Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml
@@ -78,7 +78,7 @@
-
+
diff --git a/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml b/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml
index bfe9355..8329a02 100644
--- a/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml
+++ b/Modules/SicModules/Config/PM/PM2/_ioDefinePM2.xml
@@ -104,7 +104,7 @@
-
+
@@ -310,7 +310,7 @@
-
+
diff --git a/Modules/SicModules/Config/TM/DeviceModelSystem.xml b/Modules/SicModules/Config/TM/DeviceModelSystem.xml
index 1983fc3..06b6b43 100644
--- a/Modules/SicModules/Config/TM/DeviceModelSystem.xml
+++ b/Modules/SicModules/Config/TM/DeviceModelSystem.xml
@@ -67,10 +67,10 @@
-
-
-
-
+
+
+
+
diff --git a/Modules/SicModules/PMs/PMModuleDevice.cs b/Modules/SicModules/PMs/PMModuleDevice.cs
index aaff4a2..4fc759f 100644
--- a/Modules/SicModules/PMs/PMModuleDevice.cs
+++ b/Modules/SicModules/PMs/PMModuleDevice.cs
@@ -986,11 +986,11 @@ namespace SicModules.PMs
{
if (Module == ModuleName.PM1.ToString())
{
- return DEVICE.GetDevice("TM.ReactorADoorClosed").Value;
+ return DEVICE.GetDevice("TM.SensorReactorADoorClosed").Value;
}
else
{
- return DEVICE.GetDevice("TM.ReactorBDoorClosed").Value;
+ return DEVICE.GetDevice("TM.SensorReactorBDoorClosed").Value;
}
}
@@ -3568,7 +3568,7 @@ namespace SicModules.PMs
public override bool CheckRotationEnable()
{
//if (!_sicServo.ServoEnable || !_sicServo.ServoReady || _sicServo.ServoError)
- if (!_sicServo.ServoEnable || !_sicServo.ServoError)
+ if (!_sicServo.ServoEnable || _sicServo.ServoError)
return false;
return true;
diff --git a/SicSimulator/Config/_ioDefinePM.xml b/SicSimulator/Config/_ioDefinePM.xml
index 920704b..bdb9838 100644
--- a/SicSimulator/Config/_ioDefinePM.xml
+++ b/SicSimulator/Config/_ioDefinePM.xml
@@ -107,7 +107,7 @@
-
+
@@ -138,6 +138,8 @@
+
+
@@ -312,7 +314,7 @@
-
+
@@ -686,17 +688,17 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
diff --git a/SicSimulator/Instances/SimulatorSystem.cs b/SicSimulator/Instances/SimulatorSystem.cs
index 595e9f4..b882ce8 100644
--- a/SicSimulator/Instances/SimulatorSystem.cs
+++ b/SicSimulator/Instances/SimulatorSystem.cs
@@ -274,7 +274,6 @@ namespace SicSimulator.Instances
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_ServoDriverFaultSW"].Value = true;
@@ -359,7 +358,7 @@ namespace SicSimulator.Instances
MonitorValve("PM2");
MonitorFlowRamp("PM1");
- MonitorFlowRamp("PM2");
+ //MonitorFlowRamp("PM2");
MonitorGasConnector("PM1");
MonitorLid("PM1");
MonitorLidSwing("PM1");
@@ -411,10 +410,8 @@ namespace SicSimulator.Instances
new Tuple("AI_M15","AO_M15"),
new Tuple("AI_M16","AO_M16"),
new Tuple("AI_M17","AO_M17"),
- new Tuple("AI_M18","AO_M18"),
new Tuple("AI_M19","AO_M19"),
new Tuple("AI_M20","AO_M20"),
- new Tuple("AI_M21","AO_M21"),
new Tuple("AI_M22","AO_M22"),
new Tuple("AI_M23","AO_M23"),
new Tuple("AI_M25","AO_M25"),
@@ -422,8 +419,6 @@ namespace SicSimulator.Instances
new Tuple("AI_M27","AO_M27"),
new Tuple("AI_M28","AO_M28"),
new Tuple("AI_M29","AO_M29"),
- new Tuple("AI_M30","AO_M30"),
- new Tuple("AI_M40","AO_M40"),
new Tuple("AI_M31","AO_M31"),
new Tuple("AI_M32","AO_M32"),
new Tuple("AI_M33","AO_M33"),
@@ -447,8 +442,6 @@ namespace SicSimulator.Instances
new Tuple("AI_PressCtrl5","AO_PressCtrl5"),
new Tuple("AI_PressCtrl6","AO_PressCtrl6"),
new Tuple("AI_PressCtrl7","AO_PressCtrl7"),
- new Tuple("AI_PressCtrl8","AO_PressCtrl8"),
- new Tuple("AI_PressCtrl9","AO_PressCtrl9"),
@@ -937,12 +930,11 @@ namespace SicSimulator.Instances
IO.DI[$"{pm}.DI_ChamMoveBodyUpDownEnableFB"].Value = IO.DO[$"{pm}.DO_ChamMoveBodyUpDownEnable"].Value;
IO.DI[$"{pm}.DI_ArSafetyBypassFB(V19)"].Value = IO.DO[$"{pm}.DO_ArSafetyBypass(V19)"].Value;
- IO.DI[$"{pm}.DI_NH3SourceFB(V34)"].Value = IO.DO[$"{pm}.DO_NH3Source(V34)"].Value;
+ IO.DI[$"{pm}.DI_H2SupplyFB(V30)"].Value = IO.DO[$"{pm}.DO_H2Supply(V30)"].Value;
IO.DI[$"{pm}.DI_PumpBypassFB(V27)"].Value = IO.DO[$"{pm}.DO_PumpBypass(V27)"].Value;
IO.DI[$"{pm}.DI_H2SupplyFB(V31)"].Value = IO.DO[$"{pm}.DO_H2Supply(V31)"].Value;
IO.DI[$"{pm}.DI_ArSupplyFB(V32)"].Value = IO.DO[$"{pm}.DO_ArSupply(V32)"].Value;
IO.DI[$"{pm}.DI_SHH2/ArSwitchFB(V33)"].Value = IO.DO[$"{pm}.DO_SHH2/ArSwitch(V33)"].Value;
- IO.DI[$"{pm}.DI_NH3SourceFB(V34)"].Value = IO.DO[$"{pm}.DO_NH3Source(V34)"].Value;
IO.DI[$"{pm}.DI_H2ArLine1FB(V35)"].Value = IO.DO[$"{pm}.DO_H2ArLine1(V35)"].Value;
IO.DI[$"{pm}.DI_H2ArLine2FB(V36)"].Value = IO.DO[$"{pm}.DO_H2ArLine2(V36)"].Value;
//IO.DI[$"{pm}.DI_DoppingDilute_FB"].Value = IO.DO[$"{pm}.DO_HighN2Flow"].Value;
@@ -972,9 +964,12 @@ namespace SicSimulator.Instances
IO.DI[$"{pm}.DI_DoppingFinalFB(V61)"].Value = IO.DO[$"{pm}.DO_DoppingFinal(V61)"].Value;
IO.DI[$"{pm}.DI_SilaneFinalFB(V62)"].Value = IO.DO[$"{pm}.DO_SilaneFinal(V62)"].Value;
IO.DI[$"{pm}.DI_PropaneFinalFB(V63)"].Value = IO.DO[$"{pm}.DO_PropaneFinal(V63)"].Value;
- //IO.DI[$"{pm}.DI_GasRingH2Purge_FB"].Value = IO.DO[$"{pm}.DO_GasRingH2Purge"].Value;
- //IO.DI[$"{pm}.DI_GasRingArPurge_FB"].Value = IO.DO[$"{pm}.DO_GasRingArPurge"].Value;
- IO.DI[$"{pm}.DI_ChamBodyArPurgeFB(V68)"].Value = IO.DO[$"{pm}.DO_ChamBodyArPurge(V68)"].Value;
+ IO.DI[$"{pm}.DI_CarrierGasH2FB(V64)"].Value = IO.DO[$"{pm}.DO_CarrierGasH2(V64)"].Value;
+ IO.DI[$"{pm}.DI_CarrierGasArFB(V65)"].Value = IO.DO[$"{pm}.DO_CarrierGasAr(V65)"].Value;
+
+ //IO.DI[$"{pm}.DI_GasRingH2Purge_FB"].Value = IO.DO[$"{pm}.DO_GasRingH2Purge"].Value;
+ //IO.DI[$"{pm}.DI_GasRingArPurge_FB"].Value = IO.DO[$"{pm}.DO_GasRingArPurge"].Value;
+ IO.DI[$"{pm}.DI_ChamBodyArPurgeFB(V68)"].Value = IO.DO[$"{pm}.DO_ChamBodyArPurge(V68)"].Value;
IO.DI[$"{pm}.DI_ReactorLeakCheckFB(V69)"].Value = IO.DO[$"{pm}.DO_ReactorLeakCheck(V69)"].Value;
IO.DI[$"{pm}.DI_TMPressBalanceFB(V70)"].Value = IO.DO[$"{pm}.DO_TMPressBalance(V70)"].Value;
//IO.DI[$"{pm}.DI_CarryGasFinal_FB"].Value = IO.DO[$"{pm}.DO_CarryGasFinal(V97)"].Value;
diff --git a/SicUI/Models/PMs/PMOperationViewModel.cs b/SicUI/Models/PMs/PMOperationViewModel.cs
index bd04556..560df04 100644
--- a/SicUI/Models/PMs/PMOperationViewModel.cs
+++ b/SicUI/Models/PMs/PMOperationViewModel.cs
@@ -293,6 +293,9 @@ namespace SicUI.Models.PMs
[Subscription("V27.DeviceData")]
public AITValveData V27 { get; set; }
+ [Subscription("V30.DeviceData")]
+ public AITValveData V30 { get; set; }
+
[Subscription("V31.DeviceData")]
public AITValveData V31 { get; set; }
@@ -305,9 +308,6 @@ namespace SicUI.Models.PMs
[Subscription("V33s.DeviceData")]
public AITValveData V33s { get; set; }
- [Subscription("V34.DeviceData")]
- public AITValveData V34 { get; set; }
-
[Subscription("V35.DeviceData")]
public AITValveData V35 { get; set; }