diff --git a/MITLIB/Dll/CommDll100D.dll b/MITLIB/Dll/CommDll100D.dll index 5f08eb7..7d343ee 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 c0ee85f..8a8e774 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 3dbeb02..7764e95 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 e138e1e..2d12be3 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 bfc89a5..c59ada0 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 fcb6491..29479f2 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 acf3c81..7d6a80c 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 4,0,0,5 - PRODUCTVERSION 4,0,0,5 + FILEVERSION 4,0,0,6 + PRODUCTVERSION 4,0,0,6 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -1014,12 +1014,12 @@ BEGIN VALUE "Comments", "1. Decouple GUI\r\n" VALUE "CompanyName", "MIT " VALUE "FileDescription", "GuiDLL" - VALUE "FileVersion", "4.0.0.5\0" + VALUE "FileVersion", "4.0.0.6\0" VALUE "InternalName", "GuiDLL" VALUE "LegalCopyright", "Copyright ? 2016" VALUE "OriginalFilename", "GuiDLL.dll" VALUE "ProductName", "MIT GuiDLL" - VALUE "ProductVersion", "4.0.0.5\0" + VALUE "ProductVersion", "4.0.0.6\0" END END BLOCK "VarFileInfo" diff --git a/MITLIB/GuiDLL/maindoc.h b/MITLIB/GuiDLL/maindoc.h index 576be67..8ea63dd 100644 --- a/MITLIB/GuiDLL/maindoc.h +++ b/MITLIB/GuiDLL/maindoc.h @@ -237,7 +237,7 @@ public: CGuiInputController *GetInputController(void); // void SetSwitch(int nSwitch, CInput *pInput); // void SetLight(int nIndicator, COutput *pOutput); - void InitParameters(void); + virtual void InitParameters(void); void SetCopyRight(CString csCopyRight); CString GetCopyRight(void); void SetMachineModel(CString csModel); diff --git a/MITLIB/IODll/Motor.h b/MITLIB/IODll/Motor.h index 7bbbb0c..53c02a3 100644 --- a/MITLIB/IODll/Motor.h +++ b/MITLIB/IODll/Motor.h @@ -62,6 +62,7 @@ #define MOTOR_PULSE_OUTPUT_1P 0 #define MOTOR_PULSE_OUTPUT_2P 1 +#define MOTOR_PULSE_OUTPUT_4AB_PHASE_LEADING 6 // 8134 IO Status /* ------------ I/O Status Definition ------------------------------------- */ diff --git a/MITLIB/Lib/CommDll100D.lib b/MITLIB/Lib/CommDll100D.lib index ff67a14..be669d5 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 7729e58..802c182 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 c8d0bec..7f0fc30 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 a16263b..f4ea9e9 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 0f2e469..318c9f0 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 8f5fcde..190b062 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 e0cd416..b2df864 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 4,0,0,5 - PRODUCTVERSION 4,0,0,5 + FILEVERSION 4,0,0,6 + PRODUCTVERSION 4,0,0,6 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", "4.0.0.5\0" + VALUE "FileVersion", "4.0.0.6\0" VALUE "InternalName", "Utility" VALUE "LegalCopyright", "Copyright © 2016" VALUE "LegalTrademarks", " " VALUE "OriginalFilename", "Utility.dll" VALUE "PrivateBuild", " " VALUE "ProductName", "MIT Utility" - VALUE "ProductVersion", "4.0.0.5\0" - VALUE "SpecialBuild", "mitlib-release-4-5\0" + VALUE "ProductVersion", "4.0.0.6\0" + VALUE "SpecialBuild", "mitlib-release-4-6\0" END END BLOCK "VarFileInfo" diff --git a/MITLIB/mcctrdll/SemiE10.h b/MITLIB/mcctrdll/SemiE10.h index d1d6a63..7a1a4dd 100644 --- a/MITLIB/mcctrdll/SemiE10.h +++ b/MITLIB/mcctrdll/SemiE10.h @@ -272,6 +272,9 @@ public: // get all SemiE10 timing StSemiE10 GetCurrentTimeInfo(); + // Set unit count + void SetUnitCnt(); + /* // get mtta LONGLONG GetMTTA(); diff --git a/MITLIB/mcctrdll/mcctrdll.rc b/MITLIB/mcctrdll/mcctrdll.rc index 127d7e0..42827ae 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 4,0,0,5 - PRODUCTVERSION 4,0,0,5 + FILEVERSION 4,0,0,6 + PRODUCTVERSION 4,0,0,6 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -90,15 +90,15 @@ BEGIN VALUE "Comments", "1. Decouple GUI" VALUE "CompanyName", "MIT " VALUE "FileDescription", "mcctrdll" - VALUE "FileVersion", "4.0.0.5\0" + VALUE "FileVersion", "4.0.0.6\0" VALUE "InternalName", "mcctrdll" VALUE "LegalCopyright", "Copyright © 2016" VALUE "LegalTrademarks", " " VALUE "OriginalFilename", "mcctrdll.dll" VALUE "PrivateBuild", " " VALUE "ProductName", "MIT mcctrdll" - VALUE "ProductVersion", "4.0.0.5\0" - VALUE "SpecialBuild", "mitlib-release-4-5\0" + VALUE "ProductVersion", "4.0.0.6\0" + VALUE "SpecialBuild", "mitlib-release-4-6\0" END END BLOCK "VarFileInfo"