From f354ac6647f9d763c0119717c202e684b261d8ae Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 29 三月 2025 17:26:42 +0800
Subject: [PATCH] 1.修改逻辑，CStep不在设置和调用Listener,而是直接调用成员变量m_pEquipment的虚函数onStepEvent来传递数据。
---
SourceCode/Bond/Servo/CStep.h | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/Servo/CStep.h b/SourceCode/Bond/Servo/CStep.h
index 04aa2c1..aae469e 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,7 +16,6 @@
virtual ~CStep();
public:
- void setListener(StepListener listener);
void setCcLink(CCCLinkIEControl* pCcLink);
void setEquipment(CEquipment* pEquipment);
CEquipment* getEquipment();
@@ -38,7 +32,6 @@
void convertString(const char* pszBuffer, int size, std::string& strOut);
protected:
- StepListener m_listener;
StationIdentifier m_station;
std::string m_strName;
CEquipment* m_pEquipment;
--
Gitblit v1.9.3