Revise galil simulator CN;

CyberX8_MainPages/ViewModels/LoaderSetupViewModel.cs

@@ -202,9 +202,13 @@ namespace CyberX8_MainPages.ViewModels
 
         #region 系统数据
         /// <summary>
-        /// Wafer尺寸
+        /// WaferA尺寸
         /// </summary>
-        private int _waferSize = 0;
+        private int _waferSizeA = 100;
+        /// <summary>
+        /// WaferB尺寸
+        /// </summary>
+        private int _waferSizeB = 100;
         /// <summary>
         /// 查询后台数据集合
         /// </summary>
@@ -278,9 +282,13 @@ namespace CyberX8_MainPages.ViewModels
         #region 系统数据
         public string Module { get; set; }
         /// <summary>
-        /// 尺寸大小
+        /// WaferA尺寸大小
+        /// </summary>
+        public int WaferSizeA { get { return _waferSizeA; } set { SetProperty(ref _waferSizeA, value); } }
+        /// <summary>
+        /// WaferA尺寸大小
         /// </summary>
-        public int WaferSize { get { return _waferSize; } set { SetProperty(ref _waferSize, value); } }
+        public int WaferSizeB { get { return _waferSizeB; } set { SetProperty(ref _waferSizeB, value); } }
         /// <summary>
         /// Busy状态
         /// </summary>
@@ -740,7 +748,8 @@ namespace CyberX8_MainPages.ViewModels
                 List<string> allModules = CommonFunction.GetValue<List<string>>(allModulesDictionary, "System.InstalledModules");                
                 LoaderIsInstalled = allModules.Contains(ModuleName.Loader1.ToString());
             }
-            WaferSize = (int)QueryDataClient.Instance.Service.GetConfig("System.WaferSize");
+            WaferSizeA = (int)QueryDataClient.Instance.Service.GetConfig("Loader1.SideAWaferSize");
+            WaferSizeB = (int)QueryDataClient.Instance.Service.GetConfig("Loader1.SideBWaferSize");
             AddDataKeys();
             ValueSeries = new ChartValues<double>();
             LabelSeries = new ChartValues<string>();

CyberX8_MainPages/Views/LoaderSetupView.xaml

@@ -59,7 +59,7 @@
                     <Label Grid.Row="0" Content="Current Operation" HorizontalAlignment="Center" Margin="0,10,0,22"></Label>
                     <TextBlock Grid.Row="0" Text="{Binding CurrentSideAOperation}" Background="Black" VerticalAlignment="Top" TextAlignment="Center" Foreground="Lime" FontSize="16" FontWeight="Bold" Margin="10,37,10,0"/>
                     <Label Grid.Row="1" Content="Wafer Size" HorizontalAlignment="Center" Margin="0,10,0,22"></Label>
-                    <TextBlock Grid.Row="1" Text="{Binding WaferSize}" Background="Black" VerticalAlignment="Center" TextAlignment="Center" Foreground="Lime" FontSize="16" FontWeight="Bold" Margin="10,28,43,8"/>
+                    <TextBlock Grid.Row="1" Text="{Binding WaferSizeA}" Background="Black" VerticalAlignment="Center" TextAlignment="Center" Foreground="Lime" FontSize="16" FontWeight="Bold" Margin="10,28,43,8"/>
                     <TextBlock Grid.Row="1" Text="mm" Background="Black" Foreground="Lime" VerticalAlignment="Center" FontSize="16" FontWeight="Bold" Margin="81,28,2,8"/>
                 </Grid>
 
@@ -146,7 +146,7 @@
                     <Label Grid.Row="0" Content="Current Operation" HorizontalAlignment="Center" Margin="0,10,0,22"></Label>
                     <TextBlock Grid.Row="0" Text="{Binding CurrentSideBOperation}" Background="Black" VerticalAlignment="Top" Foreground="Lime" TextAlignment="Center" FontSize="16" FontWeight="Bold" Margin="10,37,10,0"/>
                     <Label Grid.Row="1" Content="Wafer Size" HorizontalAlignment="Center" Margin="0,10,0,22"></Label>
-                    <TextBlock Grid.Row="1" Text="{Binding WaferSize}" Background="Black" VerticalAlignment="Center" TextAlignment="Center"   Foreground="Lime" FontSize="16" FontWeight="Bold" Margin="10,28,43,8"/>
+                    <TextBlock Grid.Row="1" Text="{Binding WaferSizeB}" Background="Black" VerticalAlignment="Center" TextAlignment="Center"   Foreground="Lime" FontSize="16" FontWeight="Bold" Margin="10,28,43,8"/>
                     <TextBlock Grid.Row="1" Text="mm" Background="Black" Foreground="Lime" VerticalAlignment="Center" FontSize="16" FontWeight="Bold" Margin="81,28,2,8"/>
                 </Grid>
 

CyberX8_Simulator/Devices/GalilSocketSimulator.cs

@@ -485,6 +485,10 @@ namespace CyberX8_Simulator.Devices
             if (cmdStr[0] < 'A' || cmdStr[0] > 'Z') return false;
             //第2位为A~Z
             if (cmdStr[1] < 'A' || cmdStr[1] > 'Z') return false;
+            if(cmdStr[0] == 'C'&& cmdStr[1] == 'N')
+            {
+                return true;
+            }
             if (cmdStr.Length >= 4)
             {
                 //axis名称为A~H
@@ -542,6 +546,8 @@ namespace CyberX8_Simulator.Devices
                 case "DE"://设定auxiliary position
                     SetAuxiliaryPosition(axis, value);
                     break;
+                case "CN":
+                    break;
                 default:
                     break;
             }