From d89cc31a84312a4fde459dc82f29306e24750d4b Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 12 九月 2025 15:18:37 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CMeasurement.cpp | 8 ++++----
SourceCode/Bond/Servo/PageAlarm.cpp | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMeasurement.cpp b/SourceCode/Bond/Servo/CMeasurement.cpp
index d93bc50..d3f1533 100644
--- a/SourceCode/Bond/Servo/CMeasurement.cpp
+++ b/SourceCode/Bond/Servo/CMeasurement.cpp
@@ -455,14 +455,14 @@
params.push_back(CParam("检测速度", "", this->getName().c_str(), v * 0.001));
i += 4;
- // 3.检测速度
+ // 3.检测1数据
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
- params.push_back(CParam("检测速度", "", this->getName().c_str(), v * 0.001));
+ params.push_back(CParam("检测1数据", "", this->getName().c_str(), v * 0.001));
i += 4;
-
+
// 4.检测2数据
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
- params.push_back(CParam("检测速度", "", this->getName().c_str(), v * 0.001));
+ params.push_back(CParam("检测2数据", "", this->getName().c_str(), v * 0.001));
i += 4;
return (int)params.size();
diff --git a/SourceCode/Bond/Servo/PageAlarm.cpp b/SourceCode/Bond/Servo/PageAlarm.cpp
index 6146eaa..af5b619 100644
--- a/SourceCode/Bond/Servo/PageAlarm.cpp
+++ b/SourceCode/Bond/Servo/PageAlarm.cpp
@@ -196,7 +196,7 @@
pListCtrl->DeleteItem(nRowCount - 1);
}
- int nNewItem = pListCtrl->InsertItem(0, _T(""));
+ int nNewItem = pListCtrl->InsertItem(pListCtrl->GetItemCount(), _T(""));
// 璁剧疆姣忎竴鍒楃殑鏁版嵁
CString str;
--
Gitblit v1.9.3