From 3c387cc7bcd469938fbfac8bc5435bb1e846c70f Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 17 六月 2025 17:42:53 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh

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

diff --git a/SourceCode/Bond/Servo/CRobotCmdTestDlg.h b/SourceCode/Bond/Servo/CRobotCmdTestDlg.h
index c605e58..0169495 100644
--- a/SourceCode/Bond/Servo/CRobotCmdTestDlg.h
+++ b/SourceCode/Bond/Servo/CRobotCmdTestDlg.h
@@ -35,8 +35,10 @@
 protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV 鏀寔
 	virtual BOOL OnInitDialog();
-	afx_msg void OnCbnSelchangeComboCmdType();
 	afx_msg void OnBnClickedButtonExecute();
+	afx_msg void OnSelchangeComboCmdType();
+	afx_msg void OnSelchangeComboGetPos();
+	afx_msg void OnSelchangeComboPutPos();
 	DECLARE_MESSAGE_MAP()
 
 private:
@@ -46,6 +48,9 @@
 	void TrimRichEditLineLimit(int maxLines = 100);
 	void AppendLogLineRichStyled(const CString& content, COLORREF color = RGB(0, 0, 0));
 	void HighlightAllMatches(const CString& strSearch, COLORREF clrHighlight = RGB(255, 165, 0));
+	void UpdateSlotList(CComboBox* pComboDevice, CComboBox* pComboSlot);
+	void UpdateArmList(CComboBox* pComboDevice, CComboBox* pComboArm);
+	bool IsDualArmSupported(const CString& strDeviceName);
 
 	// 鎺т欢
 	CComboBox m_comboCmdType;

--
Gitblit v1.9.3