Commit 5d47e39a 几米阳光

1

1 个父辈 215f7061
......@@ -47,9 +47,9 @@ namespace Asa.IOModule
private Thread tLogOut; //日志输出
private Thread tReconn; //断开重连
private const int SEND_SLEEP = 30; //发送命令间隔
private const int NET_SLEEP = 30; //接收网络间隔
private const int TRIG_SLEEP = 30; //触发事件间隔
private const int SEND_SLEEP = 15; //发送命令间隔
private const int NET_SLEEP = 15; //接收网络间隔
private const int TRIG_SLEEP = 20; //触发事件间隔
/// <summary>
/// 自动读取DI委托
......
......@@ -202,7 +202,7 @@ namespace OnlineStore.DeviceLibrary
{
if (!wait.IsEnd)
{
wait.IsEnd = AutomaticBaiting.BatchAxisIsEnd(wait);
wait.IsEnd = AutomaticBaiting.BatchAxisIsEnd(wait,span);
}
if (!wait.IsEnd)
{
......
......@@ -153,7 +153,7 @@ namespace OnlineStore.DeviceLibrary
else if (wait.WaitType == (int)Wait_Type.BatchAxisMove_10)
{
wait.IsEnd = BatchAxisIsEnd(wait);
wait.IsEnd = BatchAxisIsEnd(wait,span);
if (wait.IsEnd)
{
BatchAxisController.StopCheck();
......@@ -259,7 +259,7 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
/// <param name="wait"></param>
/// <returns></returns>
public static bool BatchAxisIsEnd(WaitResultInfo wait)
public static bool BatchAxisIsEnd(WaitResultInfo wait,TimeSpan startSpan)
{
bool result = false;
if (IOManager.IOValue(wait.IoType).Equals(IO_VALUE.HIGH))
......@@ -277,7 +277,7 @@ namespace OnlineStore.DeviceLibrary
LogUtil.debug(wait.ToStr() + " 停止运动");
ACServerManager.SuddenStop(wait.AxisInfo);
}
else
else if(startSpan.TotalSeconds>2)
{
TimeSpan span = DateTime.Now - AxisResetMoveTime;
if ((AutoBaitingStatus.Equals(StoreRunStatus.Busy)||AutoBaitingStatus.Equals(StoreRunStatus.Reset)) && span.TotalSeconds > 10)
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!