feat: 完成基本的Jpeg控制
This commit is contained in:
parent
58378851bb
commit
771f5e8e9f
|
@ -170,7 +170,7 @@ public class DebuggerClient
|
||||||
/// <returns>操作结果,成功返回状态标志字节,失败返回错误信息</returns>
|
/// <returns>操作结果,成功返回状态标志字节,失败返回错误信息</returns>
|
||||||
public async ValueTask<Result<byte>> ReadFlag()
|
public async ValueTask<Result<byte>> ReadFlag()
|
||||||
{
|
{
|
||||||
var ret = await UDPClientPool.ReadAddr(this.ep, this.taskID, DebuggerAddr.Signal, this.timeout);
|
var ret = await UDPClientPool.ReadAddrByte(this.ep, this.taskID, DebuggerAddr.Signal, this.timeout);
|
||||||
if (!ret.IsSuccessful)
|
if (!ret.IsSuccessful)
|
||||||
{
|
{
|
||||||
logger.Error($"Failed to read flag: {ret.Error}");
|
logger.Error($"Failed to read flag: {ret.Error}");
|
||||||
|
|
|
@ -296,7 +296,7 @@ public class I2c
|
||||||
|
|
||||||
// 读取数据
|
// 读取数据
|
||||||
{
|
{
|
||||||
var ret = await UDPClientPool.ReadAddr(this.ep, this.taskID, I2cAddr.Read);
|
var ret = await UDPClientPool.ReadAddrByte(this.ep, this.taskID, I2cAddr.Read);
|
||||||
if (!ret.IsSuccessful)
|
if (!ret.IsSuccessful)
|
||||||
{
|
{
|
||||||
logger.Error($"Failed to read data from I2C FIFO: {ret.Error}");
|
logger.Error($"Failed to read data from I2C FIFO: {ret.Error}");
|
||||||
|
|
|
@ -0,0 +1,281 @@
|
||||||
|
using System.Net;
|
||||||
|
using DotNext;
|
||||||
|
using Common;
|
||||||
|
|
||||||
|
namespace Peripherals.JpegClient;
|
||||||
|
|
||||||
|
static class JpegAddr
|
||||||
|
{
|
||||||
|
const UInt32 BASE = 0x0000_0000;
|
||||||
|
public const UInt32 ENABLE = BASE + 0x0;
|
||||||
|
public const UInt32 FRAME_NUM = BASE + 0x1;
|
||||||
|
public const UInt32 FRAME_INFO = BASE + 0x2;
|
||||||
|
public const UInt32 FRAME_SAMPLE_RATE = BASE + 0x3;
|
||||||
|
public const UInt32 FRAME_DATA_MAX_POINTER = BASE + 0x4;
|
||||||
|
|
||||||
|
public const UInt32 DDR_FRAME_DATA_ADDR = 0x0000_0000;
|
||||||
|
public const UInt32 DDR_FRAME_DATA_MAX_ADDR = 0x8000_0000;
|
||||||
|
}
|
||||||
|
|
||||||
|
public class JpegInfo
|
||||||
|
{
|
||||||
|
public UInt32 Width { get; set; }
|
||||||
|
public UInt32 Height { get; set; }
|
||||||
|
public UInt32 Size { get; set; }
|
||||||
|
|
||||||
|
public JpegInfo(UInt32 width, UInt32 height, UInt32 size)
|
||||||
|
{
|
||||||
|
Width = width;
|
||||||
|
Height = height;
|
||||||
|
Size = size;
|
||||||
|
}
|
||||||
|
|
||||||
|
public JpegInfo(byte[] data)
|
||||||
|
{
|
||||||
|
if (data.Length < 8)
|
||||||
|
throw new ArgumentException("Invalid data length", nameof(data));
|
||||||
|
|
||||||
|
Width = ((UInt32)(data[5] << 8 + data[6] & 0xF0));
|
||||||
|
Height = ((UInt32)((data[6] & 0x0F) << 4 + data[7]));
|
||||||
|
Size = Number.BytesToUInt32(data, 0, 4).Value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public enum JpegSampleRate : UInt32
|
||||||
|
{
|
||||||
|
RATE_1_1 = 0b1111_1111_1111_1111_1111_1111_1111_1111,
|
||||||
|
RATE_1_2 = 0b1010_1010_1010_1010_1010_1010_1010_1010,
|
||||||
|
RATE_1_4 = 0b1000_1000_1000_1000_1000_1000_1000_1000,
|
||||||
|
RATE_3_4 = 0b1110_1110_1110_1110_1110_1110_1110_1110,
|
||||||
|
RATE_1_8 = 0b1000_0000_1000_0000_1000_0000_1000_0000,
|
||||||
|
RATE_3_8 = 0b1001_0010_0100_1001_1001_0010_0100_1001,
|
||||||
|
RATE_7_8 = 0b1111_1110_1111_1110_1111_1110_1111_1110,
|
||||||
|
RATE_1_16 = 0b1000_0000_0000_0000_1000_0000_0000_0000,
|
||||||
|
RATE_3_16 = 0b1000_0100_0010_0000_1000_0100_0010_0000,
|
||||||
|
RATE_5_16 = 0b1001_0001_0010_0010_0100_0100_1000_1001,
|
||||||
|
RATE_15_16 = 0b1111_1111_1111_1110_1111_1111_1111_1110,
|
||||||
|
RATE_1_32 = 0b1000_0000_0000_0000_0000_0000_0000_0000,
|
||||||
|
RATE_31_32 = 0b1111_1111_1111_1111_1111_1111_1111_1110,
|
||||||
|
}
|
||||||
|
|
||||||
|
public class Jpeg
|
||||||
|
{
|
||||||
|
private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
|
|
||||||
|
readonly int timeout = 2000;
|
||||||
|
readonly int taskID;
|
||||||
|
readonly int port;
|
||||||
|
readonly string address;
|
||||||
|
private IPEndPoint ep;
|
||||||
|
|
||||||
|
public Jpeg(string address, int port, int taskID, int timeout = 2000)
|
||||||
|
{
|
||||||
|
if (timeout < 0)
|
||||||
|
throw new ArgumentException("Timeout couldn't be negative", nameof(timeout));
|
||||||
|
this.address = address;
|
||||||
|
this.taskID = taskID;
|
||||||
|
this.port = port;
|
||||||
|
this.ep = new IPEndPoint(IPAddress.Parse(address), port);
|
||||||
|
this.timeout = timeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<bool> SetEnable(bool enable)
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddr(
|
||||||
|
this.ep, this.taskID, JpegAddr.ENABLE, Convert.ToUInt32(enable), this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set JPEG enable: {ret.Error}");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return ret.Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<bool> SetSampleRate(uint rate)
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddr(
|
||||||
|
this.ep, this.taskID, JpegAddr.FRAME_SAMPLE_RATE, rate, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to set JPEG sample rate: {ret.Error}");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return ret.Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<bool> SetSampleRate(JpegSampleRate rate)
|
||||||
|
{
|
||||||
|
return await SetSampleRate((uint)rate);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<uint> GetFrameNumber()
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.ReadAddrByte(
|
||||||
|
this.ep, this.taskID, JpegAddr.FRAME_NUM, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to get JPEG frame number: {ret.Error}");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
return Number.BytesToUInt32(ret.Value.Options.Data ?? Array.Empty<byte>()).Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Optional<List<JpegInfo>>> GetFrameInfo(int num)
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.ReadAddr(this.ep, this.taskID, JpegAddr.FRAME_INFO, num, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to get JPEG frame info: {ret.Error}");
|
||||||
|
return new(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
var data = ret.Value.Options.Data;
|
||||||
|
if (data == null || data.Length == 0)
|
||||||
|
{
|
||||||
|
logger.Error($"Data is null or empty");
|
||||||
|
return new(null);
|
||||||
|
}
|
||||||
|
if (data.Length != num * 2)
|
||||||
|
{
|
||||||
|
logger.Error(
|
||||||
|
$"Data length should be {num * 2} bytes, instead of {data.Length} bytes");
|
||||||
|
return new(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
var infos = new List<JpegInfo>();
|
||||||
|
for (int i = 0; i < num; i++)
|
||||||
|
{
|
||||||
|
infos.Add(new JpegInfo(data[i..(i + 1)]));
|
||||||
|
}
|
||||||
|
return new(infos);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<bool> UpdatePointer(uint cnt)
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.WriteAddr(
|
||||||
|
this.ep, this.taskID, JpegAddr.FRAME_DATA_MAX_POINTER, cnt, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to update pointer: {ret.Error}");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return ret.Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<byte[]?>> GetFrame(uint offset, uint length)
|
||||||
|
{
|
||||||
|
if (!MsgBus.IsRunning)
|
||||||
|
{
|
||||||
|
logger.Error("Message bus is not running");
|
||||||
|
return new(new Exception("Message bus is not running"));
|
||||||
|
}
|
||||||
|
MsgBus.UDPServer.ClearUDPData(this.ep.Address.ToString(), this.ep.Port);
|
||||||
|
|
||||||
|
var firstReadLength = (int)(Math.Min(length, JpegAddr.DDR_FRAME_DATA_MAX_ADDR - offset));
|
||||||
|
var secondReadLength = (int)(length - firstReadLength);
|
||||||
|
var dataBytes = new byte[length];
|
||||||
|
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.ReadAddr4Bytes(
|
||||||
|
this.ep, this.taskID, JpegAddr.DDR_FRAME_DATA_ADDR + offset, firstReadLength, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to get JPEG frame data: {ret.Error}");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
if (ret.Value.Length != firstReadLength)
|
||||||
|
{
|
||||||
|
logger.Error($"Data length should be {firstReadLength} bytes, instead of {ret.Value.Length} bytes");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
Buffer.BlockCopy(ret.Value, 0, dataBytes, 0, firstReadLength);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (secondReadLength > 0)
|
||||||
|
{
|
||||||
|
var ret = await UDPClientPool.ReadAddr4Bytes(
|
||||||
|
this.ep, this.taskID, JpegAddr.DDR_FRAME_DATA_ADDR, secondReadLength, this.timeout);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to get JPEG frame data: {ret.Error}");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
if (ret.Value.Length != secondReadLength)
|
||||||
|
{
|
||||||
|
logger.Error($"Data length should be {secondReadLength} bytes, instead of {ret.Value.Length} bytes");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
Buffer.BlockCopy(ret.Value, 0, dataBytes, firstReadLength, secondReadLength);
|
||||||
|
}
|
||||||
|
|
||||||
|
return dataBytes;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<List<byte[]>> GetMultiFrames(uint offset, uint[] sizes)
|
||||||
|
{
|
||||||
|
var frames = new List<byte[]>();
|
||||||
|
for (int i = 0; i < sizes.Length; i++)
|
||||||
|
{
|
||||||
|
var ret = await GetFrame(offset, sizes[i]);
|
||||||
|
if (!ret.IsSuccessful)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to get JPEG frame {i} data: {ret.Error}");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (ret.Value == null)
|
||||||
|
{
|
||||||
|
logger.Error($"Frame {i} data is null");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (ret.Value.Length != sizes[i])
|
||||||
|
{
|
||||||
|
logger.Error(
|
||||||
|
$"Frame {i} data length should be {sizes[i]} bytes, instead of {ret.Value.Length} bytes");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
frames.Add(ret.Value);
|
||||||
|
offset += sizes[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
var ret = await UpdatePointer((uint)sizes.Length);
|
||||||
|
if (!ret) logger.Error($"Failed to update pointer");
|
||||||
|
}
|
||||||
|
|
||||||
|
return frames;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<Result<List<byte[]>?>> GetMultiFrames(uint offset)
|
||||||
|
{
|
||||||
|
if (!MsgBus.IsRunning)
|
||||||
|
{
|
||||||
|
logger.Error("Message bus is not running");
|
||||||
|
return new(new Exception("Message bus is not running"));
|
||||||
|
}
|
||||||
|
MsgBus.UDPServer.ClearUDPData(this.ep.Address.ToString(), this.ep.Port);
|
||||||
|
|
||||||
|
var frameNum = await GetFrameNumber();
|
||||||
|
if (frameNum == 0) return null;
|
||||||
|
|
||||||
|
List<uint>? frameSizes = null;
|
||||||
|
{
|
||||||
|
var ret = await GetFrameInfo((int)frameNum);
|
||||||
|
if (!ret.HasValue || ret.Value.Count == 0)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to get frame info");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
frameSizes = ret.Value.Select(x => x.Size).ToList();
|
||||||
|
}
|
||||||
|
|
||||||
|
var frames = await GetMultiFrames(offset, frameSizes.ToArray());
|
||||||
|
if (frames.Count == 0)
|
||||||
|
{
|
||||||
|
logger.Error($"Failed to get frames");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return frames;
|
||||||
|
}
|
||||||
|
}
|
|
@ -366,7 +366,7 @@ public class Analyzer
|
||||||
/// <returns>操作结果,成功返回寄存器值,否则返回异常信息</returns>
|
/// <returns>操作结果,成功返回寄存器值,否则返回异常信息</returns>
|
||||||
public async ValueTask<Result<CaptureStatus>> ReadCaptureStatus()
|
public async ValueTask<Result<CaptureStatus>> ReadCaptureStatus()
|
||||||
{
|
{
|
||||||
var ret = await UDPClientPool.ReadAddr(this.ep, this.taskID, AnalyzerAddr.CAPTURE_MODE, this.timeout);
|
var ret = await UDPClientPool.ReadAddrByte(this.ep, this.taskID, AnalyzerAddr.CAPTURE_MODE, this.timeout);
|
||||||
if (!ret.IsSuccessful)
|
if (!ret.IsSuccessful)
|
||||||
{
|
{
|
||||||
logger.Error($"Failed to read capture status: {ret.Error}");
|
logger.Error($"Failed to read capture status: {ret.Error}");
|
||||||
|
|
|
@ -232,7 +232,7 @@ class Oscilloscope
|
||||||
/// <returns>操作结果,成功返回采样频率值,否则返回异常信息</returns>
|
/// <returns>操作结果,成功返回采样频率值,否则返回异常信息</returns>
|
||||||
public async ValueTask<Result<UInt32>> GetADFrequency()
|
public async ValueTask<Result<UInt32>> GetADFrequency()
|
||||||
{
|
{
|
||||||
var ret = await UDPClientPool.ReadAddr(this.ep, this.taskID, OscilloscopeAddr.AD_FREQ, this.timeout);
|
var ret = await UDPClientPool.ReadAddrByte(this.ep, this.taskID, OscilloscopeAddr.AD_FREQ, this.timeout);
|
||||||
if (!ret.IsSuccessful)
|
if (!ret.IsSuccessful)
|
||||||
{
|
{
|
||||||
logger.Error($"Failed to read AD frequency: {ret.Error}");
|
logger.Error($"Failed to read AD frequency: {ret.Error}");
|
||||||
|
@ -255,7 +255,7 @@ class Oscilloscope
|
||||||
/// <returns>操作结果,成功返回采样幅度值,否则返回异常信息</returns>
|
/// <returns>操作结果,成功返回采样幅度值,否则返回异常信息</returns>
|
||||||
public async ValueTask<Result<byte>> GetADVpp()
|
public async ValueTask<Result<byte>> GetADVpp()
|
||||||
{
|
{
|
||||||
var ret = await UDPClientPool.ReadAddr(this.ep, this.taskID, OscilloscopeAddr.AD_VPP, this.timeout);
|
var ret = await UDPClientPool.ReadAddrByte(this.ep, this.taskID, OscilloscopeAddr.AD_VPP, this.timeout);
|
||||||
if (!ret.IsSuccessful)
|
if (!ret.IsSuccessful)
|
||||||
{
|
{
|
||||||
logger.Error($"Failed to read AD VPP: {ret.Error}");
|
logger.Error($"Failed to read AD VPP: {ret.Error}");
|
||||||
|
@ -275,7 +275,7 @@ class Oscilloscope
|
||||||
/// <returns>操作结果,成功返回采样最大值,否则返回异常信息</returns>
|
/// <returns>操作结果,成功返回采样最大值,否则返回异常信息</returns>
|
||||||
public async ValueTask<Result<byte>> GetADMax()
|
public async ValueTask<Result<byte>> GetADMax()
|
||||||
{
|
{
|
||||||
var ret = await UDPClientPool.ReadAddr(this.ep, this.taskID, OscilloscopeAddr.AD_MAX, this.timeout);
|
var ret = await UDPClientPool.ReadAddrByte(this.ep, this.taskID, OscilloscopeAddr.AD_MAX, this.timeout);
|
||||||
if (!ret.IsSuccessful)
|
if (!ret.IsSuccessful)
|
||||||
{
|
{
|
||||||
logger.Error($"Failed to read AD max: {ret.Error}");
|
logger.Error($"Failed to read AD max: {ret.Error}");
|
||||||
|
@ -295,7 +295,7 @@ class Oscilloscope
|
||||||
/// <returns>操作结果,成功返回采样最小值,否则返回异常信息</returns>
|
/// <returns>操作结果,成功返回采样最小值,否则返回异常信息</returns>
|
||||||
public async ValueTask<Result<byte>> GetADMin()
|
public async ValueTask<Result<byte>> GetADMin()
|
||||||
{
|
{
|
||||||
var ret = await UDPClientPool.ReadAddr(this.ep, this.taskID, OscilloscopeAddr.AD_MIN, this.timeout);
|
var ret = await UDPClientPool.ReadAddrByte(this.ep, this.taskID, OscilloscopeAddr.AD_MIN, this.timeout);
|
||||||
if (!ret.IsSuccessful)
|
if (!ret.IsSuccessful)
|
||||||
{
|
{
|
||||||
logger.Error($"Failed to read AD min: {ret.Error}");
|
logger.Error($"Failed to read AD min: {ret.Error}");
|
||||||
|
|
|
@ -339,7 +339,7 @@ public class RemoteUpdater
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
var ret = await UDPClientPool.ReadAddr(this.ep, 0, RemoteUpdaterAddr.ReadCRC, this.timeout);
|
var ret = await UDPClientPool.ReadAddrByte(this.ep, 0, RemoteUpdaterAddr.ReadCRC, this.timeout);
|
||||||
if (!ret.IsSuccessful) return new(ret.Error);
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
|
|
||||||
var bytes = ret.Value.Options.Data;
|
var bytes = ret.Value.Options.Data;
|
||||||
|
@ -543,7 +543,7 @@ public class RemoteUpdater
|
||||||
logger.Trace("Clear udp data finished");
|
logger.Trace("Clear udp data finished");
|
||||||
|
|
||||||
{
|
{
|
||||||
var ret = await UDPClientPool.ReadAddr(this.ep, 0, RemoteUpdaterAddr.Version, this.timeout);
|
var ret = await UDPClientPool.ReadAddrByte(this.ep, 0, RemoteUpdaterAddr.Version, this.timeout);
|
||||||
if (!ret.IsSuccessful) return new(ret.Error);
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
|
|
||||||
var retData = ret.Value.Options.Data;
|
var retData = ret.Value.Options.Data;
|
||||||
|
|
|
@ -223,22 +223,28 @@ public class UDPClientPool
|
||||||
/// <param name="endPoint">IP端点(IP地址与端口)</param>
|
/// <param name="endPoint">IP端点(IP地址与端口)</param>
|
||||||
/// <param name="taskID">任务ID</param>
|
/// <param name="taskID">任务ID</param>
|
||||||
/// <param name="devAddr">设备地址</param>
|
/// <param name="devAddr">设备地址</param>
|
||||||
|
/// <param name="dataLength">数据长度(0~255)</param>
|
||||||
/// <param name="timeout">超时时间(毫秒)</param>
|
/// <param name="timeout">超时时间(毫秒)</param>
|
||||||
/// <returns>读取结果,包含接收到的数据包</returns>
|
/// <returns>读取结果,包含接收到的数据包</returns>
|
||||||
public static async ValueTask<Result<RecvDataPackage>> ReadAddr(
|
public static async ValueTask<Result<RecvDataPackage>> ReadAddr(
|
||||||
IPEndPoint endPoint, int taskID, uint devAddr, int timeout = 1000)
|
IPEndPoint endPoint, int taskID, uint devAddr, int dataLength, int timeout = 1000)
|
||||||
{
|
{
|
||||||
|
if (dataLength <= 0)
|
||||||
|
return new(new ArgumentException("Data length must be greater than 0"));
|
||||||
|
|
||||||
|
if (dataLength > 255)
|
||||||
|
return new(new ArgumentException("Data length must be less than or equal to 255"));
|
||||||
|
|
||||||
var ret = false;
|
var ret = false;
|
||||||
var opts = new SendAddrPackOptions()
|
var opts = new SendAddrPackOptions()
|
||||||
{
|
{
|
||||||
BurstType = BurstType.FixedBurst,
|
BurstType = BurstType.FixedBurst,
|
||||||
BurstLength = 0,
|
BurstLength = ((byte)(dataLength - 1)),
|
||||||
CommandID = Convert.ToByte(taskID),
|
CommandID = Convert.ToByte(taskID),
|
||||||
Address = devAddr,
|
Address = devAddr,
|
||||||
IsWrite = false,
|
IsWrite = false,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// Read Register
|
// Read Register
|
||||||
ret = await UDPClientPool.SendAddrPackAsync(endPoint, new SendAddrPackage(opts));
|
ret = await UDPClientPool.SendAddrPackAsync(endPoint, new SendAddrPackage(opts));
|
||||||
if (!ret) return new(new Exception("Send Address Package Failed!"));
|
if (!ret) return new(new Exception("Send Address Package Failed!"));
|
||||||
|
@ -260,6 +266,20 @@ public class UDPClientPool
|
||||||
return retPack;
|
return retPack;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 读取设备地址数据
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="endPoint">IP端点(IP地址与端口)</param>
|
||||||
|
/// <param name="taskID">任务ID</param>
|
||||||
|
/// <param name="devAddr">设备地址</param>
|
||||||
|
/// <param name="timeout">超时时间(毫秒)</param>
|
||||||
|
/// <returns>读取结果,包含接收到的数据包</returns>
|
||||||
|
public static async ValueTask<Result<RecvDataPackage>> ReadAddrByte(
|
||||||
|
IPEndPoint endPoint, int taskID, uint devAddr, int timeout = 1000)
|
||||||
|
{
|
||||||
|
return await ReadAddr(endPoint, taskID, devAddr, 0, timeout);
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 读取设备地址数据并校验结果
|
/// 读取设备地址数据并校验结果
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -275,7 +295,7 @@ public class UDPClientPool
|
||||||
{
|
{
|
||||||
var address = endPoint.Address.ToString();
|
var address = endPoint.Address.ToString();
|
||||||
|
|
||||||
var ret = await ReadAddr(endPoint, taskID, devAddr, timeout);
|
var ret = await ReadAddrByte(endPoint, taskID, devAddr, timeout);
|
||||||
if (!ret.IsSuccessful) return new(ret.Error);
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
if (!ret.Value.IsSuccessful)
|
if (!ret.Value.IsSuccessful)
|
||||||
return new(new Exception($"Read device {address} address {devAddr} failed"));
|
return new(new Exception($"Read device {address} address {devAddr} failed"));
|
||||||
|
@ -324,7 +344,7 @@ public class UDPClientPool
|
||||||
await Task.Delay(waittime);
|
await Task.Delay(waittime);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var ret = await ReadAddr(endPoint, taskID, devAddr, Convert.ToInt32(timeleft.TotalMilliseconds));
|
var ret = await ReadAddrByte(endPoint, taskID, devAddr, Convert.ToInt32(timeleft.TotalMilliseconds));
|
||||||
if (!ret.IsSuccessful) return new(ret.Error);
|
if (!ret.IsSuccessful) return new(ret.Error);
|
||||||
if (!ret.Value.IsSuccessful)
|
if (!ret.Value.IsSuccessful)
|
||||||
return new(new Exception($"Read device {address} address {devAddr} failed"));
|
return new(new Exception($"Read device {address} address {devAddr} failed"));
|
||||||
|
@ -555,7 +575,7 @@ public class UDPClientPool
|
||||||
var resultData = new List<byte>();
|
var resultData = new List<byte>();
|
||||||
for (int i = 0; i < length; i++)
|
for (int i = 0; i < length; i++)
|
||||||
{
|
{
|
||||||
var ret = await ReadAddr(endPoint, taskID, addr[i], timeout);
|
var ret = await ReadAddrByte(endPoint, taskID, addr[i], timeout);
|
||||||
if (!ret.IsSuccessful)
|
if (!ret.IsSuccessful)
|
||||||
{
|
{
|
||||||
logger.Error($"ReadAddrSeq failed at index {i}: {ret.Error}");
|
logger.Error($"ReadAddrSeq failed at index {i}: {ret.Error}");
|
||||||
|
|
Loading…
Reference in New Issue