Merge commit 'b1897f0e3d02210a294e286f1234ee7d5aab0918'

Author: L-jasmine

README.md

@@ -21,7 +21,7 @@ The `K0` button is the main action button for the application. On the EchoKit de
 
 ## Quick start
 
-Flash the `echokit.bin` device image using the web-based [ESP Launchpad](https://espressif.github.io/esp-launchpad/?flashConfigURL=https://echokit.dev/firmware/echokit.toml) tool.
+Flash the device image using the web-based [ESP Launchpad](https://espressif.github.io/esp-launchpad/?flashConfigURL=https://echokit.dev/firmware/echokit.toml) tool.
 
 ## Install espflash
 
@@ -36,7 +36,7 @@ cargo install cargo-espflash espflash ldproxy
 Get a pre-compiled binary version of the firmware. The firmware binary file is `echokit`.
 
 ```
-curl -L -o echokit https://echokit.dev/firmware/echokit-boards
+curl -L -o echokit https://echokit.dev/firmware/echokit_boards
 ```
 
 To build the `echokit` firmware file from source, you need to make sure that you install the [OS-specific dependencies](https://docs.espressif.com/projects/rust/book/installation/std-requirements.html) and then [ESP toolchain for Rust](https://docs.espressif.com/projects/rust/book/installation/riscv-and-xtensa.html). You can then build from the source and find the binary firmware in `target/xtensa-esp32s3-espidf/release/`.
@@ -57,7 +57,7 @@ espflash save-image --chip esp32s3 --merge --flash-size 16mb target/xtensa-esp32
 If you have the fully integrared box device, you can use the following command to download a pre-built binary.
 
 ```
-curl -L -o echokit https://echokit.dev/firmware/echokit-box
+curl -L -o echokit https://echokit.dev/firmware/echokit_box
 ```
 
 To build it from the Rust source code. 
@@ -70,7 +70,7 @@ cargo build  --no-default-features --features box
 
 ## Flash the firmware
 
-Connect to your computer to the EchoKit device USB port labeled `TTL`. Allow the computer to accept connection from the device when prompted. 
+Connect to your computer to the EchoKit device USB port labeled `OTG`. Allow the computer to accept connection from the device when prompted. 
 
 > On many devices, there are two USB ports, but only the `SLAVE` port can take commands from another computer. You must connect to that `SLAVE` USB port. The detected USB serial port should be `JTAG`. IT CANNOT be `USB Single`.
 

setup/index.html

@@ -37,20 +37,14 @@ <h2 class="card-title text-2xl">Setup EchoKit via Bluetooth</h2>
 
                     <div class="card bg-base-100 border border-base-300">
                         <div class="card-body">
-                            <h3 class="card-title text-lg" id="ssidTitle">WiFi Network (MUST be 2.4GHz)</h3>
+                            <h3 class="card-title text-lg" id="ssidTitle">WiFi (MUST be 2.4GHz)</h3>
                             <label class="form-control">
                                 <div class="label">
                                     <span class="label-text">Network Name</span>
                                 </div>
                                 <input type="text" id="ssidInput" placeholder="WiFi network name SSID"
                                     class="input input-bordered w-full">
                             </label>
-                        </div>
-                    </div>
-
-                    <div class="card bg-base-100 border border-base-300">
-                        <div class="card-body">
-                            <h3 class="card-title text-lg" id="passTitle">WiFi Password</h3>
                             <label class="form-control">
                                 <div class="label">
                                     <span class="label-text">Password</span>
@@ -114,7 +108,7 @@ <h3 class="card-title text-lg">Background Image</h3>
     <dialog id="resetNotSupportedModal" class="modal">
         <div class="modal-box">
             <h3 class="font-bold text-lg">⚠️ Device Reset Required</h3>
-            <p class="py-4">Device does not support this operation, please reset by pressing k0 on the device</p>
+            <p class="py-4">Please press the k0 key on the device to restart it.</p>
             <div class="modal-action">
                 <form method="dialog">
                     <button class="btn btn-primary">OK</button>
@@ -630,4 +624,4 @@ <h3 class="font-bold text-lg">⚠️ Device Reset Required</h3>
     </script>
 </body>
 
-</html>
+</html>

setup/index_zh.html

@@ -37,26 +37,21 @@ <h2 class="card-title text-2xl">蓝牙控制面板</h2>
 
                     <div class="card bg-base-100 border border-base-300">
                         <div class="card-body">
-                            <h3 class="card-title text-lg" id="ssidTitle">Wi-Fi 网络（必须是2.4GHz）</h3>
+                            <h3 class="card-title text-lg" id="ssidTitle">Wi-Fi（必须是2.4GHz）</h3>
                             <label class="form-control">
                                 <div class="label">
-                                    <span class="label-text">网络名字</span>
+                                    <span class="label-text">网络名 (SSID)</span>
                                 </div>
                                 <input type="text" id="ssidInput" placeholder="输入SSID" class="input input-bordered w-full">
                             </label>
-                        </div>
-                    </div>
-
-                    <div class="card bg-base-100 border border-base-300">
-                        <div class="card-body">
-                            <h3 class="card-title text-lg" id="passTitle">密码设置</h3>
                             <label class="form-control">
                                 <div class="label">
                                     <span class="label-text">密码</span>
                                 </div>
                                 <input type="password" id="passInput" placeholder="输入密码" class="input input-bordered w-full">
                             </label>
                         </div>
+                        </div>
                     </div>
 
                     <div class="card bg-base-100 border border-base-300">
@@ -110,7 +105,7 @@ <h3 class="card-title text-lg">背景图片设置</h3>
     <dialog id="resetNotSupportedModal" class="modal">
         <div class="modal-box">
             <h3 class="font-bold text-lg">⚠️ 需要重启设备</h3>
-            <p class="py-4">设备不支持此操作，请通过按设备上的 k0 来重启</p>
+            <p class="py-4">请按设备上的 k0 键重启</p>
             <div class="modal-action">
                 <form method="dialog">
                     <button class="btn btn-primary">确定</button>