Import of MitLib v1.39.06

Change-Id: I67b4948c658bf76d802d3d7376e93a5f2ad97a86

MITLIB/GuiDLL/GuiDLL.rc

@@ -1182,8 +1182,8 @@ VS_VERSION_INFO$(VERSION_CONTROL) VERSIONINFO
 #else
 VS_VERSION_INFO VERSIONINFO
 #endif
- FILEVERSION 1,0,24,7
- PRODUCTVERSION 1,0,24,7
+ FILEVERSION 1,0,24,6
+ PRODUCTVERSION 1,0,24,6
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -1198,17 +1198,17 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "Comments", "1. Added ESTOP SecsGem state.\r\n2. Added IsEStopState method to check if machine is in ESTOP.\r\n3. Enhanced Auto Logout feature to take place in SubSheet.  \0"
+            VALUE "Comments", "1. Resolve bug when handling SecsGem ECID Changed which did not get the correct data.\r\n2. Added new virtual methods for system IO handling such as Door Open, Air Low, etc.\0"
             VALUE "CompanyName", "MIT \0"
             VALUE "FileDescription", "GuiDLL\0"
-            VALUE "FileVersion", "1, 0, 24, 7\0"
+            VALUE "FileVersion", "1, 0, 24, 6\0"
             VALUE "InternalName", "GuiDLL\0"
             VALUE "LegalCopyright", "Copyright © 2011\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "GuiDLL.dll\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "MIT  GuiDLL\0"
-            VALUE "ProductVersion", "1, 0, 24, 7\0"
+            VALUE "ProductVersion", "1, 0, 24, 6\0"
             VALUE "SpecialBuild", "\0"
         END
     END

MITLIB/GuiDLL/maindoc.h

@@ -86,11 +86,6 @@ public:
 	HWND	m_hwndMainApp;
 public:
 	
-	// Gary 3 Oct11, V1.24.07
-	// new function to query if machine is in EStop state
-	bool IsEStopState(){ return (m_bEStopActivate == TRUE)?true:false;};
-
-
 	// Gary 16Aug11, V1.24.06
 	// new virtual function for application to do any handling
 	virtual void OnAirLow(bool bLow){};

MITLIB/IODll/IODll.rc

@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,29,3
- PRODUCTVERSION 1,0,29,3
+ FILEVERSION 1,0,29,2
+ PRODUCTVERSION 1,0,29,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -44,17 +44,17 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "Comments", "1. Enhanced all stepper motor types to use command counter instead of encoder counter.\r\n2. Corrected MotionNet HomeByIndex mode from 32 to 30.\r\n3. Added more logging to traced MotionNet command issue error codes.\r\n4. Gailil configurable trigger width\0"
+            VALUE "Comments", "1. Change MotionNet Interrupt Handling.\0"
             VALUE "CompanyName", "MIT \0"
             VALUE "FileDescription", "IODll\0"
-            VALUE "FileVersion", "1, 0, 29, 3\0"
+            VALUE "FileVersion", "1, 0, 29, 2\0"
             VALUE "InternalName", "IODll\0"
             VALUE "LegalCopyright", "Copyright © 2011\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "IODll.dll\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "MIT  IODll\0"
-            VALUE "ProductVersion", "1, 0, 29, 3\0"
+            VALUE "ProductVersion", "1, 0, 29, 2\0"
             VALUE "SpecialBuild", "\0"
         END
     END

MITLIB/IODll/Motor.h

@@ -43,11 +43,6 @@
 #define MOTOR_STEPPER_WITH_INP	4
 #define MOTOR_STEPPER_WITH_ENC_AND_INP	5
 
-// Gary 24Aug11, V1.29.03, created more motor types to 
-// handle Adlink motor control to use only internal counter
-#define MOTOR_STEPPER_ENC_INTERNAL		6
-#define MOTOR_STEPPER_WITH_ENC_AND_INP_INTERNAL	7
-
 #define MOTOR_PULSE_OUTPUT_1P	0
 #define MOTOR_PULSE_OUTPUT_2P	1
 

MITLIB/IODll/Motor_ETEL.h

@@ -136,9 +136,7 @@ public:
 	// method to arm controller axis for single trigger
 	int SetSingleTrigger(double dPosition,  int nCmpSource=1, int nPulseStretch=STRETCH_NON);
 
-	// method to arm multiaxis for simultaneous motion, 
-	// nMode = 0 : Normal multi-axis move
-	// nMode = 1 : Gantry move
+	// method to arm multiaxis for simultaneous motion
 	int SimultaneousMove(int nNoOfAxis, CMtrProfile *mtrProfile,  double *dPosition, double *dStartVel, double *dMaxVel, double *dAcc, int nMode = 0);
 
 	// method to move absolute with s-curve profile
@@ -199,9 +197,6 @@ private:
 	// method to move profile
 	int UpdateProfile(CMtrProfile mtrProfile, int nDepth, double dAcc, double dSpd, double dJerk);
 
-	// Gary 28Sep11, V1.29.03 added separate method to set gantry move profile
-	int UpdateGantryProfile(int nDepth, double dAcc, double dSpd, double dJerk);
-
 	int ResetAlarm(bool bReset);
 
 	int GantryEnable(int nNoOfAxis, CMtrProfile *mtrProfile);

MITLIB/IODll/Motor_GALIL.h

@@ -193,9 +193,6 @@ private:
 	int GalilAbsMove(double dPosition);
 
 	int GalilRelMove(double dDistance);
-
-	// Gary 20Sep11, V1.29.03, cater configurable trigger pulse width
-	int m_nPulseWidth;
 };
 
 #endif // !defined(AFX_MOTOR_GALIL_H__B32C658E_7AF3_44AE_A7F0_CA13719016EA__INCLUDED_)