public
/
mitlib.pub
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

MitLib v6.0.0.11 (VS10)

Browse Source
REL_6 v6.0.0.11
Jenkins 6 years ago
parent f6231ba438
commit 3b63dafb3d
20 changed files with 44 additions and 25 deletions
Show Stats Download Patch File Download Diff File

BIN
MITLIB/Dll/CommDll100D.dll
View File

Binary file not shown.

BIN
MITLIB/Dll/IODll100D.dll
View File

Binary file not shown.

BIN
MITLIB/Dll/SecsGem100.dll
View File

Binary file not shown.

BIN
MITLIB/Dll/Utility100D.dll
View File

Binary file not shown.

BIN
MITLIB/Dll/mcctrdll100D.dll
View File

Binary file not shown.

4
MITLIB/IODll/Motor.h
Unescape Escape View File

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

6
MITLIB/IODll/MotorAdlinkBase.h
Unescape Escape View File

@ -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);
};

9
MITLIB/IODll/MotorBase.h
Unescape Escape View File

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

6
MITLIB/IODll/Motor_8134.h
Unescape Escape View File

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

7
MITLIB/IODll/Motor_8164.h
Unescape Escape View File

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

11
MITLIB/Include/winmessage.h
Unescape Escape View File

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

BIN
MITLIB/Lib/CommDll100D.lib
View File

Binary file not shown.

BIN
MITLIB/Lib/IODll100D.lib
View File

Binary file not shown.

BIN
MITLIB/Lib/SecsGem100.lib
View File

Binary file not shown.

BIN
MITLIB/Lib/Utility100D.lib
View File

Binary file not shown.

BIN
MITLIB/Lib/mcctrdll100D.lib
View File

Binary file not shown.

10
MITLIB/Utility/Utility.rc
Unescape Escape View File

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

1
MITLIB/mcctrdll/MsgDecode.h
Unescape Escape View File

@ -22,6 +22,7 @@ typedef struct _MSG_DATA
{
int msgType;
std::string strByteMsg;
} MC_DATA;
class MCCTRDLLCLASS CMsgDecode

10
MITLIB/mcctrdll/mcctrdll.rc
Unescape Escape View File

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

5
MITLIB/mcctrdll/runctrl.h
Unescape Escape View File

@ -508,10 +508,7 @@ public:
std::vector<JAM_AUTHORIZATION> m_vecAuthroizationLevel;
CConcurrentQueue<std::shared_ptr<std::string> > m_strMsgQueue;
CConcurrentQueue<std::shared_ptr<std::string> > m_cmdMsgQueue;
CConcurrentQueue<std::shared_ptr<std::string> > m_jamMsgQueue;
CConcurrentQueue<std::shared_ptr<std::string> > m_wrnMsgQueue;
CConcurrentQueue<std::shared_ptr<MC_DATA> > m_strMcMsgQueue;
void AddDisabledBuzzerMsg(int nMsgID);

Write Preview
Loading…
Cancel
Save