From ae6ef5e9343aba44b7547ecc4afab935ebdf4806 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 19 六月 2025 09:13:09 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CMaster.cpp | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index 96ad405..a751764 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -613,17 +613,6 @@
// 读标志位
for (auto item : m_listEquipment) {
- //if (item->getID() == EQ_ID_Bonder1 ||
- // item->getID() == EQ_ID_Bonder2) {
- // const StationIdentifier& station = item->getStation();
- // MemoryBlock& block = item->getReadBitBlock();
-
- // int nRet = m_cclink.ReadData2(station, (DeviceType)block.type,
- // block.start, block.size, block.buffer);
- // if (0 == nRet) {
- // item->onReceiveLBData(block.buffer, block.size);
- // }
- //}
const StationIdentifier& station = item->getStation();
MemoryBlock& block = item->getReadBitBlock();
@@ -788,7 +777,9 @@
unlock();
}
};
-
+ listener.onProcessStateChanged = [&](void* pEquipment, PROCESS_STATE state) -> void {
+ LOGI("<Master>onProcessStateChanged<%d>", (int)state);
+ };
pEquipment->setListener(listener);
pEquipment->setCcLink(&m_cclink);
m_listEquipment.push_back(pEquipment);
--
Gitblit v1.9.3