From b9c47379d8ab2c2857b2b728ae4229c2a15c7f22 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期六, 11 一月 2025 08:41:24 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 Document/ECHINT-EHSIII-FR-019 ECHINT设备安全规格V2.xlsx                                         |    0 
 SourceCode/Bond/Servo/Servo.vcxproj                                                       |    2 
 SourceCode/Bond/Servo/HsmsPassive.h                                                       |   13 ++
 SourceCode/Bond/Servo/resource.h                                                          |    0 
 Document/【2】设备自动化通信规范 Communication Specification for Equipment Automation-V3.pdf         |    0 
 SourceCode/Bond/Servo/HsmsPassive.cpp                                                     |  102 +++++++++++++++++++-
 SourceCode/Bond/Servo/ServoDlg.cpp                                                        |  135 ++++++++++++++++++++++++++
 Document/ECHINT-APDIII-011 Equipment  Acceptance Specification-三期Panel Bond-20240301.docx |    0 
 SourceCode/Bond/HSMSSDK/Include/ISECS2Item.h                                              |    2 
 SourceCode/Bond/Servo/Servo.vcxproj.filters                                               |    6 +
 Document/ESWIN_EAS_Equipment HSMS Communication Specification_v0.2.docx                   |    0 
 SourceCode/Bond/Servo/Servo.rc                                                            |    0 
 Document/ECHINT Common Spec.xlsx                                                          |    0 
 Document/Panel Bonder八零联合 SecsTest CheckList_v3.0.xlsx                                    |    0 
 Document/ESWIN_EAS_Equipment_Communication_Specification(CC-LINK)_v3.1.docx               |    0 
 SourceCode/Bond/Servo/ServoDlg.h                                                          |   10 ++
 16 files changed, 259 insertions(+), 11 deletions(-)

diff --git "a/Document/ECHINT-APDIII-011\302\240Equipment\302\240\302\240Acceptance\302\240Specification-\344\270\211\346\234\237Panel\302\240Bond-20240301.docx" "b/Document/ECHINT-APDIII-011\302\240Equipment\302\240\302\240Acceptance\302\240Specification-\344\270\211\346\234\237Panel\302\240Bond-20240301.docx"
new file mode 100644
index 0000000..57c299b
--- /dev/null
+++ "b/Document/ECHINT-APDIII-011\302\240Equipment\302\240\302\240Acceptance\302\240Specification-\344\270\211\346\234\237Panel\302\240Bond-20240301.docx"
Binary files differ
diff --git "a/Document/ECHINT-EHSIII-FR-019\302\240ECHINT\350\256\276\345\244\207\345\256\211\345\205\250\350\247\204\346\240\274V2.xlsx" "b/Document/ECHINT-EHSIII-FR-019\302\240ECHINT\350\256\276\345\244\207\345\256\211\345\205\250\350\247\204\346\240\274V2.xlsx"
new file mode 100644
index 0000000..ace76cb
--- /dev/null
+++ "b/Document/ECHINT-EHSIII-FR-019\302\240ECHINT\350\256\276\345\244\207\345\256\211\345\205\250\350\247\204\346\240\274V2.xlsx"
Binary files differ
diff --git "a/Document/ECHINT\302\240Common\302\240Spec.xlsx" "b/Document/ECHINT\302\240Common\302\240Spec.xlsx"
new file mode 100644
index 0000000..6c5426a
--- /dev/null
+++ "b/Document/ECHINT\302\240Common\302\240Spec.xlsx"
Binary files differ
diff --git a/Document/ESWIN_EAS_Equipment HSMS Communication Specification_v0.2.docx b/Document/ESWIN_EAS_Equipment HSMS Communication Specification_v0.2.docx
new file mode 100644
index 0000000..b22c749
--- /dev/null
+++ b/Document/ESWIN_EAS_Equipment HSMS Communication Specification_v0.2.docx
Binary files differ
diff --git "a/Document/ESWIN_EAS_Equipment_Communication_Specification\050CC-LINK\051_v3.1.docx" "b/Document/ESWIN_EAS_Equipment_Communication_Specification\050CC-LINK\051_v3.1.docx"
new file mode 100644
index 0000000..c11fb4e
--- /dev/null
+++ "b/Document/ESWIN_EAS_Equipment_Communication_Specification\050CC-LINK\051_v3.1.docx"
Binary files differ
diff --git "a/Document/Panel Bonder\345\205\253\351\233\266\350\201\224\345\220\210 SecsTest CheckList_v3.0.xlsx" "b/Document/Panel Bonder\345\205\253\351\233\266\350\201\224\345\220\210 SecsTest CheckList_v3.0.xlsx"
new file mode 100644
index 0000000..46d48b7
--- /dev/null
+++ "b/Document/Panel Bonder\345\205\253\351\233\266\350\201\224\345\220\210 SecsTest CheckList_v3.0.xlsx"
Binary files differ
diff --git "a/Document/\343\200\2202\343\200\221\350\256\276\345\244\207\350\207\252\345\212\250\345\214\226\351\200\232\344\277\241\350\247\204\350\214\203\302\240Communication\302\240Specification\302\240for\302\240Equipment\302\240Automation-V3.pdf" "b/Document/\343\200\2202\343\200\221\350\256\276\345\244\207\350\207\252\345\212\250\345\214\226\351\200\232\344\277\241\350\247\204\350\214\203\302\240Communication\302\240Specification\302\240for\302\240Equipment\302\240Automation-V3.pdf"
new file mode 100644
index 0000000..7fc9a4a
--- /dev/null
+++ "b/Document/\343\200\2202\343\200\221\350\256\276\345\244\207\350\207\252\345\212\250\345\214\226\351\200\232\344\277\241\350\247\204\350\214\203\302\240Communication\302\240Specification\302\240for\302\240Equipment\302\240Automation-V3.pdf"
Binary files differ
diff --git a/SourceCode/Bond/HSMSSDK/Include/ISECS2Item.h b/SourceCode/Bond/HSMSSDK/Include/ISECS2Item.h
index e2d256c..030deaf 100644
--- a/SourceCode/Bond/HSMSSDK/Include/ISECS2Item.h
+++ b/SourceCode/Bond/HSMSSDK/Include/ISECS2Item.h
@@ -31,5 +31,7 @@
 	virtual bool getSubItemString(int index, char*& pszText) = 0;
 	virtual void reset() = 0;
 	virtual ISECS2Item* addItem(const char* pszText, const char* pszNote) = 0;
+	virtual ISECS2Item* addBinaryItem(const char* pszData, int nDataLen, const char* pszNote) = 0;
+	virtual void setBinary(const char* pszData, int nLen, const char* pszNote) = 0;
 	virtual ISECS2Item* addItem() = 0;
 };
diff --git a/SourceCode/Bond/Servo/HsmsPassive.cpp b/SourceCode/Bond/Servo/HsmsPassive.cpp
index 22d340d..b0add83 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.cpp
+++ b/SourceCode/Bond/Servo/HsmsPassive.cpp
@@ -3,7 +3,11 @@
 #include "Log.h"
 #include "Model.h"
 #include "Common.h"
+#include <time.h>
 
+
+char g_szAckOkData[] = { 0, 0, 0, 0 };
+char g_szAckNgData[] = { 1, 0, 0, 0 };
 
 unsigned __stdcall CimWorkThreadFunction(LPVOID lpParam)
 {
@@ -26,11 +30,13 @@
 	m_pModel = nullptr;
 	m_nActionTimeout = 6;
 	m_nSystemByte = 0;
+	m_strEquipmentModelType = "2860";
 	m_strSoftRev = _T("1.0.1");
 	m_hCimWorkThreadHandle = NULL;
 	m_nCimWorkThrdaddr = 0;
 	m_bCimWorking = FALSE;
 	m_hCimWorkEvent = ::CreateEvent(NULL, TRUE, FALSE, NULL);
+	m_nSessionId = 1;
 	InitializeCriticalSection(&m_criticalSection);
 }
 
@@ -109,7 +115,9 @@
 	auto onStatusChanged = [&](void* pFrom, STATE state) -> void {
 		m_pModel->notifyInt(RX_CODE_PASSIVE_STATUS_CHANGED, (int)state);
 
-		// 连上之后发S1F1, 
+		// 连上之后发S1F1
+		// 修改为不主动发送，而是响应
+		/*
 		if (STATE::SELECTED == state) {
 			m_bAreYouThereRequest = FALSE;
 			if (!m_bAreYouThereRequest) {
@@ -117,17 +125,20 @@
 				secsAreYouThereRequest();
 			}
 		}
+		*/
 	};
 	auto onRecvSysMessage = [&](void* pFrom, IMessage* pMessage) -> void {
 		LOGI("<HSMS>onRecvSysMessage:sessionId:%d, sType:%d systemBytes:%d",
 			pMessage->getHeader()->sessionId, pMessage->getHeader()->sType, pMessage->getHeader()->systemBytes);
 		onRecvMsg(pMessage);
 		if (MSG_LINKTEST_REQ == pMessage->getHeader()->sType) {
+			/*
 			Sleep(10);
 			if (!m_bAreYouThereRequest) {
 				m_bAreYouThereRequest = TRUE;
-				secsAreYouThereRequest();
+				requestYouThere();
 			}
+			*/
 		}
 	};
 
@@ -147,7 +158,13 @@
 		LOGI("<HSMS>收到消息 S%dF%d", nStream, pHeader->function);
 		if (nStream == 1 && pHeader->function == 1) {
 			// S1F1
-			secsAreYouThereReply(pHeader->sessionId, pHeader->systemBytes);
+			replyAreYouThere(pHeader->systemBytes);
+		}
+		else if (nStream == 1 && pHeader->function == 13) {
+			replyEstablishCommunications(pHeader->systemBytes);
+		}
+		else if (nStream == 2 && pHeader->function == 31) {
+			replyDatetime(pMessage);
 		}
 	};
 
@@ -251,7 +268,7 @@
 }
 
 // S1F1
-int CHsmsPassive::secsAreYouThereRequest()
+int CHsmsPassive::requestAreYouThere()
 {
 	if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
 		return ER_NOTSELECT;
@@ -261,7 +278,7 @@
 	CHsmsAction* pAction = new CHsmsAction(ACTION_HELLO, FALSE, m_nActionTimeout);
 	m_listAction.push_back(pAction);
 	IMessage* pMessage = NULL;
-	HSMS_Create1Message(pMessage, 0xffff, 1 | REPLY, 1, ++m_nSystemByte);
+	HSMS_Create1Message(pMessage, m_nSessionId, 1 | REPLY, 1, ++m_nSystemByte);
 	ASSERT(pMessage);
 	pAction->setSendMessage(pMessage);
 
@@ -272,14 +289,14 @@
 }
 
 // S1F2
-int CHsmsPassive::secsAreYouThereReply(unsigned int sessionId, unsigned int systemBytes)
+int CHsmsPassive::replyAreYouThere(unsigned int systemBytes)
 {
 	if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
 		return ER_NOTSELECT;
 	}
 
 	IMessage* pMessage = NULL;
-	HSMS_Create1Message(pMessage, sessionId, 1, 2, systemBytes);
+	HSMS_Create1Message(pMessage, m_nSessionId, 1, 2, systemBytes);
 	ASSERT(pMessage);
 
 	ISECS2Item* pItem = pMessage->getBody();
@@ -291,3 +308,74 @@
 
 	return 0;
 }
+
+// S1F14
+int CHsmsPassive::replyEstablishCommunications(unsigned int systemBytes)
+{
+	if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
+		return ER_NOTSELECT;
+	}
+
+	IMessage* pMessage = NULL;
+	HSMS_Create1Message(pMessage, m_nSessionId, 1, 14, systemBytes);
+	ASSERT(pMessage);
+
+	ISECS2Item* pItem = pMessage->getBody();
+	pItem->addBinaryItem(g_szAckOkData, 1, "COMMACK");
+	ISECS2Item* pList = pItem->addItem();
+	pList->addItem(m_strEquipmentModelType.c_str(), "MDLN");
+	pList->addItem(m_strSoftRev.c_str(), "SOFTREV");
+	m_pPassive->sendMessage(pMessage);
+	LOGI("<HSMS>[SECS Msg SEND]S1F14 (SysByte=%u)", pMessage->getHeader()->systemBytes);
+	HSMS_Destroy1Message(pMessage);
+
+	return 0;
+}
+
+// S2F31
+#include <iostream>  
+#include <time.h>  
+#include <stdlib.h>  
+#include <string.h>  
+int CHsmsPassive::replyDatetime(IMessage* pRecv)
+{
+	if (m_pPassive == NULL || STATE::SELECTED != m_pPassive->getState()) {
+		return ER_NOTSELECT;
+	}
+	ISECS2Item* pBody =	pRecv->getBody();
+	if (pBody == nullptr || pBody->getType() != SITYPE::A) ER_PARAM_ERROR;
+	char* pszMessage;
+	if (pBody->getString(pszMessage)) {
+		// 更新时间
+		SYSTEMTIME time;
+		char szBuffer[20];
+		memcpy(szBuffer, pszMessage, 16);
+		szBuffer[14] = '\0';
+		time.wSecond = atoi(&szBuffer[12]);
+		szBuffer[12] = '\0';
+		time.wMinute = atoi(&szBuffer[10]);
+		szBuffer[10] = '\0';
+		time.wHour = atoi(&szBuffer[8]);
+		szBuffer[8] = '\0';
+		time.wDay = atoi(&szBuffer[6]);
+		szBuffer[6] = '\0';
+		time.wMonth = atoi(&szBuffer[4]);
+		szBuffer[4] = '\0';
+		time.wYear = atoi(&szBuffer[0]);
+		time.wMilliseconds = 0;
+		SetLocalTime(&time);
+	}
+
+
+	IMessage* pMessage = NULL;
+	HSMS_Create1Message(pMessage, m_nSessionId, 2, 32, pRecv->getHeader()->systemBytes);
+	ASSERT(pMessage);
+
+	ISECS2Item* pItem = pMessage->getBody();
+	pItem->setBinary(g_szAckOkData, 1, "TIACK");
+	m_pPassive->sendMessage(pMessage);
+	LOGI("<HSMS>[SECS Msg SEND]S2F32 (SysByte=%u)", pRecv->getHeader()->systemBytes);
+	HSMS_Destroy1Message(pMessage);
+
+	return 0;
+}
diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index ce0c46e..cb3b047 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.h
+++ b/SourceCode/Bond/Servo/HsmsPassive.h
@@ -7,7 +7,7 @@
 #define ER_NOERROR			0
 #define ER_NOTSELECT		-1
 #define ER_BUSY				-2
-
+#define ER_PARAM_ERROR		-3
 
 class CModel;
 class CHsmsPassive
@@ -22,8 +22,14 @@
 	void setActionTimeout(int nSecond);
 	int init(CModel* pModel, const char* pszName, unsigned int port);
 	int term();
-	int secsAreYouThereRequest();
-	int secsAreYouThereReply(unsigned int sessionId, unsigned int systemBytes);
+
+public:
+	int requestAreYouThere();
+
+private:
+	int replyAreYouThere(unsigned int systemBytes);
+	int replyEstablishCommunications(unsigned int systemBytes);
+	int replyDatetime(IMessage* pRecv);
 
 private:
 	inline void Lock() { EnterCriticalSection(&m_criticalSection); }
@@ -35,6 +41,7 @@
 	IPassive* m_pPassive;
 	int m_nActionTimeout;
 	unsigned int m_nSystemByte;
+	unsigned short m_nSessionId;
 	BOOL m_bAreYouThereRequest;
 	std::string m_strEquipmentModelType;
 	std::string m_strSoftRev;
diff --git a/SourceCode/Bond/Servo/Servo.rc b/SourceCode/Bond/Servo/Servo.rc
index 57cf59a..2411f2f 100644
--- a/SourceCode/Bond/Servo/Servo.rc
+++ b/SourceCode/Bond/Servo/Servo.rc
Binary files differ
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj b/SourceCode/Bond/Servo/Servo.vcxproj
index 8b45150..d0153cb 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj
+++ b/SourceCode/Bond/Servo/Servo.vcxproj
@@ -201,6 +201,7 @@
     <ClInclude Include="LogEdit.h" />
     <ClInclude Include="Model.h" />
     <ClInclude Include="Resource.h" />
+    <ClInclude Include="SecsTestDlg.h" />
     <ClInclude Include="Servo.h" />
     <ClInclude Include="ServoDlg.h" />
     <ClInclude Include="ServoGraph.h" />
@@ -217,6 +218,7 @@
     <ClCompile Include="LogDlg.cpp" />
     <ClCompile Include="LogEdit.cpp" />
     <ClCompile Include="Model.cpp" />
+    <ClCompile Include="SecsTestDlg.cpp" />
     <ClCompile Include="Servo.cpp" />
     <ClCompile Include="ServoDlg.cpp" />
     <ClCompile Include="ServoGraph.cpp" />
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj.filters b/SourceCode/Bond/Servo/Servo.vcxproj.filters
index 4023d01..1f263f5 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj.filters
+++ b/SourceCode/Bond/Servo/Servo.vcxproj.filters
@@ -66,6 +66,9 @@
     <ClInclude Include="Context.h">
       <Filter>澶存枃浠�</Filter>
     </ClInclude>
+    <ClInclude Include="SecsTestDlg.h">
+      <Filter>澶存枃浠�</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Servo.cpp">
@@ -107,6 +110,9 @@
     <ClCompile Include="Context.cpp">
       <Filter>婧愭枃浠�</Filter>
     </ClCompile>
+    <ClCompile Include="SecsTestDlg.cpp">
+      <Filter>婧愭枃浠�</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Servo.rc">
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index b59a03d..7d7b5ad 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -8,6 +8,7 @@
 #include "afxdialogex.h"
 #include "Common.h"
 #include "Log.h"
+#include "SecsTestDlg.h"
 
 
 #ifdef _DEBUG
@@ -97,6 +98,16 @@
 	ON_MESSAGE(ID_MSG_LOGDLG_HIDE, &CServoDlg::OnLogDlgHide)
 	ON_WM_MOVING()
 	ON_WM_MOVE()
+	ON_COMMAND(ID_MENU_FILE_EXIT, &CServoDlg::OnMenuFileExit)
+	ON_UPDATE_COMMAND_UI(ID_MENU_FILE_EXIT, &CServoDlg::OnUpdateMenuFileExit)
+	ON_COMMAND(ID_MENU_FILE_SETTINGS, &CServoDlg::OnMenuFileSettings)
+	ON_UPDATE_COMMAND_UI(ID_MENU_FILE_SETTINGS, &CServoDlg::OnUpdateMenuFileSettings)
+	ON_COMMAND(ID_MENU_FILE_SECSTEST, &CServoDlg::OnMenuFileSecsTest)
+	ON_UPDATE_COMMAND_UI(ID_MENU_FILE_SECSTEST, &CServoDlg::OnUpdateMenuFileSecsTest)
+	ON_COMMAND(ID_MENU_WND_LOG, &CServoDlg::OnMenuWndLog)
+	ON_UPDATE_COMMAND_UI(ID_MENU_WND_LOG, &CServoDlg::OnUpdateMenuWndLog)
+	ON_COMMAND(ID_MENU_HELP_ABOUT, &CServoDlg::OnMenuHelpAbout)
+	ON_WM_INITMENUPOPUP()
 END_MESSAGE_MAP()
 
 
@@ -130,6 +141,13 @@
 	//  执行此操作
 	SetIcon(m_hIcon, TRUE);			// 设置大图标
 	SetIcon(m_hIcon, FALSE);		// 设置小图标
+
+
+									// 菜单
+	CMenu menu;
+	menu.LoadMenu(IDR_MENU_APP);
+	SetMenu(&menu);
+
 
 
 	// 图示
@@ -278,7 +296,123 @@
 	return static_cast<HCURSOR>(m_hIcon);
 }
 
+void CServoDlg::OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu)
+{
+	ASSERT(pPopupMenu != NULL);
 
+	CCmdUI state;
+	state.m_pMenu = pPopupMenu;
+	ASSERT(state.m_pOther == NULL);
+	ASSERT(state.m_pParentMenu == NULL);
+
+	HMENU hParentMenu;
+	if (AfxGetThreadState()->m_hTrackingMenu == pPopupMenu->m_hMenu)
+		state.m_pParentMenu = pPopupMenu;
+	else if ((hParentMenu = ::GetMenu(m_hWnd)) != NULL)
+	{
+		CWnd* pParent = this;
+		if (pParent != NULL &&
+			(hParentMenu = ::GetMenu(pParent->m_hWnd)) != NULL)
+		{
+			int nIndexMax = ::GetMenuItemCount(hParentMenu);
+			for (int nIndex = 0; nIndex < nIndexMax; nIndex++)
+			{
+				if (::GetSubMenu(hParentMenu, nIndex) == pPopupMenu->m_hMenu)
+				{
+					state.m_pParentMenu = CMenu::FromHandle(hParentMenu);
+					break;
+				}
+			}
+		}
+	}
+
+	state.m_nIndexMax = pPopupMenu->GetMenuItemCount();
+	for (state.m_nIndex = 0; state.m_nIndex < state.m_nIndexMax;
+	state.m_nIndex++)
+	{
+		state.m_nID = pPopupMenu->GetMenuItemID(state.m_nIndex);
+		if (state.m_nID == 0)
+			continue;
+
+		ASSERT(state.m_pOther == NULL);
+		ASSERT(state.m_pMenu != NULL);
+		if (state.m_nID == (UINT)-1)
+		{
+			state.m_pSubMenu = pPopupMenu->GetSubMenu(state.m_nIndex);
+			if (state.m_pSubMenu == NULL ||
+				(state.m_nID = state.m_pSubMenu->GetMenuItemID(0)) == 0 ||
+				state.m_nID == (UINT)-1)
+			{
+				continue;
+			}
+			state.DoUpdate(this, TRUE);
+		}
+		else
+		{
+			state.m_pSubMenu = NULL;
+			state.DoUpdate(this, FALSE);
+		}
+
+		UINT nCount = pPopupMenu->GetMenuItemCount();
+		if (nCount < state.m_nIndexMax)
+		{
+			state.m_nIndex -= (state.m_nIndexMax - nCount);
+			while (state.m_nIndex < nCount &&
+				pPopupMenu->GetMenuItemID(state.m_nIndex) == state.m_nID)
+			{
+				state.m_nIndex++;
+			}
+		}
+		state.m_nIndexMax = nCount;
+	}
+}
+
+void CServoDlg::OnMenuFileSettings()
+{
+
+}
+
+void CServoDlg::OnUpdateMenuFileSettings(CCmdUI* pCmdUI)
+{
+	pCmdUI->Enable(TRUE);
+}
+
+void CServoDlg::OnMenuFileSecsTest()
+{
+	CSecsTestDlg dlg;
+	dlg.DoModal();
+}
+
+void CServoDlg::OnUpdateMenuFileSecsTest(CCmdUI* pCmdUI)
+{
+	pCmdUI->Enable(TRUE);
+}
+
+void CServoDlg::OnMenuWndLog()
+{
+	OnBnClickedButtonLog();
+}
+
+void CServoDlg::OnUpdateMenuWndLog(CCmdUI* pCmdUI)
+{
+	pCmdUI->SetCheck(m_bShowLogWnd);
+}
+
+void CServoDlg::OnMenuFileExit()
+{
+	PostMessage(WM_CLOSE);
+}
+
+void CServoDlg::OnUpdateMenuFileExit(CCmdUI* pCmdUI)
+{
+	pCmdUI->Enable(TRUE);
+}
+
+void CServoDlg::OnMenuHelpAbout()
+{
+	CAboutDlg dlgAbout;
+	dlgAbout.DoModal();
+}
 
 void CServoDlg::OnBnClickedOk()
 {
@@ -337,7 +471,6 @@
 	}
 	ASSERT(m_pLogDlg);
 	m_pLogDlg->ShowWindow(m_bShowLogWnd ? SW_SHOW : SW_HIDE);
-	LOGE("OnBnClickedButtonLog");
 
 	UpdateLogBtn();
 }
diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index df41e4a..3b1cd3b 100644
--- a/SourceCode/Bond/Servo/ServoDlg.h
+++ b/SourceCode/Bond/Servo/ServoDlg.h
@@ -60,4 +60,14 @@
 	afx_msg LRESULT OnLogDlgHide(WPARAM wParam, LPARAM lParam);
 	afx_msg void OnMoving(UINT fwSide, LPRECT pRect);
 	afx_msg void OnMove(int x, int y);
+	afx_msg void OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu);
+	afx_msg void OnMenuFileSettings();
+	afx_msg void OnUpdateMenuFileSettings(CCmdUI* pCmdUI);
+	afx_msg void OnMenuFileSecsTest();
+	afx_msg void OnUpdateMenuFileSecsTest(CCmdUI* pCmdUI);
+	afx_msg void OnMenuWndLog();
+	afx_msg void OnUpdateMenuWndLog(CCmdUI* pCmdUI);
+	afx_msg void OnMenuFileExit();
+	afx_msg void OnUpdateMenuFileExit(CCmdUI* pCmdUI);
+	afx_msg void OnMenuHelpAbout();
 };
diff --git a/SourceCode/Bond/Servo/resource.h b/SourceCode/Bond/Servo/resource.h
index 0431ed5..24dbeea 100644
--- a/SourceCode/Bond/Servo/resource.h
+++ b/SourceCode/Bond/Servo/resource.h
Binary files differ

--
Gitblit v1.9.3