From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 30 一月 2026 11:16:24 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/HsmsPassive.h | 84 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 76 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index aeb5bde..81c5188 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.h
+++ b/SourceCode/Bond/Servo/HsmsPassive.h
@@ -9,6 +9,7 @@
#include "CCollectionEvent.h"
#include "ProcessJob.h"
#include "CControlJob.h"
+#include "CDataVariable.h"
#define EQCONSTANT_VALUE_MAX 64
@@ -26,6 +27,8 @@
#define ER_UNLINK_EVENT_REPORT -5
#define ER_NO_PPID_LIST -6
#define ER_NOT_SUPPORTED -7
+#define ER_CREATED_MESSAGE -8
+
/* CAACK */
@@ -76,7 +79,6 @@
typedef std::function<void(void* pFrom)> SECSEQOFFLINE;
-typedef std::function<void(void* pFrom, std::vector<EQConstant>&)> SECSEQCONSTANTREQUEST;
typedef std::function<void(void* pFrom, const char*, std::vector<CommandParameter>&)> SECSCommand;
typedef std::function<void(void* pFrom, SYSTEMTIME& time)> DATETIMESYNC;
typedef std::function<void(void* pFrom, bool bEnable, std::vector<unsigned int>& ids)> EDEVENTREPORT;
@@ -90,17 +92,17 @@
std::string& strErrorTxt)> CARRIERACTION;
typedef std::function<int(void* pFrom, std::vector<SERVO::CProcessJob*>& pjs)> PRJOBMULTICREATE;
typedef std::function<int(void* pFrom, SERVO::CControlJob& controlJob)> CONTROLJOBCREATE;
+typedef std::function<bool(void* pFrom, const std::vector<std::string>& ppids)> DELETEPPID;
typedef struct _SECSListener
{
SECSEQOFFLINE onEQOffLine;
SECSEQOFFLINE onEQOnLine;
- SECSEQCONSTANTREQUEST onEQConstantRequest;
- SECSEQCONSTANTREQUEST onEQConstantSend;
SECSCommand onCommand;
DATETIMESYNC onDatetimeSync;
EDEVENTREPORT onEnableDisableEventReport;
EDALARMREPORT onEnableDisableAlarmReport;
QUERYPPIDLIST onQueryPPIDList;
+ DELETEPPID onDeletePPID;
CARRIERACTION onCarrierAction;
PRJOBMULTICREATE onPRJobMultiCreate;
CONTROLJOBCREATE onControlJobCreate;
@@ -135,48 +137,70 @@
// 鍙栨秷 define report
bool removeReport(int rptid);
- void clearAllReport();
+ 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(BOOL bSave = FALSE);
// 浠庢枃浠朵腑鍔犺浇CVariable鍒楄〃
int loadVarialbles(const char* pszFilepath);
+ // 浠庢枃浠朵腑鍔犺浇CDataVariable鍒楄〃
+ int loadDataVarialbles(const char* pszFilepath);
+ // 浠庢枃浠朵腑鍔犺浇Equipment Constant鍒楄〃
+ int loadEquipmentConstants(const char* pszFilepath);
// 鍙栧緱CVariable鍒楄〃
std::vector<SERVO::CVariable*>& getVariables();
unsigned int getMaxVariableId() const;
+ std::vector<SERVO::CDataVariable*>& getDataVariables();
+ unsigned int getMaxDataVariableId() const;
// 鍙栧緱鎸囧畾Variable
SERVO::CVariable* getVariable(int variableId);
SERVO::CVariable* getVariable(const char* pszName);
+ SERVO::CDataVariable* getDataVariable(int dvid);
+ SERVO::CDataVariable* getDataVariable(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);
+ int deleteDataVariable(int dvid);
+ int addDataVariable(const char* pszName, const char* pszFormat, const char* pszRemark, int& outId);
+ int updateDataVariable(int dvid, const char* pszName, const char* pszFormat, const char* pszRemark);
// 璁剧疆鍙橀噺鍊�
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);
// 鍙栧緱Report鍒楄〃
std::vector<SERVO::CReport*>& getReports();
+ unsigned int getMaxReportId() const;
// 浠庢枃浠朵腑鍔犺浇CCollectionEvent鍒楄〃
int loadCollectionEvents(const char* pszFilepath);
// 鍙栧緱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);
// 鍙栧緱Report
SERVO::CReport* getReport(int rptid);
- int deleteReport(int rptid);
void setListener(SECSListener listener);
unsigned OnCimWork();
@@ -196,8 +220,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();
@@ -207,6 +235,11 @@
int requestEventReportSend_Panel_Start();
int requestEventReportSend_Panel_End();
int requestEventReportSend_OCR_PanelID_Read_OK();
+ int requestEventReportSend_OCR_PanelID_Read(short vcrResult);
+ 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);
@@ -215,6 +248,9 @@
int replyAreYouThere(IMessage* pRecv);
int replyEstablishCommunications(IMessage* pRecv);
int replySelectedEquipmentStatusData(IMessage* pRecv);
+ int replyStatusVariableNamelistRequest(IMessage* pRecv); // S1F11/S1F12
+ int replyDataVariableNamelistRequest(IMessage* pRecv); // S1F21/S1F22
+ int replyCollectionEventNamelistRequest(IMessage* pRecv); // S1F23/S1F24
int replyOnLine(IMessage* pRecv);
int replyOffLine(IMessage* pRecv);
int replyEquipmentConstantRequest(IMessage* pRecv);
@@ -229,6 +265,8 @@
int replyEanbleDisableAlarmReport(IMessage* pRecv);
int replyPurgeSpooledData(IMessage* pRecv);
int replyQueryPPIDList(IMessage* pRecv);
+ int replyDeletePPID(IMessage* pRecv); // S7F17/S7F18
+ int replyProcessProgramRequest(IMessage* pRecv); // S7F5/S7F6
int replyTerminalDisplay(IMessage* pRecv);
int replyCreateObj(IMessage* pRecv);
int replyPRJobMultiCreate(IMessage* pRecv);
@@ -238,9 +276,13 @@
inline void Unlock() { LeaveCriticalSection(&m_criticalSection); }
int onRecvMsg(IMessage* pMessage);
void clearAllVariabel();
+ void clearAllDataVariabel();
std::vector<unsigned int> parseVidList(CString& strNums);
int writeVariablesToFile(const std::string& filepath);
+ int writeDataVariablesToFile(const std::string& filepath);
+ int writeEquipmentConstantsToFile(const std::string& filepath);
int writeReportsToFile(const std::string& filepath);
+ int writeCollectionEventsToFile(const std::string& filepath);
private:
CModel* m_pModel;
@@ -261,9 +303,18 @@
std::string m_strVariableFilepath;
bool m_bVariableUtf8{ false };
bool m_bVariableUtf8Bom{ false };
+ std::string m_strDataVariableFilepath;
+ bool m_bDataVariableUtf8{ false };
+ bool m_bDataVariableUtf8Bom{ false };
std::string m_strReportFilepath;
bool m_bReportUtf8{ false };
bool m_bReportUtf8Bom{ false };
+ std::string m_strCollectionEventFilepath;
+ bool m_bCollectionUtf8{ false };
+ bool m_bCollectionUtf8Bom{ false };
+ std::string m_strEquipmentConstantFilepath;
+ bool m_bEquipmentConstantUtf8{ false };
+ bool m_bEquipmentConstantUtf8Bom{ false };
BOOL m_bCimWorking;
HANDLE m_hCimWorkEvent;
HANDLE m_hCimWorkThreadHandle;
@@ -274,6 +325,17 @@
private:
// CVariable vector
std::vector<SERVO::CVariable*> m_variabels;
+ // CDataVariable vector
+ std::vector<SERVO::CDataVariable*> m_dataVariabels;
+ // Equipment constants
+ struct EquipmentConstantEntry {
+ unsigned int id{ 0 };
+ std::string name;
+ std::string format;
+ std::string remark;
+ std::string value;
+ };
+ std::vector<EquipmentConstantEntry> m_equipmentConstants;
// CReport vector
std::vector<SERVO::CReport*> m_reports;
@@ -281,7 +343,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