From 14f406e53bdda8255efca78c41abf19806125118 Mon Sep 17 00:00:00 2001
From: darker <mr.darker@163.com>
Date: 星期二, 18 二月 2025 17:58:56 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CEquipment.h | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 7c699e3..63957e8 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -5,6 +5,7 @@
namespace SERVO {
#define BLOCK_BUFFER_MAX 1024
#define ALIVE_TIMEOUT 15
+#define VCR_MAX 1
typedef std::function<void(void* pEiuipment, BOOL bAlive)> ONALIVE;
typedef struct _EquipmentListener
@@ -57,10 +58,22 @@
virtual void onTimer(UINT nTimerid);
virtual void serialize(CArchive& ar);
virtual void onReceiveLBData(const char* pszData, size_t size);
+
+
+ // 以下为从CC-Link读取到的Bit标志位检测函数
+ public:
BOOL isAlive();
-
+ BOOL isCimOn();
+ BOOL isUpstreamInline();
+ BOOL isDownstreamInline();
+ BOOL isLocalAlarm();
+ BOOL isAutoRecipeChange();
+ BOOL isVCREnable(unsigned int index);
+
+
private:
BOOL isBitOn(const char* pszData, size_t size, int index);
+ inline BOOL equalBool(BOOL b1, BOOL b2);
protected:
inline void Lock() { EnterCriticalSection(&m_criticalSection); }
@@ -76,9 +89,15 @@
MemoryBlock m_blockReadBit;
MemoryBlock m_blockWriteBit;
+ // 以下为从CC-Link读取到的Bit标志位
private:
ALIVE m_alive;
BOOL m_bCimState; // ON/OFF
+ BOOL m_bUpstreamInline;
+ BOOL m_bDownstreamInline;
+ BOOL m_bLocalAlarm;
+ BOOL m_bAutoRecipeChange;
+ BOOL m_bVCREnable[VCR_MAX];
};
}
--
Gitblit v1.9.3