luosheng/Modbus.Net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
parallelbgls
2024-12-23 16:56:18 +08:00
parent 40b2b39d2b
commit 80d6e843af
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Modbus.Net/Modbus.Net.Modbus/ModbusReceiver.cs
View File

@@ -12,8 +12,7 @@ namespace Modbus.Net.Modbus
{ {
public class ModbusRtuDataReceiver public class ModbusRtuDataReceiver
{ {
private List<ModbusRtuProtocolReceiver> _receivers; private Dictionary<ModbusRtuProtocolReceiver, DateTime> _receivers;
private readonly IConfigurationRoot configuration = new ConfigurationBuilder() private readonly IConfigurationRoot configuration = new ConfigurationBuilder()
.SetBasePath(Directory.GetCurrentDirectory()) .SetBasePath(Directory.GetCurrentDirectory())
.AddJsonFile("appsettings.json") .AddJsonFile("appsettings.json")
@@ -60,13 +59,13 @@ namespace Modbus.Net.Modbus
public ModbusRtuDataReceiver(MachineDataType dataType, int minimumElapse = 0) public ModbusRtuDataReceiver(MachineDataType dataType, int minimumElapse = 0)
{ {
var previousTime = DateTime.MinValue; _receivers = new Dictionary<ModbusRtuProtocolReceiver,DateTime>();
_receivers = new List<ModbusRtuProtocolReceiver>();
var receiversDef = configuration.GetSection("Modbus.Net").GetSection("Receiver").GetChildren(); var receiversDef = configuration.GetSection("Modbus.Net").GetSection("Receiver").GetChildren();
foreach (var receiverDef in receiversDef) foreach (var receiverDef in receiversDef)
{ {
var _receiver = new ModbusRtuProtocolReceiver(receiverDef.GetValue<string>("e:connectionString"), receiverDef.GetValue<int>("h:slaveAddress"));
var machineName = receiverDef.GetValue<string>("a:id"); var machineName = receiverDef.GetValue<string>("a:id");
if (machineName == "EventData") minimumElapse = 0; //临时增加，后续删除
var _receiver = new ModbusRtuProtocolReceiver(receiverDef.GetValue<string>("e:connectionString"), receiverDef.GetValue<int>("h:slaveAddress"));
var addressMapName = receiverDef.GetValue<string>("f:addressMap"); var addressMapName = receiverDef.GetValue<string>("f:addressMap");
var endian = ValueHelper.GetInstance(Endian.Parse(receiverDef.GetValue<string>("j:endian"))); var endian = ValueHelper.GetInstance(Endian.Parse(receiverDef.GetValue<string>("j:endian")));
_receiver.DataProcess = receiveContent => _receiver.DataProcess = receiveContent =>
@@ -143,7 +142,7 @@ namespace Modbus.Net.Modbus
value = Math.Round(value, addressMap[i].DecimalPos); value = Math.Round(value, addressMap[i].DecimalPos);
AddValueToValueDic(valueDic, returnDic, addressMap[i], value, dataType); AddValueToValueDic(valueDic, returnDic, addressMap[i], value, dataType);
} }
if ((returnTime - previousTime).TotalSeconds + 0.5 >= minimumElapse) if ((returnTime - _receivers[_receiver]).TotalSeconds + 0.5 >= minimumElapse)
{ {
if (ReturnValueDictionary != null) if (ReturnValueDictionary != null)
{ {
@@ -151,7 +150,7 @@ namespace Modbus.Net.Modbus
dataReturn.MachineId = machineName; dataReturn.MachineId = machineName;
dataReturn.ReturnValues = new ReturnStruct<Dictionary<string, ReturnUnit<double>>>() { IsSuccess = true, Datas = returnDic }; dataReturn.ReturnValues = new ReturnStruct<Dictionary<string, ReturnUnit<double>>>() { IsSuccess = true, Datas = returnDic };
ReturnValueDictionary(dataReturn); ReturnValueDictionary(dataReturn);
previousTime = returnTime; _receivers[_receiver] = returnTime;
} }
} }
} }
@@ -200,17 +199,15 @@ namespace Modbus.Net.Modbus
if (returnBytes != null) return returnBytes; if (returnBytes != null) return returnBytes;
else return null; else return null;
}; };
_receivers.Add(_receiver); _receivers.Add(_receiver, DateTime.MinValue);
} }
} }
public async Task<bool> ConnectAsync() public async Task<bool> ConnectAsync()
{ {
var result = await Task.FromResult(Parallel.ForEach(_receivers, async _receiver => var result = await Task.FromResult(Parallel.ForEach(_receivers, async _receiver =>
{ {
await _receiver.ConnectAsync(); await _receiver.Key.ConnectAsync();
})); }));
return result.IsCompleted; return result.IsCompleted;
} }