From d06ab39efafbcb2a7b1ec4cb83e18fa3485789a9 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 29 三月 2025 08:55:56 +0800
Subject: [PATCH] 1.修改两个函数名称；
---
SourceCode/Bond/Servo/CEquipment.h | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index ced2b57..a740c89 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -13,8 +13,12 @@
#include "CEqCimMessageClearStep.h"
#include "CEqDateTimeSetCmdStep.h"
#include "CEqVCREnableStep.h"
+#include "CEqPortChangeStep.h"
+#include "CEqReadIntStep.h"
#include <vector>
#include <map>
+#include <list>
+#include "CGlass.h"
namespace SERVO {
@@ -23,10 +27,12 @@
#define VCR_MAX 1
typedef std::function<void(void* pEiuipment, BOOL bAlive)> ONALIVE;
+ typedef std::function<void(void* pEiuipment, int code)> ONDATACHANGED;
typedef struct _EquipmentListener
{
ONALIVE onAlive;
ONALIVE onCimStateChanged;
+ ONDATACHANGED onDataChanged;
} EquipmentListener;
// Memory Block 结构体定义
@@ -86,8 +92,13 @@
CPin* getPin(char* pszName);
std::vector<CPin*>& CEquipment::getInputPins();
std::vector<CPin*>& CEquipment::getOutputPins();
- virtual int recvSample(CPin* pPin, CSample* pSample);
-
+ virtual int recvIntent(CPin* pPin, CIntent* pIntent);
+ virtual BOOL glassWillArrive(CGlass* pGlass);
+ virtual int outputGlass(int port);
+ virtual int glassArrived(CGlass* pGlass);
+ void getGlassList(std::list<CGlass*>& list);
+ CGlass* getFrontGlass();
+ BOOL removeClass(CGlass* pGlass);
// 以下为从CC-Link读取到的Bit标志位检测函数
public:
@@ -103,10 +114,13 @@
private:
BOOL isBitOn(const char* pszData, size_t size, int index);
inline BOOL equalBool(BOOL b1, BOOL b2);
+ void checkReadStepSignal(unsigned int addr, const char* pszData, size_t size);
+ void checkWriteStepSignal(unsigned int addr, const char* pszData, size_t size);
protected:
inline void Lock() { EnterCriticalSection(&m_criticalSection); }
inline void Unlock() { LeaveCriticalSection(&m_criticalSection); }
+ void addGlassToList(CGlass* pGlass);
protected:
EquipmentListener m_listener;
@@ -119,6 +133,8 @@
MemoryBlock m_blockWriteBit;
std::vector<CPin*> m_inputPins;
std::vector<CPin*> m_outputPins;
+ std::list<CGlass*> m_glassList;
+
// 以下为从CC-Link读取到的Bit标志位
private:
--
Gitblit v1.9.3