diff --git a/Modules/SicPM/Devices/SicServo.cs b/Modules/SicPM/Devices/SicServo.cs index 73b34bc..6e611c2 100644 --- a/Modules/SicPM/Devices/SicServo.cs +++ b/Modules/SicPM/Devices/SicServo.cs @@ -36,6 +36,8 @@ namespace SicPM.Devices private R_TRIG _trigDisable = new R_TRIG(); private R_TRIG _trigReady = new R_TRIG(); + private R_TRIG _trigEnable = new R_TRIG(); + #region AI public bool ServoEnable @@ -289,7 +291,7 @@ namespace SicPM.Devices // return; //} - if (target == 0) + if (target == 0 && ServoEnable) { _setValueIsZero = true; } @@ -376,11 +378,19 @@ namespace SicPM.Devices MonitorRamping(); MonitorSet(); - //if (_setValueIsZero && ActualSpeedFeedback <= 1 && ServoEnable) - //{ - // _doServoEnable.SetValue(false, out string reason); - // _setValueIsZero = false; - //} + _trigEnable.CLK = ServoEnable; + if (_trigEnable.Q) + { + _setValueIsZero = false; + } + + if (_setValueIsZero && ActualSpeedFeedback <= 1 && ServoEnable) + { + _doServoEnable.SetValue(false, out string reason); + _setValueIsZero = false; + + EV.PostWarningLog(Module, "servo set speed is 0,Force set servoEnable false"); + } } public void Reset() diff --git a/SicRT/Properties/AssemblyInfo.cs b/SicRT/Properties/AssemblyInfo.cs index 4e3ae20..688437d 100644 --- a/SicRT/Properties/AssemblyInfo.cs +++ b/SicRT/Properties/AssemblyInfo.cs @@ -51,7 +51,7 @@ using System.Windows; // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 // 方法是按如下所示使用“*”: : -[assembly: AssemblyVersion("1.0.4.51")] +[assembly: AssemblyVersion("1.0.5.0")] /*[assembly: AssemblyFileVersion("1.0.0.2")]*/ diff --git a/SicRT/ReleaseNotes.txt b/SicRT/ReleaseNotes.txt index 31d75d9..d48beb5 100644 --- a/SicRT/ReleaseNotes.txt +++ b/SicRT/ReleaseNotes.txt @@ -8,6 +8,10 @@ Sic 系统更新历史记录 +--------------------------------------------------------------------------------- +Sic04 2022-12-12 Version 1.0.5.0 +1.启用磁流体转速为0,则关闭磁流体Enable功能 + Sic04 2022-12-12 Version 1.0.4.51 1.修正当DataLog中某些数据无法查询的问题。 diff --git a/SicUI/Properties/AssemblyInfo.cs b/SicUI/Properties/AssemblyInfo.cs index 195d2ef..600c95f 100644 --- a/SicUI/Properties/AssemblyInfo.cs +++ b/SicUI/Properties/AssemblyInfo.cs @@ -55,6 +55,6 @@ using System.Windows; // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.4.51")] +[assembly: AssemblyVersion("1.0.5.0")] /*[assembly: AssemblyFileVersion("1.0.0.2")]*/