From a4a43d0c9fabb83431ff5547102ae311fcc4af06 Mon Sep 17 00:00:00 2001 From: lhiven <236881222@qq.com> Date: Tue, 12 Mar 2024 17:36:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89Nozzle9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.SkyLine/Commom/VacManager.cs | 32 ++++++++++++++++---------------- Rs.SkyLine/Flow/SafeControl.cs | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Rs.SkyLine/Commom/VacManager.cs b/Rs.SkyLine/Commom/VacManager.cs index 30768f8..89babf7 100644 --- a/Rs.SkyLine/Commom/VacManager.cs +++ b/Rs.SkyLine/Commom/VacManager.cs @@ -58,13 +58,13 @@ namespace Rs.MotionPlat.Commom { if (needSleep) Thread.Sleep(GlobalVar.LoadNozzleOpenVacSuctionDelaytime); - MessageQueue.Instance.Insert(callerName+$"_打开排料{string.Join(",", indexes)}号吸嘴真空吸"); + MessageQueue.Instance.Insert(callerName+$"-打开排料{string.Join(",", indexes)}号吸嘴真空吸"); } else { if (needSleep) Thread.Sleep(GlobalVar.LoadNozzleCloseVacSuctionDelaytime); - MessageQueue.Instance.Insert(callerName + $"_关闭排料{string.Join(",", indexes)}号吸嘴真空吸"); + MessageQueue.Instance.Insert(callerName + $"-关闭排料{string.Join(",", indexes)}号吸嘴真空吸"); } } } @@ -97,13 +97,13 @@ namespace Rs.MotionPlat.Commom { if (needSleep) Thread.Sleep(GlobalVar.LoadNozzleOpenVacBreakDelaytime); - MessageQueue.Instance.Insert(callerName + $"_打开排料{string.Join(",", indexes)}号吸嘴真空破"); + MessageQueue.Instance.Insert(callerName + $"-打开排料{string.Join(",", indexes)}号吸嘴真空破"); } else { if (needSleep) Thread.Sleep(GlobalVar.LoadNozzleCloseVacBreakDelaytime); - MessageQueue.Instance.Insert(callerName + $"_关闭排料{string.Join(",", indexes)}号吸嘴真空破"); + MessageQueue.Instance.Insert(callerName + $"-关闭排料{string.Join(",", indexes)}号吸嘴真空破"); } } } @@ -136,13 +136,13 @@ namespace Rs.MotionPlat.Commom { if(NeedSleep) Thread.Sleep(GlobalVar.TurnoverTrayOpenVacSuctionDelaytime); - MessageQueue.Instance.Insert(callerName + $"_打开周转盘{string.Join(",", indexes)}号穴位真空吸"); + MessageQueue.Instance.Insert(callerName + $"-打开周转盘{string.Join(",", indexes)}号穴位真空吸"); } else { if(NeedSleep) Thread.Sleep(GlobalVar.TurnoverTrayCloseVacSuctionDelaytime); - MessageQueue.Instance.Insert(callerName + $"_关闭周转盘{string.Join(",", indexes)}号穴位真空吸"); + MessageQueue.Instance.Insert(callerName + $"-关闭周转盘{string.Join(",", indexes)}号穴位真空吸"); } } } @@ -175,13 +175,13 @@ namespace Rs.MotionPlat.Commom { if (bNeedSleep) Thread.Sleep(GlobalVar.TurnoverTrayOpenVacBreakDelaytime); - MessageQueue.Instance.Insert(callerName+$"_打开周转盘{indexes.ToJoinString()}号穴位真空破"); + MessageQueue.Instance.Insert(callerName+$"-打开周转盘{indexes.ToJoinString()}号穴位真空破"); } else { if (bNeedSleep) Thread.Sleep(GlobalVar.TurnoverTrayCloseVacBreakDelaytime); - MessageQueue.Instance.Insert(callerName+$"_关闭周转盘{indexes.ToJoinString()}号穴位真空破"); + MessageQueue.Instance.Insert(callerName+$"-关闭周转盘{indexes.ToJoinString()}号穴位真空破"); } } } @@ -216,13 +216,13 @@ namespace Rs.MotionPlat.Commom { if(bNeedSleep) Thread.Sleep(GlobalVar.TurnoverNozzleOpenVacSuctionDelaytime); - MessageQueue.Instance.Insert(callerName + $"_打开周转吸嘴{string.Join(",", indexes)}号真空吸"); + MessageQueue.Instance.Insert(callerName + $"-打开周转吸嘴{string.Join(",", indexes)}号真空吸"); } else { if (bNeedSleep) Thread.Sleep(GlobalVar.TurnoverNozzleCloseVacSuctionDelaytime); - MessageQueue.Instance.Insert(callerName + $"_关闭周转吸嘴{string.Join(",", indexes)}号真空吸"); + MessageQueue.Instance.Insert(callerName + $"-关闭周转吸嘴{string.Join(",", indexes)}号真空吸"); } } } @@ -255,13 +255,13 @@ namespace Rs.MotionPlat.Commom { if (bNeedSleep) Thread.Sleep(GlobalVar.TurnoverNozzleOpenVacBreakDelaytime); - MessageQueue.Instance.Insert(callerName+$"_打开周转吸嘴{string.Join(",", indexes)}号真空破"); + MessageQueue.Instance.Insert(callerName+$"-打开周转吸嘴{string.Join(",", indexes)}号真空破"); } else { if (bNeedSleep) Thread.Sleep(GlobalVar.TurnoverNozzleCloseVacBreakDelaytime); - MessageQueue.Instance.Insert(callerName + $"_关闭周转吸嘴{string.Join(",", indexes)}号真空破"); + MessageQueue.Instance.Insert(callerName + $"-关闭周转吸嘴{string.Join(",", indexes)}号真空破"); } } } @@ -294,13 +294,13 @@ namespace Rs.MotionPlat.Commom { if (bNeedSleep) Thread.Sleep(GlobalVar.PressOpenVacSuctionDelaytime); - MessageQueue.Instance.Insert(callerName + $"_打开测试{string.Join(",", indexes)}号穴位真空吸"); + MessageQueue.Instance.Insert(callerName + $"-打开测试{string.Join(",", indexes)}号穴位真空吸"); } else { if (bNeedSleep) Thread.Sleep(GlobalVar.PresseCloseVacSuctionDelaytime); - MessageQueue.Instance.Insert(callerName + $"_关闭测试{string.Join(",", indexes)}号穴位真空吸"); + MessageQueue.Instance.Insert(callerName + $"-关闭测试{string.Join(",", indexes)}号穴位真空吸"); } } } @@ -333,13 +333,13 @@ namespace Rs.MotionPlat.Commom { if (bNeedSleep) Thread.Sleep(GlobalVar.PresseOpenVacBreakDelaytime); - MessageQueue.Instance.Insert(callerName+$"_打开测试{string.Join(",", indexes)}号穴位真空破"); + MessageQueue.Instance.Insert(callerName+$"-打开测试{string.Join(",", indexes)}号穴位真空破"); } else { if (bNeedSleep) Thread.Sleep(GlobalVar.PressCloseVacBreakDelaytime); - MessageQueue.Instance.Insert(callerName+$"_关闭测试{string.Join(",", indexes)}号穴位真空破"); + MessageQueue.Instance.Insert(callerName+$"-关闭测试{string.Join(",", indexes)}号穴位真空破"); } } } diff --git a/Rs.SkyLine/Flow/SafeControl.cs b/Rs.SkyLine/Flow/SafeControl.cs index 0e8565d..905eea9 100644 --- a/Rs.SkyLine/Flow/SafeControl.cs +++ b/Rs.SkyLine/Flow/SafeControl.cs @@ -56,7 +56,7 @@ namespace Rs.MotionPlat.Flow MessageQueue.Instance.Warn("上下气缸原位 off"); return false; } - for (int i = 1; i < 10; i++) + for (int i = 1; i < 9; i++) { AxisControl.GetAxis($"NozzleZ{i}").GetOrgStatus(out bOnOrg); if (!bOnOrg) @@ -80,7 +80,7 @@ namespace Rs.MotionPlat.Flow MessageQueue.Instance.Warn("上下气缸原位 off"); return false; } - for (int i = 1; i < 10; i ++) + for (int i = 1; i < 9; i ++) { AxisControl.GetAxis($"NozzleZ{i}").GetOrgStatus(out bOnOrg); if (!bOnOrg)