From 904fd149e60f984f4459ff295cd6ae6505fa3f21 Mon Sep 17 00:00:00 2001
From: darker <mr.darker@163.com>
Date: 星期三, 12 二月 2025 17:48:14 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/Servo/ServoDlg.h |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index 3b1cd3b..0a760d0 100644
--- a/SourceCode/Bond/Servo/ServoDlg.h
+++ b/SourceCode/Bond/Servo/ServoDlg.h
@@ -6,6 +6,7 @@
 #include "ServoGraph.h"
 #include "BlButton.h"
 #include "LogDlg.h"
+#include "TerminalDisplayDlg.h"
 
 
 // CServoDlg 对话框
@@ -16,9 +17,22 @@
 	CServoDlg(CWnd* pParent = NULL);	// 标准构造函数
 
 
+public:
+	void ShowTerminalText(const char* pszText, unsigned int duration = -1);
+
 private:
+	void InitRxWindows();
 	void Resize();
 	void UpdateLogBtn();
+	void UpdateRobotPosition(float percentage);
+	void RotateRobot(float angleInDegrees);
+
+
+private:
+	IObserver* m_pObserver;
+	BOOL m_bShowLogWnd;
+	CLogDlg* m_pLogDlg;
+	CTerminalDisplayDlg* m_pTerminalDisplayDlg;
 
 
 // 对话框数据
@@ -31,8 +45,7 @@
 
 
 private:
-	BOOL m_bShowLogWnd;
-	CLogDlg* m_pLogDlg;
+	BOOL m_bIsRobotMoving;
 
 // 实现
 protected:
@@ -70,4 +83,6 @@
 	afx_msg void OnMenuFileExit();
 	afx_msg void OnUpdateMenuFileExit(CCmdUI* pCmdUI);
 	afx_msg void OnMenuHelpAbout();
+	afx_msg void OnTimer(UINT_PTR nIDEvent);
+	afx_msg BOOL OnEraseBkgnd(CDC* pDC);
 };

--
Gitblit v1.9.3