From 6dc80508b1c0f431007f8a8c947c152ec00c3d15 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 08 九月 2025 09:24:05 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CEFEM.cpp | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEFEM.cpp b/SourceCode/Bond/Servo/CEFEM.cpp
index 99c833a..39df4b4 100644
--- a/SourceCode/Bond/Servo/CEFEM.cpp
+++ b/SourceCode/Bond/Servo/CEFEM.cpp
@@ -549,7 +549,6 @@
// master recipe list report
CEqReadStep* pStep = new CEqReadStep(0x6955, 255 * 2,
[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
- /*CEqReadStep* pTmpStep = dynamic_cast<CEqReadStep*>((CEqReadStep*)pFrom);*/
CEqReadStep* pTmpStep = (CEqReadStep*)pFrom;
short ret = MRLRC_OK;
if (code == ROK && pszData != nullptr && size > 0) {
@@ -893,7 +892,7 @@
{
LOGI("<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