From 1e7d3ca649456469440d74fabfc16e191433f9b4 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 09 五月 2025 17:47:25 +0800
Subject: [PATCH] 1.实现FetchOut Job功能;

---
 SourceCode/Bond/Servo/CBonder.cpp |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/SourceCode/Bond/Servo/CBonder.cpp b/SourceCode/Bond/Servo/CBonder.cpp
index 2596d31..04747f5 100644
--- a/SourceCode/Bond/Servo/CBonder.cpp
+++ b/SourceCode/Bond/Servo/CBonder.cpp
@@ -113,7 +113,7 @@
 			CEqCimMessageCmdStep* pStep = new CEqCimMessageCmdStep();
 			pStep->setName(STEP_CIM_MESSAGE_CMD);
 			pStep->setWriteSignalDev(m_nIndex == 0 ? 0x361 : 0x661);
-			pStep->setCimMessageDev(m_nIndex == 0 ? 0x963 : 0x12b3);
+			pStep->setCimMessageDev(m_nIndex == 0 ? 0x950 : 0x12a0);
 			if (addStep(STEP_ID_CIM_MSG_SET_CMD_REPLY, pStep) != 0) {
 				delete pStep;
 			}
@@ -132,6 +132,8 @@
 
 		{
 			// CIM Message Confirm
+			// 要将int32的值拆分为两个short, 分别为msg id和panel id
+			// 65538, 2为msg id, 1为panel id
 			CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, m_nIndex == 0 ? 0x9d80 : 0xdd80);
 			pStep->setName(STEP_EQ_CIM_MESSAGE_CONFIRM);
 			pStep->setWriteSignalDev(m_nIndex == 0 ? 0x349 : 0x649);
@@ -185,7 +187,7 @@
 		{
 			// master recipe list report
 			CEqReadStep* pStep = new CEqReadStep(m_nIndex == 0 ? 0xa955 : 0xe955, 255 * 2,
-				[&](int code, const char* pszData, size_t size) -> int {
+				[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
 					if (code == ROK && pszData != nullptr && size > 0) {
 						// 此处解释配方数据
 						short ret = decodeRecipeListReport(pszData, size);
@@ -216,7 +218,7 @@
 		{
 			// recipe parameter report
 			CEqReadStep* pStep = new CEqReadStep(m_nIndex == 0 ? 0xaa54 : 0xea54, 257 * 2,
-				[&](int code, const char* pszData, size_t size) -> int {
+				[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
 					if (code == ROK && pszData != nullptr && size > 0) {
 						// 此处解释配方数据
 						short ret = decodeRecipeParameterReport(pszData, size);

--
Gitblit v1.9.3