From bf55b2f3083cbfdeb83611b2fa2dd552bf5b0775 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 03 三月 2025 16:20:00 +0800
Subject: [PATCH] 1.开始处理Step属性值; 2.增加左侧master面板;

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

diff --git a/SourceCode/Bond/Servo/CStep.h b/SourceCode/Bond/Servo/CStep.h
index 628f116..d1ece05 100644
--- a/SourceCode/Bond/Servo/CStep.h
+++ b/SourceCode/Bond/Servo/CStep.h
@@ -1,10 +1,9 @@
 #pragma once
 #include "CCLinkIEControl.h"
+#include "CAttributeVector.h"
 
 
 namespace SERVO {
-#define STEP_EVENT_READDATA			0x01
-#define STEP_EVENT_COMPLETE			0x02
 
 	typedef std::function<void(void* pStep, int code, void* pData)> ONSTEPEVENT;
 	typedef struct _StepListener
@@ -27,6 +26,7 @@
 		CEquipment* getEquipment();
 		void setName(const char* pszName);
 		std::string& getName();
+		virtual void getAttributeVector(CAttributeVector& attrubutes);
 		virtual void setWriteSignalDev(int dev);
 		virtual void init();
 		virtual void CStep::term();
@@ -40,6 +40,7 @@
 		inline void Unlock() { LeaveCriticalSection(&m_criticalSection); }
 		inline void nextStep();
 		inline void resetStep();
+		void convertString(const char* pszBuffer, int size, std::string& strOut);
 
 	protected:
 		StepListener m_listener;
@@ -48,7 +49,6 @@
 		CEquipment* m_pEquipment;
 		CCCLinkIEControl* m_pCclink;
 		CRITICAL_SECTION m_criticalSection;
-		std::string strName;
 		HANDLE m_hWorkThreadHandle;
 		unsigned m_nWordThreadAddr;
 		HANDLE m_hWorkStop;

--
Gitblit v1.9.3