release:6.0.3.6

This commit is contained in:
Diego
2024-06-13 10:23:36 +08:00
parent 97e7d44310
commit 905362c59c
5 changed files with 30 additions and 4 deletions

View File

@@ -466,4 +466,18 @@ public interface IProtocol : IDisposable
/// <param name="address">变量地址</param>
/// <returns></returns>
bool BitReverse(string address);
/// <summary>
/// 断开连接
/// </summary>
/// <param name="msg"></param>
/// <returns></returns>
Task Close(string msg = null);
/// <summary>
/// 连接
/// </summary>
/// <param name="cancellationToken"></param>
/// <returns></returns>
Task ConnectAsync(CancellationToken cancellationToken = default);
}

View File

@@ -204,6 +204,18 @@ public abstract class ProtocolBase : DisposableObject, IProtocol
#region
/// <inheritdoc/>
public Task ConnectAsync(CancellationToken cancellationToken=default)
{
return Channel.ConnectAsync(ConnectTimeout, cancellationToken);
}
/// <inheritdoc/>
public Task Close(string msg=default)
{
return Channel.CloseAsync(msg);
}
/// <summary>
/// 接收,非主动发送的情况,重写实现非主从并发通讯协议
/// </summary>

View File

@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Version>6.0.3.5</Version>
<Version>6.0.3.6</Version>
</PropertyGroup>
<ItemGroup>

View File

@@ -17,8 +17,8 @@ internal class ModbusMasterTest
{
private static ModbusMaster GetMaster()
{
var clientConfig = new TouchSocketConfig();
ConsoleLogger.Default.LogLevel = LogLevel.Trace;
var clientConfig = new TouchSocketConfig();
clientConfig.ConfigureContainer(a => a.AddConsoleLogger());
//创建通道也可以通过TouchSocketConfig.GetChannel扩展获取
//var clientChannel = clientConfig.GetTcpServiceWithBindIPHost("tcp://127.0.0.1:502");
@@ -38,7 +38,7 @@ internal class ModbusMasterTest
{
using ModbusMaster modbusMaster = GetMaster();
//modbusMaster.HeartbeatHexString = "ccccdddd";//心跳
await modbusMaster.Channel.ConnectAsync();
await modbusMaster.ConnectAsync();
//Console.WriteLine("回车后读取注册包为abcd的客户端");
Console.ReadLine();
var data = await modbusMaster.ReadInt16Async("40001;id=abcd");//寄存器;{id=注册包}

View File

@@ -6,7 +6,7 @@
<OutputType>Exe</OutputType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ThingsGateway.Foundation.Variable" Version="8.1" />
<PackageReference Include="ThingsGateway.Foundation.Variable" Version="8.2.0" />
</ItemGroup>