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/CVariable.h | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CVariable.h b/SourceCode/Bond/Servo/CVariable.h
index 8cf68a7..aa16b34 100644
--- a/SourceCode/Bond/Servo/CVariable.h
+++ b/SourceCode/Bond/Servo/CVariable.h
@@ -3,13 +3,14 @@
namespace SERVO {
- // 变量格式
+ // 鍙橀噺绫诲瀷
enum class SVFromat {
U1 = 0,
U2,
I2,
A20,
- A50
+ A50,
+ L
};
class CVariable
@@ -28,8 +29,13 @@
std::string& getRemark();
void setValue(__int64 value);
void setValue(const char* pszValue);
+ void setValue(std::vector<CVariable>& vars);
std::string getValue();
__int64 getIntValue();
+ std::vector<CVariable>& getVarsValue();
+ void setName(const char* pszName) { m_strName = pszName; }
+ void setFormat(const char* pszFmt) { m_format = toFormat(pszFmt); }
+ void setRemark(const char* pszRemark) { m_strRemark = pszRemark; }
private:
unsigned int m_nVarialbeId;
@@ -38,6 +44,7 @@
std::string m_strRemark;
__int64 m_nValue;
std::string m_strValue;
+ std::vector<CVariable> m_varsValue;
};
}
--
Gitblit v1.9.3