From 656228d05e6fa5200ae41621d2250de210d95600 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期二, 03 二月 2026 15:34:43 +0800
Subject: [PATCH] 1.Slot小方块大小用两种配置，LoadPort和其它的分开
---
SourceCode/Bond/Servo/CMaster.h | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index 35eb6fc..856dde3 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -54,6 +54,16 @@
ATHERERROR
};
+ enum class CurveMode {
+ Production = 0,
+ EmptyChamber
+ };
+
+ enum class SchedulingMode {
+ Production = 0, // 鐢熶骇妯″紡锛堟寜瀹㈡埛鎸囧畾Port鏄犲皠锛�
+ Tuning = 1 // 璋冩満妯″紡锛堝師鏈夎皟搴﹂�昏緫锛�
+ };
+
typedef std::function<void(void* pMaster, MASTERSTATE state)> ONMASTERSTATECHANGED;
typedef std::function<void(void* pMaster, CEquipment* pEiuipment, BOOL bAlive)> ONEQALIVE;
typedef std::function<void(CStep* pStep, int code, void* pData)> ONEQSTEPEVENT;
@@ -66,6 +76,8 @@
typedef std::function<void(void* pMaster, CEquipment* pEquipment, const std::vector<CParam>& params)> ONPROCESSDATAREPORTEX;
typedef std::function<void(void* pMaster, CEquipment* pEquipment, const std::vector<CParam>& params)> ONSVDATAREPORT;
typedef std::function<void(void* pMaster, CEquipment* pEquipment, int port, CJobDataS* pJobDataS)> ONJOBRECEIVED;
+ typedef std::function<void(void* pMaster, CEquipment* pEquipment, int port, CJobDataS* pJobDataS)> ONJOBSENTOUT;
+ typedef std::function<void(void* pMaster, CEquipment* pEquipment, int unitId, int status, int reason)> ONEQSTATUSCHANGEDEX;
typedef std::function<void(void* pMaster, int round)> ONCTROUNDEND;
typedef std::function<void(void* pMaster, void* pj)> ONPJSTART;
typedef std::function<void(void* pMaster)> ONCONTROLJOBCHANGED;
@@ -83,6 +95,8 @@
ONSVDATAREPORT onSVDataReport;
ONPROCESSDATAREPORTEX onProcessDataReport;
ONJOBRECEIVED onJobReceived;
+ ONJOBSENTOUT onJobSentOut;
+ ONEQSTATUSCHANGEDEX onEqStatusChanged;
ONCTROUNDEND onCTRoundEnd;
ONPJSTART onCjStart;
ONPJSTART onCjEnd;
@@ -113,6 +127,11 @@
void clearError();
ULONGLONG getRunTime();
MASTERSTATE getState();
+ void setCurveMode(CurveMode mode);
+ CurveMode getCurveMode() const;
+ void setSchedulingMode(SchedulingMode mode);
+ SchedulingMode getSchedulingMode() const;
+ void applySchedulingModePortMapping();
unsigned DispatchProc();
unsigned ReadBitsProc();
void onTimer(UINT nTimerid);
@@ -183,6 +202,7 @@
CRobotTask* createTransferTask_bake_to_cooling(CEquipment* pSrcEq);
CRobotTask* createTransferTask_bakecooling_to_measurement(CEquipment* pSrcEq, CEquipment* pTarEq);
CRobotTask* createTransferTask_restore(CEquipment* pEqSrc, CLoadPort** pPorts);
+ CRobotTask* createTransferTask_returnOrigin(CEquipment* pEqSrc, CLoadPort** pPorts);
CRobotTask* createTransferTask_continuous_transfer(CEquipment* pSrcEq, int nSrcSlot,
CEquipment* pTarEq, int nTarSlot, int armNo = 1);
@@ -254,6 +274,7 @@
ULONGLONG m_ullStartTime;
ULONGLONG m_ullRunTime;
MASTERSTATE m_state;
+ CurveMode m_curveMode;
// 褰撳墠浠诲姟鍜屽凡瀹屾垚浠诲姟鍒楄〃
CRobotTask* m_pActiveRobotTask;
@@ -266,6 +287,7 @@
// 鍦ㄥ紑濮嬪伐鑹哄墠鏄惁闇�瑕佸厛姣旇緝 map
BOOL m_isCompareMapsBeforeProceeding;
BOOL m_bJobMode;
+ SchedulingMode m_schedulingMode;
// 鍗冧紶鍦堟暟璁℃暟
int m_nContinuousTransferCount;
--
Gitblit v1.9.3