From e23abe37ae81be4d70e7591bfe5a2e88885d1e3f Mon Sep 17 00:00:00 2001 From: lhiven <236881222@qq.com> Date: Fri, 8 Mar 2024 15:32:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=88=B0=E4=BD=8D=E4=BF=A1?= =?UTF-8?q?=E5=8F=B7=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.Motion/GugaoPulse/GugaoPulseAxis.cs | 2 ++ Rs.Motion/Properties/AssemblyInfo.cs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Rs.Motion/GugaoPulse/GugaoPulseAxis.cs b/Rs.Motion/GugaoPulse/GugaoPulseAxis.cs index b0a2387..dc3713f 100644 --- a/Rs.Motion/GugaoPulse/GugaoPulseAxis.cs +++ b/Rs.Motion/GugaoPulse/GugaoPulseAxis.cs @@ -933,6 +933,7 @@ namespace Rs.Motion.GugaoPulse { return ErrorCode.Ok; } + #region 禁用到位信号判断 bool bINP = false; err = GetInpStatus(out bINP); if (err > ErrorCode.Ok) @@ -943,6 +944,7 @@ namespace Rs.Motion.GugaoPulse { return ErrorCode.Ok; } + #endregion double dfCurrentTorlance = 0.0; double dfTorlance = Math.Abs(Config.Tolerance); err = GetTolerance(out dfCurrentTorlance); diff --git a/Rs.Motion/Properties/AssemblyInfo.cs b/Rs.Motion/Properties/AssemblyInfo.cs index f3a69ed..25a93ad 100644 --- a/Rs.Motion/Properties/AssemblyInfo.cs +++ b/Rs.Motion/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.20.24.6")] +[assembly: AssemblyVersion("2.20.24.7")] //[assembly: AssemblyFileVersion("1.0.0.0")]