From 2d7e131c2e7f547df8d5e0d56fcea85cd49c712e Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 21 二月 2025 14:17:15 +0800
Subject: [PATCH] 1.增加Equipment Status（机器和机器单元状态）获取；
---
SourceCode/Bond/Servo/CEquipment.h | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 90774cd..c10084a 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -1,6 +1,10 @@
#pragma once
#include "Log.h"
#include "CCLinkIEControl.h"
+#include "CEqModeStep.h"
+#include "CEqStatusStep.h"
+#include <map>
+
namespace SERVO {
#define BLOCK_BUFFER_MAX 1024
@@ -40,6 +44,7 @@
public:
virtual const char* getClassName() = 0;
virtual void setListener(EquipmentListener listener);
+ void setCcLink(CCCLinkIEControl* pCcLink);
void setID(int nID);
int getID();
void setName(const char* pszName);
@@ -52,6 +57,9 @@
MemoryBlock& getReadBitBlock();
void setWriteBitBlock(unsigned int start, unsigned int end);
MemoryBlock& getWriteBitBlock();
+ void getProperties(std::vector<std::pair<std::string, std::string>>& container);
+ int addStep(unsigned int addr, CStep* pStep);
+ CStep* getStep(unsigned int addr);
virtual void init();
virtual void term();
virtual void onTimer(UINT nTimerid);
@@ -97,6 +105,10 @@
BOOL m_bLocalAlarm;
BOOL m_bAutoRecipeChange;
BOOL m_bVCREnable[VCR_MAX];
+
+ private:
+ CCCLinkIEControl* m_pCclink;
+ std::map<unsigned int, CStep*> m_mapStep;
};
}
--
Gitblit v1.9.3