Parcourir la source

添加CycleCount/WaferCount显示

lixiang il y a 1 an
Parent
commit
afb706578a

+ 15 - 3
Venus/Venus_MainPages/ViewModels/OperationOverViewModel.cs

@@ -69,8 +69,9 @@ namespace Venus_MainPages.ViewModels
         private WaferAssociationInfo _lp1WaferAssociation;
         private WaferAssociationInfo _lp2WaferAssociation;
         private WaferAssociationInfo _lp3WaferAssociation;
-        
 
+        private int m_CycledWafer;
+        private int m_CycleCountDisplay;
 
 
         #endregion
@@ -300,7 +301,16 @@ namespace Venus_MainPages.ViewModels
             get { return _lp3WaferAssociation; }
             set { SetProperty(ref _lp3WaferAssociation, value); }
         }
-        
+        public int CycledWafer
+        {
+            get { return m_CycledWafer; }
+            set { SetProperty(ref m_CycledWafer, value); }
+        }
+        public int CycleCountDisplay
+        {
+            get { return m_CycleCountDisplay; }
+            set { SetProperty(ref m_CycleCountDisplay, value); }
+        }
         #endregion
 
         #region 命令
@@ -705,8 +715,10 @@ namespace Venus_MainPages.ViewModels
             m_RtDataKeys.Add("TM.LLBESlitDoor.IsClosed");
             m_RtDataKeys.Add("System.IsAutoMode");
 
+            m_RtDataKeys.Add("Scheduler.CycledCount");
+            m_RtDataKeys.Add("Scheduler.CycledWafer");
+
 
-            
 
         }
 

+ 2 - 2
Venus/Venus_MainPages/Views/OperationOverView.xaml

@@ -495,13 +495,13 @@
                             <TextBlock Text="Wafer Count" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14" FontFamily="Arial" VerticalAlignment="Center"/>
                         </Border>
                         <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,1,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="1" Grid.Column="1" Padding="5,1">
-                            <TextBlock Text="{Binding CycledWafer}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14" FontFamily="Arial" VerticalAlignment="Center"/>
+                            <TextBlock Text="{Binding RtDataValues[Scheduler.CycledWafer]}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14" FontFamily="Arial" VerticalAlignment="Center"/>
                         </Border>
                         <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="2" Padding="5,1">
                             <TextBlock Text="Cycle Count" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14" FontFamily="Arial" VerticalAlignment="Center"/>
                         </Border>
                         <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="2" Grid.Column="1" Padding="5,1">
-                            <TextBlock Text="{Binding CycleCountDisplay}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14" FontFamily="Arial" VerticalAlignment="Center"/>
+                            <TextBlock Text="{Binding RtDataValues[Scheduler.CycledCount]}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14" FontFamily="Arial" VerticalAlignment="Center"/>
                         </Border>
                     </Grid>
 

+ 2 - 2
Venus/Venus_RT/Config/PM/Kepler2300/Kepler2300IoDefine.xml

@@ -272,8 +272,8 @@
 		<AO_ITEM Index="37" Name="" />
 		<AO_ITEM Index="38" Name="" />
 		<AO_ITEM Index="39" Name="" />
-		<AO_ITEM Index="40" Name="" />
-		<AO_ITEM Index="41" Name="" />
+		<!--<AO_ITEM Index="40" Name="AO_Gas_Line_Temp_Limit_Setpoint"      BufferOffset="80" Device="" Addr="d1080" Note="Gas LineTemp Limit" />
+		<AO_ITEM Index="41" Name="AO_Gas_Line_Temp_Limit_Setpoint"      BufferOffset="82" Device="" Addr="d1082" Note="Gas LineTemp Limit" />-->
 		<AO_ITEM Index="42" Name="" />
 		<AO_ITEM Index="43" Name="" />
 		<AO_ITEM Index="44" Name="" />

+ 2 - 0
Venus/Venus_RT/Modules/AutoCycle.cs

@@ -121,6 +121,8 @@ namespace Venus_RT.Modules
             _LLBInSlot.RemoveAll(item => item >= _LLBSlotNumber);
             _LLBOutSlot.RemoveAll(item => item >= _LLBSlotNumber);
 
+            _cycledCount = 1;
+            _cycledWafer = 2;
             DATA.Subscribe("Scheduler.CycledCount", () => _cycledCount);
             DATA.Subscribe("Scheduler.CycledWafer", () => _cycledWafer);
             DATA.Subscribe("Scheduler.CycleSetPoint", () => _cycleSetPoint);