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 @@ ./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) C:\Program Files (x86)\IVI Foundation\VISA\WinNT\lib\bc;C:\Program Files\IVI Foundation\VISA\WinNT\lib\bc;$(ReferencePath) 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) - $(ProjectName)2Cam + $(ProjectName)2Cam-Push false 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