diff --git a/commdll/Include/MEyeVision.h b/commdll/Include/MEyeVision.h index ac28f2c..769e7e2 100644 --- a/commdll/Include/MEyeVision.h +++ b/commdll/Include/MEyeVision.h @@ -181,7 +181,7 @@ public: bool StartTeachPosition(int nStationNo, int nIndexX, int nIndexY, int nColFOV, int nRowFOV); bool StartInspectPosition(int nStationNo, int nIndexX, int nIndexY, int nColFOV, int nRowFOV); bool GetMultiUnitResult(int nStationNo, stGPMultiUnitDataResult& st_MultiUnitResult, int nUnitID); - bool WaitResultReady(int nStationNo, DWORD dwTimeout, bool bMultiUnit = false); + bool WaitResultReady(int nStationNo, DWORD dwTimeout, bool bMultiUnit = false) override; bool SetFOVOffset(int nStationNo, double dOffsetX = 0.0, double dOffsetY = 0.0); __declspec(deprecated("Use SetClusterID() instead")) bool SetFOVPosition(int nStationNo, std::string strStripID, int nDeviceCluster = -1); @@ -267,6 +267,9 @@ public: bool SendMsg(const std::string& strMsg, DWORD dwTimeout, bool bWaitAck = false) override; bool SendCommand(const std::string& strCommand, bool bWaitAck = false, DWORD dwTimeout = 5000) override; bool WaitImageTaken(int nStationNo, DWORD dwTimeout = 0) override; + bool IsTeach(int nStationNo) override; + bool IsRun() override; + bool IsAck() override; bool Run() override; bool Stop() override; bool DataEnd() override; @@ -280,6 +283,8 @@ public: bool SetNetUPH(long lNetUPH) override; bool SetShiftID(const std::string& strShiftID) override; + bool GetStatus() override; + bool CloseLot(DWORD dwTimeout = 5000) override; bool OpenLot(int nPackageID, DWORD dwTimeout = 5000) override; bool OpenLot(const std::string& strPackageName, DWORD dwTimeout = 5000) override; diff --git a/commdll/Include/VisionBase.h b/commdll/Include/VisionBase.h index 85666d0..0c5db7b 100644 --- a/commdll/Include/VisionBase.h +++ b/commdll/Include/VisionBase.h @@ -69,7 +69,7 @@ namespace VISION_BASE virtual bool SwitchAppWindow(int nStationNo, DWORD dwTimeout = 5000) = 0; bool IsLotOpen() const; bool WaitInTeach(int nStationNo, DWORD dwTimeout); - bool WaitResultReady(int nStationNo, DWORD dwTimeout); + virtual bool WaitResultReady(int nStationNo, DWORD dwTimeout, bool bMultiUnit = false); virtual bool WaitImageTaken(int nStationNo, DWORD dwTimeout = 0); bool GetResult(int nStationNo, std::string& csResult); std::string GetReceiveData(); @@ -95,12 +95,12 @@ namespace VISION_BASE virtual bool DataEnd() = 0; virtual bool DataStart() = 0; virtual bool SetPackageID(long lPackageID) = 0; - virtual bool GetResult(int nStationNo, stGPDoubleDataResult& st_dResult) = 0; - virtual bool CheckResultReady(int nStationNo) = 0; - virtual bool CloseLot(DWORD dwTimeout = 5000) = 0; - virtual bool OpenLot(int nPackageID, DWORD dwTimeout = 5000) = 0; + virtual bool GetResult(int nStationNo, stGPDoubleDataResult& st_dResult); + virtual bool CheckResultReady(int nStationNo); + virtual bool CloseLot(DWORD dwTimeout = 5000) = 0; + virtual bool OpenLot(int nPackageID, DWORD dwTimeout = 5000) = 0; virtual bool OpenLot(const std::string& strPackageName, DWORD dwTimeout = 5000) = 0; - virtual bool CheckImageTaken(int nStationNo) = 0; + virtual bool CheckImageTaken(int nStationNo); virtual bool StartInspect(int nStationNo, int nNextSOT = 0, int nEdge = 1, TWO_TYPE_INSPECTION nTypeID = TWO_TYPE_INSPECTION::DISABLED) = 0; virtual void ReceiveComm(const char* cpcBuffer, int nSize) = 0; diff --git a/commdll/lib/commdllD.lib b/commdll/lib/commdllD.lib index efb1f7f..451e0e9 100644 Binary files a/commdll/lib/commdllD.lib and b/commdll/lib/commdllD.lib differ diff --git a/dll/commdllD.dll b/dll/commdllD.dll index 511be66..03406b3 100644 Binary files a/dll/commdllD.dll and b/dll/commdllD.dll differ diff --git a/dll/iodllD.dll b/dll/iodllD.dll index 0b53a0f..467a7f4 100644 Binary files a/dll/iodllD.dll and b/dll/iodllD.dll differ diff --git a/dll/mcctrdllD.dll b/dll/mcctrdllD.dll index 1a01f33..a6eab0d 100644 Binary files a/dll/mcctrdllD.dll and b/dll/mcctrdllD.dll differ diff --git a/dll/utilityD.dll b/dll/utilityD.dll index 388226b..33802c4 100644 Binary files a/dll/utilityD.dll and b/dll/utilityD.dll differ diff --git a/iodll/Include/Motor.h b/iodll/Include/Motor.h index 448915d..5384e10 100644 --- a/iodll/Include/Motor.h +++ b/iodll/Include/Motor.h @@ -325,13 +325,13 @@ public: HOME_MOVE_COMPLETE, }; - std::string GetVariable(std::string csVariableName); + std::string GetVariable(const std::string& csVariableName); int StopProgramAndMotion(); int UpdateProfile(); - int SendCommand(std::string csCommand); + int SendCommand(const std::string& csCommand); // ************************************************************ // Applicable to Galil Axis - ENDS // ************************************************************ @@ -339,28 +339,28 @@ public: // ************************************************************ // Methods to enquire other motors status - STARTS // ************************************************************ - double GetOtherAxisPosition(CMtrProfile mtrProfile); + double GetOtherAxisPosition(const CMtrProfile& mtrProfile); // Check other axis home sensor - BOOL IsHomed(CMtrProfile mtrProfile); + BOOL IsHomed(const CMtrProfile& mtrProfile); // Get other axis motion IO status - int GetMotionIOStatus(CMtrProfile mtrProfile); + int GetMotionIOStatus(const CMtrProfile& mtrProfile); // Get Other axis servo ready status - BOOL IsServoReady(CMtrProfile mtrProfile); + BOOL IsServoReady(const CMtrProfile& mtrProfile); // Get Other axis Alarm status - BOOL IsServoAlarm(CMtrProfile mtrProfile); + BOOL IsServoAlarm(const CMtrProfile& mtrProfile); // Get Other axis negative limit status - BOOL IsNegLmtHit(CMtrProfile mtrProfile); + BOOL IsNegLmtHit(const CMtrProfile& mtrProfile); // Get Other axis positive limit status - BOOL IsPosLmtHit(CMtrProfile mtrProfile); + BOOL IsPosLmtHit(const CMtrProfile& mtrProfile); // Get Other axis positive limit status - bool IsMtrOn(CMtrProfile mtrProfile); + bool IsMtrOn(const CMtrProfile& mtrProfile); // ************************************************************ // Methods to enquire other motors status - ENDS @@ -521,8 +521,8 @@ public: int SegmentedEnd(); int SegmentedArc(double* dCenter, double* dFinalPoint, int rotation); - int MasterSlaveEnable(const CMtrProfile slaveMtrProfile, double offset, double leftBoundary, double rightBoundary); - int MasterSlaveDisable(const CMtrProfile slaveMtrProfile); + int MasterSlaveEnable(const CMtrProfile& slaveMtrProfile, double offset, double leftBoundary, double rightBoundary); + int MasterSlaveDisable(const CMtrProfile& slaveMtrProfile); bool SetFixSpdRange(double dMaxVel, bool bRealWorldUnit = false); bool UnFixSpdRange(); diff --git a/iodll/Include/MotorBase.h b/iodll/Include/MotorBase.h index a6d572c..8c4bb69 100644 --- a/iodll/Include/MotorBase.h +++ b/iodll/Include/MotorBase.h @@ -329,8 +329,8 @@ public: virtual int SegmentedLine(double* dPositions); virtual int SegmentedEnd(); virtual int SegmentedArc(double* dCenter, double* dFinalPoint, int rotation); - virtual int MasterSlaveEnable(const CMtrProfile slaveMtrProfile, double offset, double leftBoundary, double rightBoundary); - virtual int MasterSlaveDisable(const CMtrProfile slaveMtrProfile); + virtual int MasterSlaveEnable(const CMtrProfile& slaveMtrProfile, double offset, double leftBoundary, double rightBoundary); + virtual int MasterSlaveDisable(const CMtrProfile& slaveMtrProfile); // ************************************************************** // virtual Methods declaration applicable to ACS ONLY - ENDS // ************************************************************** diff --git a/iodll/Include/Motor_1203.h b/iodll/Include/Motor_1203.h index e3ab290..059ccb4 100644 --- a/iodll/Include/Motor_1203.h +++ b/iodll/Include/Motor_1203.h @@ -12,7 +12,7 @@ class CMotor_1203 : public CMotorAdlinkBase { public: - CMotor_1203(CMtrProfile mtrProfile, double* dpPos, CMotionControllerBase* pBaseController); + CMotor_1203(const CMtrProfile& mtrProfile, double* dpPos, CMotionControllerBase* pBaseController); virtual ~CMotor_1203(); // ************************************************************** diff --git a/iodll/Include/Motor_7856.h b/iodll/Include/Motor_7856.h index 5483af7..77d72a2 100644 --- a/iodll/Include/Motor_7856.h +++ b/iodll/Include/Motor_7856.h @@ -10,7 +10,7 @@ class CMotor_7856 : public CMotorAdlinkBase { public: - CMotor_7856(CMtrProfile mtrProfile, double* dpPos, CMotionControllerBase* pBaseController); + CMotor_7856(const CMtrProfile& mtrProfile, double* dpPos, CMotionControllerBase* pBaseController); virtual ~CMotor_7856(); // ************************************************************** diff --git a/iodll/Include/Motor_8134.h b/iodll/Include/Motor_8134.h index f6fe23d..89c7c2a 100644 --- a/iodll/Include/Motor_8134.h +++ b/iodll/Include/Motor_8134.h @@ -8,7 +8,7 @@ class CMotor_8134 : public CMotorAdlinkBase { public: - CMotor_8134(CMtrProfile mtrProfile, double* dpPos, CMotionControllerBase* pBaseController); + CMotor_8134(const CMtrProfile& mtrProfile, double* dpPos, CMotionControllerBase* pBaseController); virtual ~CMotor_8134(); // ************************************************************** diff --git a/iodll/Include/Motor_8164.h b/iodll/Include/Motor_8164.h index 12f2682..b202da8 100644 --- a/iodll/Include/Motor_8164.h +++ b/iodll/Include/Motor_8164.h @@ -8,7 +8,7 @@ class CMotor_8164 : public CMotorAdlinkBase { public: - CMotor_8164(CMtrProfile mtrProfile, double* dpPos, CMotionControllerBase* pBaseController); + CMotor_8164(const CMtrProfile& mtrProfile, double* dpPos, CMotionControllerBase* pBaseController); virtual ~CMotor_8164(); // ************************************************************** diff --git a/iodll/Include/Motor_GALIL.h b/iodll/Include/Motor_GALIL.h index aead4db..a72b3dd 100644 --- a/iodll/Include/Motor_GALIL.h +++ b/iodll/Include/Motor_GALIL.h @@ -8,7 +8,7 @@ class CMotor_GALIL : public CMotorBase { public: - CMotor_GALIL(CMtrProfile mtrProfile, double* dpPos, CMotionControllerBase* pBaseController); + CMotor_GALIL(const CMtrProfile& mtrProfile, double* dpPos, CMotionControllerBase* pBaseController); virtual ~CMotor_GALIL(); // ************************************************************** diff --git a/iodll/lib/iodllD.lib b/iodll/lib/iodllD.lib index 13eb29c..c2b01f0 100644 Binary files a/iodll/lib/iodllD.lib and b/iodll/lib/iodllD.lib differ diff --git a/mcctrdll/Include/RunComm.h b/mcctrdll/Include/RunComm.h index 5429512..ffa4295 100644 --- a/mcctrdll/Include/RunComm.h +++ b/mcctrdll/Include/RunComm.h @@ -61,8 +61,8 @@ protected: long GetBaudRate(bool bMaint = false, int nWhichOne = 0); std::string GetParity(bool bMaint = false, int nWhichOne = 0); std::string GetCommPort(bool bMaint = false, int nWhichOne = 0); - bool GetCommPortSetting(std::string csIniFile, std::string csSectionName, int nWhichOne = 0); - bool GetNetworkPortSetting(std::string csIniFile, std::string csSectionName, int nWhichOne = 0); + bool GetCommPortSetting(const std::string& csIniFile, const std::string& csSectionName, int nWhichOne = 0); + bool GetNetworkPortSetting(const std::string& csIniFile, const std::string& csSectionName, int nWhichOne = 0); // send com data to modules in maintenance mode virtual void OnMaintenanceSendCom(LPCTSTR lpcComPort, int iBaudRate, int iDataBits, LPCTSTR lpcParity, float fStopBits, LPCTSTR lpcFlowCtrl, LPCTSTR lpcSendMsg); @@ -85,14 +85,14 @@ protected: virtual void OnMaintenanceDisconnectPort(LPCTSTR IpAddress, int iPortNo); // write acknowledge message to text file - void WriteAckToTextFile(std::string strAckMsg); - - virtual void SendPacket(std::string strAckMsg = ""); - virtual void DisconnectPort(std::string strAckMsg = ""); - virtual void ConnectPort(std::string strAckMsg = ""); - virtual void SendComm(std::string strAckMsg = ""); - virtual void CloseCommPort(std::string strAckMsg = ""); - virtual void OpenCommPort(std::string strAckMsg = ""); + void WriteAckToTextFile(const std::string& strAckMsg); + + virtual void SendPacket(const std::string& strAckMsg = ""); + virtual void DisconnectPort(const std::string& strAckMsg = ""); + virtual void ConnectPort(const std::string& strAckMsg = ""); + virtual void SendComm(const std::string& strAckMsg = ""); + virtual void CloseCommPort(const std::string& strAckMsg = ""); + virtual void OpenCommPort(const std::string& strAckMsg = ""); void InitCommSettings(LPCTSTR lpcComPort, long lBaudRate, int iDataBits, LPCTSTR lpcParity, float fStopBits, LPCTSTR lpcFlowCtrl); private: diff --git a/mcctrdll/lib/mcctrdllD.lib b/mcctrdll/lib/mcctrdllD.lib index 8d4ea94..a1b0619 100644 Binary files a/mcctrdll/lib/mcctrdllD.lib and b/mcctrdll/lib/mcctrdllD.lib differ