From 016183bc4926c4fd80599dc7e06542c5396e6fd8 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 12 四月 2025 16:24:25 +0800
Subject: [PATCH] 1.读取机器的Job Event上报； 2.修复在读取CC-Link数据当单元号超出32767时读取失败的问题。
---
SourceCode/Bond/Servo/CMaster.cpp | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index 0e3a765..fda6aeb 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -156,7 +156,8 @@
}
for (auto item : m_listEquipment) {
- if (item->getID() == EQ_ID_Bonder1) {
+ if (item->getID() == EQ_ID_Bonder1 ||
+ item->getID() == EQ_ID_Bonder2) {
const StationIdentifier& station = item->getStation();
MemoryBlock& block = item->getReadBitBlock();
@@ -726,7 +727,6 @@
pEquipment->setID(EQ_ID_Bonder1 + index);
pEquipment->setName(index == 0 ? "Bonder 1" : "Bonder 2");
pEquipment->setDescription(index == 0 ? "Bonder 1." : "Bonder 2.");
- // pEquipment->setStation(1, index == 0 ? 3 : 4);
pEquipment->setStation(0, 255);
pEquipment->setReadBitBlock(index == 0 ? 0x4600 : 0x4c00,
index == 0 ? 0x4c00 : 0x5200);
@@ -738,7 +738,7 @@
CEqModeStep* pStep = new CEqModeStep();
pStep->setName(STEP_MODE);
pStep->setWriteSignalDev(index == 0 ? 0x330 : 0x630);
- pStep->setModeDev(index == 0 ? 0x6a8c : 0x848c);
+ pStep->setModeDev(index == 0 ? 0x6a8c : 0x8a8c);
if (pEquipment->addStep(0x360, pStep) != 0) {
delete pStep;
}
@@ -860,6 +860,42 @@
delete pStep;
}
}
+ {
+ CEqJobEventStep* pStep = new CEqJobEventStep();
+ pStep->setName(STEP_EQ_RECEIVED_JOB_UPS1);
+ pStep->setWriteSignalDev(index == 0 ? 0x300 : 0x600);
+ pStep->setJobDataDev(index == 0 ? 0x6388 : 0x8388);
+ if (pEquipment->addStep(0x380, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqJobEventStep* pStep = new CEqJobEventStep();
+ pStep->setName(STEP_EQ_RECEIVED_JOB_UPS2);
+ pStep->setWriteSignalDev(index == 0 ? 0x301 : 0x601);
+ pStep->setJobDataDev(index == 0 ? 0x64c8 : 0x84c8);
+ if (pEquipment->addStep(0x381, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqJobEventStep* pStep = new CEqJobEventStep();
+ pStep->setName(STEP_EQ_SENT_OUT_JOB_UPS1);
+ pStep->setWriteSignalDev(index == 0 ? 0x306 : 0x606);
+ pStep->setJobDataDev(index == 0 ? 0x6000 : 0x8000);
+ if (pEquipment->addStep(0x386, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqJobEventStep* pStep = new CEqJobEventStep();
+ pStep->setName(STEP_EQ_SENT_OUT_JOB_UPS2);
+ pStep->setWriteSignalDev(index == 0 ? 0x307 : 0x607);
+ pStep->setJobDataDev(index == 0 ? 0x6140 : 0x8140);
+ if (pEquipment->addStep(0x387, pStep) != 0) {
+ delete pStep;
+ }
+ }
pEquipment->init();
--
Gitblit v1.9.3