From 0026ea3b1a6588f3e40b8276162f54b2a22bc7ae Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期一, 19 一月 2026 14:32:27 +0800
Subject: [PATCH] 1.修复 ： 多 PJ 支持仍是单槽实现：isProcessJobsEmpty/validate 仍只允许 1 个 PJ/CJ；Host 一次下多 PJ 或运行中追加 PJ 会被拒绝/无明确反馈。需要：协议上明示只支持 1，或补齐 ACK/NAK 与队列管理、PJobSpace 动态更新。
---
SourceCode/Bond/Servo/CRobotCmdTestDlg.h | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CRobotCmdTestDlg.h b/SourceCode/Bond/Servo/CRobotCmdTestDlg.h
index 065ee0a..0169495 100644
--- a/SourceCode/Bond/Servo/CRobotCmdTestDlg.h
+++ b/SourceCode/Bond/Servo/CRobotCmdTestDlg.h
@@ -3,7 +3,7 @@
#include <afxrich.h>
// 瀹氫箟鍛戒护鍑芥暟鎸囬拡绫诲瀷锛坰eq, armNo, getPos, getSlot, putPos, putSlot锛�
-using CmdFunc = std::function<int(int, int, int, int, int, int)>;
+using CmdFunc = std::function<int(int, int, int, int, int, int, SERVO::ONWRITED onWritedBlock)>;
// 杈撳叆鎺т欢鐘舵��
struct QuickCmdFieldMask {
@@ -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