Skip to content

刘韬 / SO20242OutBound

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 43074bca 由 LN
选项

料架离开时bug修改

1 个父辈 e57b923e
内嵌 并排
正在显示 2 个修改的文件 包含 17 行增加 和 17 行删除
DeviceLibrary/theMachine/OutShelfBean.cs
...@@ -238,7 +238,7 @@ namespace DeviceLibrary ...@@ -238,7 +238,7 @@ namespace DeviceLibrary
AgvClient.SetToNone(agvId, agvName); AgvClient.SetToNone(agvId, agvName);
LineFRun(); LineFRun();
//等待后端料格检测 //等待后端料格检测
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(Shelf_Front_Check, IO_VALUE.HIGH)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(Shelf_Back_Check, IO_VALUE.HIGH));
} }
else if (IOManager.IOValue(Agv_Detect).Equals(IO_VALUE.HIGH)) else if (IOManager.IOValue(Agv_Detect).Equals(IO_VALUE.HIGH))
{ {
...@@ -249,7 +249,7 @@ namespace DeviceLibrary ...@@ -249,7 +249,7 @@ namespace DeviceLibrary
AgvClient.SetToNone(agvId, agvName); AgvClient.SetToNone(agvId, agvName);
LineFRun(); LineFRun();
//等待后端料格检测 //等待后端料格检测
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(Shelf_Front_Check, IO_VALUE.HIGH)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(Shelf_Back_Check, IO_VALUE.HIGH));
} }
else else
{ {
...@@ -280,11 +280,11 @@ namespace DeviceLibrary ...@@ -280,11 +280,11 @@ namespace DeviceLibrary
break; break;
case MoveStep.S02_LineFRun: case MoveStep.S02_LineFRun:
MoveInfo.NextMoveStep(MoveStep.S04_WaitTime); MoveInfo.NextMoveStep(MoveStep.S04_WaitTime);
MoveInfo.log("检测到料架前端信号，再转动1秒钟"); MoveInfo.log("检测到料架后端信号，再转动2秒钟");
LineFRun(); LineFRun();
//等待后端料格检测 //等待后端料格检测
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(Shelf_Front_Check, IO_VALUE.HIGH)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(Shelf_Back_Check, IO_VALUE.HIGH));
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
break; break;
case MoveStep.S04_WaitTime: case MoveStep.S04_WaitTime:
...@@ -483,9 +483,9 @@ namespace DeviceLibrary ...@@ -483,9 +483,9 @@ namespace DeviceLibrary
//出料口定位下降端, //出料口定位下降端,
private string Location_Down = "Location_Down"; private string Location_Down = "Location_Down";
//电机正传 //电机正传
private static string Moto_Fwd = "Moto_Fwd"; private string Moto_Fwd = "Moto_Fwd";
//电机反转 //电机反转
private static string Moto_Rwd = "Moto_Rwd"; private string Moto_Rwd = "Moto_Rwd";
private void LineFRun(MoveInfo move = null) private void LineFRun(MoveInfo move = null)
{ {
lineMove(IO_VALUE.LOW, IO_VALUE.HIGH, move); lineMove(IO_VALUE.LOW, IO_VALUE.HIGH, move);
......
DeviceLibrary/theMachine/OutShelfBean_AgvPro.cs
...@@ -136,23 +136,23 @@ namespace DeviceLibrary ...@@ -136,23 +136,23 @@ namespace DeviceLibrary
ProcessShelfOut = true; ProcessShelfOut = true;
LineRRun(); LineRRun();
bool result = WaitIo(Shelf_Front_Check, IO_VALUE.LOW, 60000); bool result = WaitIo(Shelf_Back_Check, IO_VALUE.LOW, 60000);
if (!result) if (!result)
{ {
LogUtil.info(logName + " 等待 " + Shelf_Front_Check + "=LOW超时，等待60000后停止线体转动，发送FinishLeave"); LogUtil.info(logName + " 等待 " + Shelf_Back_Check + "=LOW超时，等待60000后停止线体转动，发送FinishLeave");
} }
else else
{ {
LogUtil.info(logName + " 已收到" + Shelf_Front_Check + "=LOW ，等待60000后停止线体转动，发送FinishLeave"); LogUtil.info(logName + " 已收到" + Shelf_Back_Check + "=LOW ，等待60000后停止线体转动，发送FinishLeave");
} }
result = WaitIo(Shelf_Back_Check, IO_VALUE.LOW, 60000); result = WaitIo(Shelf_Front_Check, IO_VALUE.LOW, 60000);
if (!result) if (!result)
{ {
LogUtil.info(logName + " 等待 " + Shelf_Back_Check + "=LOW超时，等待60000后停止线体转动，发送FinishLeave"); LogUtil.info(logName + " 等待 " + Shelf_Front_Check + "=LOW超时，等待60000后停止线体转动，发送FinishLeave");
} }
else else
{ {
LogUtil.info(logName + " 已收到" + Shelf_Back_Check + "=LOW ，等待60000后停止线体转动，发送FinishLeave"); LogUtil.info(logName + " 已收到" + Shelf_Front_Check + "=LOW ，等待60000后停止线体转动，发送FinishLeave");
} }
Thread.Sleep(8000); Thread.Sleep(8000);
LineStopRun(); LineStopRun();
...@@ -198,13 +198,13 @@ namespace DeviceLibrary ...@@ -198,13 +198,13 @@ namespace DeviceLibrary
bool result = false; bool result = false;
//等待进料检测信号 //等待进料检测信号
result = WaitIo(Shelf_Back_Check, IO_VALUE.HIGH, 600000, logName + "等待" + Shelf_Back_Check + "信号"); result = WaitIo(Shelf_Front_Check, IO_VALUE.HIGH, 600000, logName + "等待" + Shelf_Front_Check + "信号");
LogUtil.info(logName + " 等待 " + Shelf_Back_Check + "=High 结果： " + result + "， 开始等待 " + Shelf_Front_Check + " 信号"); LogUtil.info(logName + " 等待 " + Shelf_Front_Check + "=High 结果： " + result + "， 开始等待 " + Shelf_Front_Check + " 信号");
result = WaitIo(Shelf_Front_Check, IO_VALUE.HIGH, 600000, logName + "等待" + Shelf_Front_Check + "信号"); result = WaitIo(Shelf_Back_Check, IO_VALUE.HIGH, 600000, logName + "等待" + Shelf_Back_Check + "信号");
LogUtil.info(logName + " 等待 " + Shelf_Front_Check + "=High 结果： " + result + "，开始等待 FinishEnter 超时10分钟"); LogUtil.info(logName + " 等待 " + Shelf_Back_Check + "=High 结果： " + result + "，开始等待 FinishEnter 超时10分钟");
try try
{ {
result = WaitUtil.Wait(600000, delegate () result = WaitUtil.Wait(600000, delegate ()
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!