From 87c5da242b0502626deac934d75579559032c2c8 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 12 四月 2025 09:01:16 +0800
Subject: [PATCH] 1.CIM Message set（下发CIM消息到PLC），测试成功 2.CIM Message clear(清除PLC中的指定CIM消息)， 测试成功 3.CIM Message Confirm（PLC确认CIM消息事件检测和获取），测试成功
---
SourceCode/Bond/Servo/CMaster.h | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index 3868b59..fa79fce 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -3,17 +3,23 @@
#include "CEquipment.h"
#include "CEFEM.h"
#include "CBonder.h"
+#include "CLoadPort.h"
+#include "CFliper.h"
+#include "CAligner.h"
+#include "CVacuumBake.h"
+#include "CBakeCooling.h"
#include "CCLinkIEControl.h"
namespace SERVO {
typedef std::function<void(void* pMaster, CEquipment* pEiuipment, BOOL bAlive)> ONEQALIVE;
- typedef std::function<void(void* pEiuipment, CStep* pStep, int code, void* pData)> ONEQSTEPEVENT;
+ typedef std::function<void(CStep* pStep, int code, void* pData)> ONEQSTEPEVENT;
+ typedef std::function<void(void* pMaster, CEquipment* pEquipment, int state, int alarmId, int unitId, int level)> ONEQALARM;
typedef struct _MasterListener
{
ONEQALIVE onEqAlive;
ONEQALIVE onEqCimStateChanged;
- ONEQSTEPEVENT onEqStepEvent;
+ ONEQALARM onEqAlarm;
} MasterListener;
class CMaster
@@ -27,17 +33,38 @@
void setListener(MasterListener listener);
int init();
int term();
+ unsigned ReadBitsProc();
void onTimer(UINT nTimerid);
+ std::list<CEquipment*>& getEquipmentList();
CEquipment* getEquipment(int id);
+ void setCacheFilepath(const char* pszFilepath);
private:
- int addEquipment(CEquipment* pEquipment);
- int addEFEM(StepListener& listener);
+ int addToEquipmentList(CEquipment* pEquipment);
+ int addLoadPort(int index);
+ int addFliper();
+ int addVacuumBake();
+ int addAligner();
+ int addEFEM();
+ int addBonder(int index);
+ int addBakeCooling();
+ void connectEquipments();
+ int saveCache();
+ int saveCacheAndBackups();
+ int readCache();
+ void serialize(CArchive& ar);
private:
MasterListener m_listener;
CCCLinkIEControl m_cclink;
std::list<CEquipment*> m_listEquipment;
+ std::string m_strFilepath;
+ BOOL m_bDataModify;
+
+ private:
+ HANDLE m_hEventReadBitsThreadExit[2];
+ HANDLE m_hReadBitsThreadHandle;
+ unsigned m_nReadBitsThreadAddr;
};
}
--
Gitblit v1.9.3