.gitignore
@@ -1,14 +1,12 @@ ReviewSystem/.vs/ ReviewSystem/x64/ ReviewSystem/ipch/ ReviewSystem/bin/ ReviewSystem/lib/ Internal_Library/.vs/ Internal_Library/x64/ Internal_Library/ipch/ Internal_Library/bin/ Internal_Library/lib/ Standard_Library/.vs/ Standard_Library/x64/ @@ -19,19 +17,14 @@ FTPUploader/.vs/ FTPUploader/x64/ FTPUploader/ipch/ FTPUploader/bin/ FTPUploader/lib/ DitGlassRawMessenger/.vs/ DitGlassRawMessenger/x64/ DitGlassRawMessenger/ipch/ DitGlassRawMessenger/bin/ DitGlassRawMessenger/lib/ DitGlassRawMessenger/Backup/ ReviewHistory/.vs/ ReviewHistory/bin/ ReviewHistory/lib/ *.sdf *.opensdf @@ -44,11 +37,15 @@ *_manifest.rc *.lastbuildstate *.pch *.pdb *.idb *.log *.res *.cache *.unsuccessfulbuild *.htm *.def *.exp *.ilk *.iobj *.ipdb vc*.pdb DitGlassRawMessenger/bin/DitGlassRawMessenger_x64.exeBinary files differ
DitGlassRawMessenger/bin/DitGlassRawMessenger_x64.ini
»õ ÆÄÀÏ @@ -0,0 +1,9 @@ DataMaxNumCell=`200` DataMaxNumDefect=`50000` SelectRawType=`1` LogFilePath=`c:\DIT_LogData\LogGlassRawMessenger` Stack_Use=`0` Stack_LocalPath=`D:\DIT_ResultData\Stack` Stack_EquipID=`AAAAA` RawMerge_Use=`0` RawMerge_LocalPath=`D:\DIT_ResultData\RawMerge` DitGlassRawMessenger/bin/DitGlassRawMessenger_x64.pdbBinary files differ
DitGlassRawMessenger/bin/DitGlassRawMessengerd_x64.exeBinary files differ
DitGlassRawMessenger/bin/DitGlassRawMessengerd_x64.ini
»õ ÆÄÀÏ @@ -0,0 +1,9 @@ DataMaxNumCell=`200` DataMaxNumDefect=`50000` SelectRawType=`1` LogFilePath=`c:\DIT_LogData\LogGlassRawMessenger` Stack_Use=`0` Stack_LocalPath=`D:\DIT_ResultData\Stack` Stack_EquipID=`AAAAA` RawMerge_Use=`1` RawMerge_LocalPath=`D:\DIT_ResultData\RawMerge` DitGlassRawMessenger/bin/DitGlassRawMessengerd_x64.pdbBinary files differ
DitGlassRawMessenger/bin/aaa.txt
DitGlassRawMessenger/bin/akCore_WS10_x64.dllBinary files differ
DitGlassRawMessenger/bin/akCored_WS10_x64.dllBinary files differ
DitGlassRawMessenger/bin/akGridCtrl_x64_vc15.dllBinary files differ
DitGlassRawMessenger/bin/akGridCtrld_x64_vc15.dllBinary files differ
DitGlassRawMessenger/bin/akSTL_WS10_x64.dllBinary files differ
DitGlassRawMessenger/bin/akSTLd_WS10_x64.dllBinary files differ
DitGlassRawMessenger/lib/akCore_WS10_x64.libBinary files differ
DitGlassRawMessenger/lib/akCored_WS10_x64.libBinary files differ
DitGlassRawMessenger/lib/akGridCtrl_x64_vc15.libBinary files differ
DitGlassRawMessenger/lib/akGridCtrld_x64_vc15.libBinary files differ
DitGlassRawMessenger/lib/akSTL_WS10_x64.libBinary files differ
DitGlassRawMessenger/lib/akSTLd_WS10_x64.libBinary files differ
Internal_Library/bin/CHAutoLightControls_x64_vc15.dllBinary files differ
Internal_Library/bin/CHAutoLightControls_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHAutoLightControlsd_x64_vc15.dllBinary files differ
Internal_Library/bin/CHAutoLightControlsd_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHCameraControlSapera_x64_vc15.dllBinary files differ
Internal_Library/bin/CHCameraControlSapera_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHCameraControlSaperad_x64_vc15.dllBinary files differ
Internal_Library/bin/CHCameraControlSaperad_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHCameraControlSimulation_x64_vc15.dllBinary files differ
Internal_Library/bin/CHCameraControlSimulation_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHCameraControls_Network_x64_vc15.dllBinary files differ
Internal_Library/bin/CHCameraControls_Network_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHCameraControls_x64_vc15.dllBinary files differ
Internal_Library/bin/CHCameraControls_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHCameraControlsd_x64_vc15.dllBinary files differ
Internal_Library/bin/CHCameraControlsd_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHCameraViewer_x64_vc15.dllBinary files differ
Internal_Library/bin/CHCameraViewer_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHCameraViewerd_x64_vc15.dllBinary files differ
Internal_Library/bin/CHCameraViewerd_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHCommonClasses_x64_vc15.dllBinary files differ
Internal_Library/bin/CHCommonClasses_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHCommonClassesd_x64_vc15.dllBinary files differ
Internal_Library/bin/CHCommonClassesd_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHCommonControls_x64_vc15.dllBinary files differ
Internal_Library/bin/CHCommonControls_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHCommonControlsd_x64_vc15.dllBinary files differ
Internal_Library/bin/CHCommonControlsd_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHEdgeTriangle_x64_vc15.dllBinary files differ
Internal_Library/bin/CHEdgeTriangle_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHEdgeTriangled_x64_vc15.dllBinary files differ
Internal_Library/bin/CHEdgeTriangled_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHFolderMonitoring_x64_vc15.dllBinary files differ
Internal_Library/bin/CHFolderMonitoring_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHFolderMonitoringd_x64_vc15.dllBinary files differ
Internal_Library/bin/CHFolderMonitoringd_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHGlassDefectMap_x64_vc15.dllBinary files differ
Internal_Library/bin/CHGlassDefectMap_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHGlassDefectMapd_x64_vc15.dllBinary files differ
Internal_Library/bin/CHGlassDefectMapd_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHImageControls_x64_vc15.dllBinary files differ
Internal_Library/bin/CHImageControls_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHImageControlsd_x64_vc15.dllBinary files differ
Internal_Library/bin/CHImageControlsd_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHImageMerger_x64_vc15.dllBinary files differ
Internal_Library/bin/CHImageMerger_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHImageReSampler_x64_vc15.dllBinary files differ
Internal_Library/bin/CHImageReSampler_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHImageReSamplerd_x64_vc15.dllBinary files differ
Internal_Library/bin/CHImageReSamplerd_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHLensChangeControls_x64_vc15.dllBinary files differ
Internal_Library/bin/CHLensChangeControls_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHLensChangeControlsd_x64_vc15.dllBinary files differ
Internal_Library/bin/CHLensChangeControlsd_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHMotorCalibrator_x64_vc15.dllBinary files differ
Internal_Library/bin/CHMotorCalibrator_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHMotorCalibratord_x64_vc15.dllBinary files differ
Internal_Library/bin/CHMotorCalibratord_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHNfsDriveRenewer_x64_vc15.dllBinary files differ
Internal_Library/bin/CHNfsDriveRenewer_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHNfsDriveRenewerd_x64_vc15.dllBinary files differ
Internal_Library/bin/CHNfsDriveRenewerd_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHSignalControls_Network_x64_vc15.dllBinary files differ
Internal_Library/bin/CHSignalControls_Network_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHSignalControls_Networkd_x64_vc15.dllBinary files differ
Internal_Library/bin/CHSignalControls_Networkd_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHThreadPools_x64_vc15.dllBinary files differ
Internal_Library/bin/CHThreadPools_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHThreadPoolsd_x64_vc15.dllBinary files differ
Internal_Library/bin/CHThreadPoolsd_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHVcrControls_x64_vc15.dllBinary files differ
Internal_Library/bin/CHVcrControls_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHVcrControlsd_x64_vc15.dllBinary files differ
Internal_Library/bin/CHVcrControlsd_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHVirtualGlassMap_x64_vc15.dllBinary files differ
Internal_Library/bin/CHVirtualGlassMap_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHVirtualGlassMapd_x64_vc15.dllBinary files differ
Internal_Library/bin/CHVirtualGlassMapd_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHWsiControls_x64_vc15.dllBinary files differ
Internal_Library/bin/CHWsiControls_x64_vc15.pdbBinary files differ
Internal_Library/bin/CHWsiControlsd_x64_vc15.dllBinary files differ
Internal_Library/bin/CHWsiControlsd_x64_vc15.pdbBinary files differ
Internal_Library/bin/DitSharedMemory_x64_vc15.dllBinary files differ
Internal_Library/bin/DitSharedMemory_x64_vc15.pdbBinary files differ
Internal_Library/bin/DitSharedMemoryd_x64_vc15.dllBinary files differ
Internal_Library/bin/DitSharedMemoryd_x64_vc15.pdbBinary files differ
Internal_Library/bin/IOCPNetwork_x64_vc15.dllBinary files differ
Internal_Library/bin/IOCPNetwork_x64_vc15.pdbBinary files differ
Internal_Library/bin/IOCPNetworkd_x64_vc15.dllBinary files differ
Internal_Library/bin/IOCPNetworkd_x64_vc15.pdbBinary files differ
Internal_Library/lib/CHAutoLightControls_x64_vc15.libBinary files differ
Internal_Library/lib/CHAutoLightControlsd_x64_vc15.libBinary files differ
Internal_Library/lib/CHCameraControlSapera_x64_vc15.libBinary files differ
Internal_Library/lib/CHCameraControlSaperad_x64_vc15.libBinary files differ
Internal_Library/lib/CHCameraControlSimulation_x64_vc15.libBinary files differ
Internal_Library/lib/CHCameraControls_Network_x64_vc15.libBinary files differ
Internal_Library/lib/CHCameraControls_x64_vc15.libBinary files differ
Internal_Library/lib/CHCameraControlsd_x64_vc15.libBinary files differ
Internal_Library/lib/CHCameraViewer_x64_vc15.libBinary files differ
Internal_Library/lib/CHCameraViewerd_x64_vc15.libBinary files differ
Internal_Library/lib/CHCommonClasses_x64_vc15.libBinary files differ
Internal_Library/lib/CHCommonClassesd_x64_vc15.libBinary files differ
Internal_Library/lib/CHCommonControls_x64_vc15.libBinary files differ
Internal_Library/lib/CHCommonControlsd_x64_vc15.libBinary files differ
Internal_Library/lib/CHEdgeTriangle_x64_vc15.libBinary files differ
Internal_Library/lib/CHEdgeTriangled_x64_vc15.libBinary files differ
Internal_Library/lib/CHFolderMonitoring_x64_vc15.libBinary files differ
Internal_Library/lib/CHFolderMonitoringd_x64_vc15.libBinary files differ
Internal_Library/lib/CHGlassDefectMap_x64_vc15.libBinary files differ
Internal_Library/lib/CHGlassDefectMapd_x64_vc15.libBinary files differ
Internal_Library/lib/CHImageControls_x64_vc15.libBinary files differ
Internal_Library/lib/CHImageControlsd_x64_vc15.libBinary files differ
Internal_Library/lib/CHImageMerger_x64_vc15.libBinary files differ
Internal_Library/lib/CHImageReSampler_x64_vc15.libBinary files differ
Internal_Library/lib/CHImageReSamplerd_x64_vc15.libBinary files differ
Internal_Library/lib/CHLensChangeControls_x64_vc15.libBinary files differ
Internal_Library/lib/CHLensChangeControlsd_x64_vc15.libBinary files differ
Internal_Library/lib/CHMotorCalibrator_x64_vc15.libBinary files differ
Internal_Library/lib/CHMotorCalibratord_x64_vc15.libBinary files differ
Internal_Library/lib/CHNfsDriveRenewer_x64_vc15.libBinary files differ
Internal_Library/lib/CHNfsDriveRenewerd_x64_vc15.libBinary files differ
Internal_Library/lib/CHSignalControls_Network_x64_vc15.libBinary files differ
Internal_Library/lib/CHSignalControls_Networkd_x64_vc15.libBinary files differ
Internal_Library/lib/CHThreadPools_x64_vc15.libBinary files differ
Internal_Library/lib/CHThreadPoolsd_x64_vc15.libBinary files differ
Internal_Library/lib/CHVcrControls_x64_vc15.libBinary files differ
Internal_Library/lib/CHVcrControlsd_x64_vc15.libBinary files differ
Internal_Library/lib/CHVirtualGlassMap_x64_vc15.libBinary files differ
Internal_Library/lib/CHVirtualGlassMapd_x64_vc15.libBinary files differ
Internal_Library/lib/CHWsiControls_x64_vc15.libBinary files differ
Internal_Library/lib/CHWsiControlsd_x64_vc15.libBinary files differ
Internal_Library/lib/DitSharedMemory_x64_vc15.libBinary files differ
Internal_Library/lib/DitSharedMemoryd_x64_vc15.libBinary files differ
Internal_Library/lib/IOCPNetwork_x64_vc15.libBinary files differ
Internal_Library/lib/IOCPNetworkd_x64_vc15.libBinary files differ
ReviewSystem/CHSignalControls/CHSignalControls.vcxproj
@@ -232,12 +232,12 @@ </ItemGroup> <ItemGroup> <ClInclude Include="Resource.h" /> <ClInclude Include="SignalControl.h" /> <ClInclude Include="SignalControlInfo.h" /> <ClInclude Include="SignalControl_DitSharedMemorySync.h" /> <ClInclude Include="SignalControl_MxComponent.h" /> <ClInclude Include="SignalControl_Simulation.h" /> <ClInclude Include="SignalThread.h" /> <ClInclude Include="../include/CHSignalControls/SignalControl.h" /> <ClInclude Include="../include/CHSignalControls/SignalControlInfo.h" /> <ClInclude Include="../include/CHSignalControls/SignalControl_DitSharedMemorySync.h" /> <ClInclude Include="../include/CHSignalControls/SignalControl_MxComponent.h" /> <ClInclude Include="../include/CHSignalControls/SignalControl_Simulation.h" /> <ClInclude Include="../include/CHSignalControls/SignalThread.h" /> <ClInclude Include="stdafx.h" /> <ClInclude Include="targetver.h" /> </ItemGroup> ReviewSystem/CHSignalControls/SignalControl_DitSharedMemorySync.cpp
@@ -139,101 +139,170 @@ BOOL CSignalControl_DitSharedMemorySync::Write_SendSignal(int nAddrIndex, int nSignalIndex, WORD wSignalValue, int nOnTime) { if(nOnTime == 0) { if(m_pMemStartAddr == NULL) return FALSE; if (m_ControlInfo.GetIndex() < 0) return FALSE; CSingleLock localLock(&m_csWriteSignal); localLock.Lock(); if(m_pSendSignalValueAddr[nAddrIndex]==NULL) return FALSE; int nAddress = m_pSendSignalValueAddr[nAddrIndex]; // read value WORD wCurValue = 0; memcpy(&wCurValue, m_pMemStartAddr+nAddress, sizeof(WORD)); // send value WORD wSendValue = 0; if (wSignalValue==1) // signal on /*< SWK 20221221 - #4403 MOD Start >*/ // if (nOnTime == 0) // { // if (m_pMemStartAddr == NULL) return FALSE; // if (m_ControlInfo.GetIndex() < 0) return FALSE; // // // CSingleLock localLock(&m_csWriteSignal); // localLock.Lock(); // // if (m_pSendSignalValueAddr[nAddrIndex] == NULL) return FALSE; // // int nAddress = m_pSendSignalValueAddr[nAddrIndex]; // // // read value // WORD wCurValue = 0; // memcpy(&wCurValue, m_pMemStartAddr + nAddress, sizeof(WORD)); // // // send value // WORD wSendValue = 0; // if (wSignalValue == 1) // signal on // { // wSendValue = 1 << nSignalIndex; // wSendValue = wSendValue | wCurValue; // } // else // signal off // { // if (wCurValue > 0) // { // wSendValue = 1 << nSignalIndex; // wSendValue = (wCurValue - wSendValue) < 0 ? 0 : (wCurValue - wSendValue); // } // } // // memcpy(m_pMemStartAddr + nAddress, &wSendValue, sizeof(WORD)); // // // return TRUE; // } // else // { // if (m_pSignalThread == NULL) return FALSE; // // CSignalData signalData; // signalData.nAddrIndex = nAddrIndex; // signalData.nSignalIndex = nSignalIndex; // signalData.wSignalValue = wSignalValue; // signalData.dwOnTime = nOnTime; // // return m_pSignalThread->AddThreadData(signalData); // } // /*< SWK 20221226 - #4403 ADD Start >*/ if (0 == nOnTime) { wSendValue = 1 << nSignalIndex; wSendValue = wSendValue | wCurValue; Write_SendSignal(nAddrIndex, nSignalIndex, wSignalValue != 0); return TRUE; } else // signal off { if (wCurValue>0) { wSendValue = 1 << nSignalIndex; wSendValue = (wCurValue - wSendValue)<0 ? 0 : (wCurValue - wSendValue); } } memcpy(m_pMemStartAddr+nAddress, &wSendValue, sizeof(WORD)); return TRUE; } else { if (m_pSignalThread==NULL) return FALSE; /*< SWK 20221226 - #4403 ADD End >*/ if (m_pSignalThread == NULL) return FALSE; CSignalData signalData; signalData.nAddrIndex = nAddrIndex; signalData.nSignalIndex = nSignalIndex; signalData.wSignalValue = wSignalValue; signalData.dwOnTime = nOnTime; signalData.nAddrIndex = nAddrIndex; signalData.nSignalIndex = nSignalIndex; signalData.wSignalValue = wSignalValue; signalData.dwOnTime = nOnTime; return m_pSignalThread->AddThreadData(signalData); /*< SWK 20221221 - #4403 MOD End >*/ } /*< SWK 20221226 - #4403 ADD Start >*/ inline void CSignalControl_DitSharedMemorySync::Write_SendSignal(int nAddrIndex, int nSignalIndex, bool bOn) { int nAddress = m_pSendSignalValueAddr[nAddrIndex]; WORD wSendValue = 1 << nSignalIndex; WORD wCurValue = 0; CSingleLock localLock(&m_csWriteSignal, TRUE); memcpy(&wCurValue, m_pMemStartAddr + nAddress, sizeof(WORD)); if (bOn) wCurValue |= wSendValue; else wCurValue &= ~wSendValue; memcpy(m_pMemStartAddr + nAddress, &wCurValue, sizeof(WORD)); } /*< SWK 20221226 - #4403 ADD End >*/ void CSignalControl_DitSharedMemorySync::IST2P_RunThreadProcess(const CSignalData& signalData) { CSingleLock localLock(&m_csWriteSignal); localLock.Lock(); if (m_nSendSignalCount<=0) return; if(m_pMemStartAddr == NULL) return; int nAddress = m_pSendSignalValueAddr[signalData.nAddrIndex]; // read value WORD wCurValue = 0; memcpy(&wCurValue, m_pMemStartAddr+nAddress, sizeof(WORD)); // send value WORD wSendValue = 0; if (signalData.wSignalValue==1) // signal on /*< SWK 20221221 - #4403 MOD Start >*/ // CSingleLock localLock(&m_csWriteSignal); // localLock.Lock(); // // if (m_nSendSignalCount<=0) return; // // if(m_pMemStartAddr == NULL) return; // // int nAddress = m_pSendSignalValueAddr[signalData.nAddrIndex]; // // // read value // WORD wCurValue = 0; // memcpy(&wCurValue, m_pMemStartAddr+nAddress, sizeof(WORD)); // // // send value // WORD wSendValue = 0; // wSendValue = 1 << signalData.nSignalIndex; // if (signalData.wSignalValue==1) // signal on // { // wSendValue = 1 << signalData.nSignalIndex; // wSendValue = wSendValue | wCurValue; // } // else // signal off // { // if (wCurValue>0) // { // wSendValue = 1 << signalData.nSignalIndex; // wSendValue = (wCurValue - wSendValue)<0 ? 0 : (wCurValue - wSendValue); // } // } // // memcpy(m_pMemStartAddr+nAddress, &wSendValue, sizeof(WORD)); // // if (signalData.dwOnTime>0) // { // localLock.Unlock(); // // wait // ::Sleep(signalData.dwOnTime); // // // clear value // memcpy(m_pMemStartAddr+nAddress, &wCurValue, sizeof(WORD)); // } // // if (m_nSendSignalCount <= 0) return; if (m_pMemStartAddr == NULL) return; if (signalData.dwOnTime <= 0) // Signal without hold-time ; else if(0 == signalData.ullStartTick) // Signal with hold-time { wSendValue = 1 << signalData.nSignalIndex; wSendValue = wSendValue | wCurValue; CSignalData NewSignalData = signalData; NewSignalData.ullStartTick = GetTickCount64(); // Set Start Tick NewSignalData.wSignalValue = !signalData.wSignalValue; // Signal Inversion m_pSignalThread->AddThreadData(NewSignalData); } else // signal off else if (GetTickCount64() - signalData.ullStartTick < signalData.dwOnTime) // Check Holding Time { if (wCurValue>0) { wSendValue = 1 << signalData.nSignalIndex; wSendValue = (wCurValue - wSendValue)<0 ? 0 : (wCurValue - wSendValue); } //< KEJ 20230310 - #4403 ADD > Sleep(1); CSignalData NewSignalData = signalData; m_pSignalThread->AddThreadData(NewSignalData); return; } /*< SWK 20221226 - #4403 MOD Start >*/ // int nAddress = m_pSendSignalValueAddr[signalData.nAddrIndex]; // WORD wSendValue = 1 << signalData.nSignalIndex; // // WORD wCurValue = 0; // memcpy(&wCurValue, m_pMemStartAddr + nAddress, sizeof(WORD)); // if (true == signalData.wSignalValue) wCurValue |= wSendValue; // else wCurValue &= ~wSendValue; // memcpy(m_pMemStartAddr + nAddress, &wCurValue, sizeof(WORD)); memcpy(m_pMemStartAddr+nAddress, &wSendValue, sizeof(WORD)); if (signalData.dwOnTime>0) { // wait ::Sleep(signalData.dwOnTime); // clear value memcpy(m_pMemStartAddr+nAddress, &wCurValue, sizeof(WORD)); } Write_SendSignal(signalData.nAddrIndex, signalData.nSignalIndex, signalData.wSignalValue != 0); /*< SWK 20221226 - #4403 MOD End >*/ /*< SWK 20221221 - #4403 MOD End >*/ } BOOL CSignalControl_DitSharedMemorySync::ReadData(const CString strAddr, int nSize, CString& strData) ReviewSystem/ReviewSystem/CameraControlAlign.cpp
@@ -766,7 +766,8 @@ time.GetYear(), time.GetMonth(), time.GetDay(), time.GetHour(), time.GetMinute(), time.GetSecond()); pAlignFinder->SaveResultImage(strPath); Sleep(10); //< SWK 20221226 - #4403 DEL > // Sleep(10); if (nCameraIdx == 0) { m_AlignResult.strAlignFirest = strPath; ReviewSystem/ReviewSystem/DisplayMessage.cpp
@@ -73,8 +73,14 @@ // { // m_pDM2P->DM2P_DisplayMessage(strMessage); // } CString* pstrLog = new CString(strMessage); PostThreadMessage(m_ThreadId, WM_DIPLAY_LOG, reinterpret_cast<WPARAM>(pstrLog), 0); /*< SWK 20221226 - #4403 MOD Start >*/ // CString* pstrLog = new CString(strMessage); // PostThreadMessage(m_ThreadId, WM_DIPLAY_LOG, reinterpret_cast<WPARAM>(pstrLog), 0); pLogData plogdata = new LogData; ::GetLocalTime(&plogdata->currentTime); plogdata->strLog = strMessage; PostThreadMessage(m_ThreadId, WM_DIPLAY_LOG, reinterpret_cast<WPARAM>(plogdata), 0); /*< SWK 20221226 - #4403 MOD End >*/ } // #3417 LYWCF AOI Review ì ì¤ë¹ Log Processê°ì ADD END @@ -90,8 +96,14 @@ _vstprintf_s(strText, lpstrFormat, list); va_end(list); CString* pstrLog = new CString(strText); PostThreadMessage(m_ThreadId, WM_DIPLAY_LOG, reinterpret_cast<WPARAM>(pstrLog), 0); /*< SWK 20221226 - #4403 MOD Start >*/ // CString* pstrLog = new CString(strText); // PostThreadMessage(m_ThreadId, WM_DIPLAY_LOG, reinterpret_cast<WPARAM>(pstrLog), 0); pLogData plogdata = new LogData; ::GetLocalTime(&plogdata->currentTime); plogdata->strLog = strText; PostThreadMessage(m_ThreadId, WM_DIPLAY_LOG, reinterpret_cast<WPARAM>(plogdata), 0); /*< SWK 20221226 - #4403 MOD End >*/ } catch (...) { @@ -109,23 +121,28 @@ // #3417 LYWCF AOI Review ì ì¤ë¹ Log Processê°ì ADD END // #3417 LYWCF AOI Review ì ì¤ë¹ Log Processê°ì ADD START void CDisplayMessage::ThreadDisplayMessage(const CString& strMessage) //< SWK 20221226 - #4403 MOD > //void CDisplayMessage::ThreadDisplayMessage(const CString& strMessage) void CDisplayMessage::ThreadDisplayMessage(const LogData& logdata) { WriteToFile(strMessage); WriteToFile(logdata.currentTime, logdata.strLog); if (m_pDM2P) { m_pDM2P->DM2P_DisplayMessage(strMessage); m_pDM2P->DM2P_DisplayMessage(logdata.strLog); } } BOOL CDisplayMessage::WriteToFile(const CString& strMessage) //< SWK 20221226 - #4403 MOD > //BOOL CDisplayMessage::WriteToFile(const CString& strMessage) BOOL CDisplayMessage::WriteToFile(const SYSTEMTIME& t, const CString& strMessage) { if(m_pFileLog == NULL) return FALSE; //EnterCriticalSection(&m_csLog); CTime time = CTime::GetCurrentTime(); //< SWK 20221226 - #4403 MOD > // CTime time = CTime::GetCurrentTime(); CTime time(t); CString strTimeStamp = _T(""); // ë ì§ê° ë°ëë©´ íì¼ëª ì ê°±ì í´ì ì´ë¤. if ((time.GetMonth() != m_TimeLogFile.GetMonth()) || (time.GetDay() != m_TimeLogFile.GetDay()) || !m_pFileLog) @@ -137,7 +154,10 @@ TCHAR strCommand = 0xFEFF; CString strLog = _T(""); //strTimeStamp.Format(_T("[%02d:%02d:%02d]"), time.GetHour(), time.GetMinute(), time.GetSecond()); strTimeStamp.Format(_T("[%02d:%02d:%02d:%02d:%02d:%02d]"), time.GetYear(), time.GetMonth(), time.GetDay(), time.GetHour(), time.GetMinute(), time.GetSecond()); /*< SWK 20221221 - #4403 MOD Start >*/ // strTimeStamp.Format(_T("[%02d:%02d:%02d_%02d:%02d:%02d]"), time.GetYear(), time.GetMonth(), time.GetDay(), time.GetHour(), time.GetMinute(), time.GetSecond()); strTimeStamp.Format(_T("[%02d:%02d:%02d_%02d:%02d:%02d.%03d]"), time.GetYear(), time.GetMonth(), time.GetDay(), time.GetHour(), time.GetMinute(), time.GetSecond(), t.wMilliseconds); /*< SWK 20221221 - #4403 MOD End >*/ #ifdef UNICODE strLog.Format(_T("%c%s %s\r\n"), strCommand, strTimeStamp, strMessage); #else @@ -154,18 +174,24 @@ return TRUE; } DWORD RunThreadDisplayLog(LPVOID param) DWORD CDisplayMessage::RunThreadDisplayLog(LPVOID param) { MSG msg; while (GetMessage(&msg, NULL, 0, 0)) { CString* pstrLog = reinterpret_cast<CString*>(msg.wParam); //< SWK 20221226 - #4403 MOD > // CString* pstrLog = reinterpret_cast<CString*>(msg.wParam); CDisplayMessage::pLogData plogdata = reinterpret_cast<CDisplayMessage::pLogData>(msg.wParam); switch (msg.message) { case WM_DIPLAY_LOG: g_pLog->ThreadDisplayMessage(*pstrLog); delete pstrLog; /*< SWK 20221226 - #4403 MOD Start >*/ // g_pLog->ThreadDisplayMessage(*pstrLog); // delete pstrLog; g_pLog->ThreadDisplayMessage(*plogdata); delete plogdata; /*< SWK 20221226 - #4403 MOD End >*/ break; default: ReviewSystem/ReviewSystem/DisplayMessage.h
@@ -11,10 +11,16 @@ virtual void DM2P_DisplayMessage(const TCHAR* lpstrFormat, ...) = 0; }; DWORD RunThreadDisplayLog(LPVOID param); class CDisplayMessage : public Singleton<CDisplayMessage> { /*< SWK 20221226 - #4403 ADD Start >*/ typedef struct _Log_Data { SYSTEMTIME currentTime; CString strLog; }LogData, *pLogData; /*< SWK 20221226 - #4403 ADD End >*/ public: CDisplayMessage(const CString& strPath); virtual ~CDisplayMessage(void); @@ -22,13 +28,19 @@ public: void SetDM2P(IDisplayMessage2Parent* pDM2P) { m_pDM2P = pDM2P; } void SetPath(const CString& strPath); BOOL MakeLogFile(); BOOL WriteToFile(const CString& strMessage); void DisplayMessage(const CString& strMessage); void DisplayMessage(const TCHAR* lpstrFormat, ...); void ThreadDisplayMessage(const CString & strMessage); //< SWK 20221226 - #4403 MOD > // void ThreadDisplayMessage(const CString & strMessage); void ThreadDisplayMessage(const LogData& logdata); protected: BOOL MakeLogFile(); //< SWK 20221226 - #4403 MOD > // BOOL WriteToFile(const CString& strMessage); BOOL WriteToFile(const SYSTEMTIME& time, const CString& strMessage); public: static DWORD RunThreadDisplayLog(LPVOID param); private: CTime m_TimeLogFile; CFile* m_pFileLog; CString m_strLogPath; ReviewSystem/ReviewSystem/MainFrm.cpp
@@ -78,7 +78,10 @@ //SetTimer(ID_TIMER_RESET_COMM, 2000, NULL); SetTimer(ID_TIMER_ALIVE, 1813, NULL); //->> 기존 SetTimer(ID_TIMER_ALIVE, 1000, NULL); /*< SWK 20221221 - #4403 MOD Start >*/ // SetTimer(ID_TIMER_ALIVE, 1813, NULL); //->> 기존 SetTimer(ID_TIMER_ALIVE, 1000, NULL); SetTimer(ID_TIMER_ALIVE, 2000, NULL); /*< SWK 20221221 - #4403 MOD End >*/ //SetTimer(ID_TIMER_AFM_ALIVE, 5000, NULL);
@@ -585,110 +585,176 @@ void CReviewInterface::threadSet3rdPartyProgramVersion(void* pArg) { CReviewInterface* pThis = (CReviewInterface*)pArg; //LYW0412 BOOL bReturn, bRetFTPUploader = FALSE, bRetGRM = FALSE, bRetSync = FALSE; CFileFind finder; CTime timeLastWrite; TCHAR currentPath[MAX_PATH]; DWORD dwPid; HWND hWnd; HANDLE hHandle; CString strTemp; /*< SWK 20221222 - #4403 MOD Start >*/ // //LYW0412 // BOOL bReturn, bRetFTPUploader = FALSE, bRetGRM = FALSE, bRetSync = FALSE; // CFileFind finder; // CTime timeLastWrite; // TCHAR currentPath[MAX_PATH]; // DWORD dwPid; // HWND hWnd; // HANDLE hHandle; // CString strTemp; // // while ((bRetFTPUploader&bRetGRM&bRetSync) != TRUE) // { // bReturn = FALSE; // // //FTPUploader S/W Version Start // if (bRetFTPUploader == FALSE) // { // dwPid = 0; // hWnd = ::FindWindow(NULL, _T("FTPUploader")); // GetWindowThreadProcessId(hWnd, &dwPid); // hHandle = OpenProcess(MAXIMUM_ALLOWED, FALSE, dwPid); // ZeroMemory(currentPath, MAX_PATH); // GetModuleFileNameEx(hHandle, NULL, currentPath, MAX_PATH); // // bReturn = finder.FindFile(currentPath); // } // // while (bReturn) // { // bReturn = finder.FindNextFile(); // // if (finder.IsDots()) continue; // if (finder.IsDirectory()) continue; // // finder.GetLastWriteTime(timeLastWrite); // strTemp.Format(_T("%04d%02d%02d"), timeLastWrite.GetYear(), timeLastWrite.GetMonth(), timeLastWrite.GetDay()); // pThis->m_nFDCFTPUploaderSWVersion = atoi(strTemp); // g_pLog->DisplayMessage(_T("FDCFTPUploaderSWVersion = %d "), pThis->m_nFDCFTPUploaderSWVersion); // bRetFTPUploader = TRUE; // } // //FTPUploader S/W Version End // // bReturn = FALSE; // // //Dit Glass Raw Messenger S/W Version Start // if (bRetGRM == FALSE) // { // dwPid = 0; // hWnd = ::FindWindow(NULL, _T("Dit Glass Raw Messenger")); // GetWindowThreadProcessId(hWnd, &dwPid); // hHandle = OpenProcess(MAXIMUM_ALLOWED, FALSE, dwPid); // ZeroMemory(currentPath, MAX_PATH); // GetModuleFileNameEx(hHandle, NULL, currentPath, MAX_PATH); // // bReturn = finder.FindFile(currentPath); // } // // while (bReturn) // { // bReturn = finder.FindNextFile(); // // if (finder.IsDots()) continue; // if (finder.IsDirectory()) continue; // // finder.GetLastWriteTime(timeLastWrite); // strTemp.Format(_T("%04d%02d%02d"), timeLastWrite.GetYear(), timeLastWrite.GetMonth(), timeLastWrite.GetDay()); // pThis->m_nFDCGRMSWVersion = atoi(strTemp); // g_pLog->DisplayMessage(_T("FDCGRMSWVersion = %d "), pThis->m_nFDCGRMSWVersion); // bRetGRM = TRUE; // } // //Dit Glass Raw Messenger S/W Version End // // bReturn = FALSE; // // //Dit Shared Memory Sync Client S/W Version Start // if (bRetSync == FALSE) // { // dwPid = 0; // hWnd = ::FindWindow(NULL, _T("Dit Shared Memory Sync Client")); // GetWindowThreadProcessId(hWnd, &dwPid); // hHandle = OpenProcess(MAXIMUM_ALLOWED, FALSE, dwPid); // ZeroMemory(currentPath, MAX_PATH); // GetModuleFileNameEx(hHandle, NULL, currentPath, MAX_PATH); // // bReturn = finder.FindFile(currentPath); // } // // while (bReturn) // { // bReturn = finder.FindNextFile(); // // if (finder.IsDots()) continue; // if (finder.IsDirectory()) continue; // // finder.GetLastWriteTime(timeLastWrite); // strTemp.Format(_T("%04d%02d%02d"), timeLastWrite.GetYear(), timeLastWrite.GetMonth(), timeLastWrite.GetDay()); // pThis->m_nFDCSyncSWVersion = atoi(strTemp); // g_pLog->DisplayMessage(_T("FDCSyncSWVersion = %d "), pThis->m_nFDCSyncSWVersion); // bRetSync = TRUE; // } // //Dit Shared Memory Sync Client S/W Version End // } // // finder.Close(); while ((bRetFTPUploader&bRetGRM&bRetSync) != TRUE) auto GetModuleFileLastTime = [](LPCTSTR strWindowTitle)->long { long nLastTime = 0; DWORD dwPid = 0; HWND hWnd = ::FindWindow(NULL, strWindowTitle); if (hWnd == INVALID_HANDLE_VALUE) return nLastTime; GetWindowThreadProcessId(hWnd, &dwPid); HANDLE hHandle = OpenProcess(MAXIMUM_ALLOWED, FALSE, dwPid); TCHAR currentPath[MAX_PATH]; ZeroMemory(currentPath, MAX_PATH); GetModuleFileNameEx(hHandle, NULL, currentPath, MAX_PATH); CFileFind finder; if (finder.FindFile(currentPath)) { finder.FindNextFile(); if (finder.IsDirectory() || finder.IsDots()) return nLastTime; CTime timeLastWrite; finder.GetLastWriteTime(timeLastWrite); nLastTime = atoi(timeLastWrite.Format(_T("%Y%m%d"))); } return nLastTime; }; BOOL bRetFTPUploader = FALSE, bRetGRM = FALSE, bRetSync = FALSE; while ((bRetFTPUploader&bRetGRM&bRetSync) != TRUE) { bReturn = FALSE; //FTPUploader S/W Version Start //FTPUploader S/W Version if (bRetFTPUploader == FALSE) { dwPid = 0; hWnd = ::FindWindow(NULL, _T("FTPUploader")); GetWindowThreadProcessId(hWnd, &dwPid); hHandle = OpenProcess(MAXIMUM_ALLOWED, FALSE, dwPid); ZeroMemory(currentPath, MAX_PATH); GetModuleFileNameEx(hHandle, NULL, currentPath, MAX_PATH); bReturn = finder.FindFile(currentPath); if (pThis->m_nFDCFTPUploaderSWVersion = GetModuleFileLastTime(_T("FTPUploader"))) { g_pLog->DisplayMessage(_T("FDCFTPUploaderSWVersion = %d "), pThis->m_nFDCFTPUploaderSWVersion); bRetFTPUploader = TRUE; } } while (bReturn) { bReturn = finder.FindNextFile(); if (finder.IsDots()) continue; if (finder.IsDirectory()) continue; finder.GetLastWriteTime(timeLastWrite); strTemp.Format(_T("%04d%02d%02d"), timeLastWrite.GetYear(), timeLastWrite.GetMonth(), timeLastWrite.GetDay()); pThis->m_nFDCFTPUploaderSWVersion = atoi(strTemp); g_pLog->DisplayMessage(_T("FDCFTPUploaderSWVersion = %d "), pThis->m_nFDCFTPUploaderSWVersion); bRetFTPUploader = TRUE; } //FTPUploader S/W Version End bReturn = FALSE; //Dit Glass Raw Messenger S/W Version Start Sleep(1); //Dit Glass Raw Messenger S/W Version if (bRetGRM == FALSE) { dwPid = 0; hWnd = ::FindWindow(NULL, _T("Dit Glass Raw Messenger")); GetWindowThreadProcessId(hWnd, &dwPid); hHandle = OpenProcess(MAXIMUM_ALLOWED, FALSE, dwPid); ZeroMemory(currentPath, MAX_PATH); GetModuleFileNameEx(hHandle, NULL, currentPath, MAX_PATH); bReturn = finder.FindFile(currentPath); if (pThis->m_nFDCGRMSWVersion = GetModuleFileLastTime(_T("Dit Glass Raw Messenger"))) { g_pLog->DisplayMessage(_T("FDCGRMSWVersion = %d "), pThis->m_nFDCGRMSWVersion); bRetGRM = TRUE; } } while (bReturn) { bReturn = finder.FindNextFile(); if (finder.IsDots()) continue; if (finder.IsDirectory()) continue; finder.GetLastWriteTime(timeLastWrite); strTemp.Format(_T("%04d%02d%02d"), timeLastWrite.GetYear(), timeLastWrite.GetMonth(), timeLastWrite.GetDay()); pThis->m_nFDCGRMSWVersion = atoi(strTemp); g_pLog->DisplayMessage(_T("FDCGRMSWVersion = %d "), pThis->m_nFDCGRMSWVersion); bRetGRM = TRUE; } //Dit Glass Raw Messenger S/W Version End bReturn = FALSE; Sleep(1); //Dit Shared Memory Sync Client S/W Version Start if (bRetSync == FALSE) { dwPid = 0; hWnd = ::FindWindow(NULL, _T("Dit Shared Memory Sync Client")); GetWindowThreadProcessId(hWnd, &dwPid); hHandle = OpenProcess(MAXIMUM_ALLOWED, FALSE, dwPid); ZeroMemory(currentPath, MAX_PATH); GetModuleFileNameEx(hHandle, NULL, currentPath, MAX_PATH); bReturn = finder.FindFile(currentPath); if (pThis->m_nFDCSyncSWVersion = GetModuleFileLastTime(_T("Dit Shared Memory Sync Client"))) { g_pLog->DisplayMessage(_T("FDCSyncSWVersion = %d "), pThis->m_nFDCSyncSWVersion); bRetSync = TRUE; } } while (bReturn) { bReturn = finder.FindNextFile(); if (finder.IsDots()) continue; if (finder.IsDirectory()) continue; finder.GetLastWriteTime(timeLastWrite); strTemp.Format(_T("%04d%02d%02d"), timeLastWrite.GetYear(), timeLastWrite.GetMonth(), timeLastWrite.GetDay()); pThis->m_nFDCSyncSWVersion = atoi(strTemp); g_pLog->DisplayMessage(_T("FDCSyncSWVersion = %d "), pThis->m_nFDCSyncSWVersion); bRetSync = TRUE; } //Dit Shared Memory Sync Client S/W Version End Sleep(1); } finder.Close(); /*< SWK 20221222 - #4403 MOD End >*/ } void CReviewInterface::SetReviewProgramVersion() ReviewSystem/ReviewSystem/ReviewSystem.vcxproj
@@ -57,6 +57,7 @@ <UseOfMfc>Dynamic</UseOfMfc> <CharacterSet>MultiByte</CharacterSet> <PlatformToolset>v141</PlatformToolset> <WholeProgramOptimization>false</WholeProgramOptimization> </PropertyGroup> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Template|Win32'"> <PlatformToolset>v141</PlatformToolset> @@ -93,6 +94,10 @@ </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <TargetName>$(ProjectName)d_x64_vc10</TargetName> <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64;../lib</LibraryPath> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64;../lib</LibraryPath> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <Midl> @@ -102,14 +107,14 @@ </Midl> <ClCompile> <Optimization>Disabled</Optimization> <AdditionalIncludeDirectories>../include;../../Internal_Library/include;../../External_Library/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../include;../../Internal_Library/include;../../External_Library/include;../../FTPUploader/FTPUploader;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <PrecompiledHeader>Use</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions> </ClCompile> <ResourceCompile> ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
@@ -550,10 +550,16 @@ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::AlignStart] Send Align Fail Data!")); } AlignCamera_CameraControl(CameraControlStop); // 210805 Align Camera Sequence ë³ê²½ /*< SWK 20221226 - #4403 MOD Start >*/ // AlignCamera_CameraControl(CameraControlStop); // 210805 Align Camera Sequence ë³ê²½ // // SendSignalToSignalControl(PCControlSendSignalIndex_Seq, PCControlSend_AlignComplete_CPJT); // m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::AlignStart] Send Align Complete Signal!")); SendSignalToSignalControl(PCControlSendSignalIndex_Seq, PCControlSend_AlignComplete_CPJT); m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::AlignStart] Send Align Complete Signal!")); AlignCamera_CameraControl(CameraControlStop); /*< SWK 20221226 - #4403 MOD End >*/ // LJY-20180905 m_pSP2P->ISP2P_UpdateAlignResultStatus(0, pGlassResult); @@ -1070,7 +1076,6 @@ // #3381 LYW CF AOI Review FDC TackTime ADD START pDitRawClient->GetGlassData()->m_tmReviewLoading = CTime::GetCurrentTime(); // #3381 LYW CF AOI Review FDC TackTime ADD END CString strGlassIDTemp = NULL; CString strGlassStepIdTemp = NULL; @@ -1078,7 +1083,6 @@ strGlassIDTemp = pTransferData->strGlassID; strGlassStepIdTemp = pTransferData->strStepID; strGlassIDTemp = pTransferData->strGlassID; strcpy(pDitRawClient->GetGlassData()->m_strGlassID, strGlassIDTemp); @@ -1103,7 +1107,8 @@ /*bFileFind = FindRawBinFile(strFileName);*/ pDitRawClient->SetReviewStart(); Sleep(1000); //< SWK 20221226 - #4403 DEL > // Sleep(1000); m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::Loading] Transfer Data Read Success!")); @@ -1320,7 +1325,8 @@ } //#3561 210908 LYW ADD End Sleep(300); //< SWK 20221226 - #4403 MOD > Sleep(100); //original // if (SendSignalToSignalControl(PCControlSendSignalIndex_Ack, PCControlSend_AlignStartAck_CPJT)) @@ -1442,7 +1448,9 @@ //pDitRawClient->SetReviewStart(); Sleep(500); //< SWK 20221226 - #4403 DEL > // Sleep(500); //CString strJudgeData; m_pSP2P->ISP2P_GetSignalControl()->WriteData(_T("17110"), sizeof(pDitRawClient->GetGlassData()->m_strGlassJudge), pDitRawClient->GetGlassData()->m_strGlassJudge); m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::IN] ReadRawFile!")); @@ -1503,7 +1511,8 @@ int nTotalPlanCount = CalculatePlanData(pGlassResult); m_pSP2P->ISP2P_DisplayMessage(_T("[Read Raw File] Review All Plan Total Count : %d"), nTotalPlanCount); Sleep(1000); //< SWK 20221226 - #4403 DEL > // Sleep(1000); // send review ready //#3584 210817 LYW CF AOI Review ì뮬ë ì´ì ê¸°ë¥ ì ìí MOD START if (GetSimulationMode() == FALSE) @@ -3676,7 +3685,9 @@ tmServerLoadingTime = CTime::GetCurrentTime(); m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::GlassLoading] access Shared Memory Fail")); strPath.Format(_T("%s\\%s_%04d%02d%02d%02d%02d%02d"), pNetworkInfo->m_strUploadImagePath, strGlassID, tmServerLoadingTime.GetYear(), tmServerLoadingTime.GetMonth(), tmServerLoadingTime.GetDay(), tmServerLoadingTime.GetHour(), tmServerLoadingTime.GetMinute(), tmServerLoadingTime.GetSecond()); strImagePath.Format(_T("%s\\%s_%04d%02d%02d%02d%02d%02d"), strGlassID, tmServerLoadingTime.GetYear(), tmServerLoadingTime.GetMonth(), tmServerLoadingTime.GetDay(), tmServerLoadingTime.GetHour(), tmServerLoadingTime.GetMinute(), tmServerLoadingTime.GetSecond()); //< SWK 20221226 - #4403 MOD > // strImagePath.Format(_T("%s\\%s_%04d%02d%02d%02d%02d%02d"), strGlassID, tmServerLoadingTime.GetYear(), tmServerLoadingTime.GetMonth(), tmServerLoadingTime.GetDay(), tmServerLoadingTime.GetHour(), tmServerLoadingTime.GetMinute(), tmServerLoadingTime.GetSecond()); strImagePath.Format(_T("%s_%04d%02d%02d%02d%02d%02d"), strGlassID, tmServerLoadingTime.GetYear(), tmServerLoadingTime.GetMonth(), tmServerLoadingTime.GetDay(), tmServerLoadingTime.GetHour(), tmServerLoadingTime.GetMinute(), tmServerLoadingTime.GetSecond()); CreateDirectory(strPath, NULL); pReviewProcessor->SetUploadImagePath(strPath); pReviewProcessor->SetReviewImagePath(strImagePath); ReviewSystem/ReviewSystemSetting/DisplayMessage.cpp
@@ -98,7 +98,10 @@ SYSTEMTIME currentTime; ::GetLocalTime(¤tTime); time = CTime::GetCurrentTime(); strTimeStamp.Format(_T("[%02d:%02d:%02d:%03d]"), time.GetHour(), time.GetMinute(), time.GetSecond(), currentTime.wMilliseconds); /*< SWK 20221221 - #4403 MOD Start >*/ // strTimeStamp.Format(_T("[%02d:%02d:%02d:%03d]"), time.GetHour(), time.GetMinute(), time.GetSecond(), currentTime.wMilliseconds); strTimeStamp.Format(_T("[%02d:%02d:%02d.%03d]"), time.GetHour(), time.GetMinute(), time.GetSecond(), currentTime.wMilliseconds); /*< SWK 20221221 - #4403 MOD End >*/ #ifdef UNICODE strLog.Format(_T("%c%s %s\r\n"), strCommand, strTimeStamp, strMessage); #else ReviewSystem/bin/ACSCL_x64.dllBinary files differ
ReviewSystem/bin/ACSCL_x86.dllBinary files differ
ReviewSystem/bin/CHAfmControls_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHAfmControls_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHAfmControlsd_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHAfmControlsd_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHAlignFinder_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHAlignFinder_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHAlignFinderd_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHAlignFinderd_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHAutoLightControls_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHAutoLightControls_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHAutoLightControlsd_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHAutoLightControlsd_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHCameraControlFlyCapture_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHCameraControlFlyCapture_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHCameraControlFlyCaptured_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHCameraControlFlyCaptured_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHCameraControlSapera_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHCameraControlSapera_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHCameraControlSaperad_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHCameraControlSaperad_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHCameraControlSimulation_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHCameraControlSimulation_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHCameraControlSimulationd_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHCameraControlSimulationd_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHCameraControls_Network_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHCameraControls_Network_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHCameraControls_Networkd_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHCameraControls_Networkd_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHCameraControls_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHCameraControls_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHCameraControlsd_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHCameraControlsd_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHCommonClasses_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHCommonClasses_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHCommonClassesd_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHCommonClassesd_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHCommonControls_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHCommonControls_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHCommonControlsd_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHCommonControlsd_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHDefectPicker_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHDefectPicker_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHDefectPickerd_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHDefectPickerd_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHEdgeTriangle_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHEdgeTriangle_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHEdgeTriangled_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHEdgeTriangled_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHGlassDefectMap_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHGlassDefectMap_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHGlassDefectMapd_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHGlassDefectMapd_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHImageControls_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHImageControls_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHImageControlsd_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHImageControlsd_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHLensChangeControls_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHLensChangeControls_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHLensChangeControlsd_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHLensChangeControlsd_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHLightControls_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHLightControls_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHLightControlsd_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHLightControlsd_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHMotorCalibrator_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHMotorCalibrator_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHMotorCalibratord_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHMotorCalibratord_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHMotorControls_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHMotorControls_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHMotorControlsd_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHMotorControlsd_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHPathScheduler_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHPathScheduler_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHPathSchedulerd_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHPathSchedulerd_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHResultFileManager_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHResultFileManager_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHResultFileManagerd_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHResultFileManagerd_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHReviewDefectFinder_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHReviewDefectFinder_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHReviewDefectFinderd_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHReviewDefectFinderd_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHReviewPrioritySorter_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHReviewPrioritySorter_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHReviewPrioritySorterd_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHReviewPrioritySorterd_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHReviewRecipe_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHReviewRecipe_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHReviewReciped_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHReviewReciped_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHReviewResultParser_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHReviewResultParser_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHReviewResultParserd_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHReviewResultParserd_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHReviewResult_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHReviewResult_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHReviewResultd_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHReviewResultd_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHReviewSetting_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHReviewSetting_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHReviewSettingd_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHReviewSettingd_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHSignalControls_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHSignalControls_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHSignalControlsd_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHSignalControlsd_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHThreadPools_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHThreadPools_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHThreadPoolsd_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHThreadPoolsd_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHTotalPitchMeasure_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHTotalPitchMeasure_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHTotalPitchMeasured_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHTotalPitchMeasured_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHVcrControls_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHVcrControls_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHVcrControlsd_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHVcrControlsd_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHVirtualGlassMap_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHVirtualGlassMap_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHVirtualGlassMapd_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHVirtualGlassMapd_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHWsiControls_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHWsiControls_x64_vc15.pdbBinary files differ
ReviewSystem/bin/CHWsiControlsd_x64_vc15.dllBinary files differ
ReviewSystem/bin/CHWsiControlsd_x64_vc15.pdbBinary files differ
ReviewSystem/bin/IOCPNetwork_x64_vc15.dllBinary files differ
ReviewSystem/bin/IOCPNetwork_x64_vc15.pdbBinary files differ
ReviewSystem/bin/IOCPNetworkd_x64_vc15.dllBinary files differ
ReviewSystem/bin/IOCPNetworkd_x64_vc15.pdbBinary files differ
ReviewSystem/bin/LIBIY_Core.dllBinary files differ
ReviewSystem/bin/LIBIY_CoreD.dllBinary files differ
ReviewSystem/bin/LIBIY_ImageCodec.dllBinary files differ
ReviewSystem/bin/LIBIY_ImageCodecD.dllBinary files differ
ReviewSystem/bin/LIBIY_Wrapper.dllBinary files differ
ReviewSystem/bin/LIBIY_WrapperD.dllBinary files differ
ReviewSystem/bin/LineChecker_x64_vc15.dllBinary files differ
ReviewSystem/bin/LineChecker_x64_vc15.pdbBinary files differ
ReviewSystem/bin/LineCheckerd_x64_vc15.dllBinary files differ
ReviewSystem/bin/LineCheckerd_x64_vc15.pdbBinary files differ
ReviewSystem/bin/M_AutoDiagnosisManager_x64_vc17.dllBinary files differ
ReviewSystem/bin/M_AutoDiagnosisManager_x64_vc17.pdbBinary files differ
ReviewSystem/bin/M_AutoDiagnosisManagerd_x64_vc17.dllBinary files differ
ReviewSystem/bin/M_AutoDiagnosisManagerd_x64_vc17.pdbBinary files differ
ReviewSystem/bin/MosisAssem_x64_vc15.dllBinary files differ
ReviewSystem/bin/MosisAssemd_x64_vc15.dllBinary files differ
ReviewSystem/bin/MosisBuffer_x64_vc15.dllBinary files differ
ReviewSystem/bin/MosisBufferd_x64_vc15.dllBinary files differ
ReviewSystem/bin/PowerPmac64.dllBinary files differ
ReviewSystem/bin/ReviewRecipeEditor.exeBinary files differ
ReviewSystem/bin/ReviewRecipeEditor.pdbBinary files differ
ReviewSystem/bin/ReviewRecipeEditord_x64_vc10.exeBinary files differ
ReviewSystem/bin/ReviewRecipeEditord_x64_vc10.pdbBinary files differ
ReviewSystem/bin/ReviewSystem.exeBinary files differ
ReviewSystem/bin/ReviewSystem.pdbBinary files differ
ReviewSystem/bin/ReviewSystemSetting.exeBinary files differ
ReviewSystem/bin/ReviewSystemSetting.pdbBinary files differ
ReviewSystem/bin/ReviewSystemSettingd_x64_vc10.exeBinary files differ
ReviewSystem/bin/ReviewSystemSettingd_x64_vc10.pdbBinary files differ
ReviewSystem/bin/ReviewSystemd_x64_vc10.pdbBinary files differ
ReviewSystem/bin/akCore_WS10_x64.dllBinary files differ
ReviewSystem/bin/akCored_WS10_x64.dllBinary files differ
ReviewSystem/bin/akNetwork_WS10_x64.dllBinary files differ
ReviewSystem/bin/akNetworkd_WS10_x64.dllBinary files differ
ReviewSystem/bin/chartdir.lic
»õ ÆÄÀÏ @@ -0,0 +1 @@ RDST-24CP-62L4-8TQY-1652-A228 ReviewSystem/bin/chartdir51.dllBinary files differ
ReviewSystem/bin/mvxlc.dllBinary files differ
ReviewSystem/bin/mvxlcd.dllBinary files differ
ReviewSystem/bin/opencv_core2411.dllBinary files differ
ReviewSystem/bin/opencv_core2411d.dllBinary files differ
ReviewSystem/bin/opencv_highgui2411.dllBinary files differ
ReviewSystem/bin/opencv_highgui2411d.dllBinary files differ
ReviewSystem/bin/opencv_imgproc2411.dllBinary files differ
ReviewSystem/bin/opencv_imgproc2411d.dllBinary files differ
ReviewSystem/include/CHSignalControls/SignalControl_DitSharedMemorySync.h
@@ -14,6 +14,11 @@ virtual BOOL Read_ReceiveSignal(int nAddrIndex, WORD& dwValue); virtual BOOL Write_SendSignal(int nAddrIndex, int nSignalIndex, WORD wSignalValue, int nOnTime=1000); /*< SWK 20221226 - #4403 ADD Start >*/ protected: inline void Write_SendSignal(int nAddrIndex, int nSignalIndex, bool bOn); public: /*< SWK 20221226 - #4403 ADD End >*/ virtual BOOL Read_SendSignal(int nAddrIndex, WORD& dwValue); virtual BOOL ReadData(const CString strAddr, int nSize, CString& strData); virtual BOOL ReadData(const CString strAddr, int nSize, char* pData); ReviewSystem/include/CHSignalControls/SignalThread.h
@@ -20,6 +20,8 @@ nSignalIndex = 0; wSignalValue = 0; dwOnTime = 0; //< SWK 20221221 - #4403 ADD > ullStartTick = 0; } int nSignalType; @@ -31,6 +33,8 @@ int nSignalIndex; WORD wSignalValue; DWORD dwOnTime; //< SWK 20221221 - #4403 ADD > ULONGLONG ullStartTick; }; class CSignalThreadData : public CWorkThreadData ReviewSystem/include/akNetwork/akNetworkLinker.h
@@ -45,8 +45,8 @@ #define _AUTOLIBNAME _AKPROJECTNAME""_AKDEBUG""_AKWINDOWSDK""_AKX64".lib" //ììì½ë #define _AKDebug "akNetwork_WS10_x64" #define _AKRelese "akNetworkd_WS10_x64" #define _AKDebug "akNetworkd_WS10_x64" #define _AKRelese "akNetwork_WS10_x64" #define _AKtmp // You may turn off this include message by defining _NOPSAUTOLIB ReviewSystem/lib/CHAfmControls_x64_vc15.libBinary files differ
ReviewSystem/lib/CHAfmControlsd_x64_vc15.libBinary files differ
ReviewSystem/lib/CHAlignFinder_x64_vc15.libBinary files differ
ReviewSystem/lib/CHAlignFinderd_x64_vc15.libBinary files differ
ReviewSystem/lib/CHDefectPicker_x64_vc15.libBinary files differ
ReviewSystem/lib/CHDefectPickerd_x64_vc15.libBinary files differ
ReviewSystem/lib/CHLightControls_x64_vc15.libBinary files differ
ReviewSystem/lib/CHLightControlsd_x64_vc15.libBinary files differ
ReviewSystem/lib/CHMotorControls_x64_vc15.libBinary files differ
ReviewSystem/lib/CHMotorControlsd_x64_vc15.libBinary files differ
ReviewSystem/lib/CHPathScheduler_x64_vc15.libBinary files differ
ReviewSystem/lib/CHPathSchedulerd_x64_vc15.libBinary files differ
ReviewSystem/lib/CHResultFileManager_x64_vc15.libBinary files differ
ReviewSystem/lib/CHResultFileManagerd_x64_vc15.libBinary files differ
ReviewSystem/lib/CHReviewDefectFinder_x64_vc15.libBinary files differ
ReviewSystem/lib/CHReviewDefectFinderd_x64_vc15.libBinary files differ
ReviewSystem/lib/CHReviewPrioritySorter_x64_vc15.libBinary files differ
ReviewSystem/lib/CHReviewPrioritySorterd_x64_vc15.libBinary files differ
ReviewSystem/lib/CHReviewRecipe_x64_vc15.libBinary files differ
ReviewSystem/lib/CHReviewReciped_x64_vc15.libBinary files differ
ReviewSystem/lib/CHReviewResultParser_x64_vc15.libBinary files differ
ReviewSystem/lib/CHReviewResultParserd_x64_vc15.libBinary files differ
ReviewSystem/lib/CHReviewResult_x64_vc15.libBinary files differ
ReviewSystem/lib/CHReviewResultd_x64_vc15.libBinary files differ
ReviewSystem/lib/CHReviewSetting_x64_vc15.libBinary files differ
ReviewSystem/lib/CHReviewSettingd_x64_vc15.libBinary files differ
ReviewSystem/lib/CHSignalControls_x64_vc15.libBinary files differ
ReviewSystem/lib/CHSignalControlsd_x64_vc15.libBinary files differ
ReviewSystem/lib/CHTotalPitchMeasure_x64_vc15.libBinary files differ
ReviewSystem/lib/CHTotalPitchMeasured_x64_vc15.libBinary files differ
ReviewSystem/lib/LineChecker_x64_vc15.libBinary files differ
ReviewSystem/lib/LineCheckerd_x64_vc15.libBinary files differ
ReviewSystem/lib/M_AutoDiagnosisManager_x64_vc17.libBinary files differ
ReviewSystem/lib/M_AutoDiagnosisManagerd_x64_vc17.libBinary files differ
ReviewSystem/lib/akCore_WS10_x64.libBinary files differ
ReviewSystem/lib/akCored_WS10_x64.libBinary files differ
ReviewSystem/lib/akNetwork_WS10_x64.libBinary files differ
ReviewSystem/lib/akNetworkd_WS10_x64.libBinary files differ
