From a9f1b93ddaf19921b11044b9c8f600f652bc858e Mon Sep 17 00:00:00 2001 From: lhiven Date: Mon, 10 Mar 2025 07:51:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B1=8F=E8=94=BD=E5=90=B8?= =?UTF-8?q?=E5=98=B4=E5=90=8E=E4=B8=8D=E5=86=8D=E5=9B=9E=E5=8E=9F=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.SkyLine/Commom/Ops.cs | 80 ++++++++++++---- Rs.SkyLine/Flow/HomeFlow.cs | 133 +++++++++++++++++++++----- Rs.SkyLine/Properties/AssemblyInfo.cs | 2 +- 3 files changed, 174 insertions(+), 41 deletions(-) diff --git a/Rs.SkyLine/Commom/Ops.cs b/Rs.SkyLine/Commom/Ops.cs index b4debff..67bc5e1 100644 --- a/Rs.SkyLine/Commom/Ops.cs +++ b/Rs.SkyLine/Commom/Ops.cs @@ -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; } diff --git a/Rs.SkyLine/Flow/HomeFlow.cs b/Rs.SkyLine/Flow/HomeFlow.cs index a939f14..3343404 100644 --- a/Rs.SkyLine/Flow/HomeFlow.cs +++ b/Rs.SkyLine/Flow/HomeFlow.cs @@ -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("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); + if(NozzleManager.GetNozzle(1).Enable) + { + AxisControl.NozzleR1.MovePos(SysConfigParam.GetValue("NozzleR1StartPos"), GlobalVar.WholeSpeed); + } + if (NozzleManager.GetNozzle(2).Enable) + { + AxisControl.NozzleR2.MovePos(SysConfigParam.GetValue("NozzleR2StartPos"), GlobalVar.WholeSpeed); + } + if (NozzleManager.GetNozzle(3).Enable) + { + AxisControl.NozzleR3.MovePos(SysConfigParam.GetValue("NozzleR3StartPos"), GlobalVar.WholeSpeed); + } + if (NozzleManager.GetNozzle(4).Enable) + { + AxisControl.NozzleR4.MovePos(SysConfigParam.GetValue("NozzleR4StartPos"), GlobalVar.WholeSpeed); + } + if (NozzleManager.GetNozzle(5).Enable) + { + AxisControl.NozzleR5.MovePos(SysConfigParam.GetValue("NozzleR5StartPos"), GlobalVar.WholeSpeed); + } + if (NozzleManager.GetNozzle(6).Enable) + { + AxisControl.NozzleR6.MovePos(SysConfigParam.GetValue("NozzleR6StartPos"), GlobalVar.WholeSpeed); + } + if (NozzleManager.GetNozzle(7).Enable) + { + AxisControl.NozzleR7.MovePos(SysConfigParam.GetValue("NozzleR7StartPos"), GlobalVar.WholeSpeed); + } + if (NozzleManager.GetNozzle(8).Enable) + { + 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); diff --git a/Rs.SkyLine/Properties/AssemblyInfo.cs b/Rs.SkyLine/Properties/AssemblyInfo.cs index c70cb85..bc8eab2 100644 --- a/Rs.SkyLine/Properties/AssemblyInfo.cs +++ b/Rs.SkyLine/Properties/AssemblyInfo.cs @@ -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")]