diff --git a/MITLIB/Dll/CommDll100D.dll b/MITLIB/Dll/CommDll100D.dll index 28316e1..eedbb90 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 b617f65..4a6a36a 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 b9b6d2a..dd5444d 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 eb361dc..f1db2ff 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 2413d32..9026c23 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 4b14402..8d69aea 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 b4f9172..a27e124 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,10 - PRODUCTVERSION 3,0,0,10 + FILEVERSION 3,0,0,11 + PRODUCTVERSION 3,0,0,11 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -1014,12 +1014,12 @@ BEGIN VALUE "Comments", "1. Added Cleanup After Delete Package during deleting of package for application to do any other clean up.\r\n" VALUE "CompanyName", "MIT " VALUE "FileDescription", "GuiDLL" - VALUE "FileVersion", "3.0.0.10\0" + VALUE "FileVersion", "3.0.0.11\0" VALUE "InternalName", "GuiDLL" VALUE "LegalCopyright", "Copyright ? 2015" VALUE "OriginalFilename", "GuiDLL.dll" VALUE "ProductName", "MIT GuiDLL" - VALUE "ProductVersion", "3.0.0.10\0" + VALUE "ProductVersion", "3.0.0.11\0" END END BLOCK "VarFileInfo" diff --git a/MITLIB/IODll/Motor.h b/MITLIB/IODll/Motor.h index fdc59b0..124de1f 100644 --- a/MITLIB/IODll/Motor.h +++ b/MITLIB/IODll/Motor.h @@ -138,6 +138,7 @@ enum HOMING_METHOD HOME_INDEX, HOME_SENSOR_INDEX, HOME_BY_LIMIT, + HOME_BY_LIMIT_THEN_INDEX = 27, }; // motor profile data structure diff --git a/MITLIB/IODll/MotorBase.h b/MITLIB/IODll/MotorBase.h index 6a076e0..a22abb6 100644 --- a/MITLIB/IODll/MotorBase.h +++ b/MITLIB/IODll/MotorBase.h @@ -250,6 +250,9 @@ public: // virtual method to do homing by Home Sensor virtual BOOL HomeBySensor(); +// virtual method by limit then index + virtual BOOL HomeByLimitThenIndex(); + // virtual method to move absolute int MoveAbs(double dPosition, int nPos = -1, int nMode = 0); virtual bool AbsoluteMove(double dPosition, int nMode, PROFILE_CURVE curve) = 0; diff --git a/MITLIB/IODll/Motor_7856.h b/MITLIB/IODll/Motor_7856.h index 8ef728b..bf565bc 100644 --- a/MITLIB/IODll/Motor_7856.h +++ b/MITLIB/IODll/Motor_7856.h @@ -65,6 +65,9 @@ public: // method to do homing by Home Sensor BOOL HomeBySensor() override; +// method to home by home mode 27: (EL On Then reverse to count EZ number and reset counter) + BOOL HomeByLimitThenIndex() override; + // method to move absolute bool AbsoluteMove(double dPosition, int nMode, PROFILE_CURVE curve) override; diff --git a/MITLIB/Lib/CommDll100D.lib b/MITLIB/Lib/CommDll100D.lib index f378a47..72cdbed 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 16eef81..cc69c7f 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 a295b4d..35e986b 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 7818cb6..3e9b72a 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 708c347..2c941b2 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 cd6f020..66bbef3 100644 Binary files a/MITLIB/Lib/mcctrdll100D.lib and b/MITLIB/Lib/mcctrdll100D.lib differ diff --git a/MITLIB/SecsGemDll/SGManager.h b/MITLIB/SecsGemDll/SGManager.h index ceb7fa1..0b3f810 100644 --- a/MITLIB/SecsGemDll/SGManager.h +++ b/MITLIB/SecsGemDll/SGManager.h @@ -33,7 +33,7 @@ public: bool IsOnlineLocal(); bool IsSpoolActive(); bool IsConnectWithSecsGem(); // check for connection between handler and Ti secs gem - bool m_bDataComplete; + bool m_bDataComplete; std::string m_RcvBuff; void OnReceive(const char *buf, int size); void OnDisconnect(int errorCode); diff --git a/MITLIB/Utility/Utility.rc b/MITLIB/Utility/Utility.rc index 7ec38da..bacb5a8 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,10 - PRODUCTVERSION 3,0,0,10 + FILEVERSION 3,0,0,11 + PRODUCTVERSION 3,0,0,11 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x21L @@ -129,15 +129,15 @@ BEGIN VALUE "Comments", "1. Reduce opening and closing of MitLanguage.mdb\0" VALUE "CompanyName", "MIT \0" VALUE "FileDescription", "Utility\0" - VALUE "FileVersion", "3.0.0.10\0" + VALUE "FileVersion", "3.0.0.11\0" VALUE "InternalName", "Utility\0" VALUE "LegalCopyright", "Copyright © 2015\0" VALUE "LegalTrademarks", " \0" VALUE "OriginalFilename", "Utility.dll\0" VALUE "PrivateBuild", " \0" VALUE "ProductName", "MIT Utility\0" - VALUE "ProductVersion", "3.0.0.10\0" - VALUE "SpecialBuild", "mitlib-release-3-10\0" + VALUE "ProductVersion", "3.0.0.11\0" + VALUE "SpecialBuild", "mitlib-release-3-11\0" END END BLOCK "VarFileInfo" diff --git a/MITLIB/mcctrdll/MaintMsg.h b/MITLIB/mcctrdll/MaintMsg.h index 2eadb61..1ee7c92 100644 --- a/MITLIB/mcctrdll/MaintMsg.h +++ b/MITLIB/mcctrdll/MaintMsg.h @@ -25,6 +25,8 @@ public: CMaintMsg(); virtual ~CMaintMsg(); + static CMutex m_MaintMsgMutex; + private: static CString m_csMaintMsg; }; diff --git a/MITLIB/mcctrdll/mcctrdll.rc b/MITLIB/mcctrdll/mcctrdll.rc index e09affd..d7b59e2 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,10 - PRODUCTVERSION 3,0,0,10 + FILEVERSION 3,0,0,11 + PRODUCTVERSION 3,0,0,11 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -91,15 +91,15 @@ BEGIN VALUE "Comments", "1. Do not process clear warning if warning did not exist\r\n2. Do not process warning if already process\r\n3. Clear run module warning when end of lot completed\0" VALUE "CompanyName", "MIT \0" VALUE "FileDescription", "mcctrdll\0" - VALUE "FileVersion", "3.0.0.10\0" + VALUE "FileVersion", "3.0.0.11\0" VALUE "InternalName", "mcctrdll\0" VALUE "LegalCopyright", "Copyright © 2015\0" VALUE "LegalTrademarks", " \0" VALUE "OriginalFilename", "mcctrdll.dll\0" VALUE "PrivateBuild", " \0" VALUE "ProductName", "MIT mcctrdll\0" - VALUE "ProductVersion", "3.0.0.10\0" - VALUE "SpecialBuild", "mitlib-release-3-10\0" + VALUE "ProductVersion", "3.0.0.11\0" + VALUE "SpecialBuild", "mitlib-release-3-11\0" END END BLOCK "VarFileInfo"