GasLeakCheckViewModel Update

Venus/Venus_MainPages/ViewModels/GasLeakCheckViewModel.cs

@@ -725,10 +725,11 @@ namespace Venus_MainPages.ViewModels
             m_LeakRateUpperLimit = 10;
             BasePressure = 100;
 
-
+            
 
             addDataKeys();
-         
+            
+
             timer = new DispatcherTimer();
             timer.Interval = TimeSpan.FromSeconds(1);
             timer.Tick += timer_Tick;
@@ -885,7 +886,7 @@ namespace Venus_MainPages.ViewModels
 
             MFCN2Data = (AITMfcData)RtDataValues[$"{ModuleName}.MfcN2"];
 
-            if (ChamberType == JetChamber.VenusSE || ChamberType == JetChamber.VenusDE)
+            if (ChamberType == JetChamber.VenusSE)
             {
                 MFC9Data = (AITMfcData)RtDataValues[$"{ModuleName}.MfcGas9"];
                 MFC10Data = (AITMfcData)RtDataValues[$"{ModuleName}.MfcGas10"];
@@ -918,6 +919,38 @@ namespace Venus_MainPages.ViewModels
                 SecondPurgeValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValveSecondPurge.IsOpen"];
                 PV14ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePV14.IsOpen"];
             }
+            else if (ChamberType == JetChamber.VenusDE)
+            {
+                MFC9Data = (AITMfcData)RtDataValues[$"{ModuleName}.MfcGas9"];
+                MFC10Data = (AITMfcData)RtDataValues[$"{ModuleName}.MfcGas10"];
+                MFC11Data = (AITMfcData)RtDataValues[$"{ModuleName}.MfcGas11"];
+                MFC12Data = (AITMfcData)RtDataValues[$"{ModuleName}.MfcGas12"];
+                //12 valve
+                PV51ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePV51.IsOpen"];
+                PV52ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePV52.IsOpen"];
+                PV61ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePV61.IsOpen"];
+                PV62ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePV62.IsOpen"];
+                PV71ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePV71.IsOpen"];
+                PV72ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePV72.IsOpen"];
+                PV81ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePV81.IsOpen"];
+                PV82ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePV82.IsOpen"];
+                PV91ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePV91.IsOpen"];
+                PV92ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePV92.IsOpen"];
+                PVA1ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePVA1.IsOpen"];
+                PVA2ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePVA2.IsOpen"];
+                PVB1ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePVB1.IsOpen"];
+                PVB2ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePVB2.IsOpen"];
+                PVC1ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePVC1.IsOpen"];
+                PVC2ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePVC2.IsOpen"];
+                //12 mfc
+                MFC9ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValveMfc9.IsOpen"];
+                MFC10ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValveMfc10.IsOpen"];
+                MFC11ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValveMfc11.IsOpen"];
+
+                //purge
+                MainPurgeValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValveMainPurge.IsOpen"];
+                SecondPurgeValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValveSecondPurge.IsOpen"];
+            }
             
 
 
@@ -1004,9 +1037,10 @@ namespace Venus_MainPages.ViewModels
 
         public void add12DataKeys()
         {
-            if (ChamberType == JetChamber.VenusSE || ChamberType == JetChamber.VenusDE)
+             if (ChamberType == JetChamber.VenusSE)
             {
                 //12 valve
+                m_RtDataKeys.Add($"{ModuleName}.ValvePV14.IsOpen");
                 m_RtDataKeys.Add($"{ModuleName}.ValvePV51.IsOpen");
                 m_RtDataKeys.Add($"{ModuleName}.ValvePV52.IsOpen");
                 m_RtDataKeys.Add($"{ModuleName}.ValvePV61.IsOpen");
@@ -1031,7 +1065,48 @@ namespace Venus_MainPages.ViewModels
                 //purge
                 m_RtDataKeys.Add($"{ModuleName}.ValveMainPurge.IsOpen");
                 m_RtDataKeys.Add($"{ModuleName}.ValveSecondPurge.IsOpen");
-                m_RtDataKeys.Add($"{ModuleName}.ValvePV14.IsOpen");
+            }else if ( ChamberType == JetChamber.VenusDE)
+            {
+                m_RtDataKeys.Add($"{ModuleName}.ValvePVN21.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValvePVN22.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValvePV11.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValvePV12.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValvePV21.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValvePV22.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValvePV31.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValvePV32.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValvePV41.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValvePV42.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValvePV51.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValvePV52.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValvePV61.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValvePV62.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValvePV71.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValvePV72.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValvePV81.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValvePV82.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValvePV91.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValvePV92.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValvePVA1.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValvePVA2.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValvePVB1.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValvePVB2.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValvePVC1.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValvePVC2.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValveMfc1.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValveMfc2.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValveMfc3.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValveMfc4.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValveMfc5.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValveMfc6.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValveMfc7.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValveMfc8.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValveMfc9.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValveMfc10.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValveMfc11.IsOpen");
+                //purge
+                m_RtDataKeys.Add($"{ModuleName}.ValveMainPurge.IsOpen");
+                m_RtDataKeys.Add($"{ModuleName}.ValveSecondPurge.IsOpen");
             }
 
 

Venus/Venus_RT/Config/PM/VenusSE/VenusSEDeviceModel.xml

@@ -24,6 +24,8 @@
 				isDefaultOpen="false" diOpen="" doOpen="DO_PV42" diCloseSensor="" diOpenSensor="" />
 		<IoValve id="ValvePV51" display="PV51 Valve" schematicId="PV51" unit="" isNc="true"
 		isDefaultOpen="false" diOpen="" doOpen="DO_PV51" diCloseSensor="" diOpenSensor="" />
+    <IoValve id="ValvePV14" display="PV14 Valve" schematicId="PV14" unit="" isNc="true"
+isDefaultOpen="false" diOpen="" doOpen="DO_Chamber_Purge" diCloseSensor="" diOpenSensor="" />
 		<IoValve id="ValvePV52" display="PV52 Valve" schematicId="PV52" unit="" isNc="true"
 				isDefaultOpen="false" diOpen="" doOpen="DO_PV52" diCloseSensor="" diOpenSensor="" />
 		<IoValve id="ValvePV61" display="PV61 Valve" schematicId="PV61" unit="" isNc="true"