From 06612c8a8a747fda3fd99ad4657ab239a2136046 Mon Sep 17 00:00:00 2001 From: lhiven <236881222@qq.com> Date: Thu, 7 Mar 2024 16:08:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=BF=90=E5=8A=A8=E4=B9=8B?= =?UTF-8?q?=E5=89=8D=E7=9A=84=E6=B8=85=E9=99=A4=E7=8A=B6=E6=80=81=E7=9A=84?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= 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, 2 insertions(+), 2 deletions(-) diff --git a/Rs.Motion/GugaoPulse/GugaoPulseAxis.cs b/Rs.Motion/GugaoPulse/GugaoPulseAxis.cs index d99771c..b0a2387 100644 --- a/Rs.Motion/GugaoPulse/GugaoPulseAxis.cs +++ b/Rs.Motion/GugaoPulse/GugaoPulseAxis.cs @@ -309,7 +309,7 @@ namespace Rs.Motion.GugaoPulse if (!SafeCheck()) return ErrorCode.Unsafe; //运动之前先清一下状态 - ClearAlarm(); + //ClearAlarm(); nSpeedPercent = nSpeedPercent <= 0 ? 10 : nSpeedPercent; nSpeedPercent = nSpeedPercent > 100 ? 100 : nSpeedPercent; if (HomeStatus != EHomeStatus.Finished) diff --git a/Rs.Motion/Properties/AssemblyInfo.cs b/Rs.Motion/Properties/AssemblyInfo.cs index da95b6b..f3a69ed 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.5")] +[assembly: AssemblyVersion("2.20.24.6")] //[assembly: AssemblyFileVersion("1.0.0.0")]