From 4d1e6979820d9aaf27890a833ae0fcb6959e8637 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 27 二月 2025 15:33:03 +0800
Subject: [PATCH] 1.完善警告信息，打通CC-Link获取警告信息到通过SECS上报警告信息的路径。
---
SourceCode/Bond/Servo/CMaster.cpp | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index f3a0c07..f56f68f 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -40,7 +40,7 @@
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(this, (CStep*)pStep, code, pData);
+ m_listener.onEqStepEvent((CStep*)pStep, code, pData);
}
};
@@ -140,6 +140,7 @@
{
CEFEM* pEquipment = new CEFEM();
pEquipment->setID(EQ_ID_EFEM);
+ pEquipment->setBaseAlarmId(BASE_ALARM_EFEM);
pEquipment->setName("EFEM(ROBOT)");
pEquipment->setDescription("EFEM(ROBOT).");
pEquipment->setReadBitBlock(0x4000, 0x45ff);
@@ -150,7 +151,7 @@
// 添加 step
{
CEqModeStep* pStep = new CEqModeStep();
- pStep->setName("EQMode");
+ pStep->setName(STEP_MODE);
pStep->setListener(listener);
pStep->setWriteSignalDev(0x30);
pStep->setModeDev(0x4a8c);
@@ -160,7 +161,7 @@
}
{
CEqStatusStep* pStep = new CEqStatusStep();
- pStep->setName("EQStatus");
+ pStep->setName(STEP_STATUS);
pStep->setListener(listener);
pStep->setWriteSignalDev(0x31);
pStep->setStatusDev(0x4a68);
@@ -170,7 +171,7 @@
}
{
CEqAlarmStep* pStep = new CEqAlarmStep();
- pStep->setName("EQAlarm1");
+ pStep->setName(STEP_ALARM_BLOCK1);
pStep->setListener(listener);
pStep->setWriteSignalDev(0x32);
pStep->setAlarmDev(0x4c1d);
@@ -180,7 +181,7 @@
}
{
CEqAlarmStep* pStep = new CEqAlarmStep();
- pStep->setName("EQAlarm2");
+ pStep->setName(STEP_ALARM_BLOCK2);
pStep->setListener(listener);
pStep->setWriteSignalDev(0x33);
pStep->setAlarmDev(0x4c4a);
@@ -190,7 +191,7 @@
}
{
CEqAlarmStep* pStep = new CEqAlarmStep();
- pStep->setName("EQAlarm3");
+ pStep->setName(STEP_ALARM_BLOCK3);
pStep->setListener(listener);
pStep->setWriteSignalDev(0x34);
pStep->setAlarmDev(0x4c77);
@@ -200,7 +201,7 @@
}
{
CEqAlarmStep* pStep = new CEqAlarmStep();
- pStep->setName("EQAlarm4");
+ pStep->setName(STEP_ALARM_BLOCK4);
pStep->setListener(listener);
pStep->setWriteSignalDev(0x35);
pStep->setAlarmDev(0x4ca4);
@@ -210,7 +211,7 @@
}
{
CEqAlarmStep* pStep = new CEqAlarmStep();
- pStep->setName("EQAlarm5");
+ pStep->setName(STEP_ALARM_BLOCK5);
pStep->setListener(listener);
pStep->setWriteSignalDev(0x36);
pStep->setAlarmDev(0x4cd1);
--
Gitblit v1.9.3