From 94e388265ca97ba07b102c295529fd40b04b419d Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 26 五月 2025 15:26:09 +0800
Subject: [PATCH] 1.增加顶部工具条； 2.Robot cmd测试页面增加Robot命令的响应结果； 3.CMaster增加start, stop函数，准备编写调试逻辑；

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

diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index ce6cb8d..b38bd30 100644
--- a/SourceCode/Bond/Servo/ServoDlg.h
+++ b/SourceCode/Bond/Servo/ServoDlg.h
@@ -4,14 +4,16 @@
 
 #pragma once
 #include "BlButton.h"
-#include "LogDlg.h"
-#include "AlarmDlg.h"
+#include "PageLog.h"
+#include "PageAlarm.h"
+#include "PageRecipe.h"
 #include "TerminalDisplayDlg.h"
 #include "CPanelMaster.h"
 #include "CPanelEquipment.h"
 #include "CPanelAttributes.h"
 #include "CPageGraph1.h"
 #include "CPageGraph2.h"
+#include "TopToolbar.h"
 
 
 // CServoDlg 对话框
@@ -36,8 +38,9 @@
 	CTerminalDisplayDlg* m_pTerminalDisplayDlg;
 	CPageGraph1* m_pPageGraph1;
 	CPageGraph2* m_pPageGraph2;
-	CAlarmDlg*	 m_pPageAlarm;
-	CLogDlg*	 m_pPageLog;
+	CPageRecipe* m_pPageRecipe;
+	CPageAlarm*	 m_pPageAlarm;
+	CPageLog*	 m_pPageLog;
 
 
 // 对话框数据
@@ -54,8 +57,7 @@
 	HICON m_hIcon;
 	COLORREF m_crBkgnd;
 	HBRUSH m_hbrBkgnd;
-	CBlButton m_btnLog;
-	CBlButton m_btnAlarm;
+	CTopToolbar* m_pTopToolbar;
 	CPanelMaster* m_pPanelMaster;
 	CPanelEquipment* m_pPanelEquipment;
 	CPanelAttributes* m_pPanelAttributes;
@@ -90,4 +92,5 @@
 	afx_msg void OnTimer(UINT_PTR nIDEvent);
 	afx_msg LRESULT OnPanelResize(WPARAM wParam, LPARAM lParam);
 	afx_msg void OnTabSelChanged(NMHDR* nmhdr, LRESULT* result);
+	LRESULT OnToolbarBtnClicked(WPARAM wParam, LPARAM lParam);
 };

--
Gitblit v1.9.3