From d6fabead748c80e2dd5e2ec55b55e01daed1f3c3 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 09 九月 2025 11:37:50 +0800
Subject: [PATCH] 1.修改Bonder的SVData数据解释，其中一项压力有符号，增加一个加热剩余时间； 2.SVData解释偏移错误修复
---
SourceCode/Bond/Servo/CSVData.cpp | 8 ++++----
SourceCode/Bond/Servo/CBonder.cpp | 9 +++++++--
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/SourceCode/Bond/Servo/CBonder.cpp b/SourceCode/Bond/Servo/CBonder.cpp
index 38d1d36..797dada 100644
--- a/SourceCode/Bond/Servo/CBonder.cpp
+++ b/SourceCode/Bond/Servo/CBonder.cpp
@@ -692,7 +692,7 @@
// 3.上腔压力合计
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
- params.push_back(CParam("上腔压力合计", "", this->getName().c_str(), v * 0.01f));
+ params.push_back(CParam("上腔压力合计", "", this->getName().c_str(), ((short)v) * 0.01f));
i += 2;
// 4.管道真空规值
@@ -763,7 +763,12 @@
params.push_back(CParam("下腔温度6", "", this->getName().c_str(), v * 0.1f));
i += 2;
- // 18.压合剩余时间
+ // 18.加热剩余时间
+ v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+ params.push_back(CParam("加热剩余时间", "", this->getName().c_str(), v * 0.01f));
+ i += 2;
+
+ // 19.压合剩余时间
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
params.push_back(CParam("压合剩余时间", "", this->getName().c_str(), v * 0.01f));
i += 2;
diff --git a/SourceCode/Bond/Servo/CSVData.cpp b/SourceCode/Bond/Servo/CSVData.cpp
index 22ee583..fbda14e 100644
--- a/SourceCode/Bond/Servo/CSVData.cpp
+++ b/SourceCode/Bond/Servo/CSVData.cpp
@@ -44,12 +44,12 @@
int index = 0;
CSVData svData;
- CToolUnits::convertString(&pszBuffer[index], 8, m_strTime);
- index += 8;
+ CToolUnits::convertString(&pszBuffer[index], 8 * 2, m_strTime);
+ index += 8 * 2;
m_svRawData.clear();
- m_svRawData.insert(m_svRawData.end(), (uint8_t*)(pszBuffer), (uint8_t*)(pszBuffer)+125);
- index += 125;
+ m_svRawData.insert(m_svRawData.end(), (uint8_t*)(&pszBuffer[index]), (uint8_t*)(pszBuffer)+(125 * 2));
+ index += 125 * 2;
return 133;
}
--
Gitblit v1.9.3