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(nameof(LoadXStartPos)); + } + } + public static double LoadYStartPos + { + get + { + return SysConfigParam.GetValue(nameof(LoadYStartPos)); + } + } /// /// 当前配方 /// 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;