From 0026ea3b1a6588f3e40b8276162f54b2a22bc7ae Mon Sep 17 00:00:00 2001 From: chenluhua1980 <Chenluhua@qq.com> Date: 星期一, 19 一月 2026 14:32:27 +0800 Subject: [PATCH] 1.修复 ： 多 PJ 支持仍是单槽实现：isProcessJobsEmpty/validate 仍只允许 1 个 PJ/CJ；Host 一次下多 PJ 或运行中追加 PJ 会被拒绝/无明确反馈。需要：协议上明示只支持 1，或补齐 ACK/NAK 与队列管理、PJobSpace 动态更新。 --- SourceCode/Bond/Servo/CCLinkPerformance/PerformanceMelsec.h | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/SourceCode/Bond/Servo/CCLinkPerformance/PerformanceMelsec.h b/SourceCode/Bond/Servo/CCLinkPerformance/PerformanceMelsec.h index a6020c4..baf4908 100644 --- a/SourceCode/Bond/Servo/CCLinkPerformance/PerformanceMelsec.h +++ b/SourceCode/Bond/Servo/CCLinkPerformance/PerformanceMelsec.h @@ -377,18 +377,24 @@ int GetBoardStatus(BoardStatus& status); // 读写数据 - int ReadData(const StationIdentifier& station, short nDevType, short nDevNo, short nSize, std::vector<short>& vecData); + int ReadData(const StationIdentifier& station, long nDevType, long nDevNo, long nSize, std::vector<short>& vecData); int ReadBitData(const StationIdentifier& station, DeviceType enDevType, short nDevNo, short nBitCount, BitContainer& vecData); int ReadWordData(const StationIdentifier& station, DeviceType enDevType, short nDevNo, short nWordCount, WordContainer& vecData); int ReadDWordData(const StationIdentifier& station, DeviceType enDevType, short nDevNo, short nDWordCount, DWordContainer& vecData); - int WriteData(const StationIdentifier& station, short nDevType, short nDevNo, short nSize, short* pData); + int WriteData(const StationIdentifier& station, long nDevType, long nDevNo, long nSize, short* pData); int WriteBitData(const StationIdentifier& station, DeviceType enDevType, short nDevNo, const BitContainer& vecData); int WriteWordData(const StationIdentifier& station, DeviceType enDevType, short nDevNo, const WordContainer& vecData); int WriteDWordData(const StationIdentifier& station, DeviceType enDevType, short nDevNo, const DWordContainer& vecData); // 扩展读写数据 long ReadDataEx(const StationIdentifier& station, long nDevType, long nDevNo, long nSize, std::vector<char>& vecData); + long ReadBitDataEx(const StationIdentifier& station, DeviceType enDevType, long nDevNo, long nBitCount, BitContainer& vecData); + long ReadWordDataEx(const StationIdentifier& station, DeviceType enDevType, long nDevNo, long nWordCount, WordContainer& vecData); + long ReadDWordDataEx(const StationIdentifier& station, DeviceType enDevType, long nDevNo, long nDWordCount, DWordContainer& vecData); long WriteDataEx(const StationIdentifier& station, long nDevType, long nDevNo, const std::vector<char>& vecData); + long WriteBitDataEx(const StationIdentifier& station, DeviceType enDevType, long nDevNo, const BitContainer& vecData); + long WriteWordDataEx(const StationIdentifier& station, DeviceType enDevType, long nDevNo, const WordContainer& vecData); + long WriteDWordDataEx(const StationIdentifier& station, DeviceType enDevType, long nDevNo, const DWordContainer& vecData); // 扩展软元件随机读写（支持多个软元件） long ReadRandomDataEx(const StationIdentifier& station, const std::vector<SoftElement>& vecSoftElements, std::vector<char>& vecData); -- Gitblit v1.9.3