From a7df0e1d5521248302e5437a1cf7b14c29b3cbaa Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 05 九月 2025 13:55:31 +0800
Subject: [PATCH] 1.CParam增加站点名称，以便将来知道Glass的工艺参数来自哪台机；
---
SourceCode/Bond/Servo/CMeasurement.cpp | 4 +-
SourceCode/Bond/Servo/CVacuumBake.cpp | 16 ++++----
SourceCode/Bond/Servo/CBakeCooling.cpp | 12 +++---
SourceCode/Bond/Servo/CBonder.cpp | 44 +++++++++++-----------
4 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/SourceCode/Bond/Servo/CBakeCooling.cpp b/SourceCode/Bond/Servo/CBakeCooling.cpp
index 59228f5..dbfa816 100644
--- a/SourceCode/Bond/Servo/CBakeCooling.cpp
+++ b/SourceCode/Bond/Servo/CBakeCooling.cpp
@@ -433,32 +433,32 @@
// 1.A_腔烘烤时间
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
- params.push_back(CParam("A_腔烘烤时间", "", "", v * 0.01f));
+ params.push_back(CParam("A_腔烘烤时间", "", this->getName().c_str(), v * 0.01f));
i += 2;
// 2.A_腔冷却时间
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
- params.push_back(CParam("A_腔冷却时间", "", "", v * 0.01f));
+ params.push_back(CParam("A_腔冷却时间", "", this->getName().c_str(), v * 0.01f));
i += 2;
// 3.B_腔烘烤时间
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
- params.push_back(CParam("B_腔烘烤时间", "", "", v * 0.01f));
+ params.push_back(CParam("B_腔烘烤时间", "", this->getName().c_str(), v * 0.01f));
i += 2;
// 4.BB_腔冷却时间
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
- params.push_back(CParam("B_腔冷却时间", "", "", v * 0.01f));
+ params.push_back(CParam("B_腔冷却时间", "", this->getName().c_str(), v * 0.01f));
i += 2;
// 5.A_烘烤温度设定
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
- params.push_back(CParam("A_烘烤温度设定", "", "", v * 0.1f));
+ params.push_back(CParam("A_烘烤温度设定", "", this->getName().c_str(), v * 0.1f));
i += 2;
// 6.B_烘烤温度设定
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
- params.push_back(CParam("B_烘烤温度设定", "", "", v * 0.1f));
+ params.push_back(CParam("B_烘烤温度设定", "", this->getName().c_str(), v * 0.1f));
i += 2;
diff --git a/SourceCode/Bond/Servo/CBonder.cpp b/SourceCode/Bond/Servo/CBonder.cpp
index 46108dc..c86ca7d 100644
--- a/SourceCode/Bond/Servo/CBonder.cpp
+++ b/SourceCode/Bond/Servo/CBonder.cpp
@@ -533,110 +533,110 @@
// 1.校正对位延时
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
- params.push_back(CParam("校正对位延时", "", "", v * 0.01f));
+ params.push_back(CParam("校正对位延时", "", this->getName().c_str(), v * 0.01f));
i += 2;
// 2.保压时间
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
- params.push_back(CParam("保压时间", "", "", v * 0.01f));
+ params.push_back(CParam("保压时间", "", this->getName().c_str(), v * 0.01f));
i += 2;
// 3.腔体破真空延时
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
- params.push_back(CParam("腔体破真空延时", "", "", v * 0.01f));
+ params.push_back(CParam("腔体破真空延时", "", this->getName().c_str(), v * 0.01f));
i += 2;
// 4.腔体分子泵启动延时
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
- params.push_back(CParam("腔体分子泵启动延时", "", "", v * 0.1f));
+ params.push_back(CParam("腔体分子泵启动延时", "", this->getName().c_str(), v * 0.1f));
i += 2;
// 5.腔体贴附抽真空延时
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
- params.push_back(CParam("腔体贴附抽真空延时", "", "", v * 0.1f));
+ params.push_back(CParam("腔体贴附抽真空延时", "", this->getName().c_str(), v * 0.1f));
i += 2;
// 6.加热等待延时
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
- params.push_back(CParam("加热等待延时", "", "", v * 0.1f));
+ params.push_back(CParam("加热等待延时", "", this->getName().c_str(), v * 0.1f));
i += 2;
// 7.气囊压力设定
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.001f));
+ params.push_back(CParam("气囊压力设定", "", this->getName().c_str(), v * 0.001f));
i += 4;
// 8.气囊加压速率
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.001f));
+ params.push_back(CParam("气囊加压速率", "", this->getName().c_str(), v * 0.001f));
i += 4;
// 9.气囊泄压速率
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.001f));
+ params.push_back(CParam("气囊泄压速率", "", this->getName().c_str(), v * 0.001f));
i += 4;
// 10.贴附压力上限
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.1f));
+ params.push_back(CParam("贴附压力上限", "", this->getName().c_str(), v * 0.1f));
i += 4;
// 11.Z轴转矩速度设定
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
- params.push_back(CParam("上腔Z轴转矩速度设定", "", "", v * 0.001f));
+ params.push_back(CParam("上腔Z轴转矩速度设定", "", this->getName().c_str(), v * 0.001f));
i += 4;
// 12.上腔温度设定
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
- params.push_back(CParam("上腔温度设定", "", "", v * 0.1f));
+ params.push_back(CParam("上腔温度设定", "", this->getName().c_str(), v * 0.1f));
i += 2;
// 13.下腔温度设定
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
- params.push_back(CParam("下腔温度设定", "", "", v * 0.1f));
+ params.push_back(CParam("下腔温度设定", "", this->getName().c_str(), v * 0.1f));
i += 2;
// 14.上腔Z轴预贴合位速度
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
- params.push_back(CParam("上腔Z轴预贴合位速度", "", "", v * 0.001f));
+ params.push_back(CParam("上腔Z轴预贴合位速度", "", this->getName().c_str(), v * 0.001f));
i += 4;
// 15.上腔Z轴贴附位速度
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
- params.push_back(CParam("上腔Z轴贴附位速度", "", "", v * 0.001f));
+ params.push_back(CParam("上腔Z轴贴附位速度", "", this->getName().c_str(), v * 0.001f));
i += 4;
// 16.上腔Z上腔加热位间距
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
- params.push_back(CParam("上腔Z上腔加热位间距", "", "", v * 0.001f));
+ params.push_back(CParam("上腔Z上腔加热位间距", "", this->getName().c_str(), v * 0.001f));
i += 4;
// 17.上腔贴附位压入量
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.001f));
+ params.push_back(CParam("上腔贴附位压入量", "", this->getName().c_str(), v * 0.001f));
i += 4;
// 18.上腔Z轴破真空距离
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
- params.push_back(CParam("上腔Z轴破真空距离", "", "", v * 0.001f));
+ params.push_back(CParam("上腔Z轴破真空距离", "", this->getName().c_str(), v * 0.001f));
i += 4;
// 19.下顶Pin破真空距离
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
- params.push_back(CParam("下顶Pin破真空距离", "", "", v * 0.001f));
+ params.push_back(CParam("下顶Pin破真空距离", "", this->getName().c_str(), v * 0.001f));
i += 4;
// 20.下顶Pin加热位间距
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
- params.push_back(CParam("下顶Pin加热位间距", "", "", v * 0.001f));
+ params.push_back(CParam("下顶Pin加热位间距", "", this->getName().c_str(), v * 0.001f));
i += 4;
// 21.腔体真空泵真空规设定值
- params.push_back(CParam("腔体真空泵真空规设定值", "", "", (double)toFloat(&pszData[i])));
+ params.push_back(CParam("腔体真空泵真空规设定值", "", this->getName().c_str(), (double)toFloat(&pszData[i])));
i += 4;
// 22.腔体分子泵到达设定值
- params.push_back(CParam("腔体分子泵到达设定值", "", "", (double)toFloat(&pszData[i])));
+ params.push_back(CParam("腔体分子泵到达设定值", "", this->getName().c_str(), (double)toFloat(&pszData[i])));
i += 4;
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();
diff --git a/SourceCode/Bond/Servo/CVacuumBake.cpp b/SourceCode/Bond/Servo/CVacuumBake.cpp
index c14c201..18e298b 100644
--- a/SourceCode/Bond/Servo/CVacuumBake.cpp
+++ b/SourceCode/Bond/Servo/CVacuumBake.cpp
@@ -420,40 +420,40 @@
// 1.A_腔加热时间
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
- params.push_back(CParam("A_腔加热时间", "", "", v * 0.1f));
+ params.push_back(CParam("A_腔加热时间", "", this->getName().c_str(), v * 0.1f));
i += 2;
// 2.B_腔加热时间
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
- params.push_back(CParam("B_腔加热时间", "", "", v * 0.1f));
+ params.push_back(CParam("B_腔加热时间", "", this->getName().c_str(), v * 0.1f));
i += 2;
// 3.A_腔破真空时间
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
- params.push_back(CParam("A_腔破真空时间", "", "", v * 0.01f));
+ params.push_back(CParam("A_腔破真空时间", "", this->getName().c_str(), v * 0.01f));
i += 2;
// 4.B_腔破真空时间
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
- params.push_back(CParam("B_腔破真空时间", "", "", v * 0.01f));
+ params.push_back(CParam("B_腔破真空时间", "", this->getName().c_str(), v * 0.01f));
i += 2;
// 5.A_腔真空到达值
- params.push_back(CParam("A_腔真空到达值", "", "", (double)toFloat(&pszData[i])));
+ params.push_back(CParam("A_腔真空到达值", "", this->getName().c_str(), (double)toFloat(&pszData[i])));
i += 4;
// 6.B_腔真空到达值
- params.push_back(CParam("B_腔真空到达值", "", "", (double)toFloat(&pszData[i])));
+ params.push_back(CParam("B_腔真空到达值", "", this->getName().c_str(), (double)toFloat(&pszData[i])));
i += 4;
// 7.A_腔温控表主控温度设定
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
- params.push_back(CParam("A_腔温控表主控温度设定", "", "", v * 0.1f));
+ params.push_back(CParam("A_腔温控表主控温度设定", "", this->getName().c_str(), v * 0.1f));
i += 4;
// 8.B_腔温控表主控温度设定
v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8 | (pszData[i + 2] & 0xff) << 16 | (pszData[i + 3] & 0xff) << 24;
- params.push_back(CParam("B_腔温控表主控温度设定", "", "", v * 0.1f));
+ params.push_back(CParam("B_腔温控表主控温度设定", "", this->getName().c_str(), v * 0.1f));
i += 4;
--
Gitblit v1.9.3