remove station material size

CyberX8_MainPages/ViewModels/OperationOverViewModel.cs

@@ -149,10 +149,6 @@ namespace CyberX8_MainPages.ViewModels
         ///// </summary>
         //private double _puf2FlipMin;
         /// <summary>
-        /// Wafer尺寸
-        /// </summary>
-        private int _waferSize = 0;
-        /// <summary>
         /// 定时器
         /// </summary>
         private DispatcherTimer _timer;
@@ -889,18 +885,17 @@ namespace CyberX8_MainPages.ViewModels
             _pufLayoutRotationDistance = (int)QueryDataClient.Instance.Service.GetConfig("DualPUF.PufLayoutRotationDistance");
             _robotLayoutPosition = (int)QueryDataClient.Instance.Service.GetConfig("DualPUF.RobotLayoutPosition");
 
-            _waferSize = (int)QueryDataClient.Instance.Service.GetConfig("System.WaferSize");
-            if (!m_RtDataKeys.Contains($"Station.PUF1.Roation.{_waferSize}"))
+            if (!m_RtDataKeys.Contains($"Station.PUF1.Roation"))
             {
-                addDataKeys(_waferSize);
+                addStationDataKeys();
             }
             
             RtDataValues = QueryDataClient.Instance.Service.PollData(m_RtDataKeys);
             if (RtDataValues != null)
             {
                 //目标位置数据获取
-                Puf1RotationAxis = CommonFunction.GetValue<BeckhoffStationAxis>(RtDataValues, $"Station.PUF1.Rotation.{_waferSize}");
-                Puf2RotationAxis = CommonFunction.GetValue<BeckhoffStationAxis>(RtDataValues, $"Station.PUF2.Rotation.{_waferSize}");
+                Puf1RotationAxis = CommonFunction.GetValue<BeckhoffStationAxis>(RtDataValues, $"Station.PUF1.Rotation");
+                Puf2RotationAxis = CommonFunction.GetValue<BeckhoffStationAxis>(RtDataValues, $"Station.PUF2.Rotation");
                 //Puf1FlipAxis = CommonFunction.GetValue<BeckhoffStationAxis>(RtDataValues, $"Station.PUF1.Flip.{_waferSize}");
                 //Puf2FlipAxis = CommonFunction.GetValue<BeckhoffStationAxis>(RtDataValues, $"Station.PUF2.Flip.{_waferSize}");
                 //Loader1RotationAxis = CommonFunction.GetValue<BeckhoffStationAxis>(RtDataValues, $"Station.Loader1.Rotation.{_waferSize}");
@@ -1573,17 +1568,17 @@ namespace CyberX8_MainPages.ViewModels
 
             m_RtDataKeys.Add("Scheduler.CjNameList");
         }
-        private void addDataKeys(int waferSize)
-        {
-            m_RtDataKeys.Add($"Station.PUF1.Rotation.{waferSize}"); 
-            m_RtDataKeys.Add($"Station.PUF2.Rotation.{waferSize}");
-            m_RtDataKeys.Add($"Station.PUF1.Flip.{waferSize}"); 
-            m_RtDataKeys.Add($"Station.PUF2.Flip.{waferSize}");
-            m_RtDataKeys.Add($"Station.PUF1.Vertical.{waferSize}"); 
-            m_RtDataKeys.Add($"Station.PUF2.Vertical.{waferSize}");
-            m_RtDataKeys.Add($"Station.Loader1.Rotation.{waferSize}");
-            m_RtDataKeys.Add($"Station.Loader1.TiltA.{waferSize}");
-            m_RtDataKeys.Add($"Station.Loader1.TiltB.{waferSize}");
+        private void addStationDataKeys()
+        {
+            m_RtDataKeys.Add($"Station.PUF1.Rotation"); 
+            m_RtDataKeys.Add($"Station.PUF2.Rotation");
+            m_RtDataKeys.Add($"Station.PUF1.Flip"); 
+            m_RtDataKeys.Add($"Station.PUF2.Flip");
+            m_RtDataKeys.Add($"Station.PUF1.Vertical"); 
+            m_RtDataKeys.Add($"Station.PUF2.Vertical");
+            m_RtDataKeys.Add($"Station.Loader1.Rotation");
+            m_RtDataKeys.Add($"Station.Loader1.TiltA");
+            m_RtDataKeys.Add($"Station.Loader1.TiltB");
 
             m_RtDataKeys.Add($"PUF1.Rotation.{MOTOR_POSITION}");
             m_RtDataKeys.Add($"PUF2.Rotation.{MOTOR_POSITION}");

CyberX8_RT/Config/Station/StationPositionsCfg.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <StationPositionCfg xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Module Name="Loader">
-    <Axis Name="Loader1.TiltA" MaterialSize="200">
+    <Axis Name="Loader1.TiltA">
       <ToleranceDefault>0.1</ToleranceDefault>
 		<Stations>
 			<Station Name="Loader1.TiltA.HORI" Position="230500" ModifiedDate="2024-08-13 14:39:48.548" />
@@ -10,7 +10,7 @@
 			<Station Name="Loader1.TiltA.HOME" Position="220000" ModifiedDate="12/10/2020 3:40:44 PM" />
 		</Stations>
     </Axis>
-    <Axis Name="Loader1.TiltB" MaterialSize="200">
+    <Axis Name="Loader1.TiltB">
       <ToleranceDefault>0.1</ToleranceDefault>
       <Stations>
         <Station Name="Loader1.TiltB.HORI" Position="230500" ModifiedDate="2024-08-13 14:39:48.548" />
@@ -19,171 +19,69 @@
         <Station Name="Loader1.TiltB.HOME" Position="220000" ModifiedDate="12/10/2020 3:40:44 PM" />
       </Stations>
     </Axis>
-    <Axis Name="Loader1.ShuttleA" MaterialSize="200">
+    <Axis Name="Loader1.ShuttleA">
       <ToleranceDefault>0.1</ToleranceDefault>
 		<Stations>
 			<Station Name="Loader1.ShuttleA.IN" Position="25200" ModifiedDate="2024-06-21 10:37:30.041" />
 			<Station Name="Loader1.ShuttleA.LS" Position="247500" ModifiedDate="2024-09-24 17:58:50.950" />
 			<Station Name="Loader1.ShuttleA.MID" Position="200000" ModifiedDate="7/11/2016 6:41:59 PM" />
-			<Station Name="Loader1.ShuttleA.OUT" Position="-23062" ModifiedDate="12/10/2020 3:32:26 PM" />
+			<Station Name="Loader1.ShuttleA.OUT200" Position="-23062" ModifiedDate="12/10/2020 3:32:26 PM" />
+			<Station Name="Loader1.ShuttleA.OUT150" Position="-23062" ModifiedDate="12/10/2020 3:32:26 PM" />
+			<Station Name="Loader1.ShuttleA.OUT100" Position="-23062" ModifiedDate="12/10/2020 3:32:26 PM" />
 		</Stations>
     </Axis>
-    <Axis Name="Loader1.ShuttleB" MaterialSize="200">
+    <Axis Name="Loader1.ShuttleB">
       <ToleranceDefault>0.1</ToleranceDefault>
-      <Stations>
-        <Station Name="Loader1.ShuttleB.IN" Position="25200" ModifiedDate="2024-06-21 10:37:30.041" />
-        <Station Name="Loader1.ShuttleB.LS" Position="247500" ModifiedDate="2024-09-24 17:58:50.950" />
-        <Station Name="Loader1.ShuttleB.MID" Position="200000" ModifiedDate="7/11/2016 6:41:59 PM" />
-        <Station Name="Loader1.ShuttleB.OUT" Position="-23062" ModifiedDate="12/10/2020 3:32:26 PM" />
-      </Stations>
+		<Stations>
+			<Station Name="Loader1.ShuttleB.IN" Position="25200" ModifiedDate="2024-06-21 10:37:30.041" />
+			<Station Name="Loader1.ShuttleB.LS" Position="247500" ModifiedDate="2024-09-24 17:58:50.950" />
+			<Station Name="Loader1.ShuttleB.MID" Position="200000" ModifiedDate="7/11/2016 6:41:59 PM" />
+			<Station Name="Loader1.ShuttleB.OUT200" Position="-23062" ModifiedDate="12/10/2020 3:32:26 PM" />
+			<Station Name="Loader1.ShuttleB.OUT150" Position="-23062" ModifiedDate="12/10/2020 3:32:26 PM" />
+			<Station Name="Loader1.ShuttleB.OUT100" Position="-23062" ModifiedDate="12/10/2020 3:32:26 PM" />
+		</Stations>
     </Axis>
-    <Axis Name="Loader1.LSA" MaterialSize="200">
+    <Axis Name="Loader1.LSA">
       <ToleranceDefault>0.01</ToleranceDefault>
       <Stations>
-        <Station Name="Loader1.LSA.Setup" Position="100000" />
-        <Station Name="Loader1.LSA.Lock" Position="75000" ModifiedDate="3/2/2020 6:21:09 PM" />
-        <Station Name="Loader1.LSA.Unlock" Position="201500" ModifiedDate="2/25/2020 2:54:29 PM" />
+        <Station Name="Loader1.LSA.Setup200" Position="100000" />
+        <Station Name="Loader1.LSA.Lock200" Position="75000" ModifiedDate="3/2/2020 6:21:09 PM" />
+        <Station Name="Loader1.LSA.Unlock200" Position="201500" ModifiedDate="2/25/2020 2:54:29 PM" />
+		<Station Name="Loader1.LSA.Setup150" Position="100000" />
+		<Station Name="Loader1.LSA.Lock150" Position="70000" ModifiedDate="3/2/2020 6:21:09 PM" />
+		<Station Name="Loader1.LSA.Unlock150" Position="230000" ModifiedDate="2/25/2020 2:54:29 PM" />
+		<Station Name="Loader1.LSA.Setup100" Position="100000" />
+		<Station Name="Loader1.LSA.Lock100" Position="65000" ModifiedDate="3/2/2020 6:21:09 PM" />
+		<Station Name="Loader1.LSA.Unlock100" Position="280000" ModifiedDate="2/25/2020 2:54:29 PM" />
       </Stations>
     </Axis>
-    <Axis Name="Loader1.LSB" MaterialSize="200">
-      <ToleranceDefault>0.01</ToleranceDefault>
-      <Stations>
-        <Station Name="Loader1.LSB.Setup" Position="100000" ModifiedDate="4/5/2018 5:25:08 PM" />
-        <Station Name="Loader1.LSB.Lock" Position="75000" ModifiedDate="3/2/2020 6:21:21 PM" />
-        <Station Name="Loader1.LSB.Unlock" Position="201500" ModifiedDate="2/24/2020 5:17:05 PM" />
-      </Stations>
+    <Axis Name="Loader1.LSB">
+      <ToleranceDefault>100</ToleranceDefault>
+		<Stations>
+			<Station Name="Loader1.LSB.Setup200" Position="100000" />
+			<Station Name="Loader1.LSB.Lock200" Position="75000" ModifiedDate="3/2/2020 6:21:09 PM" />
+			<Station Name="Loader1.LSB.Unlock200" Position="201500" ModifiedDate="2/25/2020 2:54:29 PM" />
+			<Station Name="Loader1.LSB.Setup150" Position="100000" />
+			<Station Name="Loader1.LSB.Lock150" Position="70000" ModifiedDate="3/2/2020 6:21:09 PM" />
+			<Station Name="Loader1.LSB.Unlock150" Position="230000" ModifiedDate="2/25/2020 2:54:29 PM" />
+			<Station Name="Loader1.LSB.Setup100" Position="100000" />
+			<Station Name="Loader1.LSB.Lock100" Position="65000" ModifiedDate="3/2/2020 6:21:09 PM" />
+			<Station Name="Loader1.LSB.Unlock100" Position="280000" ModifiedDate="2/25/2020 2:54:29 PM" />
+		</Stations>
     </Axis>
-    <Axis Name="Loader1.Rotation" MaterialSize="200">
+    <Axis Name="Loader1.Rotation">
       <ToleranceDefault>0.1</ToleranceDefault>
 		<Stations>
-			<Station Name="Loader1.Rotation.LOADA" Position="6656" ModifiedDate="2024-08-13 14:00:52.955" />
-			<Station Name="Loader1.Rotation.LOADB" Position="151875" ModifiedDate="2024-08-13 14:22:11.332" />
 			<Station Name="Loader1.Rotation.TRNPA" Position="-1093" ModifiedDate="2024-08-27 09:45:08.838" />
 			<Station Name="Loader1.Rotation.TRNPB" Position="144312" ModifiedDate="2/26/2020 12:19:29 PM" />
+			<Station Name="Loader1.Rotation.LOADA200" Position="6656" ModifiedDate="2024-08-13 14:00:52.955" />
+			<Station Name="Loader1.Rotation.LOADB200" Position="151875" ModifiedDate="2024-08-13 14:22:11.332" />
+			<Station Name="Loader1.Rotation.LOADA150" Position="6656" ModifiedDate="2024-08-13 14:00:52.955" />
+			<Station Name="Loader1.Rotation.LOADB150" Position="151875" ModifiedDate="2024-08-13 14:22:11.332" />
+			<Station Name="Loader1.Rotation.LOADA100" Position="6656" ModifiedDate="2024-08-13 14:00:52.955" />
+			<Station Name="Loader1.Rotation.LOADB100" Position="151875" ModifiedDate="2024-08-13 14:22:11.332" />
 		</Stations>
     </Axis>
-	  <Axis Name="Loader1.TiltA" MaterialSize="150">
-		  <ToleranceDefault>0.1</ToleranceDefault>
-		  <Stations>
-			  <Station Name="Loader1.TiltA.HORI" Position="230500" ModifiedDate="2024-08-13 14:39:48.548" />
-			  <Station Name="Loader1.TiltA.VERT" Position="-17500" ModifiedDate="2024-06-21 10:37:50.049" />
-			  <Station Name="Loader1.TiltA.FLOAT" Position="220000" ModifiedDate="5/12/2015 12:51:37 AM" />
-			  <Station Name="Loader1.TiltA.HOME" Position="220000" ModifiedDate="12/10/2020 3:40:44 PM" />
-		  </Stations>
-	  </Axis>
-	  <Axis Name="Loader1.TiltB" MaterialSize="150">
-		  <ToleranceDefault>0.1</ToleranceDefault>
-		  <Stations>
-			  <Station Name="Loader1.TiltB.HORI" Position="230500" ModifiedDate="2024-08-13 14:39:48.548" />
-			  <Station Name="Loader1.TiltB.VERT" Position="-17500" ModifiedDate="2024-06-21 10:37:50.049" />
-			  <Station Name="Loader1.TiltB.FLOAT" Position="220000" ModifiedDate="5/12/2015 12:51:37 AM" />
-			  <Station Name="Loader1.TiltB.HOME" Position="220000" ModifiedDate="12/10/2020 3:40:44 PM" />
-		  </Stations>
-	  </Axis>
-	  <Axis Name="Loader1.ShuttleA" MaterialSize="150">
-		  <ToleranceDefault>0.1</ToleranceDefault>
-		  <Stations>
-			  <Station Name="Loader1.ShuttleA.IN" Position="25200" ModifiedDate="2024-06-21 10:37:30.041" />
-			  <Station Name="Loader1.ShuttleA.LS" Position="247500" ModifiedDate="2024-09-24 17:58:50.950" />
-			  <Station Name="Loader1.ShuttleA.MID" Position="200000" ModifiedDate="7/11/2016 6:41:59 PM" />
-			  <Station Name="Loader1.ShuttleA.OUT" Position="-23062" ModifiedDate="12/10/2020 3:32:26 PM" />
-		  </Stations>
-	  </Axis>
-	  <Axis Name="Loader1.ShuttleB" MaterialSize="150">
-		  <ToleranceDefault>0.1</ToleranceDefault>
-		  <Stations>
-			  <Station Name="Loader1.ShuttleB.IN" Position="25200" ModifiedDate="2024-06-21 10:37:30.041" />
-			  <Station Name="Loader1.ShuttleB.LS" Position="247500" ModifiedDate="2024-09-24 17:58:50.950" />
-			  <Station Name="Loader1.ShuttleB.MID" Position="200000" ModifiedDate="7/11/2016 6:41:59 PM" />
-			  <Station Name="Loader1.ShuttleB.OUT" Position="-23062" ModifiedDate="12/10/2020 3:32:26 PM" />
-		  </Stations>
-	  </Axis>
-	  <Axis Name="Loader1.LSA" MaterialSize="150">
-		  <ToleranceDefault>0.01</ToleranceDefault>
-		  <Stations>
-			  <Station Name="Loader1.LSA.Setup" Position="100000" ModifiedDate="4/5/2018 5:25:08 PM" />
-			  <Station Name="Loader1.LSA.Lock" Position="70000" ModifiedDate="3/2/2020 6:21:21 PM" />
-			  <Station Name="Loader1.LSA.Unlock" Position="230000" ModifiedDate="2/24/2020 5:17:05 PM" />
-		  </Stations>
-	  </Axis>
-	  <Axis Name="Loader1.LSB" MaterialSize="150">
-		  <ToleranceDefault>0.01</ToleranceDefault>
-		  <Stations>
-			  <Station Name="Loader1.LSB.Setup" Position="100000" ModifiedDate="4/5/2018 5:25:08 PM" />
-			  <Station Name="Loader1.LSB.Lock" Position="70000" ModifiedDate="3/2/2020 6:21:21 PM" />
-			  <Station Name="Loader1.LSB.Unlock" Position="230000" ModifiedDate="2/24/2020 5:17:05 PM" />
-		  </Stations>
-	  </Axis>
-	  <Axis Name="Loader1.Rotation" MaterialSize="150">
-		  <ToleranceDefault>0.1</ToleranceDefault>
-		  <Stations>
-			  <Station Name="Loader1.Rotation.LOADA" Position="6656" ModifiedDate="2024-08-13 14:00:52.955" />
-			  <Station Name="Loader1.Rotation.LOADB" Position="151875" ModifiedDate="2024-08-13 14:22:11.332" />
-			  <Station Name="Loader1.Rotation.TRNPA" Position="-1093" ModifiedDate="2024-08-27 09:45:08.838" />
-			  <Station Name="Loader1.Rotation.TRNPB" Position="144312" ModifiedDate="2/26/2020 12:19:29 PM" />
-		  </Stations>
-	  </Axis>
-	  <Axis Name="Loader1.TiltA" MaterialSize="100">
-		  <ToleranceDefault>0.1</ToleranceDefault>
-		  <Stations>
-			  <Station Name="Loader1.TiltA.HORI" Position="230500" ModifiedDate="2024-08-13 14:39:48.548" />
-			  <Station Name="Loader1.TiltA.VERT" Position="-17500" ModifiedDate="2024-06-21 10:37:50.049" />
-			  <Station Name="Loader1.TiltA.FLOAT" Position="220000" ModifiedDate="5/12/2015 12:51:37 AM" />
-			  <Station Name="Loader1.TiltA.HOME" Position="220000" ModifiedDate="12/10/2020 3:40:44 PM" />
-		  </Stations>
-	  </Axis>
-	  <Axis Name="Loader1.TiltB" MaterialSize="100">
-		  <ToleranceDefault>0.1</ToleranceDefault>
-		  <Stations>
-			  <Station Name="Loader1.TiltB.HORI" Position="230500" ModifiedDate="2024-08-13 14:39:48.548" />
-			  <Station Name="Loader1.TiltB.VERT" Position="-17500" ModifiedDate="2024-06-21 10:37:50.049" />
-			  <Station Name="Loader1.TiltB.FLOAT" Position="220000" ModifiedDate="5/12/2015 12:51:37 AM" />
-			  <Station Name="Loader1.TiltB.HOME" Position="220000" ModifiedDate="12/10/2020 3:40:44 PM" />
-		  </Stations>
-	  </Axis>
-	  <Axis Name="Loader1.ShuttleA" MaterialSize="100">
-		  <ToleranceDefault>0.1</ToleranceDefault>
-		  <Stations>
-			  <Station Name="Loader1.ShuttleA.IN" Position="25200" ModifiedDate="2024-06-21 10:37:30.041" />
-			  <Station Name="Loader1.ShuttleA.LS" Position="247500" ModifiedDate="2024-09-24 17:58:50.950" />
-			  <Station Name="Loader1.ShuttleA.MID" Position="200000" ModifiedDate="7/11/2016 6:41:59 PM" />
-			  <Station Name="Loader1.ShuttleA.OUT" Position="-23062" ModifiedDate="12/10/2020 3:32:26 PM" />
-		  </Stations>
-	  </Axis>
-	  <Axis Name="Loader1.ShuttleB" MaterialSize="100">
-		  <ToleranceDefault>0.1</ToleranceDefault>
-		  <Stations>
-			  <Station Name="Loader1.ShuttleB.IN" Position="25200" ModifiedDate="2024-06-21 10:37:30.041" />
-			  <Station Name="Loader1.ShuttleB.LS" Position="247500" ModifiedDate="2024-09-24 17:58:50.950" />
-			  <Station Name="Loader1.ShuttleB.MID" Position="200000" ModifiedDate="7/11/2016 6:41:59 PM" />
-			  <Station Name="Loader1.ShuttleB.OUT" Position="-23062" ModifiedDate="12/10/2020 3:32:26 PM" />
-		  </Stations>
-	  </Axis>
-	  <Axis Name="Loader1.LSA" MaterialSize="100">
-		  <ToleranceDefault>2</ToleranceDefault>
-		  <Stations>
-			  <Station Name="Loader1.LSA.Setup" Position="100000" ModifiedDate="4/5/2018 5:25:08 PM" />
-			  <Station Name="Loader1.LSA.Lock" Position="65000" ModifiedDate="3/2/2020 6:21:21 PM" />
-			  <Station Name="Loader1.LSA.Unlock" Position="280000" ModifiedDate="2/24/2020 5:17:05 PM" />
-		  </Stations>
-	  </Axis>
-	  <Axis Name="Loader1.LSB" MaterialSize="100">
-		  <ToleranceDefault>2</ToleranceDefault>
-		  <Stations>
-			  <Station Name="Loader1.LSB.Setup" Position="100000" ModifiedDate="4/5/2018 5:25:08 PM" />
-			  <Station Name="Loader1.LSB.Lock" Position="65000" ModifiedDate="3/2/2020 6:21:21 PM" />
-			  <Station Name="Loader1.LSB.Unlock" Position="280000" ModifiedDate="2/24/2020 5:17:05 PM" />
-		  </Stations>
-	  </Axis>
-	  <Axis Name="Loader1.Rotation" MaterialSize="100">
-		  <ToleranceDefault>0.1</ToleranceDefault>
-		  <Stations>
-			  <Station Name="Loader1.Rotation.LOADA" Position="6656" ModifiedDate="2024-08-13 14:00:52.955" />
-			  <Station Name="Loader1.Rotation.LOADB" Position="151875" ModifiedDate="2024-08-13 14:22:11.332" />
-			  <Station Name="Loader1.Rotation.TRNPA" Position="-1093" ModifiedDate="2024-08-27 09:45:08.838" />
-			  <Station Name="Loader1.Rotation.TRNPB" Position="144312" ModifiedDate="2/26/2020 12:19:29 PM" />
-		  </Stations>
-	  </Axis>
   </Module>
   <Module Name="Transporter">
     <Axis Name="Transporter1.Gantry">
@@ -332,14 +230,14 @@
     </Axis>
   </Module>
   <Module Name="DualPuf">
-    <Axis Name="PUF1.Flip" MaterialSize="300">
+    <Axis Name="PUF1.Flip">
       <ToleranceDefault>0.5</ToleranceDefault>
       <Stations>
         <Station Name="PUF1.Flip.SideA" Position="174.95" ModifiedDate="2024-08-09 13:35:19.613" />
         <Station Name="PUF1.Flip.SideB" Position="-5" ModifiedDate="2024-08-09 13:36:34.531" />
       </Stations>
     </Axis>
-    <Axis Name="PUF1.Rotation" MaterialSize="300">
+    <Axis Name="PUF1.Rotation">
       <ToleranceDefault>0.5</ToleranceDefault>
       <Stations>
         <Station Name="PUF1.Rotation.Home" Position="72.9999" ModifiedDate="8/27/2018 2:53:59 PM" />
@@ -350,7 +248,7 @@
         <Station Name="PUF1.Rotation.LoaderPutDown" Position="-6.30045" ModifiedDate="9/19/2018 4:32:00 PM" />
       </Stations>
     </Axis>
-    <Axis Name="PUF1.Vertical" MaterialSize="300">
+    <Axis Name="PUF1.Vertical">
       <ToleranceDefault>0.5</ToleranceDefault>
       <Stations>
         <Station Name="PUF1.Vertical.Home" Position="2.999983" ModifiedDate="9/14/2018 2:07:45 PM" />
@@ -362,14 +260,14 @@
         <Station Name="PUF1.Vertical.LoaderPutDown" Position="-277" ModifiedDate="9/19/2018 4:31:55 PM" />
       </Stations>
     </Axis>
-    <Axis Name="PUF2.Flip" MaterialSize="300">
+    <Axis Name="PUF2.Flip">
       <ToleranceDefault>0.5</ToleranceDefault>
       <Stations>
         <Station Name="PUF2.Flip.SideA" Position="178" ModifiedDate="2024-08-09 13:38:11.955" />
         <Station Name="PUF2.Flip.SideB" Position="-2.04615" ModifiedDate="9/6/2018 10:24:30 AM" />
       </Stations>
     </Axis>
-    <Axis Name="PUF2.Rotation" MaterialSize="300">
+    <Axis Name="PUF2.Rotation">
       <ToleranceDefault>0.5</ToleranceDefault>
       <Stations>
         <Station Name="PUF2.Rotation.Home" Position="-23.2889" />
@@ -380,7 +278,7 @@
         <Station Name="PUF2.Rotation.LoaderPutDown" Position="8.500501" ModifiedDate="9/19/2018 4:48:41 PM" />
       </Stations>
     </Axis>
-    <Axis Name="PUF2.Vertical" MaterialSize="300">
+    <Axis Name="PUF2.Vertical">
       <ToleranceDefault>0.5</ToleranceDefault>
       <Stations>
         <Station Name="PUF2.Vertical.Home" Position="-15" />
@@ -392,66 +290,6 @@
         <Station Name="PUF2.Vertical.LoaderPutDown" Position="-273.5" ModifiedDate="9/19/2018 5:47:50 PM" />
       </Stations>
     </Axis>
-    <Axis Name="PUF1.Flip" MaterialSize="200">
-      <ToleranceDefault>0.5</ToleranceDefault>
-      <Stations>
-        <Station Name="PUF1.Flip.SideA" Position="174.9" ModifiedDate="2024-08-13 10:27:59.390" />
-        <Station Name="PUF1.Flip.SideB" Position="-5.3" ModifiedDate="2024-07-02 16:26:16.780" />
-      </Stations>
-    </Axis>
-    <Axis Name="PUF1.Rotation" MaterialSize="200">
-      <ToleranceDefault>0.5</ToleranceDefault>
-      <Stations>
-        <Station Name="PUF1.Rotation.Home" Position="74.00025" ModifiedDate="4/8/2018 11:39:23 AM" />
-        <Station Name="PUF1.Rotation.Park" Position="74.00025" ModifiedDate="4/8/2018 11:39:26 AM" />
-        <Station Name="PUF1.Rotation.Flip" Position="-1.8" ModifiedDate="2024-09-24 17:42:55.781" />
-        <Station Name="PUF1.Rotation.Robot" Position="74.00025" ModifiedDate="4/6/2018 9:53:10 AM" />
-        <Station Name="PUF1.Rotation.LoaderPickup" Position="-0.6" ModifiedDate="2024-09-25 09:58:41.656" />
-        <Station Name="PUF1.Rotation.LoaderPutDown" Position="-0.8" ModifiedDate="2024-09-25 09:58:29.023" />
-      </Stations>
-    </Axis>
-    <Axis Name="PUF1.Vertical" MaterialSize="200">
-      <ToleranceDefault>0.5</ToleranceDefault>
-      <Stations>
-        <Station Name="PUF1.Vertical.Home" Position="5.000019" ModifiedDate="4/16/2018 2:12:39 PM" />
-        <Station Name="PUF1.Vertical.Flip" Position="-110" ModifiedDate="10/24/2020 12:17:00 PM" />
-        <Station Name="PUF1.Vertical.Robot" Position="-185" ModifiedDate="2024-08-02 14:19:44.669" />
-        <Station Name="PUF1.Vertical.Park" Position="5" ModifiedDate="2024-08-02 14:20:04.301" />
-        <Station Name="PUF1.Vertical.Loader" Position="-27.19027" />
-        <Station Name="PUF1.Vertical.LoaderPickup" Position="-274.5" ModifiedDate="2024-09-24 17:37:33.742" />
-        <Station Name="PUF1.Vertical.LoaderPutDown" Position="-273.5" ModifiedDate="2024-09-24 17:37:11.220" />
-      </Stations>
-    </Axis>
-    <Axis Name="PUF2.Flip" MaterialSize="200">
-      <ToleranceDefault>0.5</ToleranceDefault>
-      <Stations>
-        <Station Name="PUF2.Flip.SideA" Position="178.2" ModifiedDate="2024-08-13 10:31:42.869" />
-        <Station Name="PUF2.Flip.SideB" Position="-1.05075" ModifiedDate="11/28/2020 12:47:27 PM" />
-      </Stations>
-    </Axis>
-    <Axis Name="PUF2.Rotation" MaterialSize="200">
-      <ToleranceDefault>0.5</ToleranceDefault>
-      <Stations>
-        <Station Name="PUF2.Rotation.Home" Position="-22.28895" ModifiedDate="11/2/2020 12:56:31 PM" />
-        <Station Name="PUF2.Rotation.Flip" Position="10.2" ModifiedDate="2024-08-23 09:48:10.048" />
-        <Station Name="PUF2.Rotation.Robot" Position="-22.28895" ModifiedDate="7/10/2016 4:22:13 PM" />
-        <Station Name="PUF2.Rotation.Park" Position="-22.28895" ModifiedDate="11/2/2020 12:56:35 PM" />
-        <Station Name="PUF2.Rotation.LoaderPickup" Position="12.6" ModifiedDate="2024-09-24 18:00:58.406" />
-        <Station Name="PUF2.Rotation.LoaderPutDown" Position="12.4" ModifiedDate="2024-09-24 18:00:42.093" />
-      </Stations>
-    </Axis>
-    <Axis Name="PUF2.Vertical" MaterialSize="200">
-      <ToleranceDefault>0.5</ToleranceDefault>
-      <Stations>
-        <Station Name="PUF2.Vertical.Home" Position="-15" />
-        <Station Name="PUF2.Vertical.Flip" Position="-110" ModifiedDate="10/24/2020 12:03:47 PM" />
-        <Station Name="PUF2.Vertical.Robot" Position="-186.6" ModifiedDate="2/26/2020 5:18:46 PM" />
-        <Station Name="PUF2.Vertical.Park" Position="-15" ModifiedDate="2/27/2020 10:36:46 AM" />
-        <Station Name="PUF2.Vertical.Loader" Position="-50" />
-        <Station Name="PUF2.Vertical.LoaderPickup" Position="-270" ModifiedDate="2024-09-24 18:00:24.435" />
-        <Station Name="PUF2.Vertical.LoaderPutDown" Position="-269" ModifiedDate="2024-08-13 15:11:26.549" />
-      </Stations>
-    </Axis>
   </Module>
   <Module Name="SRD1">
     <Axis Name="SRD1.Arm">

CyberX8_Themes/UserControls/LoaderStationPositionControl.xaml.cs

@@ -413,14 +413,13 @@ namespace CyberX8_Themes.UserControls
                 if (!string.IsNullOrEmpty(ModuleName))
                 {
                     _rtDataKeys.Clear();
-                    _waferSize = (int)QueryDataClient.Instance.Service.GetConfig("System.WaferSize");
                     IncrementValue = (double)QueryDataClient.Instance.Service.GetConfig("System.Increment");
-                    _rtDataKeys.Add($"Station.{ModuleName}.{_waferSize}");
+                    _rtDataKeys.Add($"Station.{ModuleName}");
                     _rtDataKeys.Add($"{ModuleName}.AxisProvider");
                     _rtDataValues = QueryDataClient.Instance.Service.PollData(_rtDataKeys);
                     if (_rtDataValues != null)
                     {
-                        _axis = CommonFunction.GetValue<BeckhoffStationAxis>(_rtDataValues, $"Station.{ModuleName}.{_waferSize}");
+                        _axis = CommonFunction.GetValue<BeckhoffStationAxis>(_rtDataValues, $"Station.{ModuleName}");
                         BeckhoffProviderAxis beckhoffProviderAxis = CommonFunction.GetValue<BeckhoffProviderAxis>(_rtDataValues, $"{ModuleName}.AxisProvider");
                         if (beckhoffProviderAxis != null)
                         {

CyberX8_Themes/UserControls/PufStationPositionControl.xaml.cs

@@ -408,12 +408,12 @@ namespace CyberX8_Themes.UserControls
                     _rtDataKeys.Clear();_waferSize = (int)QueryDataClient.Instance.Service.GetConfig("System.WaferSize");
                     
                     IncrementValue = (double)QueryDataClient.Instance.Service.GetConfig("System.Increment");
-                    _rtDataKeys.Add($"Station.{ModuleName}.{_waferSize}");
+                    _rtDataKeys.Add($"Station.{ModuleName}");
                     _rtDataKeys.Add($"{ModuleName}.AxisProvider");
                     _rtDataValues = QueryDataClient.Instance.Service.PollData(_rtDataKeys);
                     if (_rtDataValues != null)
                     {
-                        _axis = CommonFunction.GetValue<BeckhoffStationAxis>(_rtDataValues, $"Station.{ModuleName}.{_waferSize}");
+                        _axis = CommonFunction.GetValue<BeckhoffStationAxis>(_rtDataValues, $"Station.{ModuleName}");
                         BeckhoffProviderAxis beckhoffProviderAxis = CommonFunction.GetValue<BeckhoffProviderAxis>(_rtDataValues, $"{ModuleName}.AxisProvider");
                         if (_axis != null)
                         {