From 43c7dc211f10851480352b12bd01f3443079bb01 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 26 八月 2025 09:09:21 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CMaster.h | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index e5f868d..e8c7236 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -13,10 +13,25 @@
#include "CArmTray.h"
#include "CCLinkIEControl.h"
#include "CRobotTask.h"
+#include "ProcessJob.h"
+#include "CControlJob.h"
-#define CTStep_begin 0
-#define CTStep_end 99
+#define CTStep_Unknow 0
+#define CTStep_LoadPort_Aligner 1
+#define CTStep_Aligner_Fliper 2
+#define CTStep_Fliper_Bonder1 3
+#define CTStep_Bonder1_Bonder2 4
+#define CTStep_Bonder2_VacuumBake 5
+#define CTStep_VacuumBake_VacuumBake 6
+#define CTStep_VacuumBake_BakeCooling 7
+#define CTStep_BakeCooling_BakeCooling1 8
+#define CTStep_BakeCooling_BakeCooling2 9
+#define CTStep_BakeCooling_BakeCooling3 10
+#define CTStep_BakeCooling_Measurement 11
+#define CTStep_Measurement_LoadPort 12
+#define CTStep_begin CTStep_LoadPort_Aligner
+#define CTStep_end CTStep_Measurement_LoadPort
namespace SERVO {
enum class MASTERSTATE {
@@ -50,7 +65,7 @@
ONCTROUNDEND onCTRoundEnd;
} MasterListener;
- class CMaster
+ class CMaster : public IResourceView
{
public:
CMaster();
@@ -73,6 +88,7 @@
void onTimer(UINT nTimerid);
std::list<CEquipment*>& getEquipmentList();
CEquipment* getEquipment(int id);
+ CEquipment* getEquipment(int id) const;
void setCacheFilepath(const char* pszFilepath);
int abortCurrentTask();
int restoreCurrentTask();
@@ -90,6 +106,14 @@
int carrierRelease(unsigned int port);
int getContinuousTransferCount();
void setContinuousTransferCount(int round);
+ int setProcessJobs(std::vector<CProcessJob*>& pjs);
+ std::vector<CProcessJob*>& getProcessJobs();
+ CProcessJob* getProcessJob(const std::string& id);
+ int setControlJob(CControlJob& controlJob);
+ CControlJob* getControlJob();
+ CLoadPort* getPortWithCarrierId(const std::string& carrierId) const;
+ bool saveState() const;
+ bool loadState(const std::string& path);
private:
inline void lock() { EnterCriticalSection(&m_criticalSection); }
@@ -120,6 +144,14 @@
CRobotTask* createTransferTask_restore(CEquipment* pEqSrc, CLoadPort** pPorts);
CRobotTask* createTransferTask_continuous_transfer(CEquipment* pSrcEq, int nSrcSlot,
CEquipment* pTarEq, int nTarSlot, int armNo = 1);
+
+ public:
+ // —— IResourceView 覆写 ——（注意 const）
+ bool isProcessJobsEmpty() const override;
+ bool recipeExists(const std::string& ppid) const override;
+ bool carrierPresent(const std::string& carrierId) const override;
+ bool slotUsable(const std::string& carrierId, uint16_t slot) const override;
+ bool ceidDefined(uint32_t ceid) const override;
private:
CRITICAL_SECTION m_criticalSection;
@@ -165,6 +197,9 @@
private:
bool m_bEnableEventReport;
bool m_bEnableAlarmReport;
+ SERVO::CControlJob* m_pControlJob;
+ std::vector<SERVO::CProcessJob*> m_processJobs;
+ std::string m_strStatePath;
};
}
--
Gitblit v1.9.3