refactor mfc dependencies

commdll/Include/GPVisionHS.h

@@ -4,6 +4,11 @@
 
 #pragma once
 
+#include <map>
+#include <memory>
+#include <vector>
+#include <bitset>
+
 #include "GPVision.h"
 #include "FileLog.h"
 #include "VisionMultiUnitResult.h"
@@ -11,11 +16,6 @@
 
 #include "KeyValue.h"
 
-#include <map>
-#include <memory>
-#include <vector>
-#include <bitset>
-
 #ifdef BUILD_COMMDLL
 #define COMMDLL_DLLCLASS __declspec(dllexport)
 #else

commdll/Include/KeyenceBL600.h

@@ -3,8 +3,8 @@
 //////////////////////////////////////////////////////////////////////
 #pragma once
 
-
 #include <string>
+
 #include "Scanner.h"
 #include "Utility.h"
 

commdll/Include/MEyeVision.h

@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include "GPVision.h"
-
 #include <map>
 #include <memory>
 #include <vector>
@@ -111,6 +109,17 @@ public:
         MOD_GPI                    = 0x40000000,
     };
 
+    enum class TYPE_ID
+    {
+        TYPE1 = 1,
+        TYPE2,
+        TYPE3,
+        TYPE4,
+        TYPE5,
+        TYPE6,
+        TYPE7,
+    };
+
     enum class RESOLUTION
     {
         X = 1,
@@ -142,7 +151,7 @@ public:
         GOOD,
     };
 
-    CMEyeVision(const std::string& strMutexName = _T("vision_mutex"), size_t nMaxStation = MAX_VISION_STATION);
+    CMEyeVision(const std::string& strMutexName = _T("vision_mutex"), size_t nMaxStation = VISION_BASE::MAX_VISION_STATION);
     ~CMEyeVision() final;
 
     bool StartPatternLocationInspection(int nStationNo, PATTERN_LOCATION_TYPE eType);
@@ -367,12 +376,12 @@ private:
     std::vector<int>    m_nInspectSeq;
     std::vector<string> m_strUniqueId; // For tracking of unique Id issue upon inspection
     //
-    bitset<MAX_VISION_STATION> m_bsStartBufferingMode;
-    bitset<MAX_VISION_STATION> m_bsModuleStatusEnable;
-    bitset<MAX_VISION_STATION> m_bsSemiT10Enable;
-    bitset<MAX_VISION_STATION> m_bsTeachingValid;
-    bitset<MAX_VISION_STATION> m_bsDiagResultAlwaysGood;
-    bitset<MAX_VISION_STATION> m_bsDiagLogDataEnable;
+    bitset<VISION_BASE::MAX_VISION_STATION> m_bsStartBufferingMode;
+    bitset<VISION_BASE::MAX_VISION_STATION> m_bsModuleStatusEnable;
+    bitset<VISION_BASE::MAX_VISION_STATION> m_bsSemiT10Enable;
+    bitset<VISION_BASE::MAX_VISION_STATION> m_bsTeachingValid;
+    bitset<VISION_BASE::MAX_VISION_STATION> m_bsDiagResultAlwaysGood;
+    bitset<VISION_BASE::MAX_VISION_STATION> m_bsDiagLogDataEnable;
 
     //
     std::map<int, std::map<int, CVisionResult::XYT_PVI_PARAM>> m_mapDataSetConfig;

commdll/Include/NuDAM.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <string>
+
 #include "Scanner.h"
 #include "Utility.h"
 #include "SerialPort.h"

commdll/Include/OmronCompoWayF.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <string>
+
 #include "Scanner.h"
 
 #ifdef BUILD_COMMDLL

commdll/Include/OmronLaserScanner.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <string>
+
 #include "Scanner.h"
 
 #ifdef BUILD_COMMDLL

commdll/Include/OmronTempCtrlE5CN.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <string>
+
 #include "OmronCompoWayF.h"
 
 #ifdef  BUILD_COMMDLL

commdll/Include/RSLaser.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <string>
+
 #include "VisionNW.h"
 #include "Utility.h"
 

commdll/Include/RfID_Omron600.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <string>
+
 #include "utility.h"
 #include "RfId.h"
 #include "RfIdFactory.h"

commdll/Include/RfId.h

@@ -1,6 +1,7 @@
 #pragma once
 #include <memory>
 #include <string>
+
 #include "Utility.h"
 
 #ifdef  BUILD_COMMDLL

commdll/Include/VisionResult.h

@@ -3,8 +3,6 @@
 //////////////////////////////////////////////////////////////////////
 #pragma once
 
-#include <Afxtempl.h>
-
 #include <map>
 #include <string>
 #include <vector>

commdll/Include/VisionUnitResult.h

@@ -4,12 +4,12 @@
 
 #pragma once
 
-#include "VisionResult.h"
-
 #include <array>
 #include <vector>
 #include <string>
 
+#include "VisionResult.h"
+
 #ifdef BUILD_COMMDLL
 #define COMMDLL_DLLCLASS __declspec(dllexport)
 #else

iodll/Include/HardwareIni.h

@@ -7,8 +7,6 @@
 #include <string>
 #include <vector>
 
-#include "Afxtempl.h"
-
 #include "gclib.h"
 #include "gclibo.h"
 // ETEL

secsgemdll/Include/pch.h

@@ -10,6 +10,6 @@
 // add headers that you want to pre-compile here
 #include "framework.h"
 
-#include <fmt/core.h>
+#include "fmt/core.h"
 #include "Utility.h"
 #endif //PCH_H

utility/Include/DebugLog.h

@@ -70,7 +70,7 @@ void DebugLogTimingTrace(bool bTraceData, fmt::format_string<Args...> _fmt, Args
 {
     if (bTraceData)
     {
-        mitechlogManager.GetLogger(eLOGGER::DEBUG_TIMING_LOG).Log(_fmt, args...);
+        logManager.GetLogger(eLOGGER::DEBUG_TIMING_LOG).Log(_fmt, args...);
     }
 }
 

utility/Include/Trigger.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <afxtempl.h>
+#include <vector>
 
 #include "MyWait.h"
 #include "Evt.h"
@@ -20,8 +20,7 @@ public:
     void Reset();
 
 protected:
-    DWORD m_dwCount;
-    CTypedPtrArray<CPtrArray, HANDLE> m_aHandle;
+    std::vector<HANDLE> m_aHandle;
 
 private:
     DWORD WaitFor(DWORD dwTimeOut, BOOL bWaitForAll);