优化OmronFins驱动

This commit is contained in:
iioter 2022-08-10 16:53:07 +08:00
parent 8e7f8d7e63
commit 61422f89a2

View File

@ -1,36 +1,28 @@
using IoTClient.Clients.PLC; using IoTClient.Clients.PLC;
using IoTClient.Enums;
using PluginInterface; using PluginInterface;
using System;
using System.Text;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace DriverOmronFins namespace DriverOmronFins
{ {
[DriverSupported("OmronFins")] [DriverSupported("OmronFins")]
[DriverInfoAttribute("OmronFins", "V1.0.0", "Copyright IoTGateway-IoTClient© 2022-01-15")] [DriverInfo("OmronFins", "V1.0.0", "Copyright IoTGateway-IoTClient© 2022-01-15")]
public class OmronFins : IDriver public class OmronFins : IDriver
{ {
private OmronFinsClient plc = null; private OmronFinsClient? _plc;
public ILogger _logger { get; set; } public ILogger _logger { get; set; }
private readonly string _device; private readonly string _device;
#region #region
[ConfigParameter("设备Id")] [ConfigParameter("设备Id")] public string DeviceId { get; set; }
public Guid DeviceId { get; set; }
[ConfigParameter("IP地址")] [ConfigParameter("IP地址")] public string IpAddress { get; set; } = "127.0.0.1";
public string IpAddress { get; set; } = "127.0.0.1";
[ConfigParameter("端口号")] [ConfigParameter("端口号")] public int Port { get; set; } = 6000;
public int Port { get; set; } = 6000;
[ConfigParameter("超时时间ms")] [ConfigParameter("超时时间ms")] public int Timeout { get; set; } = 3000;
public int Timeout { get; set; } = 3000;
[ConfigParameter("最小通讯周期ms")] [ConfigParameter("最小通讯周期ms")] public uint MinPeriod { get; set; } = 3000;
public uint MinPeriod { get; set; } = 3000;
#endregion #endregion
@ -42,26 +34,23 @@ namespace DriverOmronFins
_logger.LogInformation($"Device:[{_device}],Create()"); _logger.LogInformation($"Device:[{_device}],Create()");
} }
public bool IsConnected public bool IsConnected
{ {
get get { return _plc != null && _plc.Connected; }
{
return plc != null && plc.Connected;
}
} }
public bool Connect() public bool Connect()
{ {
try try
{ {
plc = new OmronFinsClient(IpAddress, Port); _plc = new OmronFinsClient(IpAddress, Port);
plc.Open(); _plc.Open();
} }
catch (Exception) catch (Exception)
{ {
return false; return false;
} }
return IsConnected; return IsConnected;
} }
@ -69,12 +58,11 @@ namespace DriverOmronFins
{ {
try try
{ {
plc?.Close(); _plc?.Close();
return !IsConnected; return !IsConnected;
} }
catch (Exception) catch (Exception)
{ {
return false; return false;
} }
} }
@ -83,11 +71,10 @@ namespace DriverOmronFins
{ {
try try
{ {
plc = null; _plc = null;
} }
catch (Exception) catch (Exception)
{ {
} }
} }
@ -96,61 +83,62 @@ namespace DriverOmronFins
{ {
var ret = new DriverReturnValueModel { StatusType = VaribaleStatusTypeEnum.Good }; var ret = new DriverReturnValueModel { StatusType = VaribaleStatusTypeEnum.Good };
if (plc != null && this.IsConnected) if (_plc != null && this.IsConnected)
{ {
try try
{ {
switch (ioarg.ValueType) switch (ioarg.ValueType)
{ {
case PluginInterface.DataTypeEnum.Bit: case DataTypeEnum.Bit:
ret.Value = plc.ReadBoolean(ioarg.Address).Value == true ? 1 : 0; ret.Value = _plc.ReadBoolean(ioarg.Address).Value == true ? 1 : 0;
break; break;
case PluginInterface.DataTypeEnum.Bool: case DataTypeEnum.Bool:
ret.Value = plc.ReadBoolean(ioarg.Address).Value; ret.Value = _plc.ReadBoolean(ioarg.Address).Value;
break; break;
case PluginInterface.DataTypeEnum.UByte: case DataTypeEnum.UByte:
ret.Value = plc.ReadByte(ioarg.Address).Value; ret.Value = _plc.ReadByte(ioarg.Address).Value;
break; break;
case PluginInterface.DataTypeEnum.Byte: case DataTypeEnum.Byte:
ret.Value = (sbyte)plc.ReadByte(ioarg.Address).Value; ret.Value = (sbyte)_plc.ReadByte(ioarg.Address).Value;
break; break;
case PluginInterface.DataTypeEnum.Uint16: case DataTypeEnum.Uint16:
ret.Value =plc.ReadUInt16(ioarg.Address).Value; ret.Value = _plc.ReadUInt16(ioarg.Address).Value;
break; break;
case PluginInterface.DataTypeEnum.Int16: case DataTypeEnum.Int16:
ret.Value = plc.ReadInt16(ioarg.Address).Value; ret.Value = _plc.ReadInt16(ioarg.Address).Value;
break; break;
case PluginInterface.DataTypeEnum.Uint32: case DataTypeEnum.Uint32:
ret.Value =plc.ReadUInt32(ioarg.Address).Value; ret.Value = _plc.ReadUInt32(ioarg.Address).Value;
break; break;
case PluginInterface.DataTypeEnum.Int32: case DataTypeEnum.Int32:
ret.Value = plc.ReadInt32(ioarg.Address).Value; ret.Value = _plc.ReadInt32(ioarg.Address).Value;
break; break;
case PluginInterface.DataTypeEnum.Float: case DataTypeEnum.Float:
ret.Value = plc.ReadFloat(ioarg.Address).Value; ret.Value = _plc.ReadFloat(ioarg.Address).Value;
break; break;
case PluginInterface.DataTypeEnum.Double: case DataTypeEnum.Double:
ret.Value = plc.ReadDouble(ioarg.Address).Value; ret.Value = _plc.ReadDouble(ioarg.Address).Value;
break; break;
case PluginInterface.DataTypeEnum.Uint64: case DataTypeEnum.Uint64:
ret.Value = plc.ReadUInt64(ioarg.Address).Value; ret.Value = _plc.ReadUInt64(ioarg.Address).Value;
break; break;
case PluginInterface.DataTypeEnum.Int64: case DataTypeEnum.Int64:
ret.Value = plc.ReadInt64(ioarg.Address).Value; ret.Value = _plc.ReadInt64(ioarg.Address).Value;
break; break;
case PluginInterface.DataTypeEnum.AsciiString: case DataTypeEnum.AsciiString:
ret.Value = plc.ReadString(ioarg.Address); ret.Value = _plc.ReadString(ioarg.Address);
break; break;
case PluginInterface.DataTypeEnum.Utf8String: case DataTypeEnum.Utf8String:
ret.Value = plc.ReadString(ioarg.Address); ret.Value = _plc.ReadString(ioarg.Address);
break; break;
default: default:
ret.StatusType = VaribaleStatusTypeEnum.Bad;
ret.Message = $"读取失败,不支持的类型:{ioarg.ValueType}";
break; break;
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
ret.StatusType = VaribaleStatusTypeEnum.Bad; ret.StatusType = VaribaleStatusTypeEnum.Bad;
ret.Message = $"读取失败,{ex.Message}"; ret.Message = $"读取失败,{ex.Message}";
} }
@ -160,9 +148,11 @@ namespace DriverOmronFins
ret.StatusType = VaribaleStatusTypeEnum.Bad; ret.StatusType = VaribaleStatusTypeEnum.Bad;
ret.Message = "连接失败"; ret.Message = "连接失败";
} }
return ret; return ret;
} }
public async Task<RpcResponse> WriteAsync(string RequestId, string Method, DriverAddressIoArgModel Ioarg)
public async Task<RpcResponse> WriteAsync(string requestId, string method, DriverAddressIoArgModel ioarg)
{ {
RpcResponse rpcResponse = new() { IsSuccess = false, Description = "设备驱动内未实现写入功能" }; RpcResponse rpcResponse = new() { IsSuccess = false, Description = "设备驱动内未实现写入功能" };
return rpcResponse; return rpcResponse;