From 6323d1b04765c4486405ab432d1fa725dabc2fa8 Mon Sep 17 00:00:00 2001 From: lhiven Date: Fri, 10 Jan 2025 15:57:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8TurnoverX=E5=92=8CTurnoverY=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E8=BD=B4=E6=98=AF=E5=90=A6=E5=88=B0=E4=BD=8D=E5=A4=84?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8D=95=E8=8E=B7=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.SkyLine/Flow/Common/AxisArrived.cs | 21 +++++++++++++++------ Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs | 4 ++-- Rs.SkyLine/Properties/AssemblyInfo.cs | 2 +- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Rs.SkyLine/Flow/Common/AxisArrived.cs b/Rs.SkyLine/Flow/Common/AxisArrived.cs index 4367243..5de8af3 100644 --- a/Rs.SkyLine/Flow/Common/AxisArrived.cs +++ b/Rs.SkyLine/Flow/Common/AxisArrived.cs @@ -50,14 +50,23 @@ namespace Rs.MotionPlat.Flow.Common timer.Start(); while (timer.ElapsedMilliseconds < 3000) { - double xCurPos = Ops.GetCurPosition(AxisControl.TurnoverX); - double yCurPos = Ops.GetCurPosition(AxisControl.TurnoverY); - if ((Math.Abs(xTargetPos - xCurPos) < AxisControl.TurnoverX.Config.Tolerance - && Math.Abs(yTargetPos - yCurPos) < AxisControl.TurnoverY.Config.Tolerance) || GlobalVar.VirtualAxis) + try { - timer.Stop(); - return true; + double xCurPos = Ops.GetCurPosition(AxisControl.TurnoverX); + double yCurPos = Ops.GetCurPosition(AxisControl.TurnoverY); + if ((Math.Abs(xTargetPos - xCurPos) < AxisControl.TurnoverX.Config.Tolerance + && Math.Abs(yTargetPos - yCurPos) < AxisControl.TurnoverY.Config.Tolerance) || GlobalVar.VirtualAxis) + { + timer.Stop(); + return true; + } + } + catch (Exception ex) + { + LogHelper.Debug($"Fun:TurnoverXYIsInTargetPos {ex.Message}"); + return false; } + } timer.Stop(); return false; diff --git a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs index 26b0398..736d07d 100644 --- a/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs +++ b/Rs.SkyLine/Flow/NormalFlow/TurnoverFlow.cs @@ -1593,10 +1593,10 @@ namespace Rs.MotionPlat.Flow if (AxisArrived.TurnoverXYIsInTargetPos(targetTurnoverX, targetTurnoverY)) { ActionEnd("到治具保压位上方"); + logInfo = GetClassName() + $"已运动到测试保压位上方,cx:{Ops.GetCurPosition(AxisControl.TurnoverX)},cy:{Ops.GetCurPosition(AxisControl.TurnoverY)}"; + MessageQueue.Instance.Insert(logInfo); if (TestTrayManager.Instance.GetSlots(ETestTraySlotStatus.Have).Count > 0) { - logInfo = GetClassName() + $"已运动到测试保压位上方,cx:{Ops.GetCurPosition(AxisControl.TurnoverX)},cy:{Ops.GetCurPosition(AxisControl.TurnoverY)}"; - MessageQueue.Instance.Insert(logInfo); Step = ETurnoverFlowStep.到测试保压位下方1; } else diff --git a/Rs.SkyLine/Properties/AssemblyInfo.cs b/Rs.SkyLine/Properties/AssemblyInfo.cs index f588737..1703005 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.24.61")] + [assembly: AssemblyVersion("3.20.25.01")] //[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")]