From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 30 一月 2026 11:16:24 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

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

diff --git a/SourceCode/Bond/Servo/ServoDlg.h b/SourceCode/Bond/Servo/ServoDlg.h
index ec0cba7..e05c9e5 100644
--- a/SourceCode/Bond/Servo/ServoDlg.h
+++ b/SourceCode/Bond/Servo/ServoDlg.h
@@ -38,6 +38,7 @@
 
 public:
 	void ShowTerminalText(const char* pszText, unsigned int duration = -1);
+	void AckAlarm(int alarmId);
 
 private:
 	void InitRxWindows();
@@ -113,12 +114,20 @@
 	afx_msg void OnUpdateMenuFileExit(CCmdUI* pCmdUI);
 	afx_msg void OnMenuProjectVarialbleList();
 	afx_msg void OnUpdateMenuProjectVarialbleList(CCmdUI* pCmdUI);
+	afx_msg void OnMenuTestAlarmOn();
+	afx_msg void OnUpdateMenuTestAlarmOn(CCmdUI* pCmdUI);
+	afx_msg void OnMenuTestAlarmOff();
+	afx_msg void OnUpdateMenuTestAlarmOff(CCmdUI* pCmdUI);
 	afx_msg void OnMenuTestMessageSet();
 	afx_msg void OnUpdateMenuTestMessageSet(CCmdUI* pCmdUI);
 	afx_msg void OnMenuTestMessageClear();
 	afx_msg void OnUpdateMenuTestMessageClear(CCmdUI* pCmdUI);
 	afx_msg void OnMenuToolsClientList();
 	afx_msg void OnUpdateMenuToolsClientList(CCmdUI* pCmdUI);
+	afx_msg void OnMenuToolsCurveEmptyMode();
+	afx_msg void OnUpdateMenuToolsCurveEmptyMode(CCmdUI* pCmdUI);
+	afx_msg void OnMenuToolsCurveProductionMode();
+	afx_msg void OnUpdateMenuToolsCurveProductionMode(CCmdUI* pCmdUI);
 	afx_msg void OnMenuWndTestPanel();
 	afx_msg void OnUpdateMenuWndTestPanel(CCmdUI* pCmdUI);
 	afx_msg void OnMenuWndProPanel();

--
Gitblit v1.9.3