From b13e43c3eb3881d56f0da797a4171f070bcf2413 Mon Sep 17 00:00:00 2001
From: darker <mr.darker@163.com>
Date: 星期四, 20 二月 2025 18:05:23 +0800
Subject: [PATCH] 1.修复状态错误的问题 2.SECS运行表完成SystemDV表和EqpDV的增删改查，并且把DV数据和SV数据的增删改查提取成一个通用函数
---
SourceCode/Bond/Servo/CEquipment.h | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index 7c699e3..2a9bd53 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -1,10 +1,14 @@
#pragma once
#include "Log.h"
#include "CCLinkIEControl.h"
+#include "CStep.h"
+#include <map>
+
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
@@ -52,15 +56,29 @@
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);
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 +94,18 @@
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];
+
+ private:
+ std::map<unsigned int, CStep*> m_mapStep;
};
}
--
Gitblit v1.9.3