From 8379d72c7f16fc8850d51d0d6ed7ec7238f26edc Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 14 三月 2025 15:26:42 +0800
Subject: [PATCH] 1.增加CEqDateTimeSetCmdStep; 2.相关dev读写地址用w+16进制展示；
---
SourceCode/Bond/Servo/CMaster.cpp | 84 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 74 insertions(+), 10 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index f3a0c07..6b16c44 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);
}
};
@@ -127,6 +127,11 @@
return 0;
}
+ std::list<CEquipment*>& CMaster::getEquipmentList()
+ {
+ return m_listEquipment;
+ }
+
CEquipment* CMaster::getEquipment(int id)
{
for (auto item : m_listEquipment) {
@@ -140,6 +145,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 +156,7 @@
// 添加 step
{
CEqModeStep* pStep = new CEqModeStep();
- pStep->setName("EQMode");
+ pStep->setName(STEP_MODE);
pStep->setListener(listener);
pStep->setWriteSignalDev(0x30);
pStep->setModeDev(0x4a8c);
@@ -160,7 +166,7 @@
}
{
CEqStatusStep* pStep = new CEqStatusStep();
- pStep->setName("EQStatus");
+ pStep->setName(STEP_STATUS);
pStep->setListener(listener);
pStep->setWriteSignalDev(0x31);
pStep->setStatusDev(0x4a68);
@@ -170,7 +176,7 @@
}
{
CEqAlarmStep* pStep = new CEqAlarmStep();
- pStep->setName("EQAlarm1");
+ pStep->setName(STEP_ALARM_BLOCK1);
pStep->setListener(listener);
pStep->setWriteSignalDev(0x32);
pStep->setAlarmDev(0x4c1d);
@@ -180,7 +186,7 @@
}
{
CEqAlarmStep* pStep = new CEqAlarmStep();
- pStep->setName("EQAlarm2");
+ pStep->setName(STEP_ALARM_BLOCK2);
pStep->setListener(listener);
pStep->setWriteSignalDev(0x33);
pStep->setAlarmDev(0x4c4a);
@@ -190,7 +196,7 @@
}
{
CEqAlarmStep* pStep = new CEqAlarmStep();
- pStep->setName("EQAlarm3");
+ pStep->setName(STEP_ALARM_BLOCK3);
pStep->setListener(listener);
pStep->setWriteSignalDev(0x34);
pStep->setAlarmDev(0x4c77);
@@ -200,7 +206,7 @@
}
{
CEqAlarmStep* pStep = new CEqAlarmStep();
- pStep->setName("EQAlarm4");
+ pStep->setName(STEP_ALARM_BLOCK4);
pStep->setListener(listener);
pStep->setWriteSignalDev(0x35);
pStep->setAlarmDev(0x4ca4);
@@ -210,7 +216,7 @@
}
{
CEqAlarmStep* pStep = new CEqAlarmStep();
- pStep->setName("EQAlarm5");
+ pStep->setName(STEP_ALARM_BLOCK5);
pStep->setListener(listener);
pStep->setWriteSignalDev(0x36);
pStep->setAlarmDev(0x4cd1);
@@ -218,8 +224,66 @@
delete pStep;
}
}
-
-
+ {
+ CEqProcessStep* pStep = new CEqProcessStep();
+ pStep->setName(STEP_PROCESS);
+ pStep->setListener(listener);
+ pStep->setWriteSignalDev(0x37);
+ pStep->setProcessDev(0x1864);
+ if (pEquipment->addStep(0x367, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqCimModeChangeStep* pStep = new CEqCimModeChangeStep();
+ pStep->setName(STEP_CIM_MODE_CHANGE);
+ pStep->setListener(listener);
+ pStep->setWriteSignalDev(0x50);
+ pStep->setCimModeDev(0x15);
+ if (pEquipment->addStep(0x350, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqModeChangeStep* pStep = new CEqModeChangeStep();
+ pStep->setName(STEP_EQ_MODE_CHANGE);
+ pStep->setListener(listener);
+ pStep->setWriteSignalDev(0x51);
+ pStep->setEqModeDev(0x1E);
+ if (pEquipment->addStep(0x351, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqCimMessageCmdStep* pStep = new CEqCimMessageCmdStep();
+ pStep->setName(STEP_CIM_MESSAGE_CMD);
+ pStep->setListener(listener);
+ pStep->setWriteSignalDev(0x53);
+ pStep->setCimMessageDev(0x0);
+ if (pEquipment->addStep(0x352, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqCimMessageClearStep* pStep = new CEqCimMessageClearStep();
+ pStep->setName(STEP_CIM_MESSAGE_CLEAR);
+ pStep->setListener(listener);
+ pStep->setWriteSignalDev(0x54);
+ pStep->setClearCimMessageDev(0x13);
+ if (pEquipment->addStep(0x353, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqDateTimeSetCmdStep* pStep = new CEqDateTimeSetCmdStep();
+ pStep->setName(STEP_DATETIME_SET_CMD);
+ pStep->setListener(listener);
+ pStep->setWriteSignalDev(0x55);
+ pStep->setDateTimeDev(0x16);
+ if (pEquipment->addStep(0x354, pStep) != 0) {
+ delete pStep;
+ }
+ }
pEquipment->init();
LOGE("已添加“EFEM(ROBOT)”.");
return 0;
--
Gitblit v1.9.3