Skip to content

孙克 / RC1250-AssemblyLine

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

agv更新

1 个父辈 390accaf
内嵌 并排
正在显示 9 个修改的文件 包含 53 行增加 和 26 行删除
dll/Client.dll
此文件类型无法预览
dll/Client.xml
......@@ -261,6 +261,16 @@
是否连接服务器
</summary>
</member>
<member name="P:Asa.Client2.CancelState">
<summary>
取消状态，true发送none，false发送实际状态
</summary>
</member>
<member name="P:Asa.Client2.SendLog">
<summary>
仅发送命令的代码日志
</summary>
</member>
<member name="M:Asa.Client2.Connect">
<summary>
连接
......
source/AssemblyLineClient/FrmLineStore.cs
......@@ -410,7 +410,12 @@ namespace OnlineStore.AssemblyLine
{
停止所有料仓TToolStripMenuItem_Click(null, null);
}
AgvClient.Dispose();
IOManager.instance.CloseAllDO();
IOManager.instance.CloseAllConnection();
}
private void btnClearLog_Click(object sender, EventArgs e)
{
LogUtil.ClearLog();
......
source/DeviceLibrary/agvClient/AgvClient.cs
......@@ -25,6 +25,7 @@ namespace OnlineStore.DeviceLibrary
{
isInit = true;
agvClient = new Asa.Client2(ServerIp);
agvClient.CancelState = true;
agvClient.Log += AgvClient_Log;
agvClient.Arrive += AgvClient_Arrive;
agvClient.Ready += AgvClient_Ready;
......@@ -58,7 +59,10 @@ namespace OnlineStore.DeviceLibrary
}
}
public static void SetCancelState(bool isCancel)
{
agvClient.CancelState = isCancel;
}
public static void SetStatus(string id, string shelfId = "", ClientAction action = ClientAction.None, ClientLevel level = ClientLevel.Low)
{
ClientAction currA = GetAction(id);
......
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
......@@ -90,10 +90,11 @@ namespace OnlineStore.DeviceLibrary
{
SecondMoveInfo.NewMove(LineMoveType.CheckFixture, CheckParam);
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_00_Stop1Down);
CheckLog("检测到SW_StopCheck：" + SecondMoveInfo.SLog + "阻挡气缸下降 ，等待" + TrayManager.StopDownWaitTime);
CheckLog("检测到SW_StopCheck：" + SecondMoveInfo.SLog + "阻挡气缸下降 ，等待 SW_StopCheck=0" );
IOMove(IO_Type.SW_StopDown, IO_VALUE.HIGH);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.StopDownWaitTime));
// SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.StopDownWaitTime));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW_StopDown, IO_VALUE.HIGH));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW_StopCheck, IO_VALUE.LOW));
lastStopDown = DateTime.Now;
//IOMove(IO_Type.SW_StopDown, IO_VALUE.HIGH, TrayManager.StopDownWaitTime);
}
......@@ -124,10 +125,11 @@ namespace OnlineStore.DeviceLibrary
//托盘在第一个阻挡处
SecondMoveInfo.NewMove(LineMoveType.CheckFixture);
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_00_Stop1Down);
CheckLog(" 检测到FL_StopCheck：" + SecondMoveInfo.SLog + " FL阻挡1下降 ，等待 "+ TrayManager.StopDownWaitTime);
CheckLog(" 检测到FL_StopCheck：" + SecondMoveInfo.SLog + " FL阻挡1下降 ，等待 FL_StopCheck=0");
IOMove(IO_Type.FL_StopCylinder_Down1, IO_VALUE.HIGH);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.FL_StopCylinder_Down1, IO_VALUE.HIGH));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.StopDownWaitTime));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.FL_StopCheck, IO_VALUE.LOW));
/// SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.StopDownWaitTime));
}
}
else
......
source/DeviceLibrary/assemblyLine/LineBean.cs
......@@ -179,6 +179,8 @@ namespace OnlineStore.DeviceLibrary
mainTimer.Enabled = true;
IoCheckTimer.Enabled = true;
canStart = true;
AgvClient.Init();
});
}
......@@ -265,11 +267,12 @@ namespace OnlineStore.DeviceLibrary
Thread.Sleep(5);
//连接AGV调度
if (!AgvClient.ISConnected())
{
AgvClient.Init();
}
////连接AGV调度
//if (!AgvClient.ISConnected())
//{
//}
AgvClient.SetCancelState(false);
LineServer.StartServer(ConfigAppSettings.GetIntValue(Setting_Init.TCPServerPort));
......@@ -406,7 +409,7 @@ namespace OnlineStore.DeviceLibrary
IoCheckTimer.Enabled = false;
mainTimer.Enabled = false;
ledProcessTimer.Enabled = false;
AgvClient.SetCancelState(true);
WriteDrivetMotorRun(IO_VALUE.LOW);
//停止运行时，把阻挡气缸上升
StopMove();
......
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
......@@ -490,9 +490,10 @@ namespace OnlineStore.DeviceLibrary
if (SW41_MoveInfo.MoveStep.Equals(LineMoveStep.SW00_Wait))
{
SW41_MoveInfo.NextMoveStep(LineMoveStep.SW01_StopDown);
SWLog("横移轨道41： 阻挡气缸下降 等待 " + TrayManager.StopDownWaitTime);
SWLog("横移轨道41： 阻挡气缸下降 等待 SW4_StopCheck=0" );
IOMove(IO_Type.SW4_StopDown, IO_VALUE.HIGH);
SW41_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.StopDownWaitTime));
SW41_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW4_StopCheck, IO_VALUE.LOW));
//SW41_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.StopDownWaitTime));
}
else if (SW41_MoveInfo.MoveStep.Equals(LineMoveStep.SW01_StopDown))
{
......@@ -507,7 +508,7 @@ namespace OnlineStore.DeviceLibrary
SW41_MoveInfo.NextMoveStep(LineMoveStep.SW03_WaitTime);
SWLog("横移轨道41： 等待横移4托盘检测信号 , SW012_WaitTime " + TrayManager.SwTrayWaitTime);
CheckAndMove(IO_Type.SW4_StopDown, IO_VALUE.LOW);
SW41_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.SwTrayWaitTime));
// SW41_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.SwTrayWaitTime));
SW41_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW4_TrayCheck, IO_VALUE.HIGH));
}
else if (SW41_MoveInfo.MoveStep.Equals(LineMoveStep.SW03_WaitTime))
......@@ -518,14 +519,14 @@ namespace OnlineStore.DeviceLibrary
SWLog("横移轨道41： 等待横移4托盘检测信号 ,SW4_StopDown上升 ");
CheckAndMove(IO_Type.SW4_StopDown, IO_VALUE.LOW);
SW41_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW4_TrayCheck, IO_VALUE.HIGH));
SW41_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.SwTrayWaitTime));
// SW41_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.SwTrayWaitTime));
}
else
{
SW41_MoveInfo.NextMoveStep(LineMoveStep.SW03_WaitTime);
SWLog("横移轨道41： 等待横移4托盘检测信号 , SW012_WaitTime " + TrayManager.SwTrayWaitTime);
CheckAndMove(IO_Type.SW4_StopDown, IO_VALUE.LOW);
SW41_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.SwTrayWaitTime));
// SW41_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.SwTrayWaitTime));
SW41_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW4_TrayCheck, IO_VALUE.HIGH));
}
}
......@@ -646,9 +647,10 @@ namespace OnlineStore.DeviceLibrary
if (SW23_MoveInfo.MoveStep.Equals(LineMoveStep.SW00_Wait))
{
SW23_MoveInfo.NextMoveStep(LineMoveStep.SW01_StopDown);
SWLog("横移轨道23：阻挡气缸下降 等待 " + TrayManager.StopDownWaitTime);
SWLog("横移轨道23：阻挡气缸下降 等待 SW2_StopCheck=0 " );
IOMove(IO_Type.SW2_StopDown, IO_VALUE.HIGH);
SW23_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.StopDownWaitTime));
SW23_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW2_StopCheck, IO_VALUE.LOW));
// SW23_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.StopDownWaitTime));
}
else if (SW23_MoveInfo.MoveStep.Equals(LineMoveStep.SW01_StopDown))
{
......@@ -663,7 +665,7 @@ namespace OnlineStore.DeviceLibrary
SW23_MoveInfo.NextMoveStep(LineMoveStep.SW03_WaitTime);
SWLog("横移轨道23： 等待横移4托盘检测信号 , SW012_WaitTime " + TrayManager.SwTrayWaitTime);
CheckAndMove(IO_Type.SW2_StopDown, IO_VALUE.LOW);
SW23_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.SwTrayWaitTime));
// SW23_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.SwTrayWaitTime));
SW23_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW2_TrayCheck, IO_VALUE.HIGH));
}
else if (SW23_MoveInfo.MoveStep.Equals(LineMoveStep.SW03_WaitTime))
......@@ -674,14 +676,14 @@ namespace OnlineStore.DeviceLibrary
SWLog("横移轨道23： 等待横移4托盘检测信号 ,SW2_StopDown上升 ");
CheckAndMove(IO_Type.SW2_StopDown, IO_VALUE.LOW);
SW23_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW2_TrayCheck, IO_VALUE.HIGH));
SW23_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.SwTrayWaitTime));
// SW23_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.SwTrayWaitTime));
}
else
{
SW23_MoveInfo.NextMoveStep(LineMoveStep.SW03_WaitTime);
SWLog("横移轨道23： 等待横移4托盘检测信号 , SW012_WaitTime " + TrayManager.SwTrayWaitTime);
CheckAndMove(IO_Type.SW2_StopDown, IO_VALUE.LOW);
SW23_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.SwTrayWaitTime));
// SW23_MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.SwTrayWaitTime));
SW23_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SW2_TrayCheck, IO_VALUE.HIGH));
}
}
......
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
......@@ -428,11 +428,11 @@ namespace OnlineStore.DeviceLibrary
//托盘在第一个阻挡处
SecondMoveInfo.NewMove(LineMoveType.CheckFixture);
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_00_Stop1Down);
CheckLog(" 托盘检测：料盘检测StopCylinder_Check1 " + SecondMoveInfo.SLog + "阻挡气缸1-1下降 ， 等待 "+TrayManager.StopDownWaitTime);
CheckLog(" 托盘检测：料盘检测StopCylinder_Check1 " + SecondMoveInfo.SLog + "阻挡气缸1-1下降 ， 等待 StopCylinder_Check1=0" );
IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.HIGH);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down1, IO_VALUE.HIGH));
// SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Fixture_Check_4, IO_VALUE.HIGH));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.StopDownWaitTime));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check1, IO_VALUE.LOW));
// SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.StopDownWaitTime));
}
}
protected override void CheckFixtureProcess()
......
source/DeviceLibrary/assemblyLine/ProvidingEquip_Partial.cs
......@@ -54,10 +54,11 @@ namespace OnlineStore.DeviceLibrary
//托盘在第一个阻挡处
SecondMoveInfo.NewMove(LineMoveType.CheckFixture);
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_00_Stop1Down);
CheckLog(" 托盘检测：" + SecondMoveInfo.SLog + "阻挡气缸1-1下降 ，最多等待" + TrayManager.StopDownWaitTime);
CheckLog(" 托盘检测：" + SecondMoveInfo.SLog + "阻挡气缸1-1下降 ，等待 StopCylinder_Check1=0" );
IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.HIGH);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down1, IO_VALUE.HIGH));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.StopDownWaitTime));
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check1, IO_VALUE.LOW));
// SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(TrayManager.StopDownWaitTime));
}
}
else
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!