diff --git a/MITLIB/Dll/CommDll100D.dll b/MITLIB/Dll/CommDll100D.dll index 4a4bb54..e821d62 100644 Binary files a/MITLIB/Dll/CommDll100D.dll and b/MITLIB/Dll/CommDll100D.dll differ diff --git a/MITLIB/Dll/IODll100D.dll b/MITLIB/Dll/IODll100D.dll index 5ecd99b..46b1266 100644 Binary files a/MITLIB/Dll/IODll100D.dll and b/MITLIB/Dll/IODll100D.dll differ diff --git a/MITLIB/Dll/SecsGem100.dll b/MITLIB/Dll/SecsGem100.dll index c8ef745..fe2f0e0 100644 Binary files a/MITLIB/Dll/SecsGem100.dll and b/MITLIB/Dll/SecsGem100.dll differ diff --git a/MITLIB/Dll/Utility100D.dll b/MITLIB/Dll/Utility100D.dll index 8b1739f..67a1d68 100644 Binary files a/MITLIB/Dll/Utility100D.dll and b/MITLIB/Dll/Utility100D.dll differ diff --git a/MITLIB/Dll/mcctrdll100D.dll b/MITLIB/Dll/mcctrdll100D.dll index 60532ae..e99e2d0 100644 Binary files a/MITLIB/Dll/mcctrdll100D.dll and b/MITLIB/Dll/mcctrdll100D.dll differ diff --git a/MITLIB/IODll/Motor.h b/MITLIB/IODll/Motor.h index 75361ab..88d790f 100644 --- a/MITLIB/IODll/Motor.h +++ b/MITLIB/IODll/Motor.h @@ -523,6 +523,10 @@ public: bool SetFixSpdRange(double dMaxVel, bool bRealWorldUnit = false); bool UnFixSpdRange(); + // LERP - Linear Interpolation + bool StartXYRelMoveLinear(double dDistX, double dDistY, double dStartVel, double dMaxVel, double dAcc, double dDec); + bool StartZURelMoveLinear(double dDistZ, double dDistU, double dStartVel, double dMaxVel, double dAcc, double dDec); + private: // all the various motion controller objects diff --git a/MITLIB/IODll/MotorAdlinkBase.h b/MITLIB/IODll/MotorAdlinkBase.h index c1cf7ca..4796b41 100644 --- a/MITLIB/IODll/MotorAdlinkBase.h +++ b/MITLIB/IODll/MotorAdlinkBase.h @@ -89,4 +89,10 @@ protected: virtual bool StartSimultaneousMove(int nFirstAxisNo); virtual bool IsSimultaneousMoveSupported(void); virtual double CovertAccToMtrUnits(double dAcc, double dNumPulsePerMM); + + // LERP - Linear Interpolation + virtual bool StartXYRelMoveLinear(double dDistX, double dDistY, double dStartVel, double dMaxVel, double dAcc, double dDec); + virtual bool StartZURelMoveLinear(double dDistZ, double dDistU, double dStartVel, double dMaxVel, double dAcc, double dDec); + virtual bool StartXYSRelMoveLinear(double dDistX, double dDistY, double dStartVel, double dMaxVel, double dAcc, double dDec, double dSAcc, double dSDec); + virtual bool StartZUSRelMoveLinear(double dDistZ, double dDistU, double dStartVel, double dMaxVel, double dAcc, double dDec, double dSAcc, double dSDec); }; diff --git a/MITLIB/IODll/MotorBase.h b/MITLIB/IODll/MotorBase.h index 51c1697..656aab8 100644 --- a/MITLIB/IODll/MotorBase.h +++ b/MITLIB/IODll/MotorBase.h @@ -504,6 +504,12 @@ public: return false; } + // LERP - Linear Interpolation + virtual bool StartXYRelMoveLinear(double dDistX, double dDistY, double dStartVel, double dMaxVel, double dAcc, double dDec); + virtual bool StartZURelMoveLinear(double dDistZ, double dDistU, double dStartVel, double dMaxVel, double dAcc, double dDec); + virtual bool StartXYSRelMoveLinear(double dDistX, double dDistY, double dStartVel, double dMaxVel, double dAcc, double dDec, double dSAcc, double dSDec); + virtual bool StartZUSRelMoveLinear(double dDistZ, double dDistU, double dStartVel, double dMaxVel, double dAcc, double dDec, double dSAcc, double dSDec); + // ************************************************************** // variables declaration // ************************************************************** @@ -573,6 +579,9 @@ public: // variable to track what's the current position number of the axis int m_nCurrentPosNo; +// keep track of no of card + int m_iNoOfCard; + struct signal_mask { // home signal bit mask diff --git a/MITLIB/IODll/Motor_8134.h b/MITLIB/IODll/Motor_8134.h index 6e673a0..d9b4829 100644 --- a/MITLIB/IODll/Motor_8134.h +++ b/MITLIB/IODll/Motor_8134.h @@ -121,6 +121,12 @@ public: bool IsSimultaneousMoveSupported(void) override; + // LERP - Linear Interpolation + bool StartXYRelMoveLinear(double dDistX, double dDistY, double dStartVel, double dMaxVel, double dAcc, double dDec) override; + bool StartZURelMoveLinear(double dDistZ, double dDistU, double dStartVel, double dMaxVel, double dAcc, double dDec) override; + bool StartXYSRelMoveLinear(double dDistX, double dDistY, double dStartVel, double dMaxVel, double dAcc, double dDec, double dSAcc, double dSDec) override; + bool StartZUSRelMoveLinear(double dDistZ, double dDistU, double dStartVel, double dMaxVel, double dAcc, double dDec, double dSAcc, double dSDec) override; + // ************************************************************** // Methods declaration applicable to // ADLINK 8134, 8164 ONLY - ends diff --git a/MITLIB/IODll/Motor_8164.h b/MITLIB/IODll/Motor_8164.h index fd80a1b..9f55d6c 100644 --- a/MITLIB/IODll/Motor_8164.h +++ b/MITLIB/IODll/Motor_8164.h @@ -133,6 +133,13 @@ public: bool EnableLimitInterrupt(); bool DisableLimitInterrupt(); bool IsSimultaneousMoveSupported(void) override; + + // LERP - Linear Interpolation + bool StartXYRelMoveLinear(double dDistX, double dDistY, double dStartVel, double dMaxVel, double dAcc, double dDec) override; + bool StartZURelMoveLinear(double dDistZ, double dDistU, double dStartVel, double dMaxVel, double dAcc, double dDec) override; + bool StartXYSRelMoveLinear(double dDistX, double dDistY, double dStartVel, double dMaxVel, double dAcc, double dDec, double dSAcc, double dSDec) override; + bool StartZUSRelMoveLinear(double dDistZ, double dDistU, double dStartVel, double dMaxVel, double dAcc, double dDec, double dSAcc, double dSDec) override; + private: short m_sMtrNo; }; diff --git a/MITLIB/Include/winmessage.h b/MITLIB/Include/winmessage.h index c15fd95..5247745 100644 --- a/MITLIB/Include/winmessage.h +++ b/MITLIB/Include/winmessage.h @@ -65,24 +65,13 @@ #define WM_ON_GUI_TO_OPER_8 (WM_USER + WM_USR_DEF_GAP + 568) #define WM_ON_GUI_TO_OPER_9 (WM_USER + WM_USR_DEF_GAP + 569) -// #define WM_ON_WAF_REL_MV_CMD WM_ON_GUI_TO_WAF_HANDLER_0 -// #define WM_ON_WAF_MAINT_RC_CMD WM_ON_GUI_TO_WAF_HANDLER_1 -// #define WM_ON_WAF_MOVDIE WM_ON_GUI_TO_WAF_HANDLER_2 -// #define WM_ON_WAF_PURGE_MSG WM_ON_GUI_TO_WAF_HANDLER_3 #define WM_ON_WAF_GUI_MAP_UPDATE WM_ON_GUI_TO_WAF_HANDLER_0 -// #define WM_ON_OPERATOR_PROCESS WM_ON_GUI_TO_OPER_0 - #define WM_ON_THREAD_INTERRUPTED (WM_USER + WM_USR_DEF_GAP + 793) #define WM_ON_TESTMSG (WM_USER + WM_USR_DEF_GAP + 801) -#define WM_ON_STRING_MSG (WM_USER + WM_USR_DEF_GAP + 820) -#define WM_ON_COMMAND_MSG (WM_USER + WM_USR_DEF_GAP + 821) -#define WM_ON_JAM_MSG (WM_USER + WM_USR_DEF_GAP + 822) -#define WM_ON_WARNING_MSG (WM_USER + WM_USR_DEF_GAP + 823) - // #define WM_ON_GUI_TO_HANDLER (WM_USER + WM_USR_DEF_GAP + 1000) diff --git a/MITLIB/Lib/CommDll100D.lib b/MITLIB/Lib/CommDll100D.lib index 601eb06..4c15b32 100644 Binary files a/MITLIB/Lib/CommDll100D.lib and b/MITLIB/Lib/CommDll100D.lib differ diff --git a/MITLIB/Lib/IODll100D.lib b/MITLIB/Lib/IODll100D.lib index b5f58f9..127d869 100644 Binary files a/MITLIB/Lib/IODll100D.lib and b/MITLIB/Lib/IODll100D.lib differ diff --git a/MITLIB/Lib/SecsGem100.lib b/MITLIB/Lib/SecsGem100.lib index b5b32b3..1eb8e60 100644 Binary files a/MITLIB/Lib/SecsGem100.lib and b/MITLIB/Lib/SecsGem100.lib differ diff --git a/MITLIB/Lib/Utility100D.lib b/MITLIB/Lib/Utility100D.lib index d56b7a5..46a8cec 100644 Binary files a/MITLIB/Lib/Utility100D.lib and b/MITLIB/Lib/Utility100D.lib differ diff --git a/MITLIB/Lib/mcctrdll100D.lib b/MITLIB/Lib/mcctrdll100D.lib index d3797db..cc5e975 100644 Binary files a/MITLIB/Lib/mcctrdll100D.lib and b/MITLIB/Lib/mcctrdll100D.lib differ diff --git a/MITLIB/Utility/Utility.rc b/MITLIB/Utility/Utility.rc index 25e57f7..813b6e3 100644 --- a/MITLIB/Utility/Utility.rc +++ b/MITLIB/Utility/Utility.rc @@ -107,8 +107,8 @@ VS_VERSION_INFO$(VERSION_CONTROL) VERSIONINFO #else VS_VERSION_INFO VERSIONINFO #endif - FILEVERSION 6,0,0,10 - PRODUCTVERSION 6,0,0,10 + FILEVERSION 6,0,0,11 + PRODUCTVERSION 6,0,0,11 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x21L @@ -126,15 +126,15 @@ BEGIN VALUE "Comments", "1. Reduce opening and closing of MitLanguage.mdb" VALUE "CompanyName", "MIT " VALUE "FileDescription", "Utility" - VALUE "FileVersion", "6.0.0.10\0" + VALUE "FileVersion", "6.0.0.11\0" VALUE "InternalName", "Utility" VALUE "LegalCopyright", "Copyright © 2016" VALUE "LegalTrademarks", " " VALUE "OriginalFilename", "Utility.dll" VALUE "PrivateBuild", " " VALUE "ProductName", "MIT Utility" - VALUE "ProductVersion", "6.0.0.10\0" - VALUE "SpecialBuild", "mitlib-release-6-10\0" + VALUE "ProductVersion", "6.0.0.11\0" + VALUE "SpecialBuild", "mitlib-release-6-11\0" END END BLOCK "VarFileInfo" diff --git a/MITLIB/mcctrdll/MsgDecode.h b/MITLIB/mcctrdll/MsgDecode.h index 01c0fb4..873f9a0 100644 --- a/MITLIB/mcctrdll/MsgDecode.h +++ b/MITLIB/mcctrdll/MsgDecode.h @@ -22,6 +22,7 @@ typedef struct _MSG_DATA { int msgType; std::string strByteMsg; + } MC_DATA; class MCCTRDLLCLASS CMsgDecode diff --git a/MITLIB/mcctrdll/mcctrdll.rc b/MITLIB/mcctrdll/mcctrdll.rc index f7421bc..fbcb379 100644 --- a/MITLIB/mcctrdll/mcctrdll.rc +++ b/MITLIB/mcctrdll/mcctrdll.rc @@ -71,8 +71,8 @@ VS_VERSION_INFO$(VERSION_CONTROL) VERSIONINFO #else VS_VERSION_INFO VERSIONINFO #endif - FILEVERSION 6,0,0,10 - PRODUCTVERSION 6,0,0,10 + FILEVERSION 6,0,0,11 + PRODUCTVERSION 6,0,0,11 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -90,15 +90,15 @@ BEGIN VALUE "Comments", "1. Decouple GUI" VALUE "CompanyName", "MIT " VALUE "FileDescription", "mcctrdll" - VALUE "FileVersion", "6.0.0.10\0" + VALUE "FileVersion", "6.0.0.11\0" VALUE "InternalName", "mcctrdll" VALUE "LegalCopyright", "Copyright © 2016" VALUE "LegalTrademarks", " " VALUE "OriginalFilename", "mcctrdll.dll" VALUE "PrivateBuild", " " VALUE "ProductName", "MIT mcctrdll" - VALUE "ProductVersion", "6.0.0.10\0" - VALUE "SpecialBuild", "mitlib-release-6-10\0" + VALUE "ProductVersion", "6.0.0.11\0" + VALUE "SpecialBuild", "mitlib-release-6-11\0" END END BLOCK "VarFileInfo" diff --git a/MITLIB/mcctrdll/runctrl.h b/MITLIB/mcctrdll/runctrl.h index af90fd8..7daaeca 100644 --- a/MITLIB/mcctrdll/runctrl.h +++ b/MITLIB/mcctrdll/runctrl.h @@ -508,10 +508,7 @@ public: std::vector m_vecAuthroizationLevel; - CConcurrentQueue > m_strMsgQueue; - CConcurrentQueue > m_cmdMsgQueue; - CConcurrentQueue > m_jamMsgQueue; - CConcurrentQueue > m_wrnMsgQueue; + CConcurrentQueue > m_strMcMsgQueue; void AddDisabledBuzzerMsg(int nMsgID);