From 6dc80508b1c0f431007f8a8c947c152ec00c3d15 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:24:05 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CMeasurement.cpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMeasurement.cpp b/SourceCode/Bond/Servo/CMeasurement.cpp
index 207b427..0acf5ee 100644
--- a/SourceCode/Bond/Servo/CMeasurement.cpp
+++ b/SourceCode/Bond/Servo/CMeasurement.cpp
@@ -427,12 +427,12 @@
// 1.检测功能启用/禁用
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
- params.push_back(CParam("检测功能启用/禁用", "", "", v));
+ params.push_back(CParam("检测功能启用/禁用", "", this->getName().c_str(), v));
i += 2;
// 2.检测速度
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
- params.push_back(CParam("检测速度", "", "", v * 0.001));
+ params.push_back(CParam("检测速度", "", this->getName().c_str(), v * 0.001));
i += 4;
return (int)params.size();
--
Gitblit v1.9.3