From 6e0341c6356cdb6e527fbd89d1dc876f4e47ce46 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期五, 09 一月 2026 20:37:50 +0800
Subject: [PATCH] 1.Trace Data，ProcessData, SVData等上报
---
SourceCode/Bond/Servo/CMaster.h | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index 1d983e2..02720ee 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -58,7 +58,9 @@
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 state)> ONPROCESSSTATECHANGED;
+ 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, int round)> ONCTROUNDEND;
typedef std::function<void(void* pMaster, void* pj)> ONPJSTART;
typedef std::function<void(void* pMaster)> ONCONTROLJOBCHANGED;
@@ -73,6 +75,8 @@
ONROBOTTASKEVENT onRobotTaskEvent;
ONLOADPORTSTATUSCHANGED onLoadPortStatusChanged;
ONPROCESSSTATECHANGED onProcessStateChanged;
+ ONSVDATAREPORT onSVDataReport;
+ ONPROCESSDATAREPORTEX onProcessDataReport;
ONCTROUNDEND onCTRoundEnd;
ONPJSTART onCjStart;
ONPJSTART onCjEnd;
@@ -205,7 +209,7 @@
bool canCompleteControlJob();
bool canDeleteControlJob();
- // DAQ Bridge閻╃鍙�
+ // DAQ Bridge 鐩稿叧
Collector* getCollector() const { return m_pCollector; }
private:
@@ -243,10 +247,9 @@
int m_nLastError;
std::string m_strLastError;
- // 鍦ㄥ紑濮嬪伐鑹哄墠鏄惁鍏堥渶瑕佸厛姣旇緝map
+ // 鍦ㄥ紑濮嬪伐鑹哄墠鏄惁闇�瑕佸厛姣旇緝 map
BOOL m_isCompareMapsBeforeProceeding;
BOOL m_bJobMode;
-
// 鍗冧紶鍦堟暟璁℃暟
int m_nContinuousTransferCount;
@@ -254,7 +257,7 @@
int m_nContinuousWorkingPort;
int m_nContinuousWorkingSlot;
- // 鏂板宸茬粡寮�濮嬪鐞嗙殑ProcessJob鍒楄〃
+ // 宸茬粡寮�濮嬪鐞嗙殑 ProcessJob 鍒楄〃
std::vector<CProcessJob*> m_inProcesJobs;
std::vector<CProcessJob*> m_completeProcessJobs;
std::vector<CGlass*> m_queueGlasses;
--
Gitblit v1.9.3