From f142e86b68f5480f342442b1a4ae4c6a4fc3d912 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期二, 17 十二月 2024 09:08:12 +0800
Subject: [PATCH] 1
---
WIDESEAWCS_Server/WIDESEAWCS_Communicator/Modbus/ModbusTcpCommunicator.cs | 79 ++++++++++++++++++++++++++++++++++-----
1 files changed, 69 insertions(+), 10 deletions(-)
diff --git a/WIDESEAWCS_Server/WIDESEAWCS_Communicator/Modbus/ModbusTcpCommunicator.cs b/WIDESEAWCS_Server/WIDESEAWCS_Communicator/Modbus/ModbusTcpCommunicator.cs
index 7e34627..e4715bf 100644
--- a/WIDESEAWCS_Server/WIDESEAWCS_Communicator/Modbus/ModbusTcpCommunicator.cs
+++ b/WIDESEAWCS_Server/WIDESEAWCS_Communicator/Modbus/ModbusTcpCommunicator.cs
@@ -183,6 +183,38 @@
case TypeCode.Char:
return plc.Write(address, Convert.ToChar(value));
default:
+ if (value is int[])
+ {
+ return plc.Write(address, value as int[]);
+ }
+ else if (value is uint[])
+ {
+ return plc.Write(address, value as uint[]);
+ }
+ else if (value is short[])
+ {
+ return plc.Write(address, value as short[]);
+ }
+ else if (value is ushort[])
+ {
+ return plc.Write(address, value as ushort[]);
+ }
+ else if (value is bool[])
+ {
+ return plc.Write(address, value as bool[]);
+ }
+ else if (value is float[])
+ {
+ return plc.Write(address, value as float[]);
+ }
+ else if (value is double[])
+ {
+ return plc.Write(address, value as double[]);
+ }
+ else if (value is byte[])
+ {
+ return plc.Write(address, value as byte[]);
+ }
throw new CommunicationException(string.Format(CommunicationExceptionMessage.DataTypeErrorException, type.Name, address), CommunicationErrorType.TypeError);
}
}
@@ -197,30 +229,48 @@
}
}
- private object Read(string address, TypeCode typeCode)
+ private object Read(string address, TypeCode typeCode, ushort length = 1)
{
try
{
switch (typeCode)
{
case TypeCode.Int32:
- return (int)GetContent(plc.ReadInt32(address), address);
+ if (length > 1)
+ return (int[])GetContent(plc.ReadInt32(address, length), address);
+ else
+ return (int)GetContent(plc.ReadInt32(address), address);
case TypeCode.UInt32:
- return (uint)GetContent(plc.ReadUInt32(address), address);
+ if (length > 1)
+ return (uint[])GetContent(plc.ReadUInt32(address, length), address);
+ else
+ return (uint)GetContent(plc.ReadUInt32(address), address);
case TypeCode.Int16:
- return (short)GetContent(plc.ReadInt16(address), address);
+ if (length > 1)
+ return (short[])GetContent(plc.ReadInt16(address, length), address);
+ else
+ return (short)GetContent(plc.ReadInt16(address), address);
case TypeCode.UInt16:
- return (ushort)GetContent(plc.ReadUInt16(address), address);
+ if (length > 1)
+ return (ushort[])GetContent(plc.ReadUInt16(address, length), address);
+ else
+ return (ushort)GetContent(plc.ReadUInt16(address), address);
case TypeCode.Single:
- return (float)GetContent(plc.ReadFloat(address), address);
+ if (length > 1)
+ return (float[])GetContent(plc.ReadFloat(address, length), address);
+ else
+ return (float)GetContent(plc.ReadFloat(address), address);
case TypeCode.Boolean:
- return (bool)GetContent(plc.ReadBool(address), address);
+ if (length > 1)
+ return (bool[])GetContent(plc.ReadBool(address, length), address);
+ else
+ return (bool)GetContent(plc.ReadBool(address), address);
case TypeCode.Byte:
- return (byte)GetContent(plc.Read(address, 1), address);
+ return (byte[])GetContent(plc.Read(address, length), address);
case TypeCode.String:
- return (string)GetContent(plc.ReadString(address, 1), address);
+ return (string)GetContent(plc.ReadString(address, length), address);
case TypeCode.Char:
- return (char)GetContent(plc.Read(address, 1), address);
+ return (char[])GetContent(plc.Read(address, length), address);
default:
throw new CommunicationException(string.Format(CommunicationExceptionMessage.DataTypeErrorException, typeCode.ToString(), address), CommunicationErrorType.TypeError);
}
@@ -324,6 +374,11 @@
Type type = typeof(T);
return (T)Read(address, Type.GetTypeCode(type));
}
+ public override T[] Read<T>(string address, ushort length)
+ {
+ Type type = typeof(T);
+ return (T[])Read(address, Type.GetTypeCode(type), length);
+ }
public override object ReadAsObj(string address, string dataType)
{
@@ -406,6 +461,10 @@
{
return GetResult(Write(address, value), address, value);
}
+ public override bool Write<T>(string address, T[] values)
+ {
+ return GetResult(Write(address, values), address, values);
+ }
public override bool WriteCustomer<T>(string address, [NotNull] T value)
{
--
Gitblit v1.9.3