From 437d3d047183eed3bbd8eb79e4b40c4a1e0427c9 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期四, 15 一月 2026 10:39:31 +0800
Subject: [PATCH] 1.修复： CEID 校验恒通过：ceidDefined 返回 true，PauseEvent ID 不做有效性检查。Host 若下发无效 CEID，将被接受但运行时无法触发暂停，风险难以察觉。 指定事件发生时暂停；
---
SourceCode/Bond/Servo/CMaster.h | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.h b/SourceCode/Bond/Servo/CMaster.h
index d143a26..acd3065 100644
--- a/SourceCode/Bond/Servo/CMaster.h
+++ b/SourceCode/Bond/Servo/CMaster.h
@@ -1,5 +1,6 @@
锘�#pragma once
#include <list>
+#include <unordered_set>
#include "CEquipment.h"
#include "CEFEM.h"
#include "CBonder.h"
@@ -16,6 +17,7 @@
#include "ProcessJob.h"
#include "CControlJob.h"
#include "../DAQBridge/core/Collector.h"
+#include "CJobDataS.h"
#define CTStep_Unknow 0
@@ -60,6 +62,8 @@
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, int round)> ONCTROUNDEND;
typedef std::function<void(void* pMaster, void* pj)> ONPJSTART;
typedef std::function<void(void* pMaster)> ONCONTROLJOBCHANGED;
@@ -74,7 +78,9 @@
ONROBOTTASKEVENT onRobotTaskEvent;
ONLOADPORTSTATUSCHANGED onLoadPortStatusChanged;
ONPROCESSSTATECHANGED onProcessStateChanged;
+ ONSVDATAREPORT onSVDataReport;
ONPROCESSDATAREPORTEX onProcessDataReport;
+ ONJOBRECEIVED onJobReceived;
ONCTROUNDEND onCTRoundEnd;
ONPJSTART onCjStart;
ONPJSTART onCjEnd;
@@ -184,6 +190,8 @@
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);
public:
int getLastError();
@@ -271,6 +279,7 @@
int m_nTestFlag;
std::list<CGlass*> m_bufGlass;
+ std::unordered_set<uint32_t> m_allowedCeids;
private:
Collector* m_pCollector = nullptr;
--
Gitblit v1.9.3