From 81f91b2b71511dd21015e4bd643bc729328b8724 Mon Sep 17 00:00:00 2001
From: SikongJueluo <selfconfusion@gmail.com>
Date: Tue, 20 May 2025 20:31:48 +0800
Subject: [PATCH] fix: boundary scan could not close and jtag scan failed

---
 server/src/JtagClient.cs                      |  2 +-
 src/components/equipments/MotherBoardCaps.vue | 71 +++++++++++++------
 2 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/server/src/JtagClient.cs b/server/src/JtagClient.cs
index 6773532..37e0476 100644
--- a/server/src/JtagClient.cs
+++ b/server/src/JtagClient.cs
@@ -422,7 +422,7 @@ public class Jtag
         if (!MsgBus.IsRunning)
             return new(new Exception("Message Bus not Working!"));
 
-        var retPack = await MsgBus.UDPServer.WaitForDataAsync(address, port);
+        var retPack = await MsgBus.UDPServer.WaitForDataAsync(address, 0, port);
         if (!retPack.IsSuccessful || !retPack.Value.IsSuccessful)
             return new(new Exception("Send address package failed"));
 
diff --git a/src/components/equipments/MotherBoardCaps.vue b/src/components/equipments/MotherBoardCaps.vue
index 01170d7..e7fce0d 100644
--- a/src/components/equipments/MotherBoardCaps.vue
+++ b/src/components/equipments/MotherBoardCaps.vue
@@ -9,24 +9,40 @@
           IDCode: 0x{{ jtagIDCode.toString(16).padStart(8, "0").toUpperCase() }}
         </p>
         <button class="btn btn-circle w-6 h-6" :onclick="getIDCode">
-          <svg class="icon opacity-70 fill-primary" viewBox="0 0 1024 1024" version="1.1"
-            xmlns="http://www.w3.org/2000/svg" p-id="4865" width="200" height="200">
+          <svg
+            class="icon opacity-70 fill-primary"
+            viewBox="0 0 1024 1024"
+            version="1.1"
+            xmlns="http://www.w3.org/2000/svg"
+            p-id="4865"
+            width="200"
+            height="200"
+          >
             <path
               d="M894.481158 505.727133c0 49.589418-9.711176 97.705276-28.867468 143.007041-18.501376 43.74634-44.98454 83.031065-78.712713 116.759237-33.728172 33.728172-73.012897 60.211337-116.759237 78.712713-45.311998 19.156292-93.417623 28.877701-143.007041 28.877701s-97.695043-9.721409-142.996808-28.877701c-43.756573-18.501376-83.031065-44.98454-116.76947-78.712713-33.728172-33.728172-60.211337-73.012897-78.712713-116.759237-19.156292-45.301765-28.867468-93.417623-28.867468-143.007041 0-49.579185 9.711176-97.695043 28.867468-142.996808 18.501376-43.74634 44.98454-83.031065 78.712713-116.759237 33.738405-33.728172 73.012897-60.211337 116.76947-78.712713 45.301765-19.166525 93.40739-28.877701 142.996808-28.877701 52.925397 0 104.008842 11.010775 151.827941 32.745798 46.192042 20.977777 86.909395 50.79692 121.016191 88.608084 4.389984 4.860704 8.646937 9.854439 12.781094 14.97097l0-136.263453c0-11.307533 9.168824-20.466124 20.466124-20.466124 11.307533 0 20.466124 9.15859 20.466124 20.466124l0 183.64253c0 5.433756-2.148943 10.632151-5.986341 14.46955-3.847631 3.837398-9.046027 5.996574-14.479783 5.996574l-183.64253-0.020466c-11.307533 0-20.466124-9.168824-20.466124-20.466124 0-11.307533 9.168824-20.466124 20.466124-20.466124l132.293025 0.020466c-3.960195-4.952802-8.063653-9.782807-12.289907-14.479783-30.320563-33.605376-66.514903-60.098773-107.549481-78.753645-42.467207-19.289322-87.850837-29.072129-134.902456-29.072129-87.195921 0-169.172981 33.9533-230.816946 95.597265-61.654198 61.654198-95.597265 143.621025-95.597265 230.816946s33.943067 169.172981 95.597265 230.816946c61.643965 61.654198 143.621025 95.607498 230.816946 95.607498s169.172981-33.9533 230.816946-95.607498c61.654198-61.643965 95.597265-143.621025 95.597265-230.816946 0-11.2973 9.168824-20.466124 20.466124-20.466124C885.322567 485.261009 894.481158 494.429833 894.481158 505.727133z"
-              p-id="4866"></path>
+              p-id="4866"
+            ></path>
           </svg>
         </button>
       </div>
     </div>
     <div class="divider"></div>
-    <UploadCard class="bg-base-200" :upload-event="eqps.jtagUploadBitstream"
-      :download-event="eqps.jtagDownloadBitstream" :bitstream-file="eqps.jtagBitstream"
-      @update:bitstream-file="handleBitstreamChange">
+    <UploadCard
+      class="bg-base-200"
+      :upload-event="eqps.jtagUploadBitstream"
+      :download-event="eqps.jtagDownloadBitstream"
+      :bitstream-file="eqps.jtagBitstream"
+      @update:bitstream-file="handleBitstreamChange"
+    >
     </UploadCard>
     <div class="divider"></div>
     <div class="w-full">
       <legend class="fieldset-legend text-sm mb-0.3">Jtag运行频率</legend>
-      <select class="select w-full" @change="handleSelectJtagSpeed" :value="props.jtagFreq">
+      <select
+        class="select w-full"
+        @change="handleSelectJtagSpeed"
+        :value="props.jtagFreq"
+      >
         <option v-for="option in selectJtagSpeedOptions" :value="option.id">
           {{ option.text }}
         </option>
@@ -35,12 +51,23 @@
     <div class="flex flex-row items-center">
       <fieldset class="fieldset w-70">
         <legend class="fieldset-legend text-sm">边界扫描刷新率 / Hz</legend>
-        <input type="number" class="input validator" required placeholder="Type a number between 1 to 1000" min="1"
-          max="1000" v-model="jtagBoundaryScanFreq" title="Type a number between 1 to 1000" />
+        <input
+          type="number"
+          class="input validator"
+          required
+          placeholder="Type a number between 1 to 1000"
+          min="1"
+          max="1000"
+          v-model="jtagBoundaryScanFreq"
+          title="Type a number between 1 to 1000"
+        />
         <p class="validator-hint">输入一个1 ~ 1000的数</p>
       </fieldset>
-      <button class="btn btn-primary grow mx-4" :class="eqps.enableJtagBoundaryScan ? '' : 'btn-soft'"
-        :onclick="toggleJtagBoundaryScan">
+      <button
+        class="btn btn-primary grow mx-4"
+        :class="eqps.enableJtagBoundaryScan ? '' : 'btn-soft'"
+        :onclick="toggleJtagBoundaryScan"
+      >
         {{ eqps.enableJtagBoundaryScan ? "关闭边界扫描" : "启动边界扫描" }}
       </button>
     </div>
@@ -48,12 +75,21 @@
     <h1 class="font-bold text-center text-2xl">外设</h1>
     <div class="flex flex-row justify-around">
       <div class="flex flex-row">
-        <input type="checkbox" class="checkbox" :checked="eqps.enableMatrixKey"
-          @change="handleMatrixkeyCheckboxChange" />
+        <input
+          type="checkbox"
+          class="checkbox"
+          :checked="eqps.enableMatrixKey"
+          @change="handleMatrixkeyCheckboxChange"
+        />
         <p class="mx-2">启用矩阵键盘</p>
       </div>
       <div class="flex flex-row">
-        <input type="checkbox" class="checkbox" :checked="eqps.enablePower" @change="handlePowerCheckboxChange" />
+        <input
+          type="checkbox"
+          class="checkbox"
+          :checked="eqps.enablePower"
+          @change="handlePowerCheckboxChange"
+        />
         <p class="mx-2">启用电源</p>
       </div>
     </div>
@@ -65,7 +101,7 @@ import z from "zod";
 import UploadCard from "@/components/UploadCard.vue";
 import { useDialogStore } from "@/stores/dialog";
 import { useEquipments } from "@/stores/equipments";
-import { computed, ref, watchEffect, watchPostEffect } from "vue";
+import { computed, ref, watchEffect } from "vue";
 
 interface CapsProps {
   jtagAddr?: string;
@@ -137,11 +173,6 @@ async function handlePowerCheckboxChange(event: Event) {
 }
 
 async function toggleJtagBoundaryScan() {
-  if (eqps.jtagClientMutex.isLocked()) {
-    dialog.warn("Jtag正在被占用");
-    return;
-  }
-
   eqps.enableJtagBoundaryScan = !eqps.enableJtagBoundaryScan;
 }