From 19261d011387ec57d646decc945aadaf8913eeab Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 10 三月 2025 09:05:54 +0800
Subject: [PATCH] Merge branch 'clh'

---
 SourceCode/Bond/Servo/ServoDlg.h |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index 9fd1dbc..39ae6d7 100644
--- a/SourceCode/Bond/Servo/ServoDlg.h
+++ b/SourceCode/Bond/Servo/ServoDlg.h
@@ -6,8 +6,10 @@
 #include "ServoGraph.h"
 #include "BlButton.h"
 #include "LogDlg.h"
+#include "AlarmDlg.h"
 #include "TerminalDisplayDlg.h"
 #include "CPanelMaster.h"
+#include "CPanelEquipment.h"
 #include "CPanelAttributes.h"
 
 
@@ -42,6 +44,7 @@
 	BOOL m_bShowLogWnd;
 	BOOL m_bShowAlarmWnd;
 	CLogDlg* m_pLogDlg;
+	CAlarmDlg* m_pAlarmDlg;
 	CTerminalDisplayDlg* m_pTerminalDisplayDlg;
 
 
@@ -66,8 +69,8 @@
 	CBlButton m_btnLog;
 	CBlButton m_btnAlarm;
 	CPanelMaster* m_pPanelMaster;
+	CPanelEquipment* m_pPanelEquipment;
 	CPanelAttributes* m_pPanelAttributes;
-
 
 	// 生成的消息映射函数
 	virtual BOOL OnInitDialog();
@@ -84,6 +87,7 @@
 	afx_msg void OnSize(UINT nType, int cx, int cy);
 	afx_msg void OnClose();
 	afx_msg LRESULT OnLogDlgHide(WPARAM wParam, LPARAM lParam);
+	afx_msg LRESULT OnAlarmDlgHide(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);

--
Gitblit v1.9.3