From 4289dfbba5033a08e9aea375f439e2ea7e0648da Mon Sep 17 00:00:00 2001
From: darker <mr.darker@163.com>
Date: 星期二, 18 二月 2025 16:23:54 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CEquipment.h | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 769a8fe..3799c16 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -10,6 +10,7 @@
typedef struct _EquipmentListener
{
ONALIVE onAlive;
+ ONALIVE onCimStateChanged;
} EquipmentListener;
// Memory Block 结构体定义
@@ -56,7 +57,7 @@
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);
@@ -73,7 +74,10 @@
StationIdentifier m_station;
MemoryBlock m_blockReadBit;
MemoryBlock m_blockWriteBit;
+
+ private:
ALIVE m_alive;
+ BOOL m_bCimState; // ON/OFF
};
}
--
Gitblit v1.9.3