From 1e8e3473cb124f9e51dfc1ca35e5cb13b1668bdc Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 10 五月 2025 10:46:19 +0800
Subject: [PATCH] 1.重命名类名称和文件名；
---
SourceCode/Bond/Servo/CStep.h | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/SourceCode/Bond/Servo/CStep.h b/SourceCode/Bond/Servo/CStep.h
index 04aa2c1..d82e99a 100644
--- a/SourceCode/Bond/Servo/CStep.h
+++ b/SourceCode/Bond/Servo/CStep.h
@@ -1,17 +1,13 @@
#pragma once
#include "CCLinkIEControl.h"
#include "CAttributeVector.h"
+#include "ToolUnits.h"
+#include <map>
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,16 +17,18 @@
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);
virtual void init();
virtual void term();
-
+ void setProp(const char* pszKey, void* pValue);
+ void* getProp(const char* pszKey);
protected:
inline void Lock() { EnterCriticalSection(&m_criticalSection); }
@@ -38,12 +36,13 @@
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;
CCCLinkIEControl* m_pCclink;
CRITICAL_SECTION m_criticalSection;
+ std::map<std::string, void*> m_mapProp;
};
}
--
Gitblit v1.9.3