lhiven
/
Rs.SkyLine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

屏蔽吸嘴不再回原，向上偏移固定的距离

Browse Source
develop
lhiven 2 months ago
parent a541dc84b9
commit ea0c69e82f
3 changed files with 50 additions and 3 deletions
Show Stats Download Patch File Download Diff File

1
Rs.SkyLine/Commom/Ops.cs
Unescape Escape View File

@ -505,6 +505,7 @@ namespace Rs.MotionPlat.Commom
HikCamera.Instance.Deinit();
}
public static bool AllZHomed()
{
if(NozzleManager.GetNozzle(1).Enable)

50
Rs.SkyLine/Flow/HomeFlow.cs
Unescape Escape View File

@ -43,6 +43,7 @@ namespace Rs.MotionPlat.Flow
homeStep = 0;
m_bHomed = false;
m_bCancle = false;
double dist = 22.0;
Task.Run(() =>
{
while (!m_bCancle && !m_bHomed)
@ -84,42 +85,87 @@ namespace Rs.MotionPlat.Flow
{
AxisControl.GetAxis($"NozzleZ1").Home();
}
else
{
AxisControl.GetAxis($"NozzleZ1").HomeStatus = Motion.EHomeStatus.Finished;
AxisControl.GetAxis($"NozzleZ1").MoveOffset(dist, 5);
}
if (NozzleManager.GetNozzle(2).Enable)
{
AxisControl.GetAxis($"NozzleZ2").Home();
}
else
{
AxisControl.GetAxis($"NozzleZ2").HomeStatus = Motion.EHomeStatus.Finished;
AxisControl.GetAxis($"NozzleZ2").MoveOffset(dist, 5);
}
if (NozzleManager.GetNozzle(3).Enable)
{
AxisControl.GetAxis($"NozzleZ3").Home();
}
else
{
AxisControl.GetAxis($"NozzleZ3").HomeStatus = Motion.EHomeStatus.Finished;
AxisControl.GetAxis($"NozzleZ3").MoveOffset(dist, 5);
}
if (NozzleManager.GetNozzle(4).Enable)
{
AxisControl.GetAxis($"NozzleZ4").Home();
}
else
{
AxisControl.GetAxis($"NozzleZ4").HomeStatus = Motion.EHomeStatus.Finished;
AxisControl.GetAxis($"NozzleZ4").MoveOffset(dist, 5);
}
if (NozzleManager.GetNozzle(5).Enable)
{
AxisControl.GetAxis($"NozzleZ5").Home();
}
else
{
AxisControl.GetAxis($"NozzleZ5").HomeStatus = Motion.EHomeStatus.Finished;
AxisControl.GetAxis($"NozzleZ5").MoveOffset(dist, 5);
}
if (NozzleManager.GetNozzle(6).Enable)
{
AxisControl.GetAxis($"NozzleZ6").Home();
}
else
{
AxisControl.GetAxis($"NozzleZ6").HomeStatus = Motion.EHomeStatus.Finished;
AxisControl.GetAxis($"NozzleZ6").MoveOffset(dist, 5);
}
if (NozzleManager.GetNozzle(7).Enable)
{
AxisControl.GetAxis($"NozzleZ7").Home();
}
else
{
AxisControl.GetAxis($"NozzleZ7").HomeStatus = Motion.EHomeStatus.Finished;
AxisControl.GetAxis($"NozzleZ7").MoveOffset(dist, 5);
}
if (NozzleManager.GetNozzle(8).Enable)
{
AxisControl.GetAxis($"NozzleZ8").Home();
}
else
{
AxisControl.GetAxis($"NozzleZ8").HomeStatus = Motion.EHomeStatus.Finished;
AxisControl.GetAxis($"NozzleZ8").MoveOffset(dist, 5);
}
@ -134,7 +180,7 @@ namespace Rs.MotionPlat.Flow
case 1://等待所有Z轴回原完成
if (homeTime.ElapsedMilliseconds < 1000 * 60 * 2)//5分钟还未回零成功，则返回回零超时
{
if (Ops.AllZHomed() && Ops.IsHomed("StockZ1", "StockZ2", "StockZ3", "StockZ4", "StockZ5", "StockZ6", "PressZ", "TurnoverZ"))
if (Ops.AllZStoped() && Ops.AllZHomed() && Ops.IsHomed("StockZ1", "StockZ2", "StockZ3", "StockZ4", "StockZ5", "StockZ6", "PressZ", "TurnoverZ"))
{
MessageQueue.Instance.Insert("Z axis home finished!");
homeStep++;

2
Rs.SkyLine/Properties/AssemblyInfo.cs
Unescape Escape View File

@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
//
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
[assembly: AssemblyVersion("20.25.06.01")]
[assembly: AssemblyVersion("20.25.07.01")]
//[assembly: AssemblyVersion("1.0.0.0")]
//[assembly: AssemblyFileVersion("1.0.0.0")]

Write Preview
Loading…
Cancel
Save