From e42e8364112e97d89eeaecd13f043dff42179949 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 27 五月 2025 17:19:02 +0800
Subject: [PATCH] 1.enum修改为enum class, 理顺CLoadPort各成员变量在调度中的判定作用；
---
SourceCode/Bond/Servo/CCLinkPerformance/PerformanceMelsec.cpp | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CCLinkPerformance/PerformanceMelsec.cpp b/SourceCode/Bond/Servo/CCLinkPerformance/PerformanceMelsec.cpp
index 141634c..7bc469d 100644
--- a/SourceCode/Bond/Servo/CCLinkPerformance/PerformanceMelsec.cpp
+++ b/SourceCode/Bond/Servo/CCLinkPerformance/PerformanceMelsec.cpp
@@ -442,7 +442,7 @@
}
// 通用读数据
-int CPerformanceMelsec::ReadData(const StationIdentifier& station, const short nDevType, const short nDevNo, short nSize, std::vector<short>& vecData) {
+int CPerformanceMelsec::ReadData(const StationIdentifier& station, const long nDevType, const long nDevNo, long nSize, std::vector<short>& vecData) {
// 验证站点参数和数据有效性
int nRet = ValidateStationAndSize(station, nSize);
if (nRet != 0) {
@@ -459,7 +459,7 @@
std::lock_guard<std::mutex> lock(m_mtx);
short* pData = vecData.data();
nSize *= sizeof(short);
- nRet = mdReceive(m_nPath, CombineStation(station), nDevType, nDevNo, &nSize, pData);
+ nRet = mdReceiveEx(m_nPath, station.nNetNo, station.nStNo, nDevType, (long)(unsigned short)nDevNo, &nSize, pData);
}
if (nRet != 0) {
@@ -559,7 +559,7 @@
}
// 通用写数据
-int CPerformanceMelsec::WriteData(const StationIdentifier& station, const short nDevType, const short nDevNo, short nSize, short* pData) {
+int CPerformanceMelsec::WriteData(const StationIdentifier& station, const long nDevType, const long nDevNo, long nSize, short* pData) {
// 验证站点参数
int nRet = ValidateStation(station);
if (nRet != 0) {
@@ -577,7 +577,7 @@
{
std::lock_guard<std::mutex> lock(m_mtx);
nSize *= sizeof(short);
- nRet = mdSend(m_nPath, CombineStation(station), nDevType, nDevNo, &nSize, pData);
+ nRet = mdSendEx(m_nPath, station.nNetNo, station.nStNo, nDevType, nDevNo, &nSize, pData);
}
if (nRet != 0) {
--
Gitblit v1.9.3