From 690bbf01bc579aff0ca31b2f326c7a6b5d83604d Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 05 六月 2025 10:51:13 +0800
Subject: [PATCH] 1.Slot的部分数据不需要存储，否则影响代码修改Slot布局等信息； 2.Bonder Porcess完成后，合成两片一起搬送的逻辑问题；
---
SourceCode/Bond/Servo/CCLinkPerformance/CCLinkIEControl.cpp | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CCLinkPerformance/CCLinkIEControl.cpp b/SourceCode/Bond/Servo/CCLinkPerformance/CCLinkIEControl.cpp
index 582cc6b..8315cc3 100644
--- a/SourceCode/Bond/Servo/CCLinkPerformance/CCLinkIEControl.cpp
+++ b/SourceCode/Bond/Servo/CCLinkPerformance/CCLinkIEControl.cpp
@@ -80,7 +80,7 @@
return 0; // 校验通过
}
-int CCCLinkIEControl::ReadData2(const StationIdentifier& station, short devType, short devNo, short size, void* pData)
+int CCCLinkIEControl::ReadData2(const StationIdentifier& station, DeviceType enDevType, long devNo, long size, void* pData)
{
// 验证站点参数和数据有效性
int nRet = ValidateStationAndSize(station, size);
@@ -92,7 +92,8 @@
// 确保线程安全的最小锁定范围
{
std::lock_guard<std::mutex> lock(m_mtx);
- nRet = mdReceive(m_nPath, CombineStation(station), devType, devNo, &size, pData);
+ const short nDevType = CalculateDeviceType(station, enDevType);
+ nRet = mdReceiveEx(m_nPath, station.nNetNo, station.nStNo, nDevType, devNo, &size, pData);
}
if (nRet != 0) {
--
Gitblit v1.9.3