From bc7f1c4e028e69be51079b59dae4ae5c4d43f5bb Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期六, 31 一月 2026 21:54:56 +0800
Subject: [PATCH] 1.状态指示图，目前灰色表示掉线，绿色表示在线。增加Slot的小点表示有没有料，及加工状态 。 2.增加图示
---
SourceCode/Bond/Servo/HsmsPassive.h | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h
index 938a4ec..81c5188 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,11 +146,14 @@
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);
@@ -165,6 +165,9 @@
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);
@@ -232,6 +235,7 @@
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();
@@ -276,6 +280,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 +312,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 +327,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