Commit 47649dac 几米阳光

日志修改

1 个父辈 5a11e644
...@@ -97,7 +97,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -97,7 +97,7 @@ namespace OnlineStore.DeviceLibrary
TimeSpan span = DateTime.Now - StoreMove.LastSetpTime; TimeSpan span = DateTime.Now - StoreMove.LastSetpTime;
if (span.TotalMinutes > 5) if (span.TotalMinutes > 5)
{ {
WarnMsg = StoreName + "等待超时【" + StoreMove.MoveType + "】【" + StoreMove.MoveStep + "】已等待【" + span.TotalMinutes + "】分钟,"; WarnMsg = StoreName + "等待超时【" + StoreMove.MoveType + "】【" + StoreMove.MoveStep + "】已等待【" +Math.Round( span.TotalMinutes )+ "】分钟,";
foreach (WaitResultInfo wait in list) foreach (WaitResultInfo wait in list)
{ {
WarnMsg = WarnMsg + "\r\n" + wait.ToStr(); WarnMsg = WarnMsg + "\r\n" + wait.ToStr();
......
...@@ -234,11 +234,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -234,11 +234,11 @@ namespace OnlineStore.DeviceLibrary
{ {
if (IsHomeMove) if (IsHomeMove)
{ {
return "轴【" + AxisInfo.ToString() + "】原点返回"; return "轴【" + AxisInfo.DisplayStr + "】原点返回";
} }
else else
{ {
return "轴【" + AxisInfo.ToString() + "】绝对运动,目标位置【" + TargetPosition + "】"; return "轴【" + AxisInfo.DisplayStr + "】绝对运动,目标位置【" + TargetPosition + "】";
} }
} }
else if (WaitType == 2) else if (WaitType == 2)
...@@ -259,7 +259,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -259,7 +259,7 @@ namespace OnlineStore.DeviceLibrary
} }
else if (WaitType == 6) else if (WaitType == 6)
{ {
return "轴【" + AxisInfo.ToString() + "】ORG信号:【" + IoValue + "】 "; return "轴【" + AxisInfo.DisplayStr + "】ORG信号:【" + IoValue + "】 ";
} }
{ {
return "Wait位置类型:WaitType=【" + WaitType + "】"; return "Wait位置类型:WaitType=【" + WaitType + "】";
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!