From 96579a48b3b558f5ce58cffe372b1f563a9e62ce Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 03 九月 2025 17:23:56 +0800
Subject: [PATCH] 1.配方列表和配方参数获取合并在线程中获取，并更新状态到对话框； 2.配方参数获取； 3.Bonder, AOI, 真空烘烤, 冷却烧烤配方参数解释。
---
SourceCode/Bond/Servo/CMeasurement.cpp | 62 +++++++++++++++++++-----------
1 files changed, 39 insertions(+), 23 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMeasurement.cpp b/SourceCode/Bond/Servo/CMeasurement.cpp
index f4b41a4..53ffb9c 100644
--- a/SourceCode/Bond/Servo/CMeasurement.cpp
+++ b/SourceCode/Bond/Servo/CMeasurement.cpp
@@ -207,33 +207,33 @@
{
// 请求配方参数
- //CEqWriteStep* pStep = new CEqWriteStep();
- //pStep->setName(STEP_EQ_RECIPE_PARAMETER_REQ);
- //pStep->setWriteSignalDev(0xf67);
- //pStep->setDataDev(0x379b);
- //if (addStep(STEP_ID_RECIPE_PARAMETER_CMD_REPLY, pStep) != 0) {
- // delete pStep;
- //}
+ CEqWriteStep* pStep = new CEqWriteStep();
+ pStep->setName(STEP_EQ_RECIPE_PARAMETER_REQ);
+ pStep->setWriteSignalDev(0xf67);
+ pStep->setDataDev(0x379b);
+ if (addStep(STEP_ID_RECIPE_PARAMETER_CMD_REPLY, pStep) != 0) {
+ delete pStep;
+ }
}
{
// recipe parameter report
- //CEqReadStep* pStep = new CEqReadStep(0x1aa54, 257 * 2,
- // [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
- // if (code == ROK && pszData != nullptr && size > 0) {
- // // 此处解释配方数据
- // short ret = decodeRecipeParameterReport(pszData, size);
- // pStep->setReturnCode(ret);
- // }
- // pStep->setReturnCode(MRLRC_OK);
- // return -1;
- // });
- //pStep->setName(STEP_EQ_RECIPE_PARAMETER);
- //pStep->setWriteSignalDev(0xf4c);
- //pStep->setReturnDev(m_nIndex == 0 ? 0x126c : 0x1bbc);
- //if (addStep(STEP_ID_RECIPE_PARAMETER_REPORT, pStep) != 0) {
- // delete pStep;
- //}
+ CEqReadStep* pStep = new CEqReadStep(0x1aa54, 257 * 2,
+ [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+ if (code == ROK && pszData != nullptr && size > 0) {
+ // 此处解释配方数据
+ short ret = decodeRecipeParameterReport(pszData, size);
+ pStep->setReturnCode(ret);
+ }
+ pStep->setReturnCode(MRLRC_OK);
+ return -1;
+ });
+ pStep->setName(STEP_EQ_RECIPE_PARAMETER);
+ pStep->setWriteSignalDev(0xf4c);
+ pStep->setReturnDev(0x37ac);
+ if (addStep(STEP_ID_RECIPE_PARAMETER_REPORT, pStep) != 0) {
+ delete pStep;
+ }
}
// 使用CEqReadStep替换CEqJobEventStep
@@ -416,4 +416,20 @@
{
return 35000;
}
+
+ int CMeasurement::parsingParams(const char* pszData, size_t size, std::vector<CParam>& parsms)
+ {
+ ASSERT(pszData);
+ if (size < 250) return 0;
+ int i = 0, v;
+
+
+ // 1.检测功能启用/禁用
+ v = (pszData[i] & 0xff) | (pszData[i + 1] & 0xff) << 8;
+ parsms.push_back(CParam("检测功能启用/禁用", 0, "", v));
+ i += 2;
+
+
+ return (int)parsms.size();
+ }
}
--
Gitblit v1.9.3