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