diff --git a/MITLIB/Dll/8134A.dll b/MITLIB/Dll/8134A.dll index 2fd4f24..6916d5b 100644 Binary files a/MITLIB/Dll/8134A.dll and b/MITLIB/Dll/8134A.dll differ diff --git a/MITLIB/Dll/CommDll100D.dll b/MITLIB/Dll/CommDll100D.dll index 7b57377..bb2bf2c 100644 Binary files a/MITLIB/Dll/CommDll100D.dll and b/MITLIB/Dll/CommDll100D.dll differ diff --git a/MITLIB/Dll/GuiDll100D.dll b/MITLIB/Dll/GuiDll100D.dll index ea1f17d..3c0255d 100644 Binary files a/MITLIB/Dll/GuiDll100D.dll and b/MITLIB/Dll/GuiDll100D.dll differ diff --git a/MITLIB/Dll/IODll100D.dll b/MITLIB/Dll/IODll100D.dll index 7d0fb5f..c76483d 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 6b7871e..9154a87 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 391c83a..fe4e7d8 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 ddc894b..659aa9f 100644 Binary files a/MITLIB/Dll/mcctrdll100D.dll and b/MITLIB/Dll/mcctrdll100D.dll differ diff --git a/MITLIB/GuiDLL/GuiDLL.rc b/MITLIB/GuiDLL/GuiDLL.rc index b952d13..d270e58 100644 --- a/MITLIB/GuiDLL/GuiDLL.rc +++ b/MITLIB/GuiDLL/GuiDLL.rc @@ -995,8 +995,8 @@ VS_VERSION_INFO$(VERSION_CONTROL) VERSIONINFO #else VS_VERSION_INFO VERSIONINFO #endif - FILEVERSION 3,0,0,7 - PRODUCTVERSION 3,0,0,7 + FILEVERSION 3,0,0,8 + PRODUCTVERSION 3,0,0,8 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -1014,12 +1014,12 @@ BEGIN VALUE "Comments", "1. Solve Auto logout did not inform application level that user login has changed\r\n2. Solve motor position + index cannot have more than 50\r\n3. Increase Maintanence Page message box so that it can display 2 lines of message\r\n4. Select Secondary langauage will Prompt Error when using New Hardward Entry Method\r\n5. Configurable color for E10 and Mode display in Handler GUI" VALUE "CompanyName", "MIT " VALUE "FileDescription", "GuiDLL" - VALUE "FileVersion", "3.0.0.7\0" + VALUE "FileVersion", "3.0.0.8\0" VALUE "InternalName", "GuiDLL" VALUE "LegalCopyright", "Copyright ? 2012" VALUE "OriginalFilename", "GuiDLL.dll" VALUE "ProductName", "MIT GuiDLL" - VALUE "ProductVersion", "3.0.0.7\0" + VALUE "ProductVersion", "3.0.0.8\0" END END BLOCK "VarFileInfo" diff --git a/MITLIB/IODll/MotionController_ACS.h b/MITLIB/IODll/MotionController_ACS.h index 90798a2..ee2aa4c 100644 --- a/MITLIB/IODll/MotionController_ACS.h +++ b/MITLIB/IODll/MotionController_ACS.h @@ -54,6 +54,8 @@ private: char m_errorString[256]; CMotionLogger m_logger; HANDLE m_hComm; + + bool TerminateStrayConnections(); }; #endif // !defined(AFX_MOTIONCONTROLLER_ACS_H__3E235D4B_C75D_4F13_A9B5_61EFB6BB5378__INCLUDED_) diff --git a/MITLIB/IODll/Motor.h b/MITLIB/IODll/Motor.h index c9af873..fdc59b0 100644 --- a/MITLIB/IODll/Motor.h +++ b/MITLIB/IODll/Motor.h @@ -509,7 +509,7 @@ public: int SegmentedEnd(); int SegmentedArc(double *dCenter, double *dFinalPoint, int rotation); - int MasterSlaveEnable(const CMtrProfile slaveMtrProfile, double leftBoundary, double rightBoundary); + int MasterSlaveEnable(const CMtrProfile slaveMtrProfile, double offset, double leftBoundary, double rightBoundary); int MasterSlaveDisable(const CMtrProfile slaveMtrProfile); private: diff --git a/MITLIB/IODll/MotorBase.h b/MITLIB/IODll/MotorBase.h index 93eafb4..6a076e0 100644 --- a/MITLIB/IODll/MotorBase.h +++ b/MITLIB/IODll/MotorBase.h @@ -323,7 +323,7 @@ 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 leftBoundary, double rightBoundary); + 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/MITLIB/IODll/Motor_ACS.h b/MITLIB/IODll/Motor_ACS.h index 377d598..82b9689 100644 --- a/MITLIB/IODll/Motor_ACS.h +++ b/MITLIB/IODll/Motor_ACS.h @@ -55,7 +55,7 @@ public: int SegmentedLine(double *dPositions) override; int SegmentedEnd() override; int SegmentedArc(double *dCenter, double *dFinalPoint, int rotation) override; - int MasterSlaveEnable(const CMtrProfile slaveMtrProfile, double leftBoundary, double rightBoundary) override; + int MasterSlaveEnable(const CMtrProfile slaveMtrProfile, double offset, double leftBoundary, double rightBoundary) override; int MasterSlaveDisable(const CMtrProfile slaveMtrProfile) override; CString IntArrayToString(std::vector vArray); @@ -65,6 +65,7 @@ public: CString DoubleArrayToString(int nItems, double *iArray); void SetCallBackAxisMask(unsigned __int64 mask); unsigned __int64 GetCallBackAxisMask(); + void StopCheckMotionEnd(); private: DWORD WaitProgramDone(DWORD dwTimeout); @@ -88,4 +89,7 @@ private: std::vector m_segmentedAxes; std::vector m_segmentedMtrProfile; unsigned __int64 m_axisMask; + bool m_bMotionStarted; + + bool AnyMotionRequired(int nMtrNo, double position); }; diff --git a/MITLIB/Lib/CommDll100D.lib b/MITLIB/Lib/CommDll100D.lib index d1ccd3c..c66f12c 100644 Binary files a/MITLIB/Lib/CommDll100D.lib and b/MITLIB/Lib/CommDll100D.lib differ diff --git a/MITLIB/Lib/GuiDll100D.lib b/MITLIB/Lib/GuiDll100D.lib index 692eabe..0b84f2a 100644 Binary files a/MITLIB/Lib/GuiDll100D.lib and b/MITLIB/Lib/GuiDll100D.lib differ diff --git a/MITLIB/Lib/IODll100D.lib b/MITLIB/Lib/IODll100D.lib index 5d332de..2915e2a 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 21cc347..95b31c9 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 e9373d9..6fdc33a 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 e41c60c..fd94090 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 bc999e5..ef23869 100644 --- a/MITLIB/Utility/Utility.rc +++ b/MITLIB/Utility/Utility.rc @@ -110,8 +110,8 @@ VS_VERSION_INFO$(VERSION_CONTROL) VERSIONINFO #else VS_VERSION_INFO VERSIONINFO #endif - FILEVERSION 3,0,0,7 - PRODUCTVERSION 3,0,0,7 + FILEVERSION 3,0,0,8 + PRODUCTVERSION 3,0,0,8 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x21L @@ -129,15 +129,15 @@ BEGIN VALUE "Comments", "1. Add in enum for Techinician and Above Can Delete Lot report.\r\n2. For VC6 compilation, if TraceDebug to debug window message is greater than 512 characters, Trace to debug window ""TRACE Data cannot be longer than 512 chars! Please trim your TRACE message\0" VALUE "CompanyName", "MIT \0" VALUE "FileDescription", "Utility\0" - VALUE "FileVersion", "3.0.0.7\0" + VALUE "FileVersion", "3.0.0.8\0" VALUE "InternalName", "Utility\0" VALUE "LegalCopyright", "Copyright © 2010\0" VALUE "LegalTrademarks", " \0" VALUE "OriginalFilename", "Utility.dll\0" VALUE "PrivateBuild", " \0" VALUE "ProductName", "MIT Utility\0" - VALUE "ProductVersion", "3.0.0.7\0" - VALUE "SpecialBuild", "mitlib-release-3-7\0" + VALUE "ProductVersion", "3.0.0.8\0" + VALUE "SpecialBuild", "mitlib-release-3-8\0" END END BLOCK "VarFileInfo" diff --git a/MITLIB/mcctrdll/mcctrdll.rc b/MITLIB/mcctrdll/mcctrdll.rc index 3db7aed..167b32a 100644 --- a/MITLIB/mcctrdll/mcctrdll.rc +++ b/MITLIB/mcctrdll/mcctrdll.rc @@ -72,8 +72,8 @@ VS_VERSION_INFO$(VERSION_CONTROL) VERSIONINFO #else VS_VERSION_INFO VERSIONINFO #endif - FILEVERSION 3,0,0,7 - PRODUCTVERSION 3,0,0,7 + FILEVERSION 3,0,0,8 + PRODUCTVERSION 3,0,0,8 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -91,15 +91,15 @@ BEGIN VALUE "Comments", "1. Handled vacuum input as reversed logic.\0" VALUE "CompanyName", "MIT \0" VALUE "FileDescription", "mcctrdll\0" - VALUE "FileVersion", "3.0.0.7\0" + VALUE "FileVersion", "3.0.0.8\0" VALUE "InternalName", "mcctrdll\0" VALUE "LegalCopyright", "Copyright © 2013\0" VALUE "LegalTrademarks", " \0" VALUE "OriginalFilename", "mcctrdll.dll\0" VALUE "PrivateBuild", " \0" VALUE "ProductName", "MIT mcctrdll\0" - VALUE "ProductVersion", "3.0.0.7\0" - VALUE "SpecialBuild", "mitlib-release-3-7\0" + VALUE "ProductVersion", "3.0.0.8\0" + VALUE "SpecialBuild", "mitlib-release-3-8\0" END END BLOCK "VarFileInfo"