revise lp/dummy ui

CyberX8_MainPages/ViewModels/EfemViewModel.cs

@@ -1210,6 +1210,9 @@ namespace CyberX8_MainPages.ViewModels
             m_RtDataKeys.Add("LP1.WaferSize");
             m_RtDataKeys.Add("LP2.WaferSize");
             m_RtDataKeys.Add("LP3.WaferSize");
+
+            m_RtDataKeys.Add("Dummy1.WaferSize");
+            m_RtDataKeys.Add("Dummy2.WaferSize");
         }
         /// <summary>
         /// Robot位置信息变更（动画）

CyberX8_MainPages/ViewModels/OperationOverViewModel.cs

@@ -657,14 +657,9 @@ namespace CyberX8_MainPages.ViewModels
         #region 命令
 
 
-        private DelegateCommand<object> _LoadWaferCommand;
-        public DelegateCommand<object> LoadWaferCommand =>
-            _LoadWaferCommand ?? (_LoadWaferCommand = new DelegateCommand<object>(OnLoadWafer));
-
-        private DelegateCommand<object> _UnLoadWaferCommand;
-        public DelegateCommand<object> UnLoadWaferCommand =>
-            _UnLoadWaferCommand ?? (_UnLoadWaferCommand = new DelegateCommand<object>(OnUnLoadWafer));
-
+        private DelegateCommand<object> _MapCommand;
+        public DelegateCommand<object> MapCommand =>
+            _MapCommand ?? (_MapCommand = new DelegateCommand<object>(OnMap));
 
         private DelegateCommand<object> _StartCommand;
         public DelegateCommand<object> StartCommand =>
@@ -799,13 +794,9 @@ namespace CyberX8_MainPages.ViewModels
 
         }
         
-        private void OnLoadWafer(object obj)
-        {
-            InvokeClient.Instance.Service.DoOperation($"{obj.ToString()}.Load", ModuleManager.ModuleInfos[obj.ToString()].ModuleID);
-        }
-        private void OnUnLoadWafer(object obj)
+        private void OnMap(object obj)
         {
-            InvokeClient.Instance.Service.DoOperation($"{obj.ToString()}.Unload", ModuleManager.ModuleInfos[obj.ToString()].ModuleID);
+            InvokeClient.Instance.Service.DoOperation($"{obj.ToString()}.Map");
         }
         private void OnStart(object obj)
         {
@@ -1405,7 +1396,9 @@ namespace CyberX8_MainPages.ViewModels
             m_RtDataKeys.Add("LP2.WaferSize");
             m_RtDataKeys.Add("LP3.WaferSize"); 
             m_RtDataKeys.Add("Dummy1.CassettePlaced"); 
-            m_RtDataKeys.Add("Dummy2.CassettePlaced"); 
+            m_RtDataKeys.Add("Dummy2.CassettePlaced");
+            m_RtDataKeys.Add("Dummy1.WaferSize");
+            m_RtDataKeys.Add("Dummy2.WaferSize");
 
 
             m_RtDataKeys.Add("System.IsAutoMode");

CyberX8_MainPages/Views/EfemView.xaml

@@ -58,7 +58,8 @@
             <TextBlock Text="Dummy2" HorizontalAlignment="Center" Margin="0,5,0,20" FontSize="12"
                        Visibility="{Binding RtDataValues[Dummy2.CassettePlaced],Converter={StaticResource BoolToVisibility2}}">
             </TextBlock>
-        
+            <TextBlock Text="{Binding RtDataValues[Dummy2.WaferSize], StringFormat=({0})}" HorizontalAlignment="Center" Margin="0,-10,0,0" FontSize="12"
+           Visibility="{Binding RtDataValues[Dummy2.CassettePlaced],Converter={StaticResource BoolToVisibility2}}"/>
         </StackPanel>
         <StackPanel Canvas.Top="15" Canvas.Left="1550">
             <userControls:FOUPFrontView UnitData="{Binding Dummy1ModuleInfo}"
@@ -67,6 +68,8 @@
             <TextBlock Text="Dummy1" HorizontalAlignment="Center" Margin="0,5,0,0" FontSize="12"
                        Visibility="{Binding RtDataValues[Dummy1.CassettePlaced],Converter={StaticResource BoolToVisibility2}}">
             </TextBlock>
+            <TextBlock Text="{Binding RtDataValues[Dummy1.WaferSize], StringFormat=({0})}" HorizontalAlignment="Center" Margin="0,10,0,0" FontSize="12"
+                       Visibility="{Binding RtDataValues[Dummy1.CassettePlaced],Converter={StaticResource BoolToVisibility2}}"/>
         </StackPanel>
         <userControls:SRDFrontView UnitData1="{Binding Srd2ModuleInfo}" UnitData2="{Binding Srd1ModuleInfo}" Title="SRD"  Canvas.Top="80" Canvas.Left="1040"/>
 

CyberX8_MainPages/Views/OperationOverView.xaml

@@ -111,8 +111,8 @@
                                 </TextBlock>
 
                                 <StackPanel Orientation="Horizontal" IsEnabled="{Binding IsLP1HasNoJob}">
-                                    <customControls:PathButton Content="Load"   HorizontalAlignment="Center" Margin="5,5,0,5" Width="75" Height="30" Command="{Binding LoadWaferCommand}"   CommandParameter="LP1"   IsEnabled="{Binding IsLP1Unable,Converter={StaticResource BoolToBool}}"/>
-                                    <customControls:PathButton Content="UnLoad" HorizontalAlignment="Center" Margin="5,5,0,5" Width="75" Height="30" Command="{Binding UnLoadWaferCommand}" CommandParameter="LP1"   IsEnabled="{Binding IsLP1Unable,Converter={StaticResource BoolToBool}}"/>
+                                    <customControls:PathButton Content="Map"   HorizontalAlignment="Center" Margin="25,5,0,5" Width="75" Height="30" Command="{Binding MapCommand}"   CommandParameter="LP1"   IsEnabled="{Binding IsLP1Unable,Converter={StaticResource BoolToBool}}"/>
+
                                 </StackPanel>
 
 
@@ -131,15 +131,15 @@
                                     </TextBlock.Text>
                                 </TextBlock>
                                 <StackPanel Orientation="Horizontal" IsEnabled="{Binding IsLP2HasNoJob}">
-                                    <customControls:PathButton Content="Load"   HorizontalAlignment="Center" Margin="5,5,0,5" Width="75" Height="30" Command="{Binding LoadWaferCommand}" CommandParameter="LP2"   
+                                    <customControls:PathButton Content="Map"   HorizontalAlignment="Center" Margin="25,5,0,5" Width="75" Height="30" Command="{Binding MapCommand}" CommandParameter="LP2"   
                                                            IsEnabled="{Binding IsLP2Unable,Converter={StaticResource BoolToBool}}"/>
-                                    <customControls:PathButton Content="UnLoad" HorizontalAlignment="Center" Margin="5,5,0,5" Width="75" Height="30" Command="{Binding UnLoadWaferCommand}" CommandParameter="LP2"  IsEnabled="{Binding IsLP2Unable,Converter={StaticResource BoolToBool}}"/>
+                                  
                                 </StackPanel>
 
 
                             </StackPanel>
 
-                            <StackPanel Visibility="{Binding RtDataValues[LP1.CassettePlaced],Converter={StaticResource boolToVisibility2}}">
+                            <StackPanel Visibility="{Binding RtDataValues[LP3.CassettePlaced],Converter={StaticResource boolToVisibility2}}">
                                 <TextBox Background="{DynamicResource Table_BG_Title}" Text="LP3" Width="Auto" Height="15" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"
                                      IsReadOnly="True" FontSize="10"/>
                                 <ctrls:FOUPFrontView UnitData="{Binding LP3ModuleInfo}" 
@@ -153,9 +153,9 @@
                                     </TextBlock.Text>
                                 </TextBlock>
                                 <StackPanel Orientation="Horizontal" IsEnabled="{Binding IsLP3HasNoJob}">
-                                    <customControls:PathButton Content="Load"   HorizontalAlignment="Center" Margin="5,5,0,5" Width="75" Height="30" Command="{Binding LoadWaferCommand}" CommandParameter="LP3"   
+                                    <customControls:PathButton Content="Map"   HorizontalAlignment="Center" Margin="25,5,0,5" Width="75" Height="30" Command="{Binding MapCommand}" CommandParameter="LP3"   
                                                            IsEnabled="{Binding IsLP3Unable,Converter={StaticResource BoolToBool}}"/>
-                                    <customControls:PathButton Content="UnLoad" HorizontalAlignment="Center" Margin="5,5,0,5" Width="75" Height="30" Command="{Binding UnLoadWaferCommand}" CommandParameter="LP3"  IsEnabled="{Binding IsLP3Unable,Converter={StaticResource BoolToBool}}"/>
+                                   
                                 </StackPanel>
 
 
@@ -173,6 +173,7 @@
                                         </MultiBinding>
                                     </TextBlock.Text>
                                 </TextBlock>
+                                <TextBlock Text="{Binding RtDataValues[Dummy1.WaferSize], StringFormat=({0})}" HorizontalAlignment="Center" Margin="0,10,0,0" FontSize="12"/>
                             </StackPanel>
                             <StackPanel Visibility="{Binding RtDataValues[Dummy2.CassettePlaced],Converter={StaticResource boolToVisibility2}}">
                                 <TextBox Background="{DynamicResource Table_BG_Title}" Text="Dummy2" Width="Auto" Height="15" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"
@@ -187,6 +188,7 @@
                                         </MultiBinding>
                                     </TextBlock.Text>
                                 </TextBlock>
+                                <TextBlock Text="{Binding RtDataValues[Dummy2.WaferSize], StringFormat=({0})}" HorizontalAlignment="Center" Margin="0,10,0,0" FontSize="12"/>
                             </StackPanel>
                         </StackPanel>
                     </Border>

CyberX8_RT/Devices/EFEM/DummyDevice.cs

@@ -61,6 +61,7 @@ namespace CyberX8_RT.Devices.EFEM
             _module = moduleName;
             SubscribeValueAction();
             DATA.Subscribe($"{_module}.CassettePlaced", () => _hasCassete, SubscriptionAttribute.FLAG.IgnoreSaveDB);
+            DATA.Subscribe($"{_module}.WaferSize", () => WaferSize.ToString(), SubscriptionAttribute.FLAG.IgnoreSaveDB);
         }
 
         /// <summary>