From f0e9c7745f0f01e93b00306c2ba64b0586e70b9d Mon Sep 17 00:00:00 2001
From: Darker <mr.darker@163.com>
Date: 星期二, 04 三月 2025 10:56:41 +0800
Subject: [PATCH] 1. 添加通过 alarm_event_id 解除报警（更新结束时间） 2. 通过多个属性查找并解除报警（更新结束时间）
---
SourceCode/Bond/Servo/CMaster.cpp | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 101 insertions(+), 12 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index 2bbfe86..82d77ca 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -13,7 +13,7 @@
CMaster::CMaster()
{
- m_listener = {nullptr, nullptr};
+ m_listener = {nullptr, nullptr, nullptr};
}
CMaster::~CMaster()
@@ -28,11 +28,21 @@
{
m_listener.onEqAlive = listener.onEqAlive;
m_listener.onEqCimStateChanged = listener.onEqCimStateChanged;
+ m_listener.onEqStepEvent = listener.onEqStepEvent;
}
int CMaster::init()
{
LOGI("<Master>正在初始化...");
+
+
+ StepListener listener;
+ listener.onEvent = [&](void* pStep, int code, void* pData) -> void {
+ TRACE("<CEquipment>onEvent<%d, 0x%x>.\n", code, pData);
+ if (m_listener.onEqStepEvent != nullptr) {
+ m_listener.onEqStepEvent((CStep*)pStep, code, pData);
+ }
+ };
// cclink
@@ -62,18 +72,8 @@
// 初始化添加各子设备
- {
- CEFEM* pEquipment = new CEFEM();
- pEquipment->setID(EQ_ID_EFEM);
- pEquipment->setName("EFEM(ROBOT)");
- pEquipment->setDescription("EFEM(ROBOT).");
- pEquipment->setReadBitBlock(0x4000, 0x45ff);
- pEquipment->setStation(0, 255);
- addEquipment(pEquipment);
+ addEFEM(listener);
- pEquipment->init();
- LOGE("已添加“EFEM(ROBOT)”.");
- }
/*
{
CBonder* pBonder = new CBonder();
@@ -136,6 +136,95 @@
return nullptr;
}
+ int CMaster::addEFEM(StepListener& listener)
+ {
+ CEFEM* pEquipment = new CEFEM();
+ pEquipment->setID(EQ_ID_EFEM);
+ pEquipment->setName("EFEM(ROBOT)");
+ pEquipment->setDescription("EFEM(ROBOT).");
+ pEquipment->setReadBitBlock(0x4000, 0x45ff);
+ pEquipment->setStation(0, 255);
+ addEquipment(pEquipment);
+
+
+ // 添加 step
+ {
+ CEqModeStep* pStep = new CEqModeStep();
+ pStep->setName("EQMode");
+ pStep->setListener(listener);
+ pStep->setWriteSignalDev(0x30);
+ pStep->setModeDev(0x4a8c);
+ if (pEquipment->addStep(0x360, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqStatusStep* pStep = new CEqStatusStep();
+ pStep->setName("EQStatus");
+ pStep->setListener(listener);
+ pStep->setWriteSignalDev(0x31);
+ pStep->setStatusDev(0x4a68);
+ if (pEquipment->addStep(0x361, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqAlarmStep* pStep = new CEqAlarmStep();
+ pStep->setName("EQAlarm1");
+ pStep->setListener(listener);
+ pStep->setWriteSignalDev(0x32);
+ pStep->setAlarmDev(0x4c1d);
+ if (pEquipment->addStep(0x362, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqAlarmStep* pStep = new CEqAlarmStep();
+ pStep->setName("EQAlarm2");
+ pStep->setListener(listener);
+ pStep->setWriteSignalDev(0x33);
+ pStep->setAlarmDev(0x4c4a);
+ if (pEquipment->addStep(0x363, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqAlarmStep* pStep = new CEqAlarmStep();
+ pStep->setName("EQAlarm3");
+ pStep->setListener(listener);
+ pStep->setWriteSignalDev(0x34);
+ pStep->setAlarmDev(0x4c77);
+ if (pEquipment->addStep(0x364, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqAlarmStep* pStep = new CEqAlarmStep();
+ pStep->setName("EQAlarm4");
+ pStep->setListener(listener);
+ pStep->setWriteSignalDev(0x35);
+ pStep->setAlarmDev(0x4ca4);
+ if (pEquipment->addStep(0x365, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqAlarmStep* pStep = new CEqAlarmStep();
+ pStep->setName("EQAlarm5");
+ pStep->setListener(listener);
+ pStep->setWriteSignalDev(0x36);
+ pStep->setAlarmDev(0x4cd1);
+ if (pEquipment->addStep(0x366, pStep) != 0) {
+ delete pStep;
+ }
+ }
+
+
+ pEquipment->init();
+ LOGE("已添加“EFEM(ROBOT)”.");
+ return 0;
+ }
+
void CMaster::onTimer(UINT nTimerid)
{
for (auto item : m_listEquipment) {
--
Gitblit v1.9.3