~chenluhua/Bond2.git

			@@ -21,6 +21,7 @@
			#include "SystemLogManagerDlg.h"
			#include "UserManager.h"
			#include "SystemLogManager.h"
			#include "PortConfigurationDlg.h"


			#ifdef _DEBUG
			@@ -235,6 +236,9 @@
			else if (exCode == ROBOT_EVENT_ABORT) {
			m_pMyStatusbar->setCurTaskBtnText("无");
			}
			else if (exCode == ROBOT_EVENT_RESTORE) {
			m_pMyStatusbar->setCurTaskBtnText("无");
			}
			}
			}

			@@ -279,6 +283,10 @@
			// 执行此操作
			SetIcon(m_hIcon, TRUE); // 设置大图标
			SetIcon(m_hIcon, FALSE); // 设置小图标


			// model init
			theApp.m_model.init();


			// 菜单
			@@ -349,9 +357,6 @@
			int height = GetSystemMetrics(SM_CYSCREEN);
			MoveWindow((width - rcWnd.Width()) / 2, 0, rcWnd.Width(), rcWnd.Height(), TRUE);


			// model init
			theApp.m_model.init();


			SetTimer(TIMER_ID_CREATE_TERMINAL, 3000, nullptr);
			@@ -882,6 +887,10 @@
			m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
			}
			}
			else if (id == IDC_BUTTON_PORT_CONFIG) {
			CPortConfigurationDlg dlg;
			dlg.DoModal();
			}
			else if (id == IDC_BUTTON_ROBOT) {
			theApp.m_model.getMaster().clearError();
			SERVO::CEFEM* pEFEM = (SERVO::CEFEM*)theApp.m_model.getMaster().getEquipment(EQ_ID_EFEM);
			@@ -889,6 +898,16 @@
			dlg.SetEFEM(pEFEM);
			dlg.DoModal();
			}
			else if (id == IDC_BUTTON_SETTINGS) {
			SERVO::CEquipment* pEq = theApp.m_model.m_master.getEquipment(EQ_ID_EFEM);
			((SERVO::CEFEM*)pEq)->printDebugRobotState();
			pEq->printDebugString001();
			pEq = theApp.m_model.m_master.getEquipment(EQ_ID_Bonder1);
			pEq->printDebugString001();
			pEq = theApp.m_model.m_master.getEquipment(EQ_ID_Bonder2);
			pEq->printDebugString001();

			}
			else if (id == IDC_BUTTON_OPERATOR) {
			int menuId = (int)wParam;
			SystemLogManager& logManager = SystemLogManager::getInstance();