MitLib v3.0.0.8 (VS10)

main v3.0.0.8
Jenkins 11 years ago
parent 5448b98843
commit 4652bcf3cf

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -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"

@ -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_)

@ -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:

@ -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

@ -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<int> 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<int> m_segmentedAxes;
std::vector<CMtrProfile> m_segmentedMtrProfile;
unsigned __int64 m_axisMask;
bool m_bMotionStarted;
bool AnyMotionRequired(int nMtrNo, double position);
};

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -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"

@ -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"

Loading…
Cancel
Save