From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 22 十月 2025 14:24:34 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/HsmsPassive.h | 126 ++++++++++++++++++++++++++++++++----------
1 files changed, 96 insertions(+), 30 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index 0436b2c..1863abd 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.h
+++ b/SourceCode/Bond/Servo/HsmsPassive.h
@@ -5,7 +5,10 @@
#include <functional>
#include <vector>
#include <map>
+#include <set>
#include "CCollectionEvent.h"
+#include "ProcessJob.h"
+#include "CControlJob.h"
#define EQCONSTANT_VALUE_MAX 64
@@ -15,11 +18,25 @@
#define VALUE_NAME_MAX 64
-#define ER_NOERROR 0
-#define ER_NOTSELECT -1
-#define ER_BUSY -2
-#define ER_PARAM_ERROR -3
+#define ER_NOERROR 0
+#define ER_NOTSELECT -1
+#define ER_BUSY -2
+#define ER_PARAM_ERROR -3
+#define ER_NO_EVENT -4
+#define ER_UNLINK_EVENT_REPORT -5
+#define ER_NO_PPID_LIST -6
+#define ER_NOT_SUPPORTED -7
+
+/* CAACK */
+
+#define CAACK_0 0 /* ok */
+#define CAACK_1 1 /* invalid command */
+#define CAACK_2 2 /* cannot perform now */
+#define CAACK_3 3 /* invalid data or argument */
+#define CAACK_4 4 /* initiated for asynchronous completion */
+#define CAACK_5 5 /* rejected - invalid state */
+#define CAACK_6 6 /* command performed with errors */
/*
* 常量数据结构
@@ -64,6 +81,15 @@
typedef std::function<void(void* pFrom, SYSTEMTIME& time)> DATETIMESYNC;
typedef std::function<void(void* pFrom, bool bEnable, std::vector<unsigned int>& ids)> EDEVENTREPORT;
typedef std::function<void(void* pFrom, bool bEnable, unsigned int id)> EDALARMREPORT;
+typedef std::function<std::vector<std::string> (void* pFrom)> QUERYPPIDLIST;
+typedef std::function<unsigned int (void* pFrom,
+ unsigned int DATAID,
+ const char* pszCarrierAction,
+ const char* pszCarrierId,
+ unsigned char PTN,
+ 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 struct _SECSListener
{
SECSEQOFFLINE onEQOffLine;
@@ -74,6 +100,10 @@
DATETIMESYNC onDatetimeSync;
EDEVENTREPORT onEnableDisableEventReport;
EDALARMREPORT onEnableDisableAlarmReport;
+ QUERYPPIDLIST onQueryPPIDList;
+ CARRIERACTION onCarrierAction;
+ PRJOBMULTICREATE onPRJobMultiCreate;
+ CONTROLJOBCREATE onControlJobCreate;
} SECSListener;
@@ -91,25 +121,21 @@
/* 设置软件版本号 最大长度 20 bytes */
void setSoftRev(const char* pszRev);
- /* 添加Report */
- void addReport(unsigned int id, const char* pszName);
+ /* 添加变量值到ISECS2Item */
+ void addVariableValueToItem(ISECS2Item* pParent, SERVO::CVariable* pVariable);
// 连接Report
- void linkEventReport(unsigned int RPTID, unsigned int CEID);
+ void linkEventReport(unsigned int CEID, unsigned int RPTID);
// 取消连接report
void unlinkEventReport(unsigned int CEID);
- unsigned int getCEID(int RPTID);
-
// define Report
- void defineReport(unsigned int VID, unsigned int RPTID);
+ SERVO::CReport* defineReport(unsigned int RPTID, std::vector<unsigned int>& vids);
// 取消 define report
- void deleteReport(unsigned int RPTID);
-
- // 取消/删除所有 define report
- void deleteAllReport();
+ bool removeReport(int rptid);
+ void clearAllReport();
// 从文件中加载CVariable列表
int loadVarialbles(const char* pszFilepath);
@@ -119,24 +145,62 @@
// 取得指定Variable
SERVO::CVariable* getVariable(int variableId);
+ SERVO::CVariable* getVariable(const char* pszName);
- // 从文件中加载CReport表表
+ // 设置变量值
+ 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);
+
+ // 从文件中加载CReport列表
int loadReports(const char* pszFilepath);
+ // 取得Report列表
std::vector<SERVO::CReport*>& getReports();
+
+ // 从文件中加载CCollectionEvent列表
+ int loadCollectionEvents(const char* pszFilepath);
+
+ // 取得CCollectionEvent列表
+ std::vector<SERVO::CCollectionEvent*>& getCollectionEvents();
+
+ // 取消/删除所有CollectionEvent
+ void clearAllCollectionEvent();
+
+ // 取得CCollectionEvent
+ SERVO::CCollectionEvent* getEvent(unsigned short CEID);
+
+ // 取得Report
+ SERVO::CReport* getReport(int rptid);
void setListener(SECSListener listener);
unsigned OnCimWork();
void OnTimer(UINT nTimerid);
void setActionTimeout(int nSecond);
int init(CModel* pModel, const char* pszName, unsigned int port);
+ int loadCacheFromFile(const char* pszFilepath);
+ int saveCache();
int term();
+ int serialize(char* pszBuffer, int nBufferSize);
+ int unserialize(const char* pszBuffer, int nBufferSize);
public:
/* request开头的函数为主动发送数据的函数 */
int requestAreYouThere();
int requestAlarmReport(int ALCD, int ALID, const char* ALTX);
- int requestEventReportSend(unsigned int DATAID, unsigned int RPTID, const std::vector<std::string>& values);
+ int requestEventReportSend(unsigned int CEID);
+ int requestEventReportSend(const char* pszEventName);
+ int requestEventReportSend_CarrierID_Readed();
+ int requestEventReportSend_Port_Unload_Ready();
+ int requestEventReportSend_Port_Load_Ready();
+ int requestEventReportSend_Port_Blocked();
+ int requestEventReportSend_PJ_Queued();
+ int requestEventReportSend_PJ_Start();
+ int requestEventReportSend_PJ_End();
+ int requestEventReportSend_CJ_Start();
+ int requestEventReportSend_CJ_End();
+ int requestEventReportSend_Panel_Start();
+ int requestEventReportSend_Panel_End();
private:
void replyAck(int s, int f, unsigned int systemBytes, BYTE ack, const char* pszAckName);
@@ -144,6 +208,7 @@
/* reply开头的函数为回复函数 */
int replyAreYouThere(IMessage* pRecv);
int replyEstablishCommunications(IMessage* pRecv);
+ int replySelectedEquipmentStatusData(IMessage* pRecv);
int replyOnLine(IMessage* pRecv);
int replyOffLine(IMessage* pRecv);
int replyEquipmentConstantRequest(IMessage* pRecv);
@@ -153,17 +218,21 @@
int replyLinkEventReport(IMessage* pRecv);
int replyEanbleDisableEventReport(IMessage* pRecv);
int replyCommand(IMessage* pRecv);
+ int replyConfigureSpooling(IMessage* pRecv);
+ int replyCarrierAction(IMessage* pRecv);
int replyEanbleDisableAlarmReport(IMessage* pRecv);
+ int replyPurgeSpooledData(IMessage* pRecv);
int replyQueryPPIDList(IMessage* pRecv);
int replyTerminalDisplay(IMessage* pRecv);
+ int replyCreateObj(IMessage* pRecv);
+ int replyPRJobMultiCreate(IMessage* pRecv);
private:
inline void Lock() { EnterCriticalSection(&m_criticalSection); }
inline void Unlock() { LeaveCriticalSection(&m_criticalSection); }
int onRecvMsg(IMessage* pMessage);
void clearAllVariabel();
- std::vector<int> parseVidList(CString& strNums);
- void clearAllReport();
+ std::vector<unsigned int> parseVidList(CString& strNums);
private:
CModel* m_pModel;
@@ -177,6 +246,7 @@
CRITICAL_SECTION m_criticalSection;
std::list<CHsmsAction*> m_listAction;
std::list<CHsmsAction*> m_listActionSent;
+ std::list<CHsmsAction*> m_listActionSpooling;
private:
SECSListener m_listener;
@@ -184,24 +254,20 @@
HANDLE m_hCimWorkEvent;
HANDLE m_hCimWorkThreadHandle;
unsigned m_nCimWorkThrdaddr;
+ std::string m_strCacheFilepath;
+ CHsmsAction* m_pActiveAction;
private:
- // RPTID to CEID
- std::map<unsigned int, unsigned int> m_mapReportIdToCEID;
-
- // RPTID to Report
- std::map<unsigned int, REPORT> m_mapReport;
-
- // VID to RPTID
- std::map<unsigned int, unsigned int> m_mapValueIdToPRTID;
-
- // VID to Report
- std::map<unsigned int, VALUE> m_mapValue;
-
// CVariable vector
std::vector<SERVO::CVariable*> m_variabels;
// CReport vector
std::vector<SERVO::CReport*> m_reports;
+
+ // CollectionEvent vector
+ std::vector<SERVO::CCollectionEvent*> m_collectionEvents;
+
+ // Spooling Config
+ std::map<uint16_t, std::set<uint16_t>> m_spoolingConfig;
};
--
Gitblit v1.9.3