From 2a803976ed12e59f3e082e7c08941ef5004e6ea1 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 20 五月 2025 11:40:10 +0800
Subject: [PATCH] 1. 添加机器臂命令配置界面
---
SourceCode/Bond/Servo/CMaster.h | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index f3a531b..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,13 +47,15 @@
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();
@@ -58,6 +68,11 @@
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