From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 30 一月 2026 11:16:24 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CEFEM.cpp | 57 +++++++++++++++++++++------------------------------------
1 files changed, 21 insertions(+), 36 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEFEM.cpp b/SourceCode/Bond/Servo/CEFEM.cpp
index fbd1b22..d882c9b 100644
--- a/SourceCode/Bond/Servo/CEFEM.cpp
+++ b/SourceCode/Bond/Servo/CEFEM.cpp
@@ -133,7 +133,7 @@
LOGI("<CEquipment-%s>发送RobotCmdS成功.", m_strName.c_str());
}
else {
- LOGI("<CEquipment-%s>发送RobotCmds失败，code:%d", m_strName.c_str(), code);
+ LOGE("<CEquipment-%s>发送RobotCmds失败，code:%d", m_strName.c_str(), code);
}
return 0;
@@ -367,7 +367,7 @@
void CEFEM::initPins()
{
// 加入Pin初始化代码
- LOGI("<CEFEM>initPins");
+ LOGD("<CEFEM>initPins");
}
void CEFEM::initSteps()
@@ -461,25 +461,6 @@
}
{
- // VCR Event Report
- // 机器上报扫码结果，扫码器预计安装在巡边检机器上
- CEqReadStep* pStep = new CEqReadStep(0x5fef, 15 * 2,
- [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
- if (code == ROK && pszData != nullptr && size > 0) {
- decodeVCREventReport((CStep*)pFrom, pszData, size);
- }
- return -1;
- });
- pStep->setName(STEP_EQ_VCR1_EVENT_REPORT);
- pStep->setProp("Port", (void*)1);
- pStep->setWriteSignalDev(0x4a);
- pStep->setReturnDev(0x91e);
- if (addStep(STEP_ID_VCR1_EVENT_REPORT, pStep) != 0) {
- delete pStep;
- }
- }
-
- {
// eq cim message clear
CEqCimMessageClearStep* pStep = new CEqCimMessageClearStep();
pStep->setName(STEP_CIM_MESSAGE_CLEAR);
@@ -547,16 +528,17 @@
{
// master recipe list report
- CEqReadStep* pStep = new CEqReadStep(0x6955, 250 * 2,
- [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
- if (code == ROK && pszData != nullptr && size > 0) {
- // 此处解释配方数据
- short ret = decodeRecipeListReport(pszData, size);
- pStep->setReturnCode(ret);
- }
- pStep->setReturnCode(MRLRC_OK);
- return -1;
- });
+ CEqReadStep* pStep = new CEqReadStep(0x6955, 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) {
+ // 此处解释配方数据
+ ret = decodeRecipeListReport(pszData, size);
+ }
+ pTmpStep->setReturnCode(ret);
+ return -1;
+ });
pStep->setName(STEP_EQ_MASTER_RECIPE_LIST);
pStep->setWriteSignalDev(0x4b);
pStep->setReturnDev(0x91d);
@@ -696,9 +678,11 @@
}
}
+ // FAC Data Report
+ addFacDataReportStep(0x6589, 0x04d, 1);
+ /*
{
- // FAC Data Report
- CEqReadStep* pStep = new CEqReadStep(0x6301, 108 * 2,
+ CEqReadStep* pStep = new CEqReadStep(0x6589, 133 * 2,
[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
if (code == ROK && pszData != nullptr && size > 0) {
decodeFacDataReport((CStep*)pFrom, pszData, size);
@@ -712,6 +696,7 @@
delete pStep;
}
}
+ */
{
// JOB Data Request
@@ -889,9 +874,9 @@
void CEFEM::printDebugRobotState()
{
- LOGI("<CEFEM>Robot status:%d, ARM1:%s, ARM2:%s",
+ LOGD("<CEFEM>Robot status:%d, ARM1:%s, ARM2:%s",
m_robotData.status,
- m_robotData.armState[1] ? _T("ON") : _T("OFF"),
- m_robotData.armState[2] ? _T("ON") : _T("OFF"));
+ m_robotData.armState[0] ? _T("ON") : _T("OFF"),
+ m_robotData.armState[1] ? _T("ON") : _T("OFF"));
}
}
--
Gitblit v1.9.3