From 6b464ef47119edc17df86a6e9d0430491cbbc33d Mon Sep 17 00:00:00 2001
From: lhiven <236881222@qq.com>
Date: Fri, 29 Dec 2023 20:17:13 +0900
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=20=E5=9B=BA=E9=AB=98=E5=8D=A1?=
=?UTF-8?q?=E5=9C=A8=E8=BF=90=E5=8A=A8=E4=B9=8B=E5=89=8D=E6=B8=85=E9=99=A4?=
=?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BF=A1=E6=81=AF=202=E3=80=81=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E7=89=88=E6=9C=AC=E5=8F=B7?=
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 | 4 ++--
Rs.Motion/Rs.Motion.csproj | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Rs.Motion/GugaoPulse/GugaoPulseAxis.cs b/Rs.Motion/GugaoPulse/GugaoPulseAxis.cs
index 0674c2c..02806ca 100644
--- a/Rs.Motion/GugaoPulse/GugaoPulseAxis.cs
+++ b/Rs.Motion/GugaoPulse/GugaoPulseAxis.cs
@@ -308,6 +308,8 @@ namespace Rs.Motion.GugaoPulse
return ErrorCode.AxisNotInit;
if (!SafeCheck())
return ErrorCode.Unsafe;
+ //运动之前先清一下状态
+ 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 953274d..8d7d16e 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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.*")]
+//[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Rs.Motion/Rs.Motion.csproj b/Rs.Motion/Rs.Motion.csproj
index a1957cf..1d9d474 100644
--- a/Rs.Motion/Rs.Motion.csproj
+++ b/Rs.Motion/Rs.Motion.csproj
@@ -11,7 +11,7 @@
Rs.Motion
v4.8
512
- true
+ false