From d5c8d6545efe0ab2026a4127fde0fa2bad659ccd Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 06 八月 2025 14:45:52 +0800
Subject: [PATCH] 1.实现EAP中ProceedWithCarrier和CarrierRelease的功能模拟及测试；
---
SourceCode/Bond/Servo/CBonder.cpp | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/CBonder.cpp b/SourceCode/Bond/Servo/CBonder.cpp
index afe3cdf..7ebd7be 100644
--- a/SourceCode/Bond/Servo/CBonder.cpp
+++ b/SourceCode/Bond/Servo/CBonder.cpp
@@ -193,12 +193,13 @@
// master recipe list report
CEqReadStep* pStep = new CEqReadStep(m_nIndex == 0 ? 0xa955 : 0xe955, 255 * 2,
[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+ CEqReadStep* pTmpStep = (CEqReadStep*)pFrom;
+ short ret = MRLRC_OK;
if (code == ROK && pszData != nullptr && size > 0) {
// 此处解释配方数据
- short ret = decodeRecipeListReport(pszData, size);
- pStep->setReturnCode(ret);
+ ret = decodeRecipeListReport(pszData, size);
}
- pStep->setReturnCode(MRLRC_OK);
+ pTmpStep->setReturnCode(ret);
return -1;
});
pStep->setName(STEP_EQ_MASTER_RECIPE_LIST);
@@ -420,16 +421,18 @@
CEquipment::onTimer(nTimerid);
// test
+ /*
static int i[2] = { 0, 0 };
i[m_nIndex]++;
- if (m_nIndex == 0 && i[m_nIndex] == 100) {
+ if (m_nIndex == 0 && i[m_nIndex] % 20 == 0) {
if (m_listener.onAlarm != nullptr) {
m_listener.onAlarm(this, 1,
- 100,
+ i[m_nIndex],
getID(),
1);
}
}
+ */
}
void CBonder::serialize(CArchive& ar)
@@ -465,6 +468,12 @@
return pBuddy != nullptr;
}
+ BOOL CBonder::hasG2Class()
+ {
+ CGlass* pGlass = (CGlass*)m_slot[0].getContext();
+ return (pGlass != nullptr);
+ }
+
int CBonder::onProcessData(CProcessData* pProcessData)
{
CEquipment::onProcessData(pProcessData);
--
Gitblit v1.9.3