From 03dc81df7fe0ea0e754abcc5af3d329527428853 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期五, 09 一月 2026 20:06:45 +0800
Subject: [PATCH] 1.工节数据上报。
---
SourceCode/Bond/Servo/CMaster.h | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index e2844bd..d143a26 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -58,8 +58,11 @@
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, 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 +73,8 @@
ONEQDATACHANGED onEqDataChanged;
ONROBOTTASKEVENT onRobotTaskEvent;
ONLOADPORTSTATUSCHANGED onLoadPortStatusChanged;
+ ONPROCESSSTATECHANGED onProcessStateChanged;
+ ONPROCESSDATAREPORTEX onProcessDataReport;
ONCTROUNDEND onCTRoundEnd;
ONPJSTART onCjStart;
ONPJSTART onCjEnd;
@@ -77,6 +82,7 @@
ONPJSTART onPjEnd;
ONPJSTART onPanelStart;
ONPJSTART onPanelEnd;
+ ONCONTROLJOBCHANGED onControlJobChanged;
} MasterListener;
class CMaster : public IResourceView
@@ -139,6 +145,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); }
@@ -200,7 +207,7 @@
bool canCompleteControlJob();
bool canDeleteControlJob();
- // DAQ Bridge閻╃鍙�
+ // DAQ Bridge 鐩稿叧
Collector* getCollector() const { return m_pCollector; }
private:
@@ -238,10 +245,9 @@
int m_nLastError;
std::string m_strLastError;
- // 鍦ㄥ紑濮嬪伐鑹哄墠鏄惁鍏堥渶瑕佸厛姣旇緝map
+ // 鍦ㄥ紑濮嬪伐鑹哄墠鏄惁闇�瑕佸厛姣旇緝 map
BOOL m_isCompareMapsBeforeProceeding;
BOOL m_bJobMode;
-
// 鍗冧紶鍦堟暟璁℃暟
int m_nContinuousTransferCount;
@@ -249,7 +255,7 @@
int m_nContinuousWorkingPort;
int m_nContinuousWorkingSlot;
- // 鏂板宸茬粡寮�濮嬪鐞嗙殑ProcessJob鍒楄〃
+ // 宸茬粡寮�濮嬪鐞嗙殑 ProcessJob 鍒楄〃
std::vector<CProcessJob*> m_inProcesJobs;
std::vector<CProcessJob*> m_completeProcessJobs;
std::vector<CGlass*> m_queueGlasses;
@@ -271,4 +277,3 @@
void CreateDAQBridgeServer();
};
}
-
--
Gitblit v1.9.3