upload missing files

Venus/Framework/Common/Device/ModuleName.cs

@@ -121,11 +121,6 @@ namespace MECF.Framework.Common.Equipment
         [EnumMember]
         VCEB,
 
-        [EnumMember]
-        SETM,
-        [EnumMember]
-        DETM,
-
         //transfer modules
         [EnumMember]
         TM,
@@ -198,8 +193,6 @@ namespace MECF.Framework.Common.Equipment
         [EnumMember]
         PMF,
 
-        [EnumMember]
-        VPA,
     }
 
     public static class ModuleHelper
@@ -292,20 +285,12 @@ namespace MECF.Framework.Common.Equipment
             return unit == ModuleName.EFEM;
         }
 
-        public static bool isSETM(ModuleName unit)
-        {
-            return unit == ModuleName.SETM || unit == ModuleName.DETM;
-        }
 
         public static bool IsVCE(ModuleName unit)
         {
             return unit == ModuleName.VCE1 || unit == ModuleName.VCE2 || unit == ModuleName.VCEA || unit == ModuleName.VCEB;
         }
 
-        public static bool IsVPA(ModuleName unit)
-        {
-            return unit == ModuleName.VPA;
-        }
         public static string GetAbbr(ModuleName module)
         {
             switch (module)

Venus/Framework/Common/Jobs/SequenceInfo.cs

@@ -28,11 +28,11 @@ namespace MECF.Framework.Common.Jobs
         [DataMember]
         public string Name { get; set; }
 
-        [DataMember]
-        public string PreWaferCleanRecipe { get; set; }
+        //[DataMember]
+        //public string PreWaferCleanRecipe { get; set; }
 
-        [DataMember]
-        public string PostWaferCleanRecipe { get; set; }
+        //[DataMember]
+        //public string PostWaferCleanRecipe { get; set; }
 
         [DataMember]
         public string WTWCleanRecipe { get; set; }
@@ -172,15 +172,15 @@ namespace MECF.Framework.Common.Jobs
                                 info.WTWCleanRecipe = attr.Value;
                             }
 
-                            if (attr.Name == "PreClean")
-                            {
-                                info.PreWaferCleanRecipe = attr.Value;
-                            }
+                            //if (attr.Name == "PreClean")
+                            //{
+                            //    info.PreWaferCleanRecipe = attr.Value;
+                            //}
 
-                            if (attr.Name == "PostClean")
-                            {
-                                info.PostWaferCleanRecipe = attr.Value;
-                            }
+                            //if (attr.Name == "PostClean")
+                            //{
+                            //    info.PostWaferCleanRecipe = attr.Value;
+                            //}
 
                         }
 

Venus/Venus_MainPages/Unity/ModuleManager.cs

@@ -47,8 +47,8 @@ namespace Venus_MainPages.Unity
                 ModulesID.Add("VCEA");
             if (installModules.Contains("VCEB"))
                 ModulesID.Add("VCEB");
-            if (installModules.Contains("VPA"))
-                ModulesID.Add("VPA");
+            //if (installModules.Contains("VPA"))
+            //    ModulesID.Add("VPA");
             if (installModules.Contains("Aligner1"))
                 ModulesID.Add("Aligner1");
 

Venus/Venus_MainPages/ViewModels/SeTMViewModel.cs

@@ -24,7 +24,7 @@ namespace Venus_MainPages.ViewModels
 {
     public enum SeTMModule
     {
-        PMA, PMB, PMC, VCE1, VPA
+        PMA, PMB, PMC, VCE1, Aligner1
     }
     public enum SeTMBlade
     {
@@ -33,10 +33,10 @@ namespace Venus_MainPages.ViewModels
     public class SeTMViewModel : BindableBase
     {
         #region 私有字段
-        public double m_VPAangle;
+        public double m_Alignerangle;
 
         private ModuleInfo m_VCEModuleInfo;
-        private ModuleInfo m_VPAModuleInfo;
+        private ModuleInfo m_AlignerModuleInfo;
         private ModuleInfo m_TMModuleInfo;
 
         //Wafer
@@ -85,7 +85,7 @@ namespace Venus_MainPages.ViewModels
         private bool m_PMBIsInstalled;
         private bool m_PMCIsInstalled;
         private bool m_VCEIsInstalled;
-        private bool m_VPAIsInstalled;
+        private bool m_AlignerIsInstalled;
         private Dictionary<string, object> m_RtDataValues = new Dictionary<string, object>();
         private List<string> m_RtDataKeys = new List<string>();
 
@@ -110,10 +110,10 @@ namespace Venus_MainPages.ViewModels
         #endregion
 
         #region 属性
-        public double VPAangle
+        public double Alignerangle
         {
-            get { return m_VPAangle; }
-            set { SetProperty(ref m_VPAangle, value); }
+            get { return m_Alignerangle; }
+            set { SetProperty(ref m_Alignerangle, value); }
         }
         public WaferInfo PMAWafer
         {
@@ -177,12 +177,12 @@ namespace Venus_MainPages.ViewModels
                 SetProperty(ref m_VCEModuleInfo, value);
             }
         }
-        public ModuleInfo VPAModuleInfo
+        public ModuleInfo AlignerModuleInfo
         {
-            get { return m_VPAModuleInfo; }
+            get { return m_AlignerModuleInfo; }
             set
             {
-                SetProperty(ref m_VPAModuleInfo, value);
+                SetProperty(ref m_AlignerModuleInfo, value);
             }
         }
         public Dictionary<string, object> RtDataValues
@@ -211,10 +211,10 @@ namespace Venus_MainPages.ViewModels
             get { return m_VCEIsInstalled; }
             set { SetProperty(ref m_VCEIsInstalled, value); }
         }
-        public bool VPAIsInstalled
+        public bool AlignerIsInstalled
         {
-            get { return m_VPAIsInstalled; }
-            set { SetProperty(ref m_VPAIsInstalled, value); }
+            get { return m_AlignerIsInstalled; }
+            set { SetProperty(ref m_AlignerIsInstalled, value); }
         }
 
         public List<SeTMModule> TMModules
@@ -450,7 +450,7 @@ namespace Venus_MainPages.ViewModels
             PMBIsInstalled = allModules.Contains("PMB");
             PMCIsInstalled = allModules.Contains("PMC");
             VCEIsInstalled = allModules.Contains("VCE1");
-            VPAIsInstalled = allModules.Contains("VPA");
+            AlignerIsInstalled = allModules.Contains("Aligner1");
             if (PMAIsInstalled == true)
             {
                 TMModules.Add(SeTMModule.PMA);
@@ -462,20 +462,20 @@ namespace Venus_MainPages.ViewModels
             if (PMCIsInstalled == true)
             {
                 TMModules.Add(SeTMModule.PMC);
-                m_VPAangle = 270;
+                m_Alignerangle = 270;
             }
             else
             {
-                m_VPAangle = 180;
+                m_Alignerangle = 180;
             }
 
             if (VCEIsInstalled == true)
             {
                 TMModules.Add(SeTMModule.VCE1);
             }
-            if (VPAIsInstalled == true)
+            if (AlignerIsInstalled == true)
             {
-                TMModules.Add(SeTMModule.VPA);
+                TMModules.Add(SeTMModule.Aligner1);
             }
 
             PickSoltItemsSource.Add(1);
@@ -617,7 +617,7 @@ namespace Venus_MainPages.ViewModels
             {
                 InvokeClient.Instance.Service.DoOperation($"TM.PMPlace", moveItems);
             }
-            //VCE、VPA
+            //VCE、Aligner1
             else
             {
                 InvokeClient.Instance.Service.DoOperation($"TM.Place", moveItems);
@@ -663,7 +663,7 @@ namespace Venus_MainPages.ViewModels
             }
             List<string> stations = new List<string>();
             stations.Add("VCE1");
-            stations.Add("VPA");
+            stations.Add("Aligner1");
             if (PMAIsCycle == true)
             {
                 stations.Add("PMA");
@@ -721,9 +721,9 @@ namespace Venus_MainPages.ViewModels
             PMCDoorIsOpen = !CommonFunction.GetValue<bool>(RtDataValues, "TM.PMCSlitDoorClosed");
             VCEOutDoorIsOpen = !CommonFunction.GetValue<bool>(RtDataValues, "VCE1.VCEOutDoorClosed");
             RobotMoveInfo = (RobotMoveInfo)QueryDataClient.Instance.Service.GetData("TM.RobotMoveAction");
+            PAWafer = ModuleManager.ModuleInfos["Aligner1"].WaferManager.Wafers[0];
             RobotUpperWafer = TMModuleInfo.WaferManager.Wafers[0];
             RobotLowerWafer = TMModuleInfo.WaferManager.Wafers[1];
-            PAWafer = ModuleManager.ModuleInfos["Aligner1"].WaferManager.Wafers[0];
 
         }
         private async void RobotMoveInfoChanged(RobotMoveInfo oldValue, RobotMoveInfo newValue)
@@ -768,7 +768,7 @@ namespace Venus_MainPages.ViewModels
             }
             #endregion
 
-            #region VPA、VCE1 Pick、Place
+            #region Aligner1、VCE1 Pick、Place
             else if ((oldValue.Action == RobotAction.None || oldValue.ArmTarget != newValue.ArmTarget) && (newValue.Action == RobotAction.Placing || newValue.Action == RobotAction.Picking))
             {
                 var TMRobotMoveActionBladeTarget = newValue.BladeTarget;
@@ -783,7 +783,7 @@ namespace Venus_MainPages.ViewModels
                 var values = RobotTarget.Split('.');
                 var arm = values[0];
                 var module = values[1];
-                //if (module == "VPA")
+                //if (module == "Aligner1")
                 //{
                 //    module = PMCIsInstalled ? "VPA" : "VPARight";
                 //}

Venus/Venus_MainPages/ViewModels/VenusDETMViewModel.cs

@@ -25,10 +25,10 @@ namespace Venus_MainPages.ViewModels
     public class VenusDETMViewModel : BindableBase
     {
         #region 私有字段
-        public double m_VPAangle;
+        public double m_Alignerangle;
 
         private ModuleInfo m_VCEModuleInfo;
-        private ModuleInfo m_VPAModuleInfo;
+        private ModuleInfo m_AlignerModuleInfo;
         private ModuleInfo m_TMModuleInfo;
 
         //Wafer
@@ -77,7 +77,7 @@ namespace Venus_MainPages.ViewModels
         private bool m_PMBIsInstalled;
         private bool m_PMCIsInstalled;
         private bool m_VCEIsInstalled;
-        private bool m_VPAIsInstalled;
+        private bool m_AlignerIsInstalled;
         private Dictionary<string, object> m_RtDataValues = new Dictionary<string, object>();
         private List<string> m_RtDataKeys = new List<string>();
 
@@ -102,10 +102,10 @@ namespace Venus_MainPages.ViewModels
         #endregion
 
         #region 属性
-        public double VPAangle
+        public double Alignerangle
         {
-            get { return m_VPAangle; }
-            set { SetProperty(ref m_VPAangle, value); }
+            get { return m_Alignerangle; }
+            set { SetProperty(ref m_Alignerangle, value); }
         }
         public WaferInfo PMAWafer
         {
@@ -169,12 +169,12 @@ namespace Venus_MainPages.ViewModels
                 SetProperty(ref m_VCEModuleInfo, value);
             }
         }
-        public ModuleInfo VPAModuleInfo
+        public ModuleInfo AlignerModuleInfo
         {
-            get { return m_VPAModuleInfo; }
+            get { return m_AlignerModuleInfo; }
             set
             {
-                SetProperty(ref m_VPAModuleInfo, value);
+                SetProperty(ref m_AlignerModuleInfo, value);
             }
         }
         public Dictionary<string, object> RtDataValues
@@ -203,10 +203,10 @@ namespace Venus_MainPages.ViewModels
             get { return m_VCEIsInstalled; }
             set { SetProperty(ref m_VCEIsInstalled, value); }
         }
-        public bool VPAIsInstalled
+        public bool AlignerIsInstalled
         {
-            get { return m_VPAIsInstalled; }
-            set { SetProperty(ref m_VPAIsInstalled, value); }
+            get { return m_AlignerIsInstalled; }
+            set { SetProperty(ref m_AlignerIsInstalled, value); }
         }
 
         public List<SeTMModule> TMModules
@@ -444,7 +444,7 @@ namespace Venus_MainPages.ViewModels
             PMCIsInstalled = true;
             //VCEIsInstalled = allModules.Contains("VCE1");
             VCEIsInstalled = true;
-            VPAIsInstalled = true;
+            AlignerIsInstalled = true;
             if (PMAIsInstalled == true)
             {
                 TMModules.Add(SeTMModule.PMA);
@@ -456,20 +456,20 @@ namespace Venus_MainPages.ViewModels
             if (PMCIsInstalled == true)
             {
                 TMModules.Add(SeTMModule.PMC);
-                m_VPAangle = 270;
+                m_Alignerangle = 270;
             }
             else
             {
-                m_VPAangle = 180;
+                m_Alignerangle = 180;
             }
 
             if (VCEIsInstalled == true)
             {
                 TMModules.Add(SeTMModule.VCE1);
             }
-            if (VPAIsInstalled == true)
+            if (AlignerIsInstalled == true)
             {
-                TMModules.Add(SeTMModule.VPA);
+                TMModules.Add(SeTMModule.Aligner1);
             }
 
             PickSoltItemsSource.Add(1);
@@ -611,7 +611,7 @@ namespace Venus_MainPages.ViewModels
             {
                 InvokeClient.Instance.Service.DoOperation($"TM.PMPlace", moveItems);
             }
-            //VCE、VPA
+            //VCE、Aligner1
             else
             {
                 InvokeClient.Instance.Service.DoOperation($"TM.Place", moveItems);
@@ -658,7 +658,7 @@ namespace Venus_MainPages.ViewModels
             }
             List<string> stations = new List<string>();
             stations.Add("VCE1");
-            stations.Add("VPA");
+            stations.Add("Aligner1");
             if (PMAIsCycle == true)
             {
                 stations.Add("PMA");
@@ -716,9 +716,9 @@ namespace Venus_MainPages.ViewModels
             PMCDoorIsOpen = !CommonFunction.GetValue<bool>(RtDataValues, "TM.PMCSlitDoorClosed");
             VCEOutDoorIsOpen = !CommonFunction.GetValue<bool>(RtDataValues, "VCE1.VCEOutDoorClosed");
             RobotMoveInfo = (RobotMoveInfo)QueryDataClient.Instance.Service.GetData("TM.RobotMoveAction");
+            PAWafer = ModuleManager.ModuleInfos["Aligner1"].WaferManager.Wafers[0];
             RobotUpperWafer = TMModuleInfo.WaferManager.Wafers[0];
             RobotLowerWafer = TMModuleInfo.WaferManager.Wafers[1];
-            PAWafer = ModuleManager.ModuleInfos["VPA"].WaferManager.Wafers[0];
 
         }
         private async void RobotMoveInfoChanged(RobotMoveInfo oldValue, RobotMoveInfo newValue)
@@ -763,7 +763,7 @@ namespace Venus_MainPages.ViewModels
             }
             #endregion
 
-            #region VPA、VCE1 Pick、Place
+            #region Aligner1、VCE1 Pick、Place
             else if ((oldValue.Action == RobotAction.None || oldValue.ArmTarget != newValue.ArmTarget) && (newValue.Action == RobotAction.Placing || newValue.Action == RobotAction.Picking))
             {
                 var TMRobotMoveActionBladeTarget = newValue.BladeTarget;

Venus/Venus_MainPages/ViewModels/VenusDeOperationOverViewModel.cs

@@ -35,7 +35,7 @@ namespace Venus_MainPages.ViewModels
         private ModuleInfo m_PMBModuleInfo;
         private ModuleInfo m_PMCModuleInfo;
         private ModuleInfo m_PMDModuleInfo;
-        private ModuleInfo m_VPAModuleInfo;
+        private ModuleInfo m_AlignerModuleInfo;
         private ModuleInfo m_TMModuleInfo;
         public WaferInfo m_PMAWafer;
         public WaferInfo m_PMBWafer;
@@ -309,12 +309,12 @@ namespace Venus_MainPages.ViewModels
                 SetProperty(ref m_PMDModuleInfo, value);
             }
         }
-        public ModuleInfo VPAModuleInfo
+        public ModuleInfo AlignerModuleInfo
         {
-            get { return m_VPAModuleInfo; }
+            get { return m_AlignerModuleInfo; }
             set
             {
-                SetProperty(ref m_VPAModuleInfo, value);
+                SetProperty(ref m_AlignerModuleInfo, value);
             }
         }
 
@@ -691,6 +691,8 @@ namespace Venus_MainPages.ViewModels
                 {"Module", info.ModuleData.ModuleID},
                 {"SlotSequence", slotSequence.ToArray()},
                 {"AutoStart", true},
+                { "PreCleanRecipeName",info.PreCleanRecipeName},
+                { "PostCleanRecipeName",info.PostCleanRecipeName}
             };
             InvokeClient.Instance.Service.DoOperation("System.CreateSEJob", param);
         }
@@ -841,7 +843,7 @@ namespace Venus_MainPages.ViewModels
             List<string> stations = new List<string>();
 
             stations.Add("VCEA");
-            stations.Add("VPA");
+            stations.Add("Aligner1");
             if (PMAIsInstalled)
             {
                 stations.Add("PMA");
@@ -999,10 +1001,10 @@ namespace Venus_MainPages.ViewModels
                 }
                 RobotMoveInfo = (RobotMoveInfo)QueryDataClient.Instance.Service.GetData("TM.RobotMoveAction");
 
+                PAWafer = ModuleManager.ModuleInfos["Aligner1"].WaferManager.Wafers[0];
                 TMModuleInfo = ModuleManager.ModuleInfos["TMRobot"];
                 RobotUpperWafer = TMModuleInfo.WaferManager.Wafers[0];
                 RobotLowerWafer = TMModuleInfo.WaferManager.Wafers[1];
-                PAWafer = ModuleManager.ModuleInfos["Aligner1"].WaferManager.Wafers[0];
             }
             catch
             {
@@ -1044,7 +1046,7 @@ namespace Venus_MainPages.ViewModels
             }
             #endregion
 
-            #region VPA、VCE1 Pick、Place
+            #region Aligner1、VCE1 Pick、Place
             else if ((oldValue.Action == RobotAction.None || oldValue.ArmTarget != newValue.ArmTarget) && (newValue.Action == RobotAction.Placing || newValue.Action == RobotAction.Picking))
             {
                 var TMRobotMoveActionBladeTarget = newValue.BladeTarget;

Venus/Venus_MainPages/ViewModels/VenusSeOperationOverViewModel.cs

@@ -31,7 +31,7 @@ namespace Venus_MainPages.ViewModels
         private ModuleInfo m_PMAModuleInfo;
         private ModuleInfo m_PMBModuleInfo;
         private ModuleInfo m_PMCModuleInfo;
-        private ModuleInfo m_VPAModuleInfo;
+        private ModuleInfo m_AlignerModuleInfo;
         private ModuleInfo m_TMModuleInfo;
         public WaferInfo m_PMAWafer;
         public WaferInfo m_PMBWafer;
@@ -209,12 +209,12 @@ namespace Venus_MainPages.ViewModels
                 SetProperty(ref m_PMCModuleInfo, value);
             }
         }
-        public ModuleInfo VPAModuleInfo
+        public ModuleInfo AligenrModuleInfo
         {
-            get { return m_VPAModuleInfo; }
+            get { return m_AlignerModuleInfo; }
             set
             {
-                SetProperty(ref m_VPAModuleInfo, value);
+                SetProperty(ref m_AlignerModuleInfo, value);
             }
         }
 
@@ -621,7 +621,7 @@ namespace Venus_MainPages.ViewModels
             List<string> stations = new List<string>();
 
             stations.Add("VCE1");
-            stations.Add("VPA");
+            stations.Add("Aligner1");
             if (PMAIsInstalled)
             {
                 stations.Add("PMA");
@@ -740,10 +740,10 @@ namespace Venus_MainPages.ViewModels
                 }
                 RobotMoveInfo = (RobotMoveInfo)QueryDataClient.Instance.Service.GetData("TM.RobotMoveAction");
 
+                PAWafer = ModuleManager.ModuleInfos["Aligner1"].WaferManager.Wafers[0];
                 TMModuleInfo = ModuleManager.ModuleInfos["TMRobot"];
                 RobotUpperWafer = TMModuleInfo.WaferManager.Wafers[0];
                 RobotLowerWafer = TMModuleInfo.WaferManager.Wafers[1];
-                PAWafer = ModuleManager.ModuleInfos["Aligner1"].WaferManager.Wafers[0];
             }
             catch
             {
@@ -785,7 +785,7 @@ namespace Venus_MainPages.ViewModels
             }
             #endregion
 
-            #region VPA、VCE1 Pick、Place
+            #region Aligner1、VCE1 Pick、Place
             else if ((oldValue.Action == RobotAction.None || oldValue.ArmTarget != newValue.ArmTarget) && (newValue.Action == RobotAction.Placing || newValue.Action == RobotAction.Picking))
             {
                 var TMRobotMoveActionBladeTarget = newValue.BladeTarget;

Venus/Venus_MainPages/Views/VenusDeOperationOverView.xaml

@@ -577,12 +577,12 @@
                 </TabItem>
                 <TabItem Header="VCEA" Style="{StaticResource StyleTabControl}">
                     <Viewbox Width="336" VerticalAlignment="Top">
-                        <local:WaferAssociationSEUnit WFInfo="{Binding VCEAwaferAssociation}"/>
+                        <local:WaferAssociationUnit WAInfo="{Binding VCEAwaferAssociation}"/>
                     </Viewbox>
                 </TabItem>
                 <TabItem Header="VCEB" Style="{StaticResource StyleTabControl}">
                     <Viewbox Width="336" VerticalAlignment="Top">
-                        <local:WaferAssociationSEUnit WFInfo="{Binding VCEBwaferAssociation}"/>
+                        <local:WaferAssociationUnit WAInfo="{Binding VCEBwaferAssociation}"/>
                     </Viewbox>
                 </TabItem>
             </TabControl>

Venus/Venus_Simulator/App.config

@@ -4,7 +4,7 @@
 		<section name="customSettings" type="System.Configuration.NameValueSectionHandler"/>
 	</configSections>
 	<customSettings>
-		<add key="SimulatorType" value="2"/>
+		<add key="SimulatorType" value="4"/>
 	</customSettings>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />

Venus/Venus_Simulator/Config/UILayout_DE.xml

@@ -84,7 +84,7 @@
 	<Navigation Id="DETM" Name="DETM">
 		<SubView Id="VCEA" Name="HongHuVCE" ViewClass="Venus_Simulator.Views.Simu_VCEView" Assembly="Venus_Simulator"/>
 		<SubView Id="VCEB" Name="HongHuVCEB" ViewClass="Venus_Simulator.Views.Simu_VCE2View" Assembly="Venus_Simulator"/>
-		<SubView Id="HongHUVPA" Name="HongHuVPA" ViewClass="Venus_Simulator.Views.HongHuVPA" Assembly="Venus_Simulator"/>
+		<SubView Id="HongHUAligner1" Name="HongHuAligner1" ViewClass="Venus_Simulator.Views.HongHuVPA" Assembly="Venus_Simulator"/>
 		<SubView Id="ioDETM" Name="IO-DETM" ViewClass="Venus_Simulator.Views.SimulatorIoDETMView" Assembly="Venus_Simulator"/>
 		<SubView Id="DETMRB" Name="DE TM RB" ViewClass="Venus_Simulator.Views.Simu_DETMView" Assembly="Venus_Simulator"/>
 		<SubView Id="SkyPumpDETM" Name="SkyPumpDETM" ViewClass="Venus_Simulator.Views.SimuSkyPumpDETMView" Assembly="Venus_Simulator"/>

Venus/Venus_Simulator/Config/UILayout_SE.xml

@@ -83,7 +83,7 @@
 
 	<Navigation Id="SETM" Name="SETM">
 		<SubView Id="VCE1" Name="HongHuVCE" ViewClass="Venus_Simulator.Views.Simu_VCEView" Assembly="Venus_Simulator"/>
-		<SubView Id="HongHUVPA" Name="HongHuVPA" ViewClass="Venus_Simulator.Views.HongHuVPA" Assembly="Venus_Simulator"/>
+		<SubView Id="HongHUAligner1" Name="HongHuAligner1" ViewClass="Venus_Simulator.Views.HongHuVPA" Assembly="Venus_Simulator"/>
 		<SubView Id="ioSETM" Name="IO-SETM" ViewClass="Venus_Simulator.Views.SimulatorIoSETMView" Assembly="Venus_Simulator"/>
 		<SubView Id="SETMRB" Name="SE TM RB" ViewClass="Venus_Simulator.Views.Simu_SETMView" Assembly="Venus_Simulator"/>
 		<SubView Id="SkyPumpSETM" Name="SkyPumpSETM" ViewClass="Venus_Simulator.Views.SimuSkyPumpSETMView" Assembly="Venus_Simulator"/>

Venus/Venus_Simulator/Instances/SimulatorSystem.cs

@@ -687,7 +687,7 @@ namespace Venus_Simulator.Instances
 
         private void SetSETMDefaultValue()
         {
-            ModuleName mod = ModuleName.SETM;
+            string mod = "SETM";
 
             IO.DI[$"{mod}.DI_System_CDA_Pressure_OK"].Value = true;
             IO.DI[$"{mod}.DI_LID_DOOR_CLOSED"].Value = true;
@@ -733,7 +733,7 @@ namespace Venus_Simulator.Instances
         }
         private void SetDETMDefaultValue()
         {
-            ModuleName mod = ModuleName.DETM;
+            string mod = "DETM";
 
             IO.DI[$"{mod}.DI_Smif1_Ready_to_load"].Value = true;
             IO.DI[$"{mod}.DI_Smif1_Ready_to_unload"].Value = true;
@@ -1069,7 +1069,7 @@ namespace Venus_Simulator.Instances
         }
         void MonitorSEMFSlitDoor()
         {
-            ModuleName mod = ModuleName.SETM;
+            string mod = "SETM";
             // VCE T door open
             if (IO.DO[$"{mod}.DO_VCE_Slit_Door_Open"].Value)
             {
@@ -1127,7 +1127,7 @@ namespace Venus_Simulator.Instances
         }
         void MonitorDEMFSlitDoor()
         {
-            ModuleName mod = ModuleName.DETM;
+            string mod = "DETM";
             // VCE L door open
             if (IO.DO[$"{mod}.DO_VCEA_SlitDoor_Open"].Value)
             {
@@ -2205,7 +2205,7 @@ namespace Venus_Simulator.Instances
         }
         void MonitorSEMFPressure()
         {
-            ModuleName mod = ModuleName.SETM;
+            string mod = "SETM";
             string VCE_ChamberPressure = "AI_VCE_Pressure";
             string TM_AI_ChamberPressure = "AI_TM_Pressure";
 
@@ -2302,7 +2302,7 @@ namespace Venus_Simulator.Instances
 
         void MonitorDEMFPressure()
         {
-            ModuleName mod = ModuleName.DETM;
+            string mod = "DETM";
             string AI_Left_VCE_Pressure = "AI_Left_VCE_Pressure";
             string AI_Right_VCE_Pressure = "AI_Right_VCE_Pressure";
             string TM_AI_ChamberPressure = "AI_TM_Pressure";

Venus/Venus_UI/Views/ShellView.xaml.cs

@@ -172,9 +172,9 @@ namespace Venus_UI.Views
 
                 }
                 else
-					if(e.TranferTo.ModuleID == "VPA" || string.IsNullOrEmpty(e.TranferTo.ModuleID))
+					if(e.TranferTo.ModuleID == "Aligner1" || string.IsNullOrEmpty(e.TranferTo.ModuleID))
                     InvokeClient.Instance.Service.DoOperation("System.MoveWafer",
-                        e.TranferFrom.ModuleID, e.TranferFrom.SlotID, "VPA", 0, true, 0, coolingflag, coolingtime, "");
+                        e.TranferFrom.ModuleID, e.TranferFrom.SlotID, "Aligner1", 0, true, 0, coolingflag, coolingtime, "");
                 
                     InvokeClient.Instance.Service.DoOperation("System.MoveWafer",
                         e.TranferFrom.ModuleID, e.TranferFrom.SlotID, e.TranferTo.ModuleID, e.TranferTo.SlotID, alignflag, angel, coolingflag, coolingtime, "");