From 858ed1990e5e36ac9fb9c261fcfb76fa26bd68c2 Mon Sep 17 00:00:00 2001
From: bestlqiang <bestlqiang@163.com>
Date: Fri, 4 Dec 2020 16:23:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E6=8E=A8=E5=87=BA=E6=B2=BB?=
 =?UTF-8?q?=E5=85=B7=E8=B6=85=E6=97=B6=E6=8A=A5=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LaiPuLaser/LaiPuLaser.vcxproj              |  2 +-
 LaiPuLaser/Program_SZ_XL_TrackWorkFlow.cpp | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/LaiPuLaser/LaiPuLaser.vcxproj b/LaiPuLaser/LaiPuLaser.vcxproj
index 1f343af..a866a94 100644
--- a/LaiPuLaser/LaiPuLaser.vcxproj
+++ b/LaiPuLaser/LaiPuLaser.vcxproj
@@ -48,7 +48,7 @@
     <IncludePath>./OpenCV/Include/opencv2;./OpenCV/Include;C:\Program Files (x86)\Advantech\Common Motion\Public;C:\Program Files (x86)\Advantech\Common Motion\Examples\General;C:\Program Files\Advantech\Common Motion\Public;C:\Program Files\Advantech\Common Motion\Examples\General;C:\Program Files (x86)\IVI Foundation\VISA\WinNT\include;C:\Program Files\IVI Foundation\VISA\WinNT\include;$(IncludePath)</IncludePath>
     <ReferencePath>C:\Program Files (x86)\IVI Foundation\VISA\WinNT\lib\bc;C:\Program Files\IVI Foundation\VISA\WinNT\lib\bc;$(ReferencePath)</ReferencePath>
     <LibraryPath>D:\紫外切割机\OpenCVStaticlib;./OpenCV/staticlib;D:\Personal\Documents\Gemalto\SuperDog 2.4\Samples\Licensing\C\x64\msc\lib;C:\Program Files (x86)\IVI Foundation\VISA\WinNT\lib\msc;C:\Program Files\IVI Foundation\VISA\WinNT\lib\msc;$(LibraryPath)</LibraryPath>
-    <TargetName>$(ProjectName)2Cam</TargetName>
+    <TargetName>$(ProjectName)2Cam-Push</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
diff --git a/LaiPuLaser/Program_SZ_XL_TrackWorkFlow.cpp b/LaiPuLaser/Program_SZ_XL_TrackWorkFlow.cpp
index cfc1e81..0fb0b41 100644
--- a/LaiPuLaser/Program_SZ_XL_TrackWorkFlow.cpp
+++ b/LaiPuLaser/Program_SZ_XL_TrackWorkFlow.cpp
@@ -690,13 +690,15 @@ bool CTrackWorkFlow::PushJigOut()
 	PlcCmd = _ETrack_PlcCmd_Push_Jig_Out;
 	SendMsgToPlc(PlcCmd, false);
 	m_bPushJigOut = false;
+
+	int CheckTimes = 450;
 	int cnt = 0;
-	while (cnt < 200 && (!m_bPushJigOut))
+	while (!m_bPushJigOut&&(cnt<CheckTimes))
 	{
-		Sleep(100);
+		Sleep(200);
 		cnt++;
 	}
-	if (cnt == 200)
+	if (cnt == CheckTimes)
 	{
 		gTrackWorkFlow1.RadAlamOnOff(true);
 		AfxMessageBox("ÍƳöÖξ߳¬Ê±!");
@@ -718,12 +720,12 @@ bool CTrackWorkFlow::IsJigOK()
 	m_bJigOK = false;
 	SendMsgToPlc(PlcCmd, false);
 	int cnt = 0;
-	while (cnt < 10 && (!m_bJigOK))
+	while (cnt < 20 && (!m_bJigOK))
 	{
-		Sleep(300);
+		Sleep(100);
 		cnt++;
 	}
-	if (cnt == 10)
+	if (cnt == 20)
 	{
 		gTrackWorkFlow1.RadAlamOnOff(true);
 		AfxMessageBox(m_TrackName + " Öξßδµ½Î»!");