Browse Source

fix the Chamber Pressure not show && Add CheckLoad Station to PA Position && fix CheckLoad cannot finish in Simulator.

zhouhr 1 year ago
parent
commit
5266d6e42b

+ 28 - 19
Venus/Venus_MainPages/ViewModels/VenusSeOperationOverViewModel.cs

@@ -407,7 +407,7 @@ namespace Venus_MainPages.ViewModels
         #region 命令实现
         private void OnLoad()
         {
-            if (VCEIsInstalled && !loadflag)
+            if (VCEIsInstalled && !loadflag && VCEwaferAssociation == null)
             {
                 VCEwaferAssociation = new WaferAssociationInfo
                 {
@@ -547,25 +547,34 @@ namespace Venus_MainPages.ViewModels
             m_RtDataKeys.Add($"SEScheduler.CycleSetPoint");
             m_RtDataKeys.Add($"SEScheduler.CycleCount");
             m_RtDataKeys.Add($"SEScheduler.ThroughPut");
-            if (PMAIsInstalled)
-            {
 
-                m_RtDataKeys.Add($"PMA.ChamberPressure");
-                m_RtDataKeys.Add($"PMA.VentingFlag");
-                m_RtDataKeys.Add($"PMA.CurrentRecipeResult");
-            }
-            if (PMBIsInstalled)
-            {
-                m_RtDataKeys.Add($"PMB.ChamberPressure");
-                m_RtDataKeys.Add($"PMB.VentingFlag");
-                m_RtDataKeys.Add($"PMB.CurrentRecipeResult");
-            }
-            if (PMCIsInstalled)
-            {
-                m_RtDataKeys.Add($"PMC.ChamberPressure");
-                m_RtDataKeys.Add($"PMC.VentingFlag");
-                m_RtDataKeys.Add($"PMC.CurrentRecipeResult");
-            }
+            m_RtDataKeys.Add($"PMA.ChamberPressure");
+            m_RtDataKeys.Add($"PMA.VentingFlag");
+            m_RtDataKeys.Add($"PMA.CurrentRecipeResult");
+            m_RtDataKeys.Add($"PMB.ChamberPressure");
+            m_RtDataKeys.Add($"PMB.VentingFlag");
+            m_RtDataKeys.Add($"PMB.CurrentRecipeResult");
+            m_RtDataKeys.Add($"PMC.ChamberPressure");
+            m_RtDataKeys.Add($"PMC.VentingFlag");
+            m_RtDataKeys.Add($"PMC.CurrentRecipeResult");
+            //if (PMAIsInstalled)
+            //{
+            //    m_RtDataKeys.Add($"PMA.ChamberPressure");
+            //    m_RtDataKeys.Add($"PMA.VentingFlag");
+            //    m_RtDataKeys.Add($"PMA.CurrentRecipeResult");
+            //}
+            //if (PMBIsInstalled)
+            //{
+            //    m_RtDataKeys.Add($"PMB.ChamberPressure");
+            //    m_RtDataKeys.Add($"PMB.VentingFlag");
+            //    m_RtDataKeys.Add($"PMB.CurrentRecipeResult");
+            //}
+            //if (PMCIsInstalled)
+            //{
+            //    m_RtDataKeys.Add($"PMC.ChamberPressure");
+            //    m_RtDataKeys.Add($"PMC.VentingFlag");
+            //    m_RtDataKeys.Add($"PMC.CurrentRecipeResult");
+            //}
 
         }
 

+ 1 - 1
Venus/Venus_MainPages/Views/VenusSeOperationOverView.xaml

@@ -359,7 +359,7 @@
             <!-- OverOperation -->
 
             <!-- Cycle information-->
-            <Canvas Canvas.Top="690" Canvas.Left="1710">
+            <Canvas Canvas.Top="690" Canvas.Left="1410">
                 <Border BorderBrush="#376092" BorderThickness="2" Padding="10" CornerRadius="7">
                     <Grid Width="200" Height="100">
                         <Grid.ColumnDefinitions>

+ 1 - 1
Venus/Venus_RT/Devices/TM/HongHuVR.cs

@@ -227,7 +227,7 @@ namespace Venus_RT.Devices.VCE
             _status = RState.Running;
             string arm = hand == Hand.Blade2 ? "B" : "A";
 
-            return _SendCommand($"CHECK LOAD 03 {arm}");
+            return _SendCommand($"CHECK LOAD {_StationNumbers[ModuleName.VPA]} {arm}");
         }
 
 

+ 2 - 1
Venus/Venus_Simulator/Devices/SETMSimulatorServer.cs

@@ -50,7 +50,8 @@ namespace Venus_Simulator.Devices
                 string arm = result.Groups[2].Value;
 
                 //OnWriteMessage(string.Format($"LOAD {arm} OFF"));
-                OnWriteMessage(string.Format($"CHECK LOAD"));
+                //OnWriteMessage(string.Format($"CHECK LOAD"));
+                OnWriteMessage("_RDY");
             }
             else if (_move_arm.IsMatch(str))
             {