From 410ea79955e2d115643a38f40e006f1aeaba897b Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 26 四月 2025 14:39:23 +0800
Subject: [PATCH] 1.增加CVcrEventStep

---
 SourceCode/Bond/Servo/CStep.h |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/SourceCode/Bond/Servo/CStep.h b/SourceCode/Bond/Servo/CStep.h
index 04aa2c1..866e6f2 100644
--- a/SourceCode/Bond/Servo/CStep.h
+++ b/SourceCode/Bond/Servo/CStep.h
@@ -1,17 +1,12 @@
 #pragma once
 #include "CCLinkIEControl.h"
 #include "CAttributeVector.h"
+#include "ToolUnits.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
-	{
-		ONSTEPEVENT			onEvent;
-	} StepListener;
 
 	class CEquipment;
 	class CStep
@@ -21,10 +16,11 @@
 		virtual ~CStep();
 
 	public:
-		void setListener(StepListener listener);
 		void setCcLink(CCCLinkIEControl* pCcLink);
 		void setEquipment(CEquipment* pEquipment);
 		CEquipment* getEquipment();
+		void setID(int id);
+		int getID();
 		void setName(const char* pszName);
 		std::string& getName();
 		virtual void getAttributeVector(CAttributeVector& attrubutes);
@@ -38,7 +34,7 @@
 		void convertString(const char* pszBuffer, int size, std::string& strOut);
 
 	protected:
-		StepListener m_listener;
+		int m_nID;
 		StationIdentifier m_station;
 		std::string m_strName;
 		CEquipment* m_pEquipment;

--
Gitblit v1.9.3