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

2014-08-01 update 4

Browse Source
This commit is contained in:
parallelbgls
2014-08-01 13:59:48 +08:00
parent 32232fa34c
commit a6e06afb6d
2 changed files with 47 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
NA200H/ModBus.Net/BaseProtocal.cs
View File

@@ -42,6 +42,12 @@ namespace ModBus.Net
Protocals.Add(linkProtocal.GetType().Name, linkProtocal);
}
public virtual byte[] SendReceive(params object[] content)
{
int t;
return _protocalLinker.SendReceive(ProtocalUnit.TranslateContent(content));
}
public virtual OutputStruct SendReceive(ProtocalUnit unit, params object[] content)
{
int t = 0;

23
NA200H/ModBus.Net/ProtocalUnit.cs
View File

@@ -15,12 +15,11 @@ namespace ModBus.Net
}
public abstract OutputStruct Unformat(byte[] messageBytes, ref int pos);
/// <summary>
/// </summary>
/// <param name="contents"></param>
/// <returns></returns>
public byte[] TranslateContent(params object[] contents)
public static byte[] TranslateContent(params object[] contents)
{
bool b = false;
var newContentsList = new List<object>();
@@ -31,7 +30,7 @@ namespace ModBus.Net
{
b = true;
IEnumerable<object> contentArray =
ArrayList.Adapter((Array) content).ToArray(typeof (object)).OfType<object>();
ArrayList.Adapter((Array)content).ToArray(typeof(object)).OfType<object>();
newContentsList.AddRange(contentArray);
}
else
@@ -48,47 +47,47 @@ namespace ModBus.Net
{
case "System.Int16":
{
translateTarget.AddRange(ValueHelper.Instance.GetBytes((short) content));
translateTarget.AddRange(ValueHelper.Instance.GetBytes((short)content));
break;
}
case "System.Int32":
{
translateTarget.AddRange(ValueHelper.Instance.GetBytes((int) content));
translateTarget.AddRange(ValueHelper.Instance.GetBytes((int)content));
break;
}
case "System.Int64":
{
translateTarget.AddRange(ValueHelper.Instance.GetBytes((long) content));
translateTarget.AddRange(ValueHelper.Instance.GetBytes((long)content));
break;
}
case "System.UInt16":
{
translateTarget.AddRange(ValueHelper.Instance.GetBytes((ushort) content));
translateTarget.AddRange(ValueHelper.Instance.GetBytes((ushort)content));
break;
}
case "System.UInt32":
{
translateTarget.AddRange(ValueHelper.Instance.GetBytes((uint) content));
translateTarget.AddRange(ValueHelper.Instance.GetBytes((uint)content));
break;
}
case "System.UInt64":
{
translateTarget.AddRange(ValueHelper.Instance.GetBytes((ulong) content));
translateTarget.AddRange(ValueHelper.Instance.GetBytes((ulong)content));
break;
}
case "System.Single":
{
translateTarget.AddRange(ValueHelper.Instance.GetBytes((float) content));
translateTarget.AddRange(ValueHelper.Instance.GetBytes((float)content));
break;
}
case "System.Double":
{
translateTarget.AddRange(ValueHelper.Instance.GetBytes((double) content));
translateTarget.AddRange(ValueHelper.Instance.GetBytes((double)content));
break;
}
case "System.Byte":
{
translateTarget.AddRange(ValueHelper.Instance.GetBytes((byte) content));
translateTarget.AddRange(ValueHelper.Instance.GetBytes((byte)content));
break;
}
default: