Merge branch 'master' of ssh://git.swordlost.top:222/SikongJueluo/FPGA_WebLab

server/src/Controllers/DebuggerController.cs

@@ -246,46 +246,6 @@ public class DebuggerController : ControllerBase
         }
     }
 
-    /// <summary>
-    /// 重新开始触发（刷新后再启动触发器）
-    /// </summary>
-    [HttpPost("RestartTrigger")]
-    [EnableCors("Users")]
-    [ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-    [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-    public async Task<IActionResult> RestartTrigger()
-    {
-        try
-        {
-            var debugger = GetDebugger();
-            if (debugger == null)
-                return BadRequest("用户未绑定有效的实验板");
-
-            var refreshResult = await debugger.Refresh();
-            if (!refreshResult.IsSuccessful)
-            {
-                logger.Error($"刷新调试器状态失败: {refreshResult.Error}");
-                return StatusCode(StatusCodes.Status500InternalServerError, "刷新调试器状态失败");
-            }
-
-            var startResult = await debugger.StartTrigger();
-            if (!startResult.IsSuccessful)
-            {
-                logger.Error($"启动触发器失败: {startResult.Error}");
-                return StatusCode(StatusCodes.Status500InternalServerError, "启动触发器失败");
-            }
-
-            return Ok(startResult.Value);
-        }
-        catch (Exception ex)
-        {
-            logger.Error(ex, "重新开始触发时发生异常");
-            return StatusCode(StatusCodes.Status500InternalServerError, "操作失败，请稍后重试");
-        }
-    }
-
     /// <summary>
     /// 读取触发器状态标志
     /// </summary>
@@ -357,7 +317,7 @@ public class DebuggerController : ControllerBase
     /// </summary>
     /// <param name="config">调试器配置信息，包含采样深度、端口数、通道配置等</param>
     /// <param name="cancellationToken">取消操作的令牌</param>
-    [HttpGet("ReadData")]
+    [HttpPost("ReadData")]
     [EnableCors("Users")]
     [ProducesResponseType(typeof(ChannelCaptureData[]), StatusCodes.Status200OK)]
     [ProducesResponseType(StatusCodes.Status400BadRequest)]
@@ -412,7 +372,15 @@ public class DebuggerController : ControllerBase
                 return StatusCode(StatusCodes.Status500InternalServerError, "读取捕获数据失败");
             }
 
+            var freshResult = await debugger.Refresh();
+            if (!freshResult.IsSuccessful)
+            {
+                logger.Error($"刷新调试器状态失败: {freshResult.Error}");
+                return StatusCode(StatusCodes.Status500InternalServerError, "刷新调试器状态失败");
+            }
+
             var rawData = dataResult.Value;
+            logger.Debug($"rawData: {BitConverter.ToString(rawData)}");
             int depth = (int)config.captureDepth;
             int portDataLen = 4 * depth;
             int portNum = (int)config.totalPortNum;
@@ -442,6 +410,7 @@ public class DebuggerController : ControllerBase
                     UInt32 mask = (wireWidth == 32) ? 0xFFFFFFFF : ((1u << wireWidth) - 1u);
                     channelUintArr[i] = (sample >> wireStart) & mask;
                 }
+                logger.Debug($"{channel.name} HexData: {BitConverter.ToString(channelUintArr.SelectMany(BitConverter.GetBytes).ToArray())}");
                 var base64 = Convert.ToBase64String(channelUintArr.SelectMany(BitConverter.GetBytes).ToArray());
                 channelDataList.Add(new ChannelCaptureData { name = channel.name, data = base64 });
             }

server/src/Peripherals/DebuggerClient.cs

@@ -213,7 +213,7 @@ public class DebuggerClient
     {
         var captureData = new byte[1024 * 4 * portNum];
         {
-            var ret = await UDPClientPool.ReadAddr4BytesAsync(this.ep, this.taskID, this.captureDataAddr, captureData.Length, this.timeout);
+            var ret = await UDPClientPool.ReadAddr4Bytes(this.ep, this.taskID, this.captureDataAddr, captureData.Length / 4, this.timeout);
             if (!ret.IsSuccessful)
             {
                 logger.Error($"Failed to read data: {ret.Error}");