From 6d71f1d8264b929ca71bf133246b894ed955c079 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 12 六月 2025 15:17:50 +0800
Subject: [PATCH] Merge branch 'master' into liuyang
---
SourceCode/Bond/Servo/CMaster.cpp | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index 7b24735..e5f2e60 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -565,16 +565,24 @@
// 读标志位
for (auto item : m_listEquipment) {
- if (item->getID() == EQ_ID_Bonder1 ||
- item->getID() == EQ_ID_Bonder2) {
- const StationIdentifier& station = item->getStation();
- MemoryBlock& block = item->getReadBitBlock();
+ //if (item->getID() == EQ_ID_Bonder1 ||
+ // item->getID() == EQ_ID_Bonder2) {
+ // const StationIdentifier& station = item->getStation();
+ // MemoryBlock& block = item->getReadBitBlock();
- int nRet = m_cclink.ReadData2(station, (DeviceType)block.type,
- block.start, block.size, block.buffer);
- if (0 == nRet) {
- item->onReceiveLBData(block.buffer, block.size);
- }
+ // int nRet = m_cclink.ReadData2(station, (DeviceType)block.type,
+ // block.start, block.size, block.buffer);
+ // if (0 == nRet) {
+ // item->onReceiveLBData(block.buffer, block.size);
+ // }
+ //}
+ const StationIdentifier& station = item->getStation();
+ MemoryBlock& block = item->getReadBitBlock();
+
+ int nRet = m_cclink.ReadData2(station, (DeviceType)block.type,
+ block.start, block.size, block.buffer);
+ if (0 == nRet) {
+ item->onReceiveLBData(block.buffer, block.size);
}
}
}
@@ -788,7 +796,7 @@
pEquipment->setBaseAlarmId(BASE_ALARM_EFEM);
pEquipment->setName("VacuumBake(G1)");
pEquipment->setDescription("VacuumBake(G1).");
- pEquipment->setReadBitBlock(0x4000, 0x45ff);
+ pEquipment->setReadBitBlock(0x5c00, 0x66ff);
pEquipment->setStation(0, 255);
addToEquipmentList(pEquipment);
@@ -899,7 +907,7 @@
pEquipment->setBaseAlarmId(BASE_ALARM_EFEM);
pEquipment->setName("BakeCooling");
pEquipment->setDescription("BakeCooling.");
- pEquipment->setReadBitBlock(0x4000, 0x45ff);
+ pEquipment->setReadBitBlock(0x5100, 0x5bff);
pEquipment->setStation(0, 255);
addToEquipmentList(pEquipment);
--
Gitblit v1.9.3