g82tt/ThingsGateway
1
0
Fork 0
mirror of https://gitee.com/ThingsGateway/ThingsGateway.git synced 2025-10-29 06:33:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 转换器实例初始化方法

Browse Source
This commit is contained in:
Diego
2025-02-14 16:23:00 +08:00
parent 4faf41e482
commit 783f878947
8 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Directory.Build.props
View File

@@ -1,8 +1,8 @@
<Project>
<PropertyGroup>
<PluginVersion>10.0.1.4</PluginVersion>
<ProPluginVersion>10.0.1.4</ProPluginVersion>
<PluginVersion>10.0.1.5</PluginVersion>
<ProPluginVersion>10.0.1.5</ProPluginVersion>
</PropertyGroup>
<PropertyGroup>

2
src/Foundation/ThingsGateway.Foundation/Device/DeviceBase.cs
View File

@@ -874,7 +874,7 @@ public abstract class DeviceBase : DisposableObject, IDevice
try
{
//只关闭，不释放
Channel.SafeClose();
_ = Channel.CloseAsync();
if (Channel is IClientChannel client)
{
client.WaitHandlePool.SafeDispose();

1
src/Gateway/ThingsGateway.Gateway.Application/Entity/Device.cs
View File

@@ -118,6 +118,7 @@ public class Device : BaseDataEntity, IValidatableObject
/// </summary>
[SugarColumn(ColumnDescription = "冗余扫描间隔")]
[AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true)]
[MinValue(30000)]
public virtual int RedundantScanIntervalTime { get; set; } = 30000;
/// <summary>

2
src/Plugin/ThingsGateway.Foundation.Dlt645/Dlt645/Dlt645_2007Master.cs
View File

@@ -21,10 +21,10 @@ public class Dlt645_2007Master : DeviceBase, IDtu
public override void InitChannel(IChannel channel, ILog? deviceLog = null)
{
base.InitChannel(channel, deviceLog);
ThingsGatewayBitConverter = new Dlt645_2007BitConverter(EndianType.Big);
RegisterByteLength = 2;
channel.MaxSign = ushort.MaxValue;
}
public override IThingsGatewayBitConverter ThingsGatewayBitConverter { get; protected set; } = new Dlt645_2007BitConverter(EndianType.Big) { };
/// <summary>
/// 客户端连接滑动过期时间(TCP服务通道时)

2
src/Plugin/ThingsGateway.Foundation.Modbus/Master/ModbusMaster.cs
View File

@@ -18,10 +18,10 @@ public partial class ModbusMaster : DeviceBase, IDtu
{
base.InitChannel(channel, deviceLog);
ThingsGatewayBitConverter = new ThingsGatewayBitConverter(EndianType.Big);
RegisterByteLength = 2;
channel.MaxSign = ushort.MaxValue;
}
public override IThingsGatewayBitConverter ThingsGatewayBitConverter { get; protected set; } = new ThingsGatewayBitConverter(EndianType.Big) { };
/// <summary>
/// 客户端连接滑动过期时间(TCP服务通道时)

2
src/Plugin/ThingsGateway.Foundation.Modbus/Slave/ModbusSlave.cs
View File

@@ -48,10 +48,10 @@ public class ModbusSlave : DeviceBase, ITcpService, IDtuClient
public override void InitChannel(IChannel channel, ILog? deviceLog = null)
{
base.InitChannel(channel, deviceLog);
ThingsGatewayBitConverter = new ThingsGatewayBitConverter(EndianType.Big);
RegisterByteLength = 2;
channel.MaxSign = ushort.MaxValue;
}
public override IThingsGatewayBitConverter ThingsGatewayBitConverter { get; protected set; } = new ThingsGatewayBitConverter(EndianType.Big) { };
public override bool SupportMultipleDevice()
{

2
src/Plugin/ThingsGateway.Foundation.SiemensS7/S7/SiemensS7Master.cs
View File

@@ -24,9 +24,9 @@ public partial class SiemensS7Master : DeviceBase
base.InitChannel(channel, deviceLog);
RegisterByteLength = 1;
ThingsGatewayBitConverter = new S7BitConverter(EndianType.Big);
}
public override IThingsGatewayBitConverter ThingsGatewayBitConverter { get; protected set; } = new S7BitConverter(EndianType.Big) { };
/// <summary>
/// PduLength

2
src/Version.props
View File

@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Version>10.0.1.4</Version>
<Version>10.0.1.5</Version>
</PropertyGroup>
<ItemGroup>