From 5efff0895ad06eb0c5f04df7efe67a22b358beb3 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 18 二月 2025 16:10:23 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh
---
SourceCode/Bond/Servo/CEquipment.h | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 9f83bb8..3799c16 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -3,13 +3,31 @@
#include "CCLinkIEControl.h"
namespace SERVO {
+#define BLOCK_BUFFER_MAX 1024
+#define ALIVE_TIMEOUT 15
+
+ typedef std::function<void(void* pEiuipment, BOOL bAlive)> ONALIVE;
+ typedef struct _EquipmentListener
+ {
+ ONALIVE onAlive;
+ ONALIVE onCimStateChanged;
+ } EquipmentListener;
+
// Memory Block 结构体定义
typedef struct _MemoryBlock {
unsigned int type;
unsigned int start;
unsigned int end;
unsigned int size;
+ char buffer[BLOCK_BUFFER_MAX];
} MemoryBlock;
+
+ // ALIVE
+ typedef struct _ALIVE {
+ BOOL flag;
+ int count;
+ BOOL alive;
+ } ALIVE;
class CEquipment
{
@@ -20,6 +38,9 @@
public:
virtual const char* getClassName() = 0;
+ virtual void setListener(EquipmentListener listener);
+ void setID(int nID);
+ int getID();
void setName(const char* pszName);
std::string& getName();
void setDescription(const char* pszDescription);
@@ -34,18 +55,29 @@
virtual void term();
virtual void onTimer(UINT nTimerid);
virtual void serialize(CArchive& ar);
+ virtual void onReceiveLBData(const char* pszData, size_t size);
+ BOOL isAlive();
+
+ private:
+ BOOL isBitOn(const char* pszData, size_t size, int index);
protected:
inline void Lock() { EnterCriticalSection(&m_criticalSection); }
inline void Unlock() { LeaveCriticalSection(&m_criticalSection); }
protected:
+ EquipmentListener m_listener;
+ int m_nID;
std::string m_strName;
std::string m_strDescription;
CRITICAL_SECTION m_criticalSection;
StationIdentifier m_station;
MemoryBlock m_blockReadBit;
MemoryBlock m_blockWriteBit;
+
+ private:
+ ALIVE m_alive;
+ BOOL m_bCimState; // ON/OFF
};
}
--
Gitblit v1.9.3