From a056810ab4c5fa63777f6fdddfeb190bbd9a6f54 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 08 九月 2025 14:05:25 +0800
Subject: [PATCH] Merge branch 'liuyang'
---
SourceCode/Bond/Servo/CEFEM.cpp | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEFEM.cpp b/SourceCode/Bond/Servo/CEFEM.cpp
index dcb5684..fae20a5 100644
--- a/SourceCode/Bond/Servo/CEFEM.cpp
+++ b/SourceCode/Bond/Servo/CEFEM.cpp
@@ -697,9 +697,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);
@@ -713,6 +715,7 @@
delete pStep;
}
}
+ */
{
// JOB Data Request
@@ -892,7 +895,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