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

2017-03-07 update 1 Opc Fix.

Browse Source
This commit is contained in:
parallelbgls
2017-03-07 17:27:22 +08:00
parent ec1aaedf11
commit 331feb0b31
11 changed files with 215 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modbus.Net/Modbus.Net.OPC/AddressFormaterOpc.cs
View File

@@ -26,7 +26,7 @@ namespace Modbus.Net.OPC
protected Func<BaseMachine<TMachineKey, TUnitKey>, AddressUnit<TUnitKey>, string[]> TagGeter { get; set; }
protected char Seperator { get; set; }
public char Seperator { get; protected set; }
public override string FormatAddress(string area, int address)
{

6
Modbus.Net/Modbus.Net.OPC/ClientExtend.cs
View File

@@ -24,6 +24,8 @@ namespace Modbus.Net.OPC
Task<Node> FindNodeAsync(string tag);
Task<IEnumerable<Node>> ExploreFolderAsync(string tag);
Node RootNodeBase { get; }
}
public class MyDaClient : DaClient, IClientExtend
@@ -31,6 +33,8 @@ namespace Modbus.Net.OPC
public MyDaClient(Uri serverUrl) : base(serverUrl)
{
}
public Node RootNodeBase => RootNode;
}
public class MyUaClient : UaClient, IClientExtend
@@ -38,5 +42,7 @@ namespace Modbus.Net.OPC
public MyUaClient(Uri serverUrl) : base(serverUrl)
{
}
public Node RootNodeBase => RootNode;
}
}

6
Modbus.Net/Modbus.Net.OPC/FBox/FBoxOpcDaManchine.cs
View File

@@ -6,14 +6,14 @@ using System.Threading.Tasks;
namespace Modbus.Net.OPC.FBox
{
public class FBoxOpcDaMachine : OpcDaMachine<string,string>
public class FBoxOpcDaMachine : OpcDaMachine
{
public string LocalSequence { get; set; }
public string LinkerName { get; set; }
public FBoxOpcDaMachine(string localSequence, string linkerName,
IEnumerable<AddressUnit<string>> getAddresses, bool keepConnect) : base(ConfigurationManager.FBoxOpcDaHost, getAddresses, keepConnect)
IEnumerable<AddressUnit> getAddresses, bool keepConnect) : base(ConfigurationManager.FBoxOpcDaHost, getAddresses, keepConnect)
{
LocalSequence = localSequence;
LinkerName = linkerName;
@@ -22,7 +22,7 @@ namespace Modbus.Net.OPC.FBox
(machine, unit) =>
new string[]
{
"他人分享", ((FBoxOpcDaMachine) machine).LinkerName, ((FBoxOpcDaMachine) machine).LocalSequence,
"(.*)", ((FBoxOpcDaMachine) machine).LinkerName, ((FBoxOpcDaMachine) machine).LocalSequence,
unit.Name
}, this, '.');
}

88
Modbus.Net/Modbus.Net.OPC/OpcConnector.cs
View File

@@ -54,6 +54,29 @@ namespace Modbus.Net.OPC
return AsyncHelper.RunSync(() => SendMsgAsync(message));
}
private string[] SplitTag(string tag, char split)
{
var tagSplitList = tag.Split(split).ToList();
for (int i = 0; i < tagSplitList.Count; i++)
{
if (tagSplitList[i].Contains("("))
{
for (int j = i; j < tagSplitList.Count; j++)
{
if (tagSplitList[j].Contains(")"))
{
for (int k = i + 1; k <= j; k++)
{
tagSplitList[i] += split + tagSplitList[i + 1];
tagSplitList.RemoveAt(i + 1);
}
}
}
}
}
return tagSplitList.ToArray();
}
public override async Task<byte[]> SendMsgAsync(byte[] message)
{
try
@@ -62,12 +85,15 @@ namespace Modbus.Net.OPC
var protocal = BigEndianValueHelper.Instance.GetByte(message, ref pos);
if (protocal == 0)
{
var tagBytes = new byte[message.Length - 1];
var tagBytes = new byte[message.Length - 6];
Array.Copy(message, 1, tagBytes, 0, tagBytes.Length);
pos += tagBytes.Length;
pos += 4;
var split = Encoding.UTF8.GetString(new[] { message[pos] });
var tag = Encoding.UTF8.GetString(tagBytes);
var tagSplit = tag.Split('/');
var rootDirectory = await Client.ExploreFolderAsync("/");
var answerTag = await SearchTag(tagSplit, 0, rootDirectory);
var tagSplit = SplitTag(tag, split[0]);
var rootDirectory = await Client.ExploreFolderAsync("");
var answerTag = await SearchTag(tagSplit, split[0], 0, rootDirectory);
if (answerTag != null)
{
var result = await Client.ReadAsync<object>(answerTag);
@@ -98,38 +124,68 @@ namespace Modbus.Net.OPC
break;
}
}
var index3 = 0;
for (var i = index2 + 4; i < message.Length - 3; i++)
{
if (message[i] == 0x00 && message[i + 1] == 0xff && message[i + 2] == 0xff &&
message[i + 3] == 0x00)
{
index3 = i;
break;
}
}
var tagBytes = new byte[index - 1];
Array.Copy(message, 1, tagBytes, 0, tagBytes.Length);
var tag = Encoding.UTF8.GetString(tagBytes);
var typeBytes = new byte[index2 - index - 4];
Array.Copy(message, index + 4, typeBytes, 0, typeBytes.Length);
var splitBytes = new byte[index2 - index - 4];
Array.Copy(message, index + 4, splitBytes, 0, splitBytes.Length);
var split = Encoding.UTF8.GetString(splitBytes);
var typeBytes = new byte[index3 - index2 - 4];
Array.Copy(message, index2 + 4, typeBytes, 0, typeBytes.Length);
var type = Type.GetType(Encoding.UTF8.GetString(typeBytes));
var valueBytes = new byte[message.Length - index2 - 4];
Array.Copy(message, index2 + 4, valueBytes, 0, valueBytes.Length);
var valueBytes = new byte[message.Length - index3 - 4];
Array.Copy(message, index3 + 4, valueBytes, 0, valueBytes.Length);
int mainpos = 0, subpos = 0;
var value = BigEndianValueHelper.Instance.GetValue(valueBytes, ref mainpos, ref subpos, type);
await Client.WriteAsync(tag, value);
return new byte[] { 1 };
var rootDirectory = await Client.ExploreFolderAsync("");
var tagSplit = SplitTag(tag, split[0]);
var answerTag = await SearchTag(tagSplit, split[0], 0, rootDirectory);
if (answerTag != null)
{
try
{
await Client.WriteAsync(answerTag, value);
}
catch (Exception e)
{
AddInfo("opc write exception:" + e.Message);
return new byte[] { 0 };
}
return new byte[] {1};
}
return new byte[] {0};
}
}
catch (Exception e)
{
//AddInfo("opc client exception:" + e);
AddInfo("opc client exception:" + e.Message);
return Encoding.ASCII.GetBytes("NoData");
//return null;
}
}
private async Task<string> SearchTag(string[] tags, int deep, IEnumerable<Node> nodes)
private async Task<string> SearchTag(string[] tags, char split, int deep, IEnumerable<Node> nodes)
{
foreach (var node in nodes)
{
var currentTag = node.Tag.Substring(node.Tag.LastIndexOf('/'));
var currentTag = node.Tag.Substring(node.Tag.LastIndexOf(split) + 1);
if (Regex.IsMatch(currentTag, tags[deep]))
{
if (deep == tags.Length) return currentTag;
if (deep == tags.Length - 1) return node.Tag;
var subDirectories = await Client.ExploreFolderAsync(node.Tag);
var answerTag = await SearchTag(tags, deep + 1, subDirectories);
var answerTag = await SearchTag(tags, split, deep + 1, subDirectories);
if (answerTag != null) return answerTag;
}
}

8
Modbus.Net/Modbus.Net.OPC/OpcDaMachine.cs
View File

@@ -6,9 +6,11 @@ namespace Modbus.Net.OPC
public class OpcDaMachine<TKey, TUnitKey> : OpcMachine<TKey, TUnitKey> where TKey : IEquatable<TKey> where TUnitKey : IEquatable<TUnitKey>
{
public OpcDaMachine(string connectionString, IEnumerable<AddressUnit<TUnitKey>> getAddresses, bool keepConnect)
: base(connectionString, getAddresses, keepConnect)
: base(getAddresses, keepConnect)
{
BaseUtility = new OpcDaUtility(connectionString);
((OpcUtility) BaseUtility).GetSeperator +=
() => ((AddressFormaterOpc<TKey, TUnitKey>) AddressFormater).Seperator;
}
public OpcDaMachine(string connectionString, IEnumerable<AddressUnit<TUnitKey>> getAddresses)
@@ -20,9 +22,11 @@ namespace Modbus.Net.OPC
public class OpcDaMachine : OpcMachine
{
public OpcDaMachine(string connectionString, IEnumerable<AddressUnit> getAddresses, bool keepConnect)
: base(connectionString, getAddresses, keepConnect)
: base(getAddresses, keepConnect)
{
BaseUtility = new OpcDaUtility(connectionString);
((OpcUtility)BaseUtility).GetSeperator +=
() => ((AddressFormaterOpc<string, string>)AddressFormater).Seperator;
}
public OpcDaMachine(string connectionString, IEnumerable<AddressUnit> getAddresses)

4
Modbus.Net/Modbus.Net.OPC/OpcMachine.cs
View File

@@ -12,7 +12,7 @@ namespace Modbus.Net.OPC
public abstract class OpcMachine<TKey, TUnitKey> : BaseMachine<TKey, TUnitKey> where TKey : IEquatable<TKey>
where TUnitKey : IEquatable<TUnitKey>
{
public OpcMachine(string connectionString, IEnumerable<AddressUnit<TUnitKey>> getAddresses, bool keepConnect)
protected OpcMachine(IEnumerable<AddressUnit<TUnitKey>> getAddresses, bool keepConnect)
: base(getAddresses, keepConnect)
{
AddressCombiner = new AddressCombinerSingle<TUnitKey>();
@@ -25,7 +25,7 @@ namespace Modbus.Net.OPC
/// </summary>
public abstract class OpcMachine : BaseMachine
{
public OpcMachine(string connectionString, IEnumerable<AddressUnit> getAddresses, bool keepConnect)
protected OpcMachine(IEnumerable<AddressUnit> getAddresses, bool keepConnect)
: base(getAddresses, keepConnect)
{
AddressCombiner = new AddressCombinerSingle();

13
Modbus.Net/Modbus.Net.OPC/OpcProtocal.cs
View File

@@ -16,12 +16,14 @@ namespace Modbus.Net.OPC
public class ReadRequestOpcInputStruct : IInputStruct
{
public ReadRequestOpcInputStruct(string tag)
public ReadRequestOpcInputStruct(string tag, string split)
{
Tag = tag;
Split = split;
}
public string Tag { get; }
public string Split { get; }
}
public class ReadRequestOpcOutputStruct : IOutputStruct
@@ -39,7 +41,7 @@ namespace Modbus.Net.OPC
public override byte[] Format(IInputStruct message)
{
var r_message = (ReadRequestOpcInputStruct) message;
return Format((byte) 0x00, Encoding.UTF8.GetBytes(r_message.Tag));
return Format((byte) 0x00, Encoding.UTF8.GetBytes(r_message.Tag), 0x00ffff00, Encoding.UTF8.GetBytes(r_message.Split));
}
public override IOutputStruct Unformat(byte[] messageBytes, ref int pos)
@@ -54,13 +56,15 @@ namespace Modbus.Net.OPC
public class WriteRequestOpcInputStruct : IInputStruct
{
public WriteRequestOpcInputStruct(string tag, object setValue)
public WriteRequestOpcInputStruct(string tag, string split, object setValue)
{
Tag = tag;
Split = split;
SetValue = setValue;
}
public string Tag { get; }
public string Split { get; }
public object SetValue { get; }
}
@@ -81,7 +85,8 @@ namespace Modbus.Net.OPC
var r_message = (WriteRequestOpcInputStruct) message;
var tag = Encoding.UTF8.GetBytes(r_message.Tag);
var fullName = Encoding.UTF8.GetBytes(r_message.SetValue.GetType().FullName);
return Format((byte) 0x01, tag, 0x00ffff00, fullName, 0x00ffff00, r_message.SetValue);
var split = Encoding.UTF8.GetBytes(r_message.Split);
return Format((byte) 0x01, tag, 0x00ffff00, split, 0x00ffff00, fullName, 0x00ffff00, r_message.SetValue);
}
public override IOutputStruct Unformat(byte[] messageBytes, ref int pos)

8
Modbus.Net/Modbus.Net.OPC/OpcUaMachine.cs
View File

@@ -9,9 +9,11 @@ namespace Modbus.Net.OPC
public class OpcUaMachine<TKey, TUnitKey> : OpcMachine<TKey, TUnitKey> where TKey : IEquatable<TKey> where TUnitKey : IEquatable<TUnitKey>
{
public OpcUaMachine(string connectionString, IEnumerable<AddressUnit<TUnitKey>> getAddresses, bool keepConnect)
: base(connectionString, getAddresses, keepConnect)
: base(getAddresses, keepConnect)
{
BaseUtility = new OpcUaUtility(connectionString);
((OpcUtility)BaseUtility).GetSeperator +=
() => ((AddressFormaterOpc<string, string>)AddressFormater).Seperator;
}
public OpcUaMachine(string connectionString, IEnumerable<AddressUnit<TUnitKey>> getAddresses)
@@ -23,9 +25,11 @@ namespace Modbus.Net.OPC
public class OpcUaMachine : OpcMachine
{
public OpcUaMachine(string connectionString, IEnumerable<AddressUnit> getAddresses, bool keepConnect)
: base(connectionString, getAddresses, keepConnect)
: base(getAddresses, keepConnect)
{
BaseUtility = new OpcUaUtility(connectionString);
((OpcUtility)BaseUtility).GetSeperator +=
() => ((AddressFormaterOpc<string, string>)AddressFormater).Seperator;
}
public OpcUaMachine(string connectionString, IEnumerable<AddressUnit> getAddresses)

10
Modbus.Net/Modbus.Net.OPC/OpcUtility.cs
View File

@@ -14,6 +14,10 @@ namespace Modbus.Net.OPC
AddressTranslator = new AddressTranslatorOpc();
}
public delegate char GetSeperatorDelegate();
public event GetSeperatorDelegate GetSeperator;
public override Endian Endian => Endian.BigEndianLsb;
public override void SetConnectionType(int connectionType)
@@ -25,7 +29,8 @@ namespace Modbus.Net.OPC
{
try
{
var readRequestOpcInputStruct = new ReadRequestOpcInputStruct(startAddress);
var split = GetSeperator?.Invoke() ?? '/';
var readRequestOpcInputStruct = new ReadRequestOpcInputStruct(startAddress, split.ToString());
var readRequestOpcOutputStruct =
await
Wrapper.SendReceiveAsync(Wrapper[typeof(ReadRequestOpcProtocal)], readRequestOpcInputStruct) as
@@ -42,7 +47,8 @@ namespace Modbus.Net.OPC
{
try
{
var writeRequestOpcInputStruct = new WriteRequestOpcInputStruct(startAddress, setContents[0]);
var split = GetSeperator?.Invoke() ?? '/';
var writeRequestOpcInputStruct = new WriteRequestOpcInputStruct(startAddress, split.ToString(), setContents[0]);
var writeRequestOpcOutputStruct =
await
Wrapper.SendReceiveAsync(Wrapper[typeof(WriteRequestOpcProtocal)], writeRequestOpcInputStruct)

1
Tests/Modbus.Net.Tests/Modbus.Net.Tests.csproj
View File

@@ -56,6 +56,7 @@
<Compile Include="ModbusTest.cs" />
<Compile Include="SiemensTest.cs" />
<Compile Include="BaseTest.cs" />
<Compile Include="OpcTest.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Modbus.Net\Modbus.Net.Modbus\Modbus.Net.Modbus.csproj">

100
Tests/Modbus.Net.Tests/OpcTest.cs Normal file
View File

@@ -0,0 +1,100 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Modbus.Net.OPC;
using Modbus.Net.OPC.FBox;
namespace Modbus.Net.Tests
{
[TestClass]
public class OpcTest
{
private BaseMachine _opcMachine;
[TestInitialize]
public void Init()
{
_opcMachine = new FBoxOpcDaMachine("1","德联科技测试", null, true);
}
[TestMethod]
public async Task OpcSingle()
{
_opcMachine.GetAddresses = new List<AddressUnit>
{
new AddressUnit()
{
Id = "1",
Name = "蒸汽压力下限",
Area = "0",
Address = 1,
DataType = typeof(ushort)
}
};
var ans = await _opcMachine.GetDatasAsync(MachineGetDataType.Id);
Assert.AreEqual(ans["1"].PlcValue, 525);
}
[TestMethod]
public async Task OpcMultiple()
{
_opcMachine.GetAddresses = new List<AddressUnit>
{
new AddressUnit()
{
Id = "1",
Name = "蒸汽压力下限",
Area = "0",
Address = 1,
DataType = typeof(ushort)
},
new AddressUnit()
{
Id = "2",
Name = "蒸汽压力目标",
Area = "0",
Address = 2,
DataType = typeof(ushort)
},
new AddressUnit()
{
Id = "3",
Name = "蒸汽压力上限",
Area = "0",
Address = 3,
DataType = typeof(ushort)
}
};
var ans = await _opcMachine.GetDatasAsync(MachineGetDataType.Id);
Assert.AreEqual(ans["1"].PlcValue, 525);
Assert.AreEqual(ans["2"].PlcValue, 600);
Assert.AreEqual(ans["3"].PlcValue, 650);
}
[TestMethod]
public async Task OpcWrite()
{
_opcMachine.GetAddresses = new List<AddressUnit>
{
new AddressUnit()
{
Id = "1",
Name = "蒸汽压力下限",
Area = "0",
Address = 1,
DataType = typeof(ushort)
}
};
var success = await _opcMachine.SetDatasAsync(MachineSetDataType.Id, new Dictionary<string, double>
{
{
"1", 525
}
});
Assert.AreEqual(success, true);
var ans = await _opcMachine.GetDatasAsync(MachineGetDataType.Id);
Assert.AreEqual(ans["1"].PlcValue, 525);
}
}
}