Skip to content

Commit 341638f

Browse files
author
parallelbgls
committed
2917-02-28 Update 1 Add Name Mode。
1 parent fa19a92 commit 341638f

File tree

2 files changed

+30
-3
lines changed

2 files changed

+30
-3
lines changed

Modbus.Net/Modbus.Net/BaseMachine.cs

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@ public enum MachineGetDataType
1818
/// <summary>
1919
/// 通讯标识
2020
/// </summary>
21-
CommunicationTag
21+
CommunicationTag,
22+
23+
/// <summary>
24+
/// 名称
25+
/// </summary>
26+
Name
2227
}
2328

2429
/// <summary>
@@ -34,7 +39,12 @@ public enum MachineSetDataType
3439
/// <summary>
3540
/// 通讯标识
3641
/// </summary>
37-
CommunicationTag
42+
CommunicationTag,
43+
44+
/// <summary>
45+
/// 名称
46+
/// </summary>
47+
Name
3848
}
3949

4050
public abstract class BaseMachine : IMachineProperty
@@ -233,6 +243,11 @@ public async Task<Dictionary<string, ReturnUnit>> GetDatasAsync(MachineGetDataTy
233243
key = AddressFormater.FormatAddress(address.Area, address.Address, address.SubAddress);
234244
break;
235245
}
246+
case MachineGetDataType.Name:
247+
{
248+
key = address.Name;
249+
break;
250+
}
236251
default:
237252
{
238253
key = address.CommunicationTag;
@@ -340,6 +355,11 @@ public async Task<bool> SetDatasAsync(MachineSetDataType setDataType, Dictionary
340355
GetAddresses.SingleOrDefault(p => p.CommunicationTag == value.Key);
341356
break;
342357
}
358+
case MachineSetDataType.Name:
359+
{
360+
address = GetAddresses.SingleOrDefault(p => p.Name == value.Key);
361+
break;
362+
}
343363
}
344364
//地址为空报错
345365
if (address == null)

Modbus.Net/Modbus.Net/TaskManager.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ namespace Modbus.Net
1717
public enum MachineDataType
1818
{
1919
Address,
20-
CommunicationTag
20+
CommunicationTag,
21+
Name
2122
}
2223

2324
/// <summary>
@@ -348,6 +349,12 @@ public MachineDataType MachineDataType
348349
SetDataType = MachineSetDataType.CommunicationTag;
349350
break;
350351
}
352+
case MachineDataType.Name:
353+
{
354+
GetDataType = MachineGetDataType.Name;
355+
SetDataType = MachineSetDataType.Name;
356+
break;
357+
}
351358
}
352359
}
353360
}

0 commit comments

Comments
 (0)