From d400f022161ff47f02cd0ea95a5076d0187ecd4d Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期五, 30 一月 2026 15:11:06 +0800
Subject: [PATCH] 1.接上，日志完善；
---
SourceCode/Bond/Servo/CMaster.h | 72 +++++++++++++++++++++++++++++------
1 files changed, 59 insertions(+), 13 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index 21b68d6..20d4c3d 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -1,5 +1,6 @@
-#pragma once
+锘�#pragma once
#include <list>
+#include <unordered_set>
#include "CEquipment.h"
#include "CEFEM.h"
#include "CBonder.h"
@@ -16,6 +17,9 @@
#include "ProcessJob.h"
#include "CControlJob.h"
#include "../DAQBridge/core/Collector.h"
+#include "CJobDataS.h"
+
+class CModel;
#define CTStep_Unknow 0
@@ -50,6 +54,11 @@
ATHERERROR
};
+ enum class CurveMode {
+ Production = 0,
+ EmptyChamber
+ };
+
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;
@@ -58,8 +67,15 @@
typedef std::function<void(void* pMaster, CEquipment* pEquipment, int code)> ONEQDATACHANGED;
typedef std::function<void(void* pMaster, CRobotTask* pTask, int code)> ONROBOTTASKEVENT;
typedef std::function<void(void* pMaster, CEquipment* pEquipment, short status, __int64 data)> ONLOADPORTSTATUSCHANGED;
+ typedef std::function<void(void* pMaster, CEquipment* pEquipment, int slotNo, PROCESS_STATE prevState, PROCESS_STATE state)> ONPROCESSSTATECHANGED;
+ 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;
typedef struct _MasterListener
{
ONMASTERSTATECHANGED onMasterStateChanged;
@@ -70,6 +86,12 @@
ONEQDATACHANGED onEqDataChanged;
ONROBOTTASKEVENT onRobotTaskEvent;
ONLOADPORTSTATUSCHANGED onLoadPortStatusChanged;
+ ONPROCESSSTATECHANGED onProcessStateChanged;
+ ONSVDATAREPORT onSVDataReport;
+ ONPROCESSDATAREPORTEX onProcessDataReport;
+ ONJOBRECEIVED onJobReceived;
+ ONJOBSENTOUT onJobSentOut;
+ ONEQSTATUSCHANGEDEX onEqStatusChanged;
ONCTROUNDEND onCTRoundEnd;
ONPJSTART onCjStart;
ONPJSTART onCjEnd;
@@ -77,6 +99,7 @@
ONPJSTART onPjEnd;
ONPJSTART onPanelStart;
ONPJSTART onPanelEnd;
+ ONCONTROLJOBCHANGED onControlJobChanged;
} MasterListener;
class CMaster : public IResourceView
@@ -87,6 +110,7 @@
public:
+ void setModelCtx(CModel* pModel);
void setListener(MasterListener listener);
CRobotTask* getActiveRobotTask();
int init();
@@ -98,6 +122,8 @@
void clearError();
ULONGLONG getRunTime();
MASTERSTATE getState();
+ void setCurveMode(CurveMode mode);
+ CurveMode getCurveMode() const;
unsigned DispatchProc();
unsigned ReadBitsProc();
void onTimer(UINT nTimerid);
@@ -139,6 +165,7 @@
int getPortCassetteSnSeed(int port);
void setPortCassetteSnSeed(int port, int seed);
CGlass* getGlass(int scrPort, int scrSlot);
+ uint32_t SlotToMid(int eqid, int slot);
private:
inline void lock() { EnterCriticalSection(&m_criticalSection); }
@@ -171,19 +198,28 @@
CEquipment* pTarEq, int nTarSlot, int armNo = 1);
public:
- // —— IResourceView 覆写 ——（注意 const）
+ // 鈥斺�� 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;
+ void setAllowedCeids(const std::vector<unsigned int>& ceids);
+ void handleCollectionEvent(uint32_t ceid);
+ bool raiseSoftAlarm(int alarmId,
+ const std::string& desc,
+ int level = -1,
+ int deviceId = 0,
+ int unitId = 0,
+ const char* deviceName = "Software",
+ const char* unitName = "App");
public:
int getLastError();
std::string& getLastErrorText();
public:
- // 新增函数
+ // 鏂板鍑芥暟
CProcessJob* acquireNextProcessJob();
CGlass* acquireNextGlass();
int acquireGlassToQueue();
@@ -199,6 +235,9 @@
bool canCreateControlJob();
bool canCompleteControlJob();
bool canDeleteControlJob();
+
+ // DAQ Bridge 鐩稿叧
+ Collector* getCollector() const { return m_pCollector; }
private:
CRITICAL_SECTION m_criticalSection;
@@ -211,42 +250,42 @@
bool m_bBatch;
private:
- /* 监控比特位的线程*/
+ /* 鐩戞帶姣旂壒浣嶇殑绾跨▼*/
HANDLE m_hEventReadBitsThreadExit[2];
HANDLE m_hReadBitsThreadHandle;
unsigned m_nReadBitsThreadAddr;
- // 调度线程
+ // 璋冨害绾跨▼
HANDLE m_hDispatchEvent;
HANDLE m_hEventDispatchThreadExit[2];
HANDLE m_hDispatchThreadHandle;
unsigned m_nDispatchThreadAddr;
- // 启动时间，运行时间，状态
+ // 鍚姩鏃堕棿锛岃繍琛屾椂闂达紝鐘舵��
ULONGLONG m_ullStartTime;
ULONGLONG m_ullRunTime;
MASTERSTATE m_state;
+ CurveMode m_curveMode;
- // 当前任务和已完成任务列表
+ // 褰撳墠浠诲姟鍜屽凡瀹屾垚浠诲姟鍒楄〃
CRobotTask* m_pActiveRobotTask;
std::list< CRobotTask* > m_listTask;
- // 错误代码
+ // 閿欒浠ｇ爜
int m_nLastError;
std::string m_strLastError;
- // 在开始工艺前是否先需要先比较map
+ // 鍦ㄥ紑濮嬪伐鑹哄墠鏄惁闇�瑕佸厛姣旇緝 map
BOOL m_isCompareMapsBeforeProceeding;
BOOL m_bJobMode;
-
- // 千传圈数计数
+ // 鍗冧紶鍦堟暟璁℃暟
int m_nContinuousTransferCount;
int m_nContinuousTransferStep;
int m_nContinuousWorkingPort;
int m_nContinuousWorkingSlot;
- // 新增已经开始处理的ProcessJob列表
+ // 宸茬粡寮�濮嬪鐞嗙殑 ProcessJob 鍒楄〃
std::vector<CProcessJob*> m_inProcesJobs;
std::vector<CProcessJob*> m_completeProcessJobs;
std::vector<CGlass*> m_queueGlasses;
@@ -256,16 +295,23 @@
private:
bool m_bEnableEventReport;
bool m_bEnableAlarmReport;
+ bool m_bPauseAlarmRaised;
SERVO::CControlJob* m_pControlJob;
std::vector<SERVO::CProcessJob*> m_processJobs;
std::string m_strStatePath;
+ CModel* m_pModelCtx;
int m_nTestFlag;
std::list<CGlass*> m_bufGlass;
+ std::unordered_set<uint32_t> m_allowedCeids;
private:
Collector* m_pCollector = nullptr;
void CreateDAQBridgeServer();
+ inline void notifyControlJobChanged() {
+ if (m_listener.onControlJobChanged) {
+ m_listener.onControlJobChanged(this);
+ }
+ }
};
}
-
--
Gitblit v1.9.3