mirror/IoTClient
1
0
Fork 0
mirror of https://github.com/zhaopeiym/IoTClient synced 2025-10-26 22:15:44 +08:00
Code Issues Releases Wiki Activity

Merge 63d8099b13 into b219d57390

Browse Source
This commit is contained in:
Jeremy Wu 2025-01-14 10:00:51 +08:00 committed by GitHub
commit dd2a3aea7e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
IoTClient/Clients/PLC/OmronFinsClient.cs
View File

@ -66,12 +66,12 @@ namespace IoTClient.Clients.PLC
private byte DA1 { get; set; } = 0x01;
/// <summary>
///
/// 构造函数
/// </summary>
/// <param name="ip"></param>
/// <param name="port"></param>
/// <param name="timeout"></param>
/// <param name="endianFormat"></param>
/// <param name="ip">主机地址</param>
/// <param name="port">端口</param>
/// <param name="timeout">超时时间，默认1500毫秒</param>
/// <param name="endianFormat">字节序格式</param>
public OmronFinsClient(string ip, int port = 9600, int timeout = 1500, EndianFormat endianFormat = EndianFormat.CDAB)
{
if (!IPAddress.TryParse(ip, out IPAddress address))
@ -144,7 +144,7 @@ namespace IoTClient.Clients.PLC
/// <summary>
/// 发送报文，并获取响应报文（建议使用SendPackageReliable，如果异常会自动重试一次）
/// </summary>
/// <param name="command"></param>
/// <param name="command">指令集</param>
/// <returns></returns>
public override Result<byte[]> SendPackageSingle(byte[] command)
{
@ -190,8 +190,8 @@ namespace IoTClient.Clients.PLC
/// 读取数据
/// </summary>
/// <param name="address">地址</param>
/// <param name="length"></param>
/// <param name="isBit"></param>
/// <param name="length">长度</param>
/// <param name="isBit">类型</param>
/// <param name="setEndian">返回值是否设置大小端</param>
/// <returns></returns>
public Result<byte[]> Read(string address, ushort length, bool isBit = false, bool setEndian = true)
@ -289,9 +289,9 @@ namespace IoTClient.Clients.PLC
}
/// <summary>
/// 读取byte
/// 读取Byte
/// </summary>
/// <param name="address"></param>
/// <param name="address">地址</param>
/// <returns></returns>
public Result<byte> ReadByte(string address)
{
@ -301,7 +301,7 @@ namespace IoTClient.Clients.PLC
/// <summary>
/// 读取Int16
/// </summary>
/// <param name="address"></param>
/// <param name="address">地址</param>
/// <returns></returns>
public Result<short> ReadInt16(string address)
{
@ -823,9 +823,9 @@ namespace IoTClient.Clients.PLC
/// <summary>
/// 地址信息解析
/// </summary>
/// <param name="address"></param>
/// <param name="dataType"></param>
/// <param name="isBit"></param>
/// <param name="address">地址</param>
/// <param name="dataType">类型</param>
/// <param name="isBit">值</param>
/// <returns></returns>
private OmronFinsAddress ConvertArg(string address, DataTypeEnum dataType = DataTypeEnum.None, bool isBit = false)
{

10
IoTClient/Clients/PLC/SiemensClient.cs
View File

@ -536,9 +536,9 @@ namespace IoTClient.Clients.PLC
}
/// <summary>
///
/// 读取Byte
/// </summary>
/// <param name="address"></param>
/// <param name="address">地址</param>
/// <returns></returns>
public Result<byte> ReadByte(string address)
{
@ -1014,7 +1014,7 @@ namespace IoTClient.Clients.PLC
/// 批量写入
/// TODO 可以重构后面的Write 都走BatchWrite
/// </summary>
/// <param name="addresses"></param>
/// <param name="addresses">地址和值</param>
/// <returns></returns>
private Result BatchWrite(Dictionary<string, object> addresses)
{
@ -1138,10 +1138,10 @@ namespace IoTClient.Clients.PLC
}
/// <summary>
/// 分批写入，默认按10个地址打包读取
/// 分批写入，默认按10个地址打包写入
/// </summary>
/// <param name="addresses">地址集合</param>
/// <param name="batchNumber">批量读取数量</param>
/// <param name="batchNumber">批量写入的数量</param>
/// <returns></returns>
public Result BatchWrite(Dictionary<string, object> addresses, int batchNumber = 10)
{