MitLib v3.0.0.9 (VS10)

MITLIB/GuiDLL/GuiDLL.rc

@@ -995,8 +995,8 @@ VS_VERSION_INFO$(VERSION_CONTROL) VERSIONINFO
 #else
 VS_VERSION_INFO VERSIONINFO
 #endif
- FILEVERSION 3,0,0,8
- PRODUCTVERSION 3,0,0,8
+ FILEVERSION 3,0,0,9
+ PRODUCTVERSION 3,0,0,9
  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.8\0"
+            VALUE "FileVersion", "3.0.0.9\0"
             VALUE "InternalName", "GuiDLL"
             VALUE "LegalCopyright", "Copyright ? 2012"
             VALUE "OriginalFilename", "GuiDLL.dll"
             VALUE "ProductName", "MIT  GuiDLL"
-            VALUE "ProductVersion", "3.0.0.8\0"
+            VALUE "ProductVersion", "3.0.0.9\0"
         END
     END
     BLOCK "VarFileInfo"

MITLIB/GuiDLL/MaintenancePage.h

@@ -31,6 +31,8 @@ class CMotionController;
 class CInputController;
 class COutputController;
 
+typedef std::map<CString, bool> CSTRING_BOOL_MAP;
+
 // MaintenancePage.h : header file
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -122,17 +124,17 @@ protected:
 
 private:
 //  bool IsCurrentFieldValid(CString csPath, CString csTableName, CString csFieldName);
-    bool IsOutputDisplayEnable(CString csOutputName);
-    bool IsInputDisplayEnable(CString csInputName);
-    void GetIODisplayData();
-    bool GetMotorPosSaveTolerence(CString csCurrPosName, double &dMaxOffset, double &dMinOffset, CString csCurrMotorName);
-    bool IsCheckTolerenceEnable(CString csCurrPosName, CString csCurrMotorName);
-    bool CheckIfDisplayEnable(CString csCurrPosName);
-    bool CheckIfTeachEnable(CString csCurrPosName, CString csCurrMotorName);
+    bool IsOutputDisplayEnable(CDaoDatabase &db, CString csOutputName);
+    bool IsInputDisplayEnable(CDaoDatabase &db, CString csInputName);
+    void GetIODisplayData(CDaoDatabase &db);
+    bool GetMotorPosSaveTolerence(CDaoDatabase &db, CString csCurrPosName, double &dMaxOffset, double &dMinOffset, CString csCurrMotorName);
+    bool IsCheckTolerenceEnable(CDaoDatabase &db, CString csCurrPosName, CString csCurrMotorName);
+    bool CheckIfDisplayEnable(CDaoDatabase &db, CString csCurrPosName);
+    bool CheckIfTeachEnable(CDaoDatabase *pdb, CString csCurrPosName, CString csCurrMotorName);
     void LockButtonsDuringMachineIsRunning();
     bool UpdateCurrentModule(bool SavingSetting = true);
 //  void CheckSecurityLevel();
-    void DisplaySwitchToCurrentMotorItems();
+    void DisplaySwitchToCurrentMotorItems(CDaoDatabase *pdb = NULL, CDaoDatabase *dbpkg = NULL);
     void RefreshCurrentModuleMotorInputSignals();
     void RefreshCurrentModuleDigitalOutputSignals();
     void RefreshCurrentModuleDigitalInputSignals();
@@ -140,31 +142,31 @@ private:
     void GetCurrentMotorPosId();
     void GetCurrentMotorId();
     void SetCurrentMotorSpeedParameter();
-    void SetCurrentModuleMotorItems();
+    void SetCurrentModuleMotorItems(CDaoDatabase &db);
     void SetCurrentModuleDigitalOutputTexts();
     void SetCurrentModuleDigitalInputTexts();
-    void InitMotorTree();
+    void InitMotorTree(CDaoDatabase &db);
     void InitIconButtons();
     void LoadLedBitmap();
     void CreateTemporaryMotorBuffer();
     void CreateMotorTreeImageList();
-    void CheckRecipeSelected();                                                    // Enable or disable controls base on Recipe Selected
-    void EnableDisableSaveButton();                                                // enable save button if recipe is selected and teach current motor is enable
-    void CheckUserLevel();                                                         // Enable or disable controls base on User level
-
-    void initMaintenanceIOModules();                                               // Init Maintenance Input/Output Modules attribtes
-    void HideExtraInputItems();                                                    // Hide extra Input Items
-    void HideExtraOutputItems();                                                   // Hide extra Output Items
-    void InitPage1MaintIpAttributes();                                             // init page 1 maintenance input attributes
-    void CalNoOfInputModule();                                                     // calculate number of input modules
-    void InitPage1MaintOpAttributes();                                             // init page 1 maintenance output attributes
-    void CalNoOfOutputModule();                                                    // calculate number of output modules
-    void SaveMotorPos(CString csPackageName, bool bGoldenData = false);            // save motor pos
-    void SaveMotorSpeedParameter(CString csPackageName, bool bGoldenData = false); // save motor speed setting
-    void GetMotorPos(CString csPackageName);                                       // get motor pos and update to text box
-    void GetMotorSpeedParameter(CString csPackageName);                            // get motor speed setting and update to text box
-    bool IsMachineRunning();                                                       // check if machine is running
-    void ProcessMaintMsg();                                                        // process Maintenance Message and print to text box
+    void CheckRecipeSelected();                                                                              // Enable or disable controls base on Recipe Selected
+    void EnableDisableSaveButton();                                                                          // enable save button if recipe is selected and teach current motor is enable
+    void CheckUserLevel();                                                                                   // Enable or disable controls base on User level
+
+    void initMaintenanceIOModules();                                                                         // Init Maintenance Input/Output Modules attribtes
+    void HideExtraInputItems();                                                                              // Hide extra Input Items
+    void HideExtraOutputItems();                                                                             // Hide extra Output Items
+    void InitPage1MaintIpAttributes();                                                                       // init page 1 maintenance input attributes
+    void CalNoOfInputModule();                                                                               // calculate number of input modules
+    void InitPage1MaintOpAttributes();                                                                       // init page 1 maintenance output attributes
+    void CalNoOfOutputModule();                                                                              // calculate number of output modules
+    void SaveMotorPos(CDaoDatabase &db, CString csPackageName, bool bGoldenData = false);                    // save motor pos
+    void SaveMotorSpeedParameter(CDaoDatabase &dbMtrSpeed, CString csPackageName, bool bGoldenData = false); // save motor speed setting
+    void GetMotorPos(CString csPackageName, CDaoDatabase *pdb);                                              // get motor pos and update to text box
+    void GetMotorSpeedParameter(CString csPackageName, CDaoDatabase *pdb = NULL);                            // get motor speed setting and update to text box
+    bool IsMachineRunning();                                                                                 // check if machine is running
+    void ProcessMaintMsg();                                                                                  // process Maintenance Message and print to text box
 
 //  Indicate that output has been moved before
     void SetMvOpFlag();
@@ -181,9 +183,9 @@ private:
 //  clear all motor text when module has no motor
     void ClearAllMtrText();
 
-    int GetSubField(CString csPosName, std::map<int, CString>  &strItem);
+    int GetSubField(CDaoDatabase &db, CString csPosName, std::map<int, CString>  &strItem);
 //  Get sub Motor Position and update to control
-    void GetSubFieldPosValue();
+    void GetSubFieldPosValue(CDaoDatabase &db);
 
 //  enable motor button
     void EnableMotorButton();
@@ -192,7 +194,7 @@ private:
     void DisableMotorButton();
 
 //  initialised speed radio button
-    void InitSpdRadioBtn();
+    void InitSpdRadioBtn(CDaoDatabase &dbMtrSpeed);
 
     CImageList* m_pImageList;
     CString     m_csCurrMotorName;
@@ -325,6 +327,8 @@ private:
 
 //  true = Off Motor Disable Home and Move Button
     bool m_bOffMtrDisableHmMvBtn;
+
+    std::map<CString, CSTRING_BOOL_MAP> m_mapMtrNamPosName;
 };
 
 // {{AFX_INSERT_LOCATION}}

MITLIB/GuiDLL/MotorRS.h

@@ -82,7 +82,7 @@ public:
     BOOL GetSaveAllPkg(CString csPosName);
     int  InitModule(stModule *module);
     //  set the motor position name from Motor and MotorSubField table
-    void SetMtrPosName(stModule *module);
+    void SetMtrPosName(stModule *module, CDaoDatabase *pdb = NULL);
 
 private:
 

MITLIB/SecsGemDll/SGManager.h

@@ -34,9 +34,7 @@ public:
     bool    IsSpoolActive();
     bool    IsConnectWithSecsGem(); // check for connection between handler and Ti secs gem
     bool m_bDataComplete;
-    char m_cReceiveData[MAXSOCKBUF];
-    char m_RcvBuff[MAXSOCKBUF];
-    long m_nBufferPtr;
+    std::string m_RcvBuff;
     void OnReceive(const char *buf, int size);
     void OnDisconnect(int errorCode);
     void ResetReceiveBuffer();

MITLIB/Utility/MultiLanguage.h

@@ -63,8 +63,8 @@ public:
     static CString GetMenuItemText(CString csPageName, CString csMenuItemName);
     static CString GetMenuJobsItemText(CString csMenuItemName);
     static void    ResetStructureArray();
-    static bool    GetPagesDetailInfo();
-    static bool    GetPagesInfo();
+    static bool    GetPagesDetailInfo(CDaoDatabase *pdb = NULL);
+    static bool    GetPagesInfo(CDaoDatabase *pdb = NULL);
     static void    LoadLanguage(int nLanguage);
     static void    SetLanguage(int nLanguage = 0);
     static int     GetLanguage();

MITLIB/Utility/Utility.rc

@@ -110,8 +110,8 @@ VS_VERSION_INFO$(VERSION_CONTROL) VERSIONINFO
 #else
 VS_VERSION_INFO VERSIONINFO
 #endif
- FILEVERSION 3,0,0,8
- PRODUCTVERSION 3,0,0,8
+ FILEVERSION 3,0,0,9
+ PRODUCTVERSION 3,0,0,9
  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.8\0"
+            VALUE "FileVersion", "3.0.0.9\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.8\0"
-            VALUE "SpecialBuild", "mitlib-release-3-8\0"
+            VALUE "ProductVersion", "3.0.0.9\0"
+            VALUE "SpecialBuild", "mitlib-release-3-9\0"
         END
     END
     BLOCK "VarFileInfo"

MITLIB/mcctrdll/lotmsg.h

@@ -49,6 +49,9 @@ public:
 #define STORE_WARN          true
 #define DO_NOT_STORE_WARN   false
 
+#define JAM_MSG             true
+#define WARN_MSG            false
+
 #ifdef  BUILD_MCCTRDLL
 #define     MCCTRDLLCLASS   __declspec(dllexport)
 #else
@@ -99,7 +102,7 @@ public:
 // Message Record
     void BeginMsgRecord(LPCSTR pLotNumber, CString LotStartDateTime);
     void StoreMsg();
-    void StoreMsgList(CPtrList &pMsg);
+    void StoreMsgList(CPtrList &pMsg, bool bJam = JAM_MSG);
 
     void EndMsgRecord();
 
@@ -154,7 +157,7 @@ private:
     void ClearMsgList(CPtrList &pMsg);
 
 // Message Record Operations
-    void StoreMsgItem(CMsgItem *msg);
+    void StoreMsgItem(CMsgItem *msg, bool bJam = JAM_MSG);
 
 //  post jam message to sec gem jam task thread
     void PostSecGemJamMessage(CMsgItem *msg);

MITLIB/mcctrdll/mcctrdll.rc

@@ -72,8 +72,8 @@ VS_VERSION_INFO$(VERSION_CONTROL) VERSIONINFO
 #else
 VS_VERSION_INFO VERSIONINFO
 #endif
- FILEVERSION 3,0,0,8
- PRODUCTVERSION 3,0,0,8
+ FILEVERSION 3,0,0,9
+ PRODUCTVERSION 3,0,0,9
  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.8\0"
+            VALUE "FileVersion", "3.0.0.9\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.8\0"
-            VALUE "SpecialBuild", "mitlib-release-3-8\0"
+            VALUE "ProductVersion", "3.0.0.9\0"
+            VALUE "SpecialBuild", "mitlib-release-3-9\0"
         END
     END
     BLOCK "VarFileInfo"

MITLIB/mcctrdll/run.h

@@ -13,6 +13,7 @@
 #include "RunTask.h"
 #include "OutputController.h"
 #include "Utility.h"
+#include <set>
 
 enum MODE
 {
@@ -302,6 +303,9 @@ public:
 //  For run modules to do clean up after system power up
     virtual void OnPowerUpCompleted();
 
+//  Clear Run Module Warning code
+    void ClrWarn();
+
 protected:
     stModule *m_pstModule;
     HWND      m_hwndMainApp;
@@ -325,6 +329,12 @@ protected:
 //  clear jam occured before flag
     void ClearJamOccuredBeforeFlag();
 
+//  Returns warning code in std::set
+    std::set<int> GetWarnSet();
+
+//  Return true if warning has been set before
+    bool IsWarningExist(int iWarnCode);
+
 // event to request motor stop in Maintenance Mode
     CEvt m_evtMaintStop;
     CEvt m_evtMcStop;
@@ -344,6 +354,7 @@ private:
     };
 
     CArray<stWarning, stWarning> m_astWarning;
+    std::set<int>                m_setWarn;
 
 // Gary 03jun03 start
     BOOL m_bWarningClear;