From d68541dce155a682f65b7c3fbfbfbeef17ea5b8f Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 12 五月 2025 12:00:41 +0800
Subject: [PATCH] 1.StoredJob, Fetched out Job实现； 2.CStep增加定制的Attribute, 以便通过的Step不使用getAttributeVector也能添加不一样的Attribute;
---
SourceCode/Bond/Servo/CMaster.h | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index adf5059..31ea5da 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -8,17 +8,24 @@
#include "CAligner.h"
#include "CVacuumBake.h"
#include "CBakeCooling.h"
+#include "CArm.h"
+#include "CArmTray.h"
#include "CCLinkIEControl.h"
namespace SERVO {
typedef std::function<void(void* pMaster, CEquipment* pEiuipment, BOOL bAlive)> ONEQALIVE;
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 std::function<void(void* pMaster, CEquipment* pEquipment, CVcrEventReport* pReport)> ONEQVCREVENTREPORT;
+ typedef std::function<void(void* pMaster, CEquipment* pEquipment, int code)> ONEQDATACHANGED;
typedef struct _MasterListener
{
ONEQALIVE onEqAlive;
ONEQALIVE onEqCimStateChanged;
- ONEQSTEPEVENT onEqStepEvent;
+ ONEQALARM onEqAlarm;
+ ONEQVCREVENTREPORT onEqVcrEventReport;
+ ONEQDATACHANGED onEqDataChanged;
} MasterListener;
class CMaster
@@ -32,6 +39,7 @@
void setListener(MasterListener listener);
int init();
int term();
+ unsigned ReadBitsProc();
void onTimer(UINT nTimerid);
std::list<CEquipment*>& getEquipmentList();
CEquipment* getEquipment(int id);
@@ -39,15 +47,18 @@
private:
int addToEquipmentList(CEquipment* pEquipment);
- int addLoadPort(int index, StepListener& listener);
- int addFliper(StepListener& listener);
- int addVacuumBake(StepListener& listener);
- int addAligner(StepListener& listener);
- int addEFEM(StepListener& listener);
- int addBonder(int index, StepListener& listener);
- int addBakeCooling(StepListener& listener);
+ CLoadPort* addLoadPort(int index);
+ CFliper* addFliper();
+ CVacuumBake* addVacuumBake();
+ CAligner* addAligner();
+ CEFEM* addEFEM();
+ CArm* addArm();
+ CArmTray* addArmTray(int index);
+ CBonder* addBonder(int index);
+ CBakeCooling* addBakeCooling();
void connectEquipments();
int saveCache();
+ int saveCacheAndBackups();
int readCache();
void serialize(CArchive& ar);
@@ -56,6 +67,12 @@
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