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

2016-01-04 update 1 add data remove in fboxconnector

Browse Source
This commit is contained in:
parallelbgls@outlook.com
2016-01-04 10:20:54 +08:00
parent 88ce1d7f12
commit 0488414141
1 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Modbus.Net/ModBus.Net/FBox/SignalRConnector.cs
View File

@@ -258,7 +258,31 @@ namespace ModBus.Net.FBox
foreach (var value in values) foreach (var value in values)
{ {
if (value.Status != 0) return; if (value.Status != 0)
{
lock (_machineData)
{
if (_boxUidDataGroups.ContainsKey(localBoxUid))
{
foreach (var dataGroupInner in _boxUidDataGroups[localBoxUid])
{
var dMonEntry =
dataGroupInner.DMonEntries.FirstOrDefault(
p => p.Uid == value.Id);
if (dMonEntry != null)
{
if (_machineData[localBoxNo + "," + dataGroupInner.Name]
.ContainsKey(dMonEntry.Desc))
{
_machineData[localBoxNo + "," + dataGroupInner.Name]
.Remove(dMonEntry.Desc);
}
}
}
}
}
return;
}
lock (_machineData) lock (_machineData)
{ {
if (_boxUidDataGroups.ContainsKey(localBoxUid)) if (_boxUidDataGroups.ContainsKey(localBoxUid))
@@ -643,6 +667,12 @@ namespace ModBus.Net.FBox
} }
var machineDataValue = _machineData[ConnectionToken]; var machineDataValue = _machineData[ConnectionToken];
var machineDataType = _machineDataType[ConnectionToken]; var machineDataType = _machineDataType[ConnectionToken];
if (machineDataValue != null && machineDataType.Count == 0)
{
_connected = false;
Console.WriteLine($"Return Value Rejected with connectionToken {ConnectionToken}");
return null;
}
int pos = 0; int pos = 0;
int area = ValueHelper.Instance.GetInt(message, ref pos); int area = ValueHelper.Instance.GetInt(message, ref pos);
int address = ValueHelper.Instance.GetInt(message, ref pos); int address = ValueHelper.Instance.GetInt(message, ref pos);