From 155cb7fe0dcb564729c6aecdb65815f3f0ed24e2 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期二, 13 一月 2026 11:28:26 +0800
Subject: [PATCH] 1.ECID, DVID的查询和实现；
---
SourceCode/Bond/Servo/HsmsPassive.h | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index 938a4ec..24815d7 100644
--- a/SourceCode/Bond/Servo/HsmsPassive.h
+++ b/SourceCode/Bond/Servo/HsmsPassive.h
@@ -79,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;
@@ -98,8 +97,6 @@
{
SECSEQOFFLINE onEQOffLine;
SECSEQOFFLINE onEQOnLine;
- SECSEQCONSTANTREQUEST onEQConstantRequest;
- SECSEQCONSTANTREQUEST onEQConstantSend;
SECSCommand onCommand;
DATETIMESYNC onDatetimeSync;
EDEVENTREPORT onEnableDisableEventReport;
@@ -149,6 +146,8 @@
int loadVarialbles(const char* pszFilepath);
// 浠庢枃浠朵腑鍔犺浇CDataVariable鍒楄〃
int loadDataVarialbles(const char* pszFilepath);
+ // 浠庢枃浠朵腑鍔犺浇Equipment Constant鍒楄〃
+ int loadEquipmentConstants(const char* pszFilepath);
// 鍙栧緱CVariable鍒楄〃
std::vector<SERVO::CVariable*>& getVariables();
@@ -276,6 +275,7 @@
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);
@@ -307,6 +307,9 @@
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;
@@ -319,6 +322,15 @@
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;
--
Gitblit v1.9.3