g82tt/ThingsGateway
1
0
Fork 0
mirror of https://gitee.com/ThingsGateway/ThingsGateway.git synced 2025-10-26 21:27:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复上个版本 modbus驱动打包变量 代码错误

Browse Source
This commit is contained in:
Kimdiego2098
2024-04-08 21:46:47 +08:00
parent 2963a9cdca
commit 82e30a326a
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/foundation/ThingsGateway.Foundation.Modbus/src/Helper/PackHelper.cs
View File

@@ -81,13 +81,24 @@ public class PackHelper
var stationNumbers = modbusAddressSameFunList.Select(t => t.Station).Distinct();
foreach (var stationNumber in stationNumbers)
{
var modbusAddressSameStationList = modbusAddressList.Where(t => t.ReadFunction == stationNumber);
var modbusAddressSameStationList = modbusAddressList.Where(t => t.Station == stationNumber);
var socketIds = modbusAddressSameStationList.Select(t => t.SocketId).Distinct();
foreach (var socketId in socketIds)//DTU区分
if (socketIds.Any())
{
var addressList = modbusAddressSameFunList
.Where(t => t.Station == stationNumber)
.ToDictionary(t => t, t => map[t]);
foreach (var socketId in socketIds)//DTU区分
{
var addressList = modbusAddressSameFunList
.Where(t => t.SocketId == socketId)
.ToDictionary(t => t, t => map[t]);
var tempResult = LoadSourceRead<T>(addressList, functionCode, group.Key, maxPack);
deviceVariableSourceReads.AddRange(tempResult);
}
}
else
{
var addressList = modbusAddressSameStationList
.ToDictionary(t => t, t => map[t]);
var tempResult = LoadSourceRead<T>(addressList, functionCode, group.Key, maxPack);
deviceVariableSourceReads.AddRange(tempResult);