From 94fafb0f07b1df0e86f170cbf03d657ba39a16ff Mon Sep 17 00:00:00 2001
From: darker <mr.darker@163.com>
Date: 星期二, 18 二月 2025 17:43:04 +0800
Subject: [PATCH] 1. 添加设备属性对话框 2. 在配置文件中添加设备ID
---
SourceCode/Bond/Servo/CMaster.cpp | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index 92505c0..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 {
@@ -12,7 +13,7 @@
CMaster::CMaster()
{
- m_listener = {nullptr};
+ m_listener = {nullptr, nullptr};
}
CMaster::~CMaster()
@@ -26,6 +27,7 @@
void CMaster::setListener(MasterListener listener)
{
m_listener.onEqAlive = listener.onEqAlive;
+ m_listener.onEqCimStateChanged = listener.onEqCimStateChanged;
}
int CMaster::init()
@@ -63,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);
@@ -106,12 +108,27 @@
m_listener.onEqAlive(this, p, bAlive);
}
};
+ listener.onCimStateChanged = [&](void* pEquipment, BOOL bOn) -> void {
+ CEquipment* p = (CEquipment*)pEquipment;
+ if (m_listener.onEqCimStateChanged != nullptr) {
+ m_listener.onEqCimStateChanged(this, p, bOn);
+ }
+ };
pEquipment->setListener(listener);
m_listEquipment.push_back(pEquipment);
return 0;
}
+ CEquipment* CMaster::getEquipment(int id)
+ {
+ for (auto item : m_listEquipment) {
+ if (item->getID() == id) return item;
+ }
+
+ return nullptr;
+ }
+
void CMaster::onTimer(UINT nTimerid)
{
for (auto item : m_listEquipment) {
--
Gitblit v1.9.3