From 1f3ab977cb937cbe30fcfad87eac396973961e13 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 18 二月 2025 17:50:20 +0800
Subject: [PATCH] Merge branch 'liuyang'
---
SourceCode/Bond/Servo/CMaster.cpp | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index c7e1a14..e2d3f3c 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -1,4 +1,5 @@
#include "stdafx.h"
+#include "Common.h"
#include "CMaster.h"
namespace SERVO {
@@ -64,7 +65,7 @@
// 初始化添加各子设备
{
CEFEM* pEquipment = new CEFEM();
- pEquipment->setID(1);
+ pEquipment->setID(EQ_ID_EFEM);
pEquipment->setName("EFEM(ROBOT)");
pEquipment->setDescription("EFEM(ROBOT).");
pEquipment->setReadBitBlock(0x4000, 0x45ff);
@@ -121,6 +122,10 @@
CEquipment* CMaster::getEquipment(int id)
{
+ for (auto item : m_listEquipment) {
+ if (item->getID() == id) return item;
+ }
+
return nullptr;
}
--
Gitblit v1.9.3