From 1cc8012fac8508796e50653fb26bcc003bc02b9d Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期二, 13 一月 2026 08:24:52 +0800
Subject: [PATCH] 1.实现DVID的加载，获取等；
---
SourceCode/Bond/Servo/HsmsPassive.h | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index 5ebd43e..938a4ec 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 */
@@ -90,6 +93,7 @@
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;
@@ -101,6 +105,7 @@
EDEVENTREPORT onEnableDisableEventReport;
EDALARMREPORT onEnableDisableAlarmReport;
QUERYPPIDLIST onQueryPPIDList;
+ DELETEPPID onDeletePPID;
CARRIERACTION onCarrierAction;
PRJOBMULTICREATE onPRJobMultiCreate;
CONTROLJOBCREATE onControlJobCreate;
@@ -142,14 +147,19 @@
// 浠庢枃浠朵腑鍔犺浇CVariable鍒楄〃
int loadVarialbles(const char* pszFilepath);
+ // 浠庢枃浠朵腑鍔犺浇CDataVariable鍒楄〃
+ int loadDataVarialbles(const char* pszFilepath);
// 鍙栧緱CVariable鍒楄〃
std::vector<SERVO::CVariable*>& getVariables();
unsigned int getMaxVariableId() const;
+ std::vector<SERVO::CDataVariable*>& getDataVariables();
// 鍙栧緱鎸囧畾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);
@@ -160,6 +170,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);
@@ -232,6 +244,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);
@@ -246,6 +261,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);
@@ -255,8 +272,10 @@
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 writeReportsToFile(const std::string& filepath);
int writeCollectionEventsToFile(const std::string& filepath);
@@ -279,6 +298,9 @@
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 };
@@ -295,6 +317,8 @@
private:
// CVariable vector
std::vector<SERVO::CVariable*> m_variabels;
+ // CDataVariable vector
+ std::vector<SERVO::CDataVariable*> m_dataVariabels;
// CReport vector
std::vector<SERVO::CReport*> m_reports;
--
Gitblit v1.9.3