From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 22 十月 2025 14:24:34 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CBonder.cpp | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CBonder.cpp b/SourceCode/Bond/Servo/CBonder.cpp
index 38d1d36..b9f8343 100644
--- a/SourceCode/Bond/Servo/CBonder.cpp
+++ b/SourceCode/Bond/Servo/CBonder.cpp
@@ -487,9 +487,9 @@
return 0;
}
- int CBonder::onProcessStateChanged(PROCESS_STATE state)
+ int CBonder::onProcessStateChanged(int slotNo, PROCESS_STATE state)
{
- CEquipment::onProcessStateChanged(state);
+ CEquipment::onProcessStateChanged(slotNo, state);
if (state == PROCESS_STATE::Complete) {
// 检查数据，当前两片玻璃，一片为G1, 一片为G2, 且pProcessData中的id能匹配G1或G2
@@ -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;
--
Gitblit v1.9.3