From 1088998c1363c1ac229a2b8810e58457dffb445e Mon Sep 17 00:00:00 2001
From: lhiven <lhiven@163.com>
Date: Tue, 19 Dec 2023 17:40:21 +0900
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E5=8F=98=E9=87=8F=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=8E=92=E6=96=99=E8=BD=B4=E7=9A=84=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E7=82=B9=20=E4=BF=AE=E5=A4=8D=E5=88=A4=E6=96=AD=E8=BD=B4?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=81=9C=E6=AD=A2=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Rs.SkyLine/Commom/GlobalVar.cs | 14 ++++++++++++++
 Rs.SkyLine/Commom/Ops.cs       |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Rs.SkyLine/Commom/GlobalVar.cs b/Rs.SkyLine/Commom/GlobalVar.cs
index a591e1b..274bb4c 100644
--- a/Rs.SkyLine/Commom/GlobalVar.cs
+++ b/Rs.SkyLine/Commom/GlobalVar.cs
@@ -13,7 +13,21 @@ namespace Rs.Framework
 {
     public static class GlobalVar
     {
+        public static double LoadXStartPos
+        {
+            get
+            {
+                return SysConfigParam.GetValue<double>(nameof(LoadXStartPos));
+            }
+        }
 
+        public static double LoadYStartPos
+        {
+            get
+            {
+                return SysConfigParam.GetValue<double>(nameof(LoadYStartPos));
+            }
+        }
         /// <summary>
         /// 当前配方
         /// </summary>
diff --git a/Rs.SkyLine/Commom/Ops.cs b/Rs.SkyLine/Commom/Ops.cs
index 2252d3f..c00c9e3 100644
--- a/Rs.SkyLine/Commom/Ops.cs
+++ b/Rs.SkyLine/Commom/Ops.cs
@@ -286,7 +286,7 @@ namespace Rs.MotionPlat.Commom
             ErrorCode errCode = ErrorCode.Ok;
             foreach (var axis in axies)
             {
-                errCode = axis.IsInPosition(out bool isArrived);
+                errCode = axis.IsArrived(out bool isArrived);
                 if (errCode > ErrorCode.Ok)
                 {
                     return false;