SikongJueluo/FPGA_WebLab
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add: 添加前端对焦交互逻辑

Browse Source
This commit is contained in:
alivender
2025-07-15 20:04:16 +08:00
parent 474151d412
commit 0f850c3ae7
6 changed files with 4455 additions and 4169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
server/src/Controllers/VideoStreamController.cs
View File

@@ -447,4 +447,61 @@ public class VideoStreamController : ControllerBase
return TypedResults.InternalServerError($"执行自动对焦失败: {ex.Message}");
}
}
/// <summary>
/// 执行一次自动对焦 (GET方式)
/// </summary>
/// <returns>对焦结果</returns>
[HttpGet("Focus")]
[EnableCors("Users")]
[ProducesResponseType(typeof(object), StatusCodes.Status200OK)]
[ProducesResponseType(typeof(object), StatusCodes.Status400BadRequest)]
[ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)]
public async Task<IResult> Focus()
{
try
{
logger.Info("收到执行一次对焦请求 (GET)");
// 检查摄像头是否已配置
if (!_videoStreamService.IsCameraConfigured())
{
logger.Warn("摄像头未配置，无法执行对焦");
return TypedResults.BadRequest(new
{
success = false,
message = "摄像头未配置，请先配置摄像头连接",
timestamp = DateTime.Now
});
}
var result = await _videoStreamService.PerformAutoFocusAsync();
if (result)
{
logger.Info("对焦执行成功");
return TypedResults.Ok(new
{
success = true,
message = "对焦执行成功",
timestamp = DateTime.Now
});
}
else
{
logger.Warn("对焦执行失败");
return TypedResults.BadRequest(new
{
success = false,
message = "对焦执行失败",
timestamp = DateTime.Now
});
}
}
catch (Exception ex)
{
logger.Error(ex, "执行对焦时发生异常");
return TypedResults.InternalServerError($"执行对焦失败: {ex.Message}");
}
}
}

25
server/src/Peripherals/CameraClient.cs
View File

@@ -213,8 +213,7 @@ class Camera
/// <returns>包含图像数据的字节数组</returns>
public async ValueTask<Result<byte[]>> ReadFrame()
{
// 只在第一次或出错时清除UDP缓冲区，避免每帧都清除造成延迟
// await MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
logger.Trace($"Reading frame from camera {this.address}");
@@ -303,7 +302,13 @@ class Camera
return true;
}
public async ValueTask<Result<byte>> ReadRegisters(UInt16 register)
/// <summary>
/// 读取I2C寄存器字节值
/// </summary>
/// <param name="register">要读取的寄存器地址 (16位)</param>
/// <returns>ret</returns>
public async ValueTask<Result<byte>> ReadRegister(UInt16 register)
{
var i2c = new Peripherals.I2cClient.I2c(this.address, this.port, this.taskID, this.timeout);
@@ -1218,18 +1223,22 @@ class Camera
{
logger.Info("开始写入OV5640自动对焦固件");
MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
var setStartAddrResult = await ConfigureRegisters([[0x3000, 0x80]]);
if (!setStartAddrResult.IsSuccessful) return setStartAddrResult;
// 组装固件写入命令：地址 + 所有固件数据
UInt16 firmwareAddr = 0x8000;
var firmwareCommands = new List<UInt16[]>();
var firmwareCommand = new UInt16[1 + OV5640_AF_FIRMWARE.Length];
firmwareCommand[0] = firmwareAddr;
// 将固件数据复制到命令数组中
for (int i = 0; i < OV5640_AF_FIRMWARE.Length; i++)
{
UInt16 addr = (UInt16)(firmwareAddr + i);
firmwareCommands.Add([addr, OV5640_AF_FIRMWARE[i]]);
firmwareCommand[i + 1] = OV5640_AF_FIRMWARE[i];
}
var result = await ConfigureRegisters(firmwareCommands.ToArray());
var result = await ConfigureRegisters([firmwareCommand]);
if (!result.IsSuccessful)
{
logger.Error($"固件写入失败: {result.Error}");
@@ -1324,7 +1333,7 @@ class Camera
// 步骤2: 读取寄存器 0x3029 的状态，如果返回值为 0x10，代表对焦已完成
for (int iteration = 5000; iteration > 0; iteration--)
{
var readResult = await ReadRegisters(0x3029);
var readResult = await ReadRegister(0x3029);
if (!readResult.IsSuccessful)
{
logger.Error($"读取对焦状态寄存器(0x3029)失败: {readResult.Error}");

10
server/src/UdpClientPool.cs
View File

@@ -91,9 +91,9 @@ public class UDPClientPool
var sendLen = socket.SendTo(sendBytes, endPoint);
socket.Close();
// logger.Debug($"UDP socket send address package to device {endPoint.Address.ToString()}:{endPoint.Port.ToString()}:");
// logger.Debug($" Original Data: {BitConverter.ToString(pkg.ToBytes()).Replace("-", " ")}");
// logger.Debug($" Decoded Data: {pkg.ToString()}");
logger.Debug($"UDP socket send address package to device {endPoint.Address.ToString()}:{endPoint.Port.ToString()}:");
logger.Debug($" Original Data: {BitConverter.ToString(pkg.ToBytes()).Replace("-", " ")}");
logger.Debug($" Decoded Data: {pkg.ToString()}");
if (sendLen == sendBytes.Length) { return true; }
else { return false; }
@@ -164,8 +164,8 @@ public class UDPClientPool
var sendLen = socket.SendTo(sendBytes, endPoint);
socket.Close();
// logger.Debug($"UDP socket send data package to device {endPoint.Address.ToString()}:{endPoint.Port.ToString()}:");
// logger.Debug($" Original Data: {BitConverter.ToString(pkg.ToBytes()).Replace("-", " ")}");
logger.Debug($"UDP socket send data package to device {endPoint.Address.ToString()}:{endPoint.Port.ToString()}:");
logger.Debug($" Original Data: {BitConverter.ToString(pkg.ToBytes()).Replace("-", " ")}");
if (sendLen == sendBytes.Length) { return true; }
else { return false; }