Sic-Software
/
Sic04
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update from Svn. 

当磁流体转速为0时，ServoOff以消除抖动。
This commit is contained in:
DESKTOP-GPE37UV\THINKAPD 2022-12-12 19:25:19 +08:00
parent 5fb5353935
commit 0218878572
4 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Modules/SicPM/Devices/SicServo.cs
View File

@ -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()

2
SicRT/Properties/AssemblyInfo.cs
View File

@ -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")]*/

4
SicRT/ReleaseNotes.txt
View File

@ -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中某些数据无法查询的问题。

2
SicUI/Properties/AssemblyInfo.cs
View File

@ -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")]*/