From 4289dfbba5033a08e9aea375f439e2ea7e0648da Mon Sep 17 00:00:00 2001
From: darker <mr.darker@163.com>
Date: 星期二, 18 二月 2025 16:23:54 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CMaster.cpp | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index d33f26f..bee8f05 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -64,6 +64,7 @@
// 初始化添加各子设备
{
CEFEM* pEquipment = new CEFEM();
+ pEquipment->setID(1);
pEquipment->setName("EFEM(ROBOT)");
pEquipment->setDescription("EFEM(ROBOT).");
pEquipment->setReadBitBlock(0x4000, 0x45ff);
@@ -120,6 +121,10 @@
CEquipment* CMaster::getEquipment(int id)
{
+ for (auto item : m_listEquipment) {
+ if (item->getID() == id) return item;
+ }
+
return nullptr;
}
--
Gitblit v1.9.3