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 | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/SourceCode/Bond/Servo/HsmsPassive.h b/SourceCode/Bond/Servo/HsmsPassive.h index 24815d7..81c5188 100644 --- a/SourceCode/Bond/Servo/HsmsPassive.h +++ b/SourceCode/Bond/Servo/HsmsPassive.h @@ -153,6 +153,7 @@ std::vector<SERVO::CVariable*>& getVariables(); unsigned int getMaxVariableId() const; std::vector<SERVO::CDataVariable*>& getDataVariables(); + unsigned int getMaxDataVariableId() const; // 鍙栧緱鎸囧畾Variable SERVO::CVariable* getVariable(int variableId); @@ -164,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); @@ -231,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(); -- Gitblit v1.9.3