Explorar o código

Revise Transporter related bugs;

niuyx hai 4 semanas
pai
achega
886e1c8a62

+ 94 - 136
CyberX8_RT/Config/Station/StationPositionsCfg_Simulator.xml

@@ -4,82 +4,82 @@
 		<Axis Name="Loader1.TiltA">
 			<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" />
+				<Station Name="Loader1.TiltA.HORI" Position="82.97" ModifiedDate="2025-02-20 16:51:27.564" />
+				<Station Name="Loader1.TiltA.VERT" Position="-7.03" ModifiedDate="2025-02-21 10:57:45.769" />
+				<Station Name="Loader1.TiltA.FLOAT" Position="29.41" ModifiedDate="2025-03-06 17:34:02.000" />
+				<Station Name="Loader1.TiltA.HOME" Position="79.19" ModifiedDate="2025-02-20 16:52:03.136" />
 			</Stations>
 		</Axis>
 		<Axis Name="Loader1.TiltB">
 			<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" />
+				<Station Name="Loader1.TiltB.HORI" Position="82.97" ModifiedDate="2025-02-20 16:51:53.944" />
+				<Station Name="Loader1.TiltB.VERT" Position="-3.58" ModifiedDate="2025-02-27 14:16:35.218" />
+				<Station Name="Loader1.TiltB.FLOAT" Position="79.194" ModifiedDate="5/12/2015 12:51:37 AM" />
+				<Station Name="Loader1.TiltB.HOME" Position="79.194" ModifiedDate="12/10/2020 3:40:44 PM" />
 			</Stations>
 		</Axis>
 		<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.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" />
+				<Station Name="Loader1.ShuttleA.IN" Position="66.88" ModifiedDate="2025-02-19 14:48:19.009" />
+				<Station Name="Loader1.ShuttleA.LS" Position="64.49" ModifiedDate="2025-03-06 16:51:15.759" />
+				<Station Name="Loader1.ShuttleA.MID" Position="51.29" ModifiedDate="2025-02-25 10:41:11.970" />
+				<Station Name="Loader1.ShuttleA.OUT200" Position="-29.49" ModifiedDate="2025-03-04 17:53:55.951" />
+				<Station Name="Loader1.ShuttleA.OUT150" Position="-5.913" ModifiedDate="12/10/2020 3:32:26 PM" />
+				<Station Name="Loader1.ShuttleA.OUT100" Position="-5.913" ModifiedDate="12/10/2020 3:32:26 PM" />
 			</Stations>
 		</Axis>
 		<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.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" />
+				<Station Name="Loader1.ShuttleB.IN" Position="68.14" ModifiedDate="2025-02-26 10:14:47.448" />
+				<Station Name="Loader1.ShuttleB.LS" Position="66.39" ModifiedDate="2025-02-26 16:41:55.416" />
+				<Station Name="Loader1.ShuttleB.MID" Position="51.29" ModifiedDate="2025-03-04 16:18:20.735" />
+				<Station Name="Loader1.ShuttleB.OUT200" Position="-33.14" ModifiedDate="2025-03-04 16:06:30.469" />
+				<Station Name="Loader1.ShuttleB.OUT150" Position="-5.913" ModifiedDate="12/10/2020 3:32:26 PM" />
+				<Station Name="Loader1.ShuttleB.OUT100" Position="-5.913" ModifiedDate="12/10/2020 3:32:26 PM" />
 			</Stations>
 		</Axis>
 		<Axis Name="Loader1.LSA">
-			<ToleranceDefault>0.01</ToleranceDefault>
+			<ToleranceDefault>0.04</ToleranceDefault>
 			<Stations>
-				<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" />
+				<Station Name="Loader1.LSA.Setup200" Position="3.2" ModifiedDate="2025-02-27 16:15:15.701" />
+				<Station Name="Loader1.LSA.Lock200" Position="3" ModifiedDate="2025-02-27 16:15:25.198" />
+				<Station Name="Loader1.LSA.Unlock200" Position="5.7" ModifiedDate="2025-02-27 16:14:48.787" />
+				<Station Name="Loader1.LSA.Setup150" Position="2.273" />
+				<Station Name="Loader1.LSA.Lock150" Position="1.591" ModifiedDate="3/2/2020 6:21:09 PM" />
+				<Station Name="Loader1.LSA.Unlock150" Position="5.227" ModifiedDate="2/25/2020 2:54:29 PM" />
+				<Station Name="Loader1.LSA.Setup100" Position="2.273" />
+				<Station Name="Loader1.LSA.Lock100" Position="1.477" ModifiedDate="3/2/2020 6:21:09 PM" />
+				<Station Name="Loader1.LSA.Unlock100" Position="4.364" ModifiedDate="2/25/2020 2:54:29 PM" />
 			</Stations>
 		</Axis>
 		<Axis Name="Loader1.LSB">
-			<ToleranceDefault>100</ToleranceDefault>
+			<ToleranceDefault>0.04</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" />
+				<Station Name="Loader1.LSB.Setup200" Position="3.2" ModifiedDate="2025-02-27 14:28:08.753" />
+				<Station Name="Loader1.LSB.Lock200" Position="3" ModifiedDate="2025-02-27 14:19:47.389" />
+				<Station Name="Loader1.LSB.Unlock200" Position="5.7" ModifiedDate="2025-02-27 14:17:04.894" />
+				<Station Name="Loader1.LSB.Setup150" Position="2.273" />
+				<Station Name="Loader1.LSB.Lock150" Position="1.591" ModifiedDate="3/2/2020 6:21:09 PM" />
+				<Station Name="Loader1.LSB.Unlock150" Position="5.227" ModifiedDate="2/25/2020 2:54:29 PM" />
+				<Station Name="Loader1.LSB.Setup100" Position="2.273" />
+				<Station Name="Loader1.LSB.Lock100" Position="1.477" ModifiedDate="3/2/2020 6:21:09 PM" />
+				<Station Name="Loader1.LSB.Unlock100" Position="6.364" ModifiedDate="2/25/2020 2:54:29 PM" />
 			</Stations>
 		</Axis>
 		<Axis Name="Loader1.Rotation">
-			<ToleranceDefault>0.1</ToleranceDefault>
+			<ToleranceDefault>0.2</ToleranceDefault>
 			<Stations>
-				<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" />
+				<Station Name="Loader1.Rotation.TRNPA" Position="-1.04" ModifiedDate="2025-02-19 17:13:36.065" />
+				<Station Name="Loader1.Rotation.TRNPB" Position="178.16" ModifiedDate="2/26/2020 12:19:29 PM" />
+				<Station Name="Loader1.Rotation.LOADA200" Position="7.79" ModifiedDate="2025-03-01 13:50:33.916" />
+				<Station Name="Loader1.Rotation.LOADB200" Position="188.33" ModifiedDate="2025-03-04 15:24:59.934" />
+				<Station Name="Loader1.Rotation.LOADA150" Position="8.217" ModifiedDate="2024-08-13 14:00:52.955" />
+				<Station Name="Loader1.Rotation.LOADB150" Position="187.5" ModifiedDate="2024-08-13 14:22:11.332" />
+				<Station Name="Loader1.Rotation.LOADA100" Position="8.217" ModifiedDate="2024-08-13 14:00:52.955" />
+				<Station Name="Loader1.Rotation.LOADB100" Position="187.5" ModifiedDate="2024-08-13 14:22:11.332" />
 			</Stations>
 		</Axis>
 	</Module>
@@ -126,10 +126,10 @@
 		<Axis Name="Transporter1.Elevator">
 			<ToleranceDefault>0.5</ToleranceDefault>
 			<Stations>
-				<Station Name="Transporter1.Elevator.UP" Position="-7.02" ModifiedDate="2024-09-01 17:46:07.004" />
-				<Station Name="Transporter1.Elevator.LOW" Position="500" />
-				<Station Name="Transporter1.Elevator.Cell1" Position="570" ModifiedDate="2024-08-14 11:27:04.589" />
-				<Station Name="Transporter1.Elevator.Cell2" Position="570" ModifiedDate="2024-08-14 11:35:25.181" />
+				<Station Name="Transporter1.Elevator.UP" Position="-2.2" ModifiedDate="2024-09-01 17:46:07.004" />
+				<Station Name="Transporter1.Elevator.CellTop" Position="55" />
+				<Station Name="Transporter1.Elevator.Cell1" Position="475.86" ModifiedDate="2024-08-14 11:27:04.589" />
+				<Station Name="Transporter1.Elevator.Cell2" Position="476.520" ModifiedDate="2024-08-14 11:35:25.181" />
 				<Station Name="Transporter1.Elevator.Cell3" Position="569.5" ModifiedDate="2024-08-14 11:38:10.981" />
 				<Station Name="Transporter1.Elevator.Cell4" Position="569" ModifiedDate="2024-08-14 11:44:05.454" />
 				<Station Name="Transporter1.Elevator.Cell5" Position="583.9999" ModifiedDate="11/30/2020 11:31:11 AM" />
@@ -166,8 +166,8 @@
 		<Axis Name="Transporter2.Gantry">
 			<ToleranceDefault>0.5</ToleranceDefault>
 			<Stations>
-				<Station Name="Transporter2.Gantry.Park" Position="400" ModifiedDate="2024-08-28 15:29:47.217" />
-				<Station Name="Transporter2.Gantry.Loader" Position="-325.94" ModifiedDate="2024-10-09 15:13:35.068" />
+				<Station Name="Transporter2.Gantry.Park" Position="151.95" ModifiedDate="2025-03-06 15:33:59.436" />
+				<Station Name="Transporter2.Gantry.Loader" Position="0" ModifiedDate="2024-10-09 15:13:35.068" />
 				<Station Name="Transporter2.Gantry.Cell15" Position="1869" ModifiedDate="12/7/2020 3:47:49 PM" />
 				<Station Name="Transporter2.Gantry.Cell16" Position="1713" ModifiedDate="12/7/2020 3:46:39 PM" />
 				<Station Name="Transporter2.Gantry.Cell17" Position="1556" ModifiedDate="12/7/2020 3:42:25 PM" />
@@ -177,7 +177,7 @@
 				<Station Name="Transporter2.Gantry.Cell21" Position="960" ModifiedDate="2024-08-27 14:40:37.796" />
 				<Station Name="Transporter2.Gantry.Cell22" Position="880" ModifiedDate="2024-09-01 17:49:56.949" />
 				<Station Name="Transporter2.Gantry.Cell23" Position="738.4999" ModifiedDate="12/7/2020 4:08:08 PM" />
-				<Station Name="Transporter2.Gantry.Cell24" Position="645" ModifiedDate="2024-10-09 15:58:48.135" />
+				<Station Name="Transporter2.Gantry.Cell24" Position="751.95" ModifiedDate="2025-03-06 15:27:07.259" />
 				<Station Name="Transporter2.Gantry.Cell25" Position="611" ModifiedDate="2024-10-09 15:58:51.862" />
 				<Station Name="Transporter2.Gantry.Cell26" Position="576" ModifiedDate="2024-10-09 15:58:56.303" />
 				<Station Name="Transporter2.Gantry.Cell27" Position="541" ModifiedDate="2024-10-09 15:59:01.686" />
@@ -198,96 +198,54 @@
 		<Axis Name="Transporter2.Elevator">
 			<ToleranceDefault>0.5</ToleranceDefault>
 			<Stations>
-				<Station Name="Transporter2.Elevator.UP" Position="-7" ModifiedDate="2024-09-20 13:34:01.263" />
-				<Station Name="Transporter2.Elevator.LOW" Position="500" />
-				<Station Name="Transporter2.Elevator.Loader" Position="571" ModifiedDate="2024-09-25 16:10:52.892" />
-				<Station Name="Transporter2.Elevator.Cell15" Position="583.9997" ModifiedDate="12/7/2020 3:48:18 PM" />
-				<Station Name="Transporter2.Elevator.Cell16" Position="584.2038" ModifiedDate="12/7/2020 3:45:27 PM" />
-				<Station Name="Transporter2.Elevator.Cell17" Position="584.5001" ModifiedDate="12/7/2020 3:42:56 PM" />
-				<Station Name="Transporter2.Elevator.Cell18" Position="584.5" ModifiedDate="12/7/2020 3:41:28 PM" />
-				<Station Name="Transporter2.Elevator.Cell19" Position="583.4957" ModifiedDate="12/7/2020 3:38:51 PM" />
-				<Station Name="Transporter2.Elevator.Cell20" Position="581" ModifiedDate="2024-09-25 17:23:10.604" />
-				<Station Name="Transporter2.Elevator.Cell21" Position="574.5" ModifiedDate="2024-08-13 16:38:41.933" />
-				<Station Name="Transporter2.Elevator.Cell22" Position="572.55" ModifiedDate="2024-09-01 17:50:52.540" />
-				<Station Name="Transporter2.Elevator.Cell23" Position="581.9999" ModifiedDate="12/7/2020 4:07:17 PM" />
-				<Station Name="Transporter2.Elevator.Cell24" Position="573" ModifiedDate="2024-09-01 17:31:44.732" />
-				<Station Name="Transporter2.Elevator.Cell25" Position="572.5" ModifiedDate="2024-08-28 14:13:15.098" />
-				<Station Name="Transporter2.Elevator.Cell26" Position="572.5" ModifiedDate="2024-08-28 14:16:47.833" />
-				<Station Name="Transporter2.Elevator.Cell27" Position="572.5" ModifiedDate="2024-08-28 14:19:53.433" />
-				<Station Name="Transporter2.Elevator.Cell28" Position="572.5" ModifiedDate="2024-08-28 14:22:12.776" />
-				<Station Name="Transporter2.Elevator.Cell29" Position="571.5" ModifiedDate="2024-08-28 14:24:08.184" />
-				<Station Name="Transporter2.Elevator.Cell30" Position="571.5" ModifiedDate="2024-08-28 14:25:41.584" />
-				<Station Name="Transporter2.Elevator.Cell31" Position="571.5" ModifiedDate="2024-08-28 14:27:10.496" />
-				<Station Name="Transporter2.Elevator.Cell32" Position="571.5" ModifiedDate="2024-08-28 15:33:40.266" />
-				<Station Name="Transporter2.Elevator.Cell33" Position="571.5" ModifiedDate="2024-08-28 15:37:07.305" />
-				<Station Name="Transporter2.Elevator.Cell34" Position="571.5" ModifiedDate="2024-08-28 15:37:11.456" />
-				<Station Name="Transporter2.Elevator.Cell35" Position="571.5" ModifiedDate="2024-08-28 15:38:16.040" />
-				<Station Name="Transporter2.Elevator.Cell36" Position="571.5" ModifiedDate="2024-08-28 15:39:40.513" />
-				<Station Name="Transporter2.Elevator.Cell37" Position="571.5" ModifiedDate="2024-08-28 15:48:02.112" />
-				<Station Name="Transporter2.Elevator.Cell38" Position="571.5" ModifiedDate="2024-08-28 15:41:37.552" />
-				<Station Name="Transporter2.Elevator.Cell39" Position="571.5" ModifiedDate="2024-09-20 13:44:43.983" />
+				<Station Name="Transporter2.Elevator.UP" Position="-2.2" ModifiedDate="2024-09-20 13:34:01.263" />
+				<Station Name="Transporter2.Elevator.CellTop" Position="55" />
+				<Station Name="Transporter2.Elevator.Loader" Position="475.86" ModifiedDate="2024-09-25 16:10:52.892" />
+				<Station Name="Transporter2.Elevator.Cell15" Position="476.74" ModifiedDate="12/7/2020 3:48:18 PM" />
+				<Station Name="Transporter2.Elevator.Cell16" Position="476.74" ModifiedDate="12/7/2020 3:45:27 PM" />
+				<Station Name="Transporter2.Elevator.Cell17" Position="483.78" ModifiedDate="12/7/2020 3:42:56 PM" />
+				<Station Name="Transporter2.Elevator.Cell18" Position="475.86" ModifiedDate="12/7/2020 3:41:28 PM" />
+				<Station Name="Transporter2.Elevator.Cell19" Position="475.86" ModifiedDate="12/7/2020 3:38:51 PM" />
+				<Station Name="Transporter2.Elevator.Cell20" Position="475.64" ModifiedDate="2024-09-25 17:23:10.604" />
+				<Station Name="Transporter2.Elevator.Cell21" Position="477.62" ModifiedDate="2024-08-13 16:38:41.933" />
+				<Station Name="Transporter2.Elevator.Cell22" Position="477.62" ModifiedDate="2024-09-01 17:50:52.540" />
+				<Station Name="Transporter2.Elevator.Cell23" Position="477.62" ModifiedDate="12/7/2020 4:07:17 PM" />
+				<Station Name="Transporter2.Elevator.Cell24" Position="467.41" ModifiedDate="2025-03-06 15:26:53.847" />
+				<Station Name="Transporter2.Elevator.Cell25" Position="477.62" ModifiedDate="2024-08-28 14:13:15.098" />
+				<Station Name="Transporter2.Elevator.Cell26" Position="477.62" ModifiedDate="2024-08-28 14:16:47.833" />
+				<Station Name="Transporter2.Elevator.Cell27" Position="477.62" ModifiedDate="2024-08-28 14:19:53.433" />
+				<Station Name="Transporter2.Elevator.Cell28" Position="477.62" ModifiedDate="2024-08-28 14:22:12.776" />
+				<Station Name="Transporter2.Elevator.Cell29" Position="477.62" ModifiedDate="2024-08-28 14:24:08.184" />
+				<Station Name="Transporter2.Elevator.Cell30" Position="477.62" ModifiedDate="2024-08-28 14:25:41.584" />
+				<Station Name="Transporter2.Elevator.Cell31" Position="477.62" ModifiedDate="2024-08-28 14:27:10.496" />
+				<Station Name="Transporter2.Elevator.Cell32" Position="477.62" ModifiedDate="2024-08-28 15:33:40.266" />
+				<Station Name="Transporter2.Elevator.Cell33" Position="477.62" ModifiedDate="2024-08-28 15:37:07.305" />
+				<Station Name="Transporter2.Elevator.Cell34" Position="477.62" ModifiedDate="2024-08-28 15:37:11.456" />
+				<Station Name="Transporter2.Elevator.Cell35" Position="477.62" ModifiedDate="2024-08-28 15:38:16.040" />
+				<Station Name="Transporter2.Elevator.Cell36" Position="477.62" ModifiedDate="2024-08-28 15:39:40.513" />
+				<Station Name="Transporter2.Elevator.Cell37" Position="477.62" ModifiedDate="2024-08-28 15:48:02.112" />
+				<Station Name="Transporter2.Elevator.Cell38" Position="477.62" ModifiedDate="2024-08-28 15:41:37.552" />
+				<Station Name="Transporter2.Elevator.Cell39" Position="477.62" ModifiedDate="2024-09-20 13:44:43.983" />
 			</Stations>
 		</Axis>
 	</Module>
 	<Module Name="DualPuf">
 		<Axis Name="PUF1.Flip">
-			<ToleranceDefault>0.5</ToleranceDefault>
+			<ToleranceDefault>0.1</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" />
+				<Station Name="PUF1.Flip.Home" Position="0.435" ModifiedDate="2024-08-09 13:35:19.613" />
+				<Station Name="PUF1.Flip.SideA" Position="-6.79" ModifiedDate="2025-03-04 15:34:45.843" />
+				<Station Name="PUF1.Flip.SideB" Position="171.73" ModifiedDate="2025-03-04 15:54:16.292" />
 			</Stations>
 		</Axis>
 		<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" />
-				<Station Name="PUF1.Rotation.Park" Position="72.9999" ModifiedDate="8/27/2018 2:54:03 PM" />
-				<Station Name="PUF1.Rotation.Flip" Position="-7" ModifiedDate="4/6/2015 8:34:18 PM" />
-				<Station Name="PUF1.Rotation.Robot" Position="72.9999" ModifiedDate="7/31/2018 4:34:50 PM" />
-				<Station Name="PUF1.Rotation.LoaderPickup" Position="-6.10065" ModifiedDate="9/14/2018 2:13:39 PM" />
-				<Station Name="PUF1.Rotation.LoaderPutDown" Position="-6.30045" ModifiedDate="9/19/2018 4:32:00 PM" />
-			</Stations>
-		</Axis>
-		<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" />
-				<Station Name="PUF1.Vertical.Flip" Position="-148" />
-				<Station Name="PUF1.Vertical.Robot" Position="-145" ModifiedDate="2024-08-09 13:46:54.195" />
-				<Station Name="PUF1.Vertical.Park" Position="2.999992" ModifiedDate="9/14/2018 2:07:39 PM" />
-				<Station Name="PUF1.Vertical.Loader" Position="-27.19027" />
-				<Station Name="PUF1.Vertical.LoaderPickup" Position="-279" ModifiedDate="9/17/2018 2:09:42 PM" />
-				<Station Name="PUF1.Vertical.LoaderPutDown" Position="-277" ModifiedDate="9/19/2018 4:31:55 PM" />
-			</Stations>
-		</Axis>
-		<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">
-			<ToleranceDefault>0.5</ToleranceDefault>
-			<Stations>
-				<Station Name="PUF2.Rotation.Home" Position="-23.2889" />
-				<Station Name="PUF2.Rotation.Flip" Position="8" ModifiedDate="4/6/2015 8:52:34 PM" />
-				<Station Name="PUF2.Rotation.Robot" Position="-23.2889" />
-				<Station Name="PUF2.Rotation.Park" Position="-23.2889" />
-				<Station Name="PUF2.Rotation.LoaderPickup" Position="8.7003" ModifiedDate="9/19/2018 4:41:57 PM" />
-				<Station Name="PUF2.Rotation.LoaderPutDown" Position="8.500501" ModifiedDate="9/19/2018 4:48:41 PM" />
-			</Stations>
-		</Axis>
-		<Axis Name="PUF2.Vertical">
-			<ToleranceDefault>0.5</ToleranceDefault>
+			<ToleranceDefault>0.1</ToleranceDefault>
 			<Stations>
-				<Station Name="PUF2.Vertical.Home" Position="-15" />
-				<Station Name="PUF2.Vertical.Flip" Position="-140" ModifiedDate="9/29/2018 3:15:47 PM" />
-				<Station Name="PUF2.Vertical.Robot" Position="-148" ModifiedDate="2024-08-09 13:47:40.203" />
-				<Station Name="PUF2.Vertical.Park" Position="-15" ModifiedDate="5/7/2015 11:15:42 PM" />
-				<Station Name="PUF2.Vertical.Loader" Position="-50" />
-				<Station Name="PUF2.Vertical.LoaderPickup" Position="-276.1" ModifiedDate="9/19/2018 4:44:11 PM" />
-				<Station Name="PUF2.Vertical.LoaderPutDown" Position="-273.5" ModifiedDate="9/19/2018 5:47:50 PM" />
+				<Station Name="PUF1.Rotation.Home" Position="8.29" ModifiedDate="2025-02-28 14:58:16.397" />
+				<Station Name="PUF1.Rotation.Flip" Position="8.29" ModifiedDate="2025-02-28 14:52:10.439" />
+				<Station Name="PUF1.Rotation.Robot" Position="8.29" ModifiedDate="2025-02-28 14:58:06.222" />
+				<Station Name="PUF1.Rotation.LoaderPickup" Position="43.29" ModifiedDate="2025-03-01 13:39:32.694" />
+				<Station Name="PUF1.Rotation.LoaderPutDown" Position="43.29" ModifiedDate="2025-03-01 13:39:37.364" />
 			</Stations>
 		</Axis>
 	</Module>

+ 1 - 1
CyberX8_RT/Devices/AXIS/JetAxisBase.cs

@@ -743,7 +743,7 @@ namespace CyberX8_RT.Devices.AXIS
         {
             foreach(Station item in _stationAxis.Stations)
             {
-                if(item.Name.EndsWith(station))
+                if(item.Name.ToLower().EndsWith(station.ToLower()))
                 {
                     if(double.TryParse(item.Position,out double position))
                     {

+ 1 - 1
CyberX8_RT/Modules/Transporter/TransporterElevatorLowRoutine.cs

@@ -82,7 +82,7 @@ namespace CyberX8_RT.Modules.Transporter
         /// <returns></returns>
         private bool ElevatorPosition()
         {
-            return _elevatorAxis.PositionStation("CELLTOP");
+            return _elevatorAxis.PositionStation("CellTop");
         }
         /// <summary>
         /// 检验Vertical移动状态

+ 13 - 12
CyberX8_RT/Modules/Transporter/TransporterPickDownToRoutine.cs

@@ -23,6 +23,7 @@ using System.Text;
 using System.Threading.Tasks;
 using CyberX8_RT.Devices.Metal;
 using CyberX8_RT.Devices.Rinse;
+using static Mono.Security.X509.X520;
 
 namespace CyberX8_RT.Modules.Transporter
 {
@@ -38,11 +39,11 @@ namespace CyberX8_RT.Modules.Transporter
             CheckMoveToStatus,
             GantryPosition,
             GantryPositiolWait,
-            CalculatePlaceSpeed,
-            PlaceDelay,            
             ElevatorPositionToCellTop,
             ElevatorPositionToCellTopWait,
             Delay,
+            CalculatePlaceSpeed,
+            PlaceDelay,            
             ElevatorPositionToCell,
             ElevatorPositionToCellWait,
             DropBlockLockoff,
@@ -104,15 +105,15 @@ namespace CyberX8_RT.Modules.Transporter
                     CheckSafeMoveToStopStatus)
                 //3. Gantry 移动
                 .Run(PutDownStep.GantryPosition, GantryPositionToCell, _delay_1ms)
-                .WaitWithStopCondition(PutDownStep.GantryPositiolWait, CheckGantryPositionStatus, CheckGantryPositionRunStop)
-                //4. 确认Place 速度和加速度
-                .Run(PutDownStep.CalculatePlaceSpeed, CalculatePownDownSpeed, _delay_1ms)
-                //5. Pickup delay
-                .Delay(PutDownStep.PlaceDelay, _placeDelayTime * 1000)               
+                .WaitWithStopCondition(PutDownStep.GantryPositiolWait, CheckGantryPositionStatus, CheckGantryPositionRunStop)                      
                 //6. Elevator 移动至cellTop
                 .Run(PutDownStep.ElevatorPositionToCellTop, ElevatorPositionToCellTop, _delay_1ms)
                 .WaitWithStopCondition(PutDownStep.ElevatorPositionToCellTopWait, CheckElevatorPositionEndStatus, CheckElevatorPositionStopStatus)
                 .Delay(PutDownStep.Delay, 500)
+                //4. 确认Place 速度和加速度
+                .Run(PutDownStep.CalculatePlaceSpeed, CalculatePownDownSpeed, _delay_1ms)
+                //5. Pickup delay
+                .Delay(PutDownStep.PlaceDelay, _placeDelayTime * 1000)
                 //7. Elevator 移动至cell
                 .Run(PutDownStep.ElevatorPositionToCell, ElevatorPositionToCell, _delay_1ms)
                 .WaitWithStopCondition(PutDownStep.ElevatorPositionToCellWait, CheckElevatorPositionEndStatus, CheckElevatorPositionStopStatus)
@@ -258,10 +259,10 @@ namespace CyberX8_RT.Modules.Transporter
         /// <returns></returns>
         private bool ElevatorPositionToCellTop()
         {
-            bool result = _elevatorAxis.PositionStation("CELLTOP", false, _velocity, _acceleration, _acceleration);
+            bool result = _elevatorAxis.PositionStation("CellTop", false, _velocity, _acceleration, _acceleration);
             if (!result)
             {
-                NotifyError(eEvent.ERR_TRANSPORTER, "elevator goto CELLTOP failed", 0);
+                NotifyError(eEvent.ERR_TRANSPORTER, "elevator goto CellTop failed", 0);
             }
             return result;
         }
@@ -347,7 +348,7 @@ namespace CyberX8_RT.Modules.Transporter
                 return true;
             }  
             BeckhoffStationAxis stationAxis = BeckhoffStationLocationManager.Instance.GetStationAxis(Module, "Elevator", 0);
-            Station upStation = stationAxis.Stations.Find(O => O.Name.EndsWith("UP")); Station cellStation = null;
+            Station upStation = stationAxis.Stations.Find(O => O.Name.EndsWith("CellTop")); Station cellStation = null;
             if (_cellName == "Loader")
             {
                 cellStation = stationAxis.Stations.Find(O => O.Name.EndsWith("Loader"));
@@ -358,7 +359,7 @@ namespace CyberX8_RT.Modules.Transporter
             }
             if (upStation==null)
             {
-                NotifyError(eEvent.ERR_TRANSPORTER, "UP is not in Station List",0);
+                NotifyError(eEvent.ERR_TRANSPORTER, "CellTop is not in Station List", 0);
                 return false;
             }
             if(cellStation==null)
@@ -419,7 +420,7 @@ namespace CyberX8_RT.Modules.Transporter
             bool result= !_transporterCommon.TransporterData.WSHoldPresent;
             if(!result)
             {
-                NotifyError(eEvent.ERR_TRANSPORTER, "confirm WS Present sensor failed",0);
+                LOG.WriteLog(eEvent.INFO_TRANSPORTER, Module, "confirm WS Present sensor failed");
             }
             return result;
         }

+ 5 - 5
CyberX8_RT/Modules/Transporter/TransporterPickUpFromRoutine.cs

@@ -118,11 +118,11 @@ namespace CyberX8_RT.Modules.Transporter
                 //9. Elevator goto Up
                  .Run(PickUpStep.ElevatorPositionToUp, ElevatorGotoUP, 100)
                 .WaitWithStopCondition(PickUpStep.ElevatorPositionToUpWait, CheckElevatorPositionEndStatus, CheckElevatorPositionStopStatus)
-                //10. Material Tracking Update
-                .Run(PickUpStep.UpdateWaferShuttle, WaferShuttleTransfer,_delay_1ms)
-                //11. 确认Transporter的Wafer shuttle hold present信号为on
+                //10. 确认Transporter的Wafer shuttle hold present信号为on
                 .Wait(PickUpStep.CheckWSPresent, CheckWSPresent, _delay_2s)
-                //13. Read Barcode 确认与Material Tracking的转移是否一致
+                //11. Material Tracking Update
+                .Run(PickUpStep.UpdateWaferShuttle, WaferShuttleTransfer,_delay_1ms)               
+                //12. Read Barcode 确认与Material Tracking的转移是否一致
                 //.Run(PickUpStep.ReadBarcodeConfirm,ReadBarcode,_delay_1ms)
                 .End(PickUpStep.End,NullFun,100);
             return Runner.Status;
@@ -426,7 +426,7 @@ namespace CyberX8_RT.Modules.Transporter
             bool result= locked && (whPresent||_bypassWaferHolderPresent);
             if (!result)
             {
-                NotifyError(eEvent.ERR_TRANSPORTER, "check wafer Shuttle present and locked failed", 0);
+                LOG.WriteLog(eEvent.INFO_TRANSPORTER, Module, "check wafer Shuttle present and locked failed");
             }
             return result;
         }

+ 2 - 1
CyberX8_Themes/UserControls/TransporterStationPositionControl.xaml.cs

@@ -404,7 +404,8 @@ namespace CyberX8_Themes.UserControls
                 }
                 else
                 {
-                    if (!lastName.StartsWith("Cell"))
+                    
+                    if (!lastName.StartsWith("Cell")||lastName=="CellTop")
                     {
                         lst.Add(lastName);
                     }