From 0b8c9e0701a300eea0b85c4bb775b64785178530 Mon Sep 17 00:00:00 2001
From: darker <mr.darker@163.com>
Date: 星期四, 20 二月 2025 18:06:58 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CMaster.cpp | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index 51f34a6..2bbfe86 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -68,7 +68,7 @@
pEquipment->setName("EFEM(ROBOT)");
pEquipment->setDescription("EFEM(ROBOT).");
pEquipment->setReadBitBlock(0x4000, 0x45ff);
- pEquipment->setStation(1, 2);
+ pEquipment->setStation(0, 255);
addEquipment(pEquipment);
pEquipment->init();
@@ -121,6 +121,7 @@
}
};
pEquipment->setListener(listener);
+ pEquipment->setCcLink(&m_cclink);
m_listEquipment.push_back(pEquipment);
return 0;
@@ -151,7 +152,7 @@
const StationIdentifier& station = item->getStation();
MemoryBlock& block = item->getReadBitBlock();
- int nRet = m_cclink.ReadData2(station, (short)block.type,
+ int nRet = m_cclink.ReadData2(station, (DeviceType)block.type,
block.start, block.size, block.buffer);
if (0 == nRet) {
item->onReceiveLBData(block.buffer, block.size);
--
Gitblit v1.9.3