From eb929a42138e7fb38b21aa7659f2aa2718917fab Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 19 二月 2025 15:55:36 +0800
Subject: [PATCH] 1.在测试机器上界面显示不完成，调整界面；
---
SourceCode/Bond/Servo/CMaster.cpp | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index 92505c0..51f34a6 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()
@@ -36,7 +38,6 @@
// cclink
if (m_cclink.Connect(CC_LINK_IE_CONTROL_CHANNEL(1)) != 0) {
LOGE("连接CC-Link失败.");
- return -1;
}
else {
LOGI("连接CC-Link成功.");
@@ -63,12 +64,14 @@
// 初始化添加各子设备
{
CEFEM* pEquipment = new CEFEM();
- pEquipment->setID(1);
+ pEquipment->setID(EQ_ID_EFEM);
pEquipment->setName("EFEM(ROBOT)");
pEquipment->setDescription("EFEM(ROBOT).");
pEquipment->setReadBitBlock(0x4000, 0x45ff);
pEquipment->setStation(1, 2);
addEquipment(pEquipment);
+
+ pEquipment->init();
LOGE("已添加“EFEM(ROBOT)”.");
}
/*
@@ -94,6 +97,11 @@
int CMaster::term()
{
+ LOGI("<Master>正在结束程序.");
+ for (auto item : m_listEquipment) {
+ item->term();
+ }
+
return 0;
}
@@ -106,12 +114,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