diff --git a/Rs.SkyLine/Flow/HomeFlow.cs b/Rs.SkyLine/Flow/HomeFlow.cs index a56ed46..23e77eb 100644 --- a/Rs.SkyLine/Flow/HomeFlow.cs +++ b/Rs.SkyLine/Flow/HomeFlow.cs @@ -1,5 +1,6 @@ using Rs.Controls; using Rs.Framework; +using Rs.Motion.Base; using Rs.MotionPlat.Commom; using System; using System.Collections.Generic; @@ -168,17 +169,17 @@ namespace Rs.MotionPlat.Flow break; case 6://go to start position Thread.Sleep(200); - AxisControl.NozzleR1.MovePos(SysConfigParam.GetValue("NozzleR1StartPos"), 4); - AxisControl.NozzleR2.MovePos(SysConfigParam.GetValue("NozzleR2StartPos"), 4); - AxisControl.NozzleR3.MovePos(SysConfigParam.GetValue("NozzleR3StartPos"), 4); - AxisControl.NozzleR4.MovePos(SysConfigParam.GetValue("NozzleR4StartPos"), 4); - AxisControl.NozzleR5.MovePos(SysConfigParam.GetValue("NozzleR5StartPos"), 4); - AxisControl.NozzleR6.MovePos(SysConfigParam.GetValue("NozzleR6StartPos"), 4); - AxisControl.NozzleR7.MovePos(SysConfigParam.GetValue("NozzleR7StartPos"), 4); - AxisControl.NozzleR8.MovePos(SysConfigParam.GetValue("NozzleR8StartPos"), 4); - AxisControl.NozzleR9.MovePos(SysConfigParam.GetValue("NozzleR9StartPos"), 4); - AxisControl.LoadX.MovePos(SysConfigParam.GetValue("LoadXStartPos"), 4); - AxisControl.LoadY.MovePos(SysConfigParam.GetValue("LoadYStartPos"), 4); + AxisControl.NozzleR1.MovePos(SysConfigParam.GetValue("NozzleR1StartPos"), GlobalVar.WholeSpeed); + AxisControl.NozzleR2.MovePos(SysConfigParam.GetValue("NozzleR2StartPos"), GlobalVar.WholeSpeed); + AxisControl.NozzleR3.MovePos(SysConfigParam.GetValue("NozzleR3StartPos"), GlobalVar.WholeSpeed); + AxisControl.NozzleR4.MovePos(SysConfigParam.GetValue("NozzleR4StartPos"), GlobalVar.WholeSpeed); + AxisControl.NozzleR5.MovePos(SysConfigParam.GetValue("NozzleR5StartPos"), GlobalVar.WholeSpeed); + AxisControl.NozzleR6.MovePos(SysConfigParam.GetValue("NozzleR6StartPos"), GlobalVar.WholeSpeed); + AxisControl.NozzleR7.MovePos(SysConfigParam.GetValue("NozzleR7StartPos"), GlobalVar.WholeSpeed); + AxisControl.NozzleR8.MovePos(SysConfigParam.GetValue("NozzleR8StartPos"), GlobalVar.WholeSpeed); + AxisControl.NozzleR9.MovePos(SysConfigParam.GetValue("NozzleR9StartPos"), GlobalVar.WholeSpeed); + AxisControl.LoadX.MovePos(SysConfigParam.GetValue("LoadXStartPos"), GlobalVar.WholeSpeed); + AxisControl.LoadY.MovePos(SysConfigParam.GetValue("LoadYStartPos"), GlobalVar.WholeSpeed); homeStep++; break; case 7: @@ -197,5 +198,19 @@ namespace Rs.MotionPlat.Flow } }); } + + private string CheckCanHome() + { + List list = new List(); + foreach(IAxis axis in AxisControl.GetAllAxis()) + { + axis.GetAlarmStatus(out bool bAlarm); + if(bAlarm) + { + list.Add(axis.Config.AxisName); + } + } + return string.Join(",", list); + } } }