From 260b16a1debe7dbc33982768a37dfd48ca34b248 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期五, 09 一月 2026 14:27:21 +0800
Subject: [PATCH] 1.EAP模拟器完善
---
SourceCode/Bond/Servo/HsmsPassive.h | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index 8106bc4..e38ccb5 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.h
+++ b/SourceCode/Bond/Servo/HsmsPassive.h
@@ -138,7 +138,7 @@
int deleteReport(int rptid);
int addReport(int rptid, const std::vector<unsigned int>& vids);
int updateReport(int rptid, const std::vector<unsigned int>& vids);
- void clearAllReport();
+ void clearAllReport(BOOL bSave = FALSE);
// 浠庢枃浠朵腑鍔犺浇CVariable鍒楄〃
int loadVarialbles(const char* pszFilepath);
@@ -150,6 +150,8 @@
// 鍙栧緱鎸囧畾Variable
SERVO::CVariable* getVariable(int variableId);
SERVO::CVariable* getVariable(const char* pszName);
+ int getCurrentControlState();
+ bool isHostCommandAllowed();
int deleteVariable(int variableId);
int addVariable(const char* pszName, const char* pszFormat, const char* pszRemark, int& outId);
int updateVariable(int variableId, const char* pszName, const char* pszFormat, const char* pszRemark);
@@ -158,6 +160,8 @@
void setVariableValue(const char* pszName, __int64 value);
void setVariableValue(const char* pszName, const char* value);
void setVariableValue(const char* pszName, std::vector<SERVO::CVariable>& vars);
+ // 鎵ц涓�娈垫寔閿佺殑浠ｇ爜鍧楋紝鐢ㄤ簬淇濊瘉 set+send 鐨勫師瀛愭��
+ void withVariableLock(const std::function<void()>& fn);
// 浠庢枃浠朵腑鍔犺浇CReport鍒楄〃
int loadReports(const char* pszFilepath);
@@ -171,10 +175,13 @@
// 鍙栧緱CCollectionEvent鍒楄〃
std::vector<SERVO::CCollectionEvent*>& getCollectionEvents();
+ unsigned int getMaxCollectionEventId() const;
// 鍙栨秷/鍒犻櫎鎵�鏈塁ollectionEvent
void clearAllCollectionEvent();
int deleteCollectionEvent(unsigned short CEID);
+ int addCollectionEvent(unsigned int CEID, const char* name, const char* desc, const std::vector<unsigned int>& rptids);
+ int updateCollectionEvent(unsigned int CEID, const char* name, const char* desc, const std::vector<unsigned int>& rptids);
// 鍙栧緱CCollectionEvent
SERVO::CCollectionEvent* getEvent(unsigned short CEID);
@@ -200,8 +207,12 @@
int requestEventReportSend(unsigned int CEID);
int requestEventReportSend(const char* pszEventName);
int requestEventReportSend_CarrierID_Readed();
+ int requestEventReportSend_CheckSlotMap();
+ int requestEventReportSend_SlotMapVerificationOK();
+ int requestEventReportSend_SlotMapVerificationNG();
int requestEventReportSend_Port_Unload_Ready();
int requestEventReportSend_Port_Load_Ready();
+ int requestEventReportSend_Port_Ready_To_Release();
int requestEventReportSend_Port_Blocked();
int requestEventReportSend_PJ_Queued();
int requestEventReportSend_PJ_Start();
@@ -211,6 +222,10 @@
int requestEventReportSend_Panel_Start();
int requestEventReportSend_Panel_End();
int requestEventReportSend_OCR_PanelID_Read_OK();
+ int requestEventReportSend_LoadPortNotAssoc();
+ int requestEventReportSend_ProcessDataReport();
+ int requestEventReportSend_SubEqpStart();
+ int requestEventReportSend_SubEqpEnd();
private:
void replyAck(int s, int f, unsigned int systemBytes, BYTE ack, const char* pszAckName);
@@ -289,7 +304,13 @@
// CollectionEvent vector
std::vector<SERVO::CCollectionEvent*> m_collectionEvents;
- // Spooling Config
- std::map<uint16_t, std::set<uint16_t>> m_spoolingConfig;
-};
+ // Spooling blacklist: StreamId -> {FunctionId...}
+ // In this map means DO NOT spool/cache.
+ // Special case: stream 1 is not spooled regardless of config.
+ // If a stream key exists with empty set => blacklist ALL functions in that stream.
+ std::map<uint16_t, std::set<uint16_t>> m_spoolBlacklistByStream;
+ bool m_spoolingEnabled{ true };
+private:
+ bool shouldSpool(uint8_t streamId, uint8_t functionId) const;
+};
--
Gitblit v1.9.3