Commit ffef7a5f 张东亮

X30忽略按钮未及时消失

1 个父辈 9f0e7f5b
...@@ -386,6 +386,7 @@ namespace DeviceLibrary ...@@ -386,6 +386,7 @@ namespace DeviceLibrary
break; break;
case MoveStep.StoreTS16: case MoveStep.StoreTS16:
MoveInfo.NextMoveStep(MoveStep.StoreTS17); MoveInfo.NextMoveStep(MoveStep.StoreTS17);
Msg.add("", MsgLevel.info, ErrInfo.X09_Clear);
if (From.posid != BoxStorePosition.strings && From.posid != BoxStorePosition.ngdoor if (From.posid != BoxStorePosition.strings && From.posid != BoxStorePosition.ngdoor
&& To.posid != BoxStorePosition.strings && To.posid != BoxStorePosition.ngdoor && To.posid != BoxStorePosition.strings && To.posid != BoxStorePosition.ngdoor
) )
...@@ -393,7 +394,7 @@ namespace DeviceLibrary ...@@ -393,7 +394,7 @@ namespace DeviceLibrary
MoveInfo.log($"{storeMoveType}:库位测试模式,上下轴,旋转不返回待机点"); MoveInfo.log($"{storeMoveType}:库位测试模式,上下轴,旋转不返回待机点");
break; break;
} }
if(RobotManage.InoutDebugMode) if (RobotManage.InoutDebugMode)
{ {
MoveInfo.log($"{storeMoveType}:库位测试模式,上下轴,旋转不返回待机点"); MoveInfo.log($"{storeMoveType}:库位测试模式,上下轴,旋转不返回待机点");
break; break;
......
...@@ -392,14 +392,15 @@ namespace TheMachine ...@@ -392,14 +392,15 @@ namespace TheMachine
listView1.Items.Add(lvi); listView1.Items.Add(lvi);
if (msg.errInfo == ErrInfo.X09_BoxNotDetect) if (msg.errInfo == ErrInfo.X09_BoxNotDetect)
{ {
if (btn_IgnoreX09.Visible) continue;
btn_IgnoreX09.Invoke(new Action(() => btn_IgnoreX09.Invoke(new Action(() =>
{ {
btn_IgnoreX09.Visible = true; btn_IgnoreX09.Visible = true;
})); }));
} }
else if (msg.errInfo == ErrInfo.X09_Clear) else if (msg.errInfo == ErrInfo.X09_Clear)
{ {
if (!btn_IgnoreX09.Visible) continue;
btn_IgnoreX09.Invoke(new Action(() => btn_IgnoreX09.Invoke(new Action(() =>
{ {
btn_IgnoreX09.Visible = false; btn_IgnoreX09.Visible = false;
...@@ -409,7 +410,7 @@ namespace TheMachine ...@@ -409,7 +410,7 @@ namespace TheMachine
{ {
Task.Run(() => Task.Run(() =>
{ {
Task.Delay(2000).Wait(); Task.Delay(1000).Wait();
if (!RobotManage.isRunning) if (!RobotManage.isRunning)
btn_run_Click(this, EventArgs.Empty); btn_run_Click(this, EventArgs.Empty);
}); });
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!