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

增加屏蔽吸嘴后不再回原功能

Browse Source
develop
lhiven 3 months ago
parent a9098f7a96
commit a9f1b93dda
3 changed files with 174 additions and 41 deletions
Show Stats Download Patch File Download Diff File

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

@ -507,14 +507,38 @@ namespace Rs.MotionPlat.Commom
public static bool AllZHomed()
{
if(AxisControl.NozzleZ1.HomeStatus!= EHomeStatus.Finished) return false;
if (AxisControl.NozzleZ2.HomeStatus != EHomeStatus.Finished) return false;
if (AxisControl.NozzleZ3.HomeStatus != EHomeStatus.Finished) return false;
if (AxisControl.NozzleZ4.HomeStatus != EHomeStatus.Finished) return false;
if (AxisControl.NozzleZ5.HomeStatus != EHomeStatus.Finished) return false;
if (AxisControl.NozzleZ6.HomeStatus != EHomeStatus.Finished) return false;
if (AxisControl.NozzleZ7.HomeStatus != EHomeStatus.Finished) return false;
if (AxisControl.NozzleZ8.HomeStatus != EHomeStatus.Finished) return false;
if(NozzleManager.GetNozzle(1).Enable)
{
if (AxisControl.NozzleZ1.HomeStatus != EHomeStatus.Finished) return false;
}
if (NozzleManager.GetNozzle(2).Enable)
{
if (AxisControl.NozzleZ2.HomeStatus != EHomeStatus.Finished) return false;
}
if (NozzleManager.GetNozzle(3).Enable)
{
if (AxisControl.NozzleZ3.HomeStatus != EHomeStatus.Finished) return false;
}
if (NozzleManager.GetNozzle(4).Enable)
{
if (AxisControl.NozzleZ4.HomeStatus != EHomeStatus.Finished) return false;
}
if (NozzleManager.GetNozzle(5).Enable)
{
if (AxisControl.NozzleZ5.HomeStatus != EHomeStatus.Finished) return false;
}
if (NozzleManager.GetNozzle(6).Enable)
{
if (AxisControl.NozzleZ6.HomeStatus != EHomeStatus.Finished) return false;
}
if (NozzleManager.GetNozzle(7).Enable)
{
if (AxisControl.NozzleZ7.HomeStatus != EHomeStatus.Finished) return false;
}
if (NozzleManager.GetNozzle(8).Enable)
{
if (AxisControl.NozzleZ8.HomeStatus != EHomeStatus.Finished) return false;
}
//if (AxisControl.NozzleZ9.HomeStatus != EHomeStatus.Finished) return false;
return true;
}
@ -549,14 +573,38 @@ namespace Rs.MotionPlat.Commom
public static bool AllRHomed()
{
if (AxisControl.NozzleR1.HomeStatus != EHomeStatus.Finished) return false;
if (AxisControl.NozzleR2.HomeStatus != EHomeStatus.Finished) return false;
if (AxisControl.NozzleR3.HomeStatus != EHomeStatus.Finished) return false;
if (AxisControl.NozzleR4.HomeStatus != EHomeStatus.Finished) return false;
if (AxisControl.NozzleR5.HomeStatus != EHomeStatus.Finished) return false;
if (AxisControl.NozzleR6.HomeStatus != EHomeStatus.Finished) return false;
if (AxisControl.NozzleR7.HomeStatus != EHomeStatus.Finished) return false;
if (AxisControl.NozzleR8.HomeStatus != EHomeStatus.Finished) return false;
if(NozzleManager.GetNozzle(1).Enable)
{
if (AxisControl.NozzleR1.HomeStatus != EHomeStatus.Finished) return false;
}
if (NozzleManager.GetNozzle(2).Enable)
{
if (AxisControl.NozzleR2.HomeStatus != EHomeStatus.Finished) return false;
}
if (NozzleManager.GetNozzle(3).Enable)
{
if (AxisControl.NozzleR3.HomeStatus != EHomeStatus.Finished) return false;
}
if (NozzleManager.GetNozzle(4).Enable)
{
if (AxisControl.NozzleR4.HomeStatus != EHomeStatus.Finished) return false;
}
if (NozzleManager.GetNozzle(5).Enable)
{
if (AxisControl.NozzleR5.HomeStatus != EHomeStatus.Finished) return false;
}
if (NozzleManager.GetNozzle(6).Enable)
{
if (AxisControl.NozzleR6.HomeStatus != EHomeStatus.Finished) return false;
}
if (NozzleManager.GetNozzle(7).Enable)
{
if (AxisControl.NozzleR7.HomeStatus != EHomeStatus.Finished) return false;
}
if (NozzleManager.GetNozzle(8).Enable)
{
if (AxisControl.NozzleR8.HomeStatus != EHomeStatus.Finished) return false;
}
//if (AxisControl.NozzleR9.HomeStatus != EHomeStatus.Finished) return false;
return true;
}

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

@ -80,14 +80,49 @@ namespace Rs.MotionPlat.Flow
AxisControl.GetAxis($"StockZ5").Home();
AxisControl.GetAxis($"StockZ6").Home();
AxisControl.GetAxis($"NozzleZ1").Home();
AxisControl.GetAxis($"NozzleZ2").Home();
AxisControl.GetAxis($"NozzleZ3").Home();
AxisControl.GetAxis($"NozzleZ4").Home();
AxisControl.GetAxis($"NozzleZ5").Home();
AxisControl.GetAxis($"NozzleZ6").Home();
AxisControl.GetAxis($"NozzleZ7").Home();
AxisControl.GetAxis($"NozzleZ8").Home();
if(NozzleManager.GetNozzle(1).Enable)
{
AxisControl.GetAxis($"NozzleZ1").Home();
}
if (NozzleManager.GetNozzle(2).Enable)
{
AxisControl.GetAxis($"NozzleZ2").Home();
}
if (NozzleManager.GetNozzle(3).Enable)
{
AxisControl.GetAxis($"NozzleZ3").Home();
}
if (NozzleManager.GetNozzle(4).Enable)
{
AxisControl.GetAxis($"NozzleZ4").Home();
}
if (NozzleManager.GetNozzle(5).Enable)
{
AxisControl.GetAxis($"NozzleZ5").Home();
}
if (NozzleManager.GetNozzle(6).Enable)
{
AxisControl.GetAxis($"NozzleZ6").Home();
}
if (NozzleManager.GetNozzle(7).Enable)
{
AxisControl.GetAxis($"NozzleZ7").Home();
}
if (NozzleManager.GetNozzle(8).Enable)
{
AxisControl.GetAxis($"NozzleZ8").Home();
}
//AxisControl.GetAxis($"NozzleZ9").Home();
//保压Z轴回原
AxisControl.PressZ.Home();
@ -146,14 +181,39 @@ namespace Rs.MotionPlat.Flow
// break;
case 2://XY回零
MessageQueue.Instance.Insert("x y r go home");
AxisControl.GetAxis($"NozzleR1").Home();
AxisControl.GetAxis($"NozzleR2").Home();
AxisControl.GetAxis($"NozzleR3").Home();
AxisControl.GetAxis($"NozzleR4").Home();
AxisControl.GetAxis($"NozzleR5").Home();
AxisControl.GetAxis($"NozzleR6").Home();
AxisControl.GetAxis($"NozzleR7").Home();
AxisControl.GetAxis($"NozzleR8").Home();
if(NozzleManager.GetNozzle(1).Enable)
{
AxisControl.GetAxis($"NozzleR1").Home();
}
if (NozzleManager.GetNozzle(2).Enable)
{
AxisControl.GetAxis($"NozzleR2").Home();
}
if (NozzleManager.GetNozzle(3).Enable)
{
AxisControl.GetAxis($"NozzleR3").Home();
}
if (NozzleManager.GetNozzle(4).Enable)
{
AxisControl.GetAxis($"NozzleR4").Home();
}
if (NozzleManager.GetNozzle(5).Enable)
{
AxisControl.GetAxis($"NozzleR5").Home();
}
if (NozzleManager.GetNozzle(6).Enable)
{
AxisControl.GetAxis($"NozzleR6").Home();
}
if (NozzleManager.GetNozzle(7).Enable)
{
AxisControl.GetAxis($"NozzleR7").Home();
}
if (NozzleManager.GetNozzle(8).Enable)
{
AxisControl.GetAxis($"NozzleR8").Home();
}
//AxisControl.GetAxis($"NozzleR9").Home();
AxisControl.LoadX.Home();
AxisControl.LoadY.Home();
@ -192,14 +252,39 @@ namespace Rs.MotionPlat.Flow
break;
case 4://go to start position
Thread.Sleep(200);
AxisControl.NozzleR1.MovePos(SysConfigParam.GetValue<double>("NozzleR1StartPos"), GlobalVar.WholeSpeed);
AxisControl.NozzleR2.MovePos(SysConfigParam.GetValue<double>("NozzleR2StartPos"), GlobalVar.WholeSpeed);
AxisControl.NozzleR3.MovePos(SysConfigParam.GetValue<double>("NozzleR3StartPos"), GlobalVar.WholeSpeed);
AxisControl.NozzleR4.MovePos(SysConfigParam.GetValue<double>("NozzleR4StartPos"), GlobalVar.WholeSpeed);
AxisControl.NozzleR5.MovePos(SysConfigParam.GetValue<double>("NozzleR5StartPos"), GlobalVar.WholeSpeed);
AxisControl.NozzleR6.MovePos(SysConfigParam.GetValue<double>("NozzleR6StartPos"), GlobalVar.WholeSpeed);
AxisControl.NozzleR7.MovePos(SysConfigParam.GetValue<double>("NozzleR7StartPos"), GlobalVar.WholeSpeed);
AxisControl.NozzleR8.MovePos(SysConfigParam.GetValue<double>("NozzleR8StartPos"), GlobalVar.WholeSpeed);
if(NozzleManager.GetNozzle(1).Enable)
{
AxisControl.NozzleR1.MovePos(SysConfigParam.GetValue<double>("NozzleR1StartPos"), GlobalVar.WholeSpeed);
}
if (NozzleManager.GetNozzle(2).Enable)
{
AxisControl.NozzleR2.MovePos(SysConfigParam.GetValue<double>("NozzleR2StartPos"), GlobalVar.WholeSpeed);
}
if (NozzleManager.GetNozzle(3).Enable)
{
AxisControl.NozzleR3.MovePos(SysConfigParam.GetValue<double>("NozzleR3StartPos"), GlobalVar.WholeSpeed);
}
if (NozzleManager.GetNozzle(4).Enable)
{
AxisControl.NozzleR4.MovePos(SysConfigParam.GetValue<double>("NozzleR4StartPos"), GlobalVar.WholeSpeed);
}
if (NozzleManager.GetNozzle(5).Enable)
{
AxisControl.NozzleR5.MovePos(SysConfigParam.GetValue<double>("NozzleR5StartPos"), GlobalVar.WholeSpeed);
}
if (NozzleManager.GetNozzle(6).Enable)
{
AxisControl.NozzleR6.MovePos(SysConfigParam.GetValue<double>("NozzleR6StartPos"), GlobalVar.WholeSpeed);
}
if (NozzleManager.GetNozzle(7).Enable)
{
AxisControl.NozzleR7.MovePos(SysConfigParam.GetValue<double>("NozzleR7StartPos"), GlobalVar.WholeSpeed);
}
if (NozzleManager.GetNozzle(8).Enable)
{
AxisControl.NozzleR8.MovePos(SysConfigParam.GetValue<double>("NozzleR8StartPos"), GlobalVar.WholeSpeed);
}
//AxisControl.NozzleR9.MovePos(SysConfigParam.GetValue<double>("NozzleR9StartPos"), GlobalVar.WholeSpeed);
AxisControl.LoadX.MovePos(SysConfigParam.GetValue<double>("LoadXStartPos"), GlobalVar.WholeSpeed);
AxisControl.LoadY.MovePos(SysConfigParam.GetValue<double>("LoadYStartPos"), GlobalVar.WholeSpeed);

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

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

Write Preview
Loading…
Cancel
Save