Fix CH592F release toolchain and knob mapping

Author: MeowKJ

firmware/CH592F/CMakeLists.txt

@@ -208,9 +208,8 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
     )
 else()
     list(APPEND CH592_COMPILE_DEFINITIONS
-        DEBUG=Debug_UART1
-        UART_LOG_ENABLE=1
-        KBD_DEBUG_BUILD=1
+        UART_LOG_ENABLE=0
+        KBD_DEBUG_BUILD=0
         KBD_USB_LOG_ENABLE=0
     )
 endif()

firmware/CH592F/cmake/toolchain-ch59x.cmake

@@ -7,7 +7,7 @@ set(CMAKE_SYSTEM_PROCESSOR riscv)
 #
 # This file auto-detects the MounRiver Studio (MRS) RISC-V GCC toolchain.
 # Supported compiler prefixes:
-#   riscv-none-embed-  |  riscv-wch-elf-  |  riscv-none-elf-
+#   riscv32-wch-elf-  |  riscv-wch-elf-  |  riscv-none-embed-  |  riscv-none-elf-
 #
 # Detection order:
 #   1. MRS_TOOLCHAIN_ROOT  — cmake -D / env var / console cache
@@ -51,7 +51,7 @@ endif()
 
 # --- MRS_TOOLCHAIN_ROOT → TOOLCHAIN_DIR ------------------------------------
 if(NOT DEFINED TOOLCHAIN_DIR AND DEFINED MRS_TOOLCHAIN_ROOT)
-    foreach(_sub IN ITEMS "RISC-V Embedded GCC/bin" "RISC-V Embedded GCC12/bin")
+    foreach(_sub IN ITEMS "RISC-V Embedded GCC15/bin" "RISC-V Embedded GCC12/bin" "RISC-V Embedded GCC/bin")
         if(EXISTS "${MRS_TOOLCHAIN_ROOT}/${_sub}")
             set(TOOLCHAIN_DIR "${MRS_TOOLCHAIN_ROOT}/${_sub}"
                 CACHE PATH "RISC-V toolchain bin directory" FORCE)
@@ -93,7 +93,7 @@ foreach(_pass IN ITEMS "hint" "path")
         set(_find_args "")
     endif()
 
-    foreach(_prefix IN ITEMS "riscv-none-embed-" "riscv-wch-elf-" "riscv-none-elf-")
+    foreach(_prefix IN ITEMS "riscv32-wch-elf-" "riscv-wch-elf-" "riscv-none-embed-" "riscv-none-elf-")
         find_program(_probe_gcc "${_prefix}gcc" ${_find_args})
         if(_probe_gcc)
             get_filename_component(_bin_dir "${_probe_gcc}" DIRECTORY)
@@ -114,7 +114,7 @@ if(NOT DEFINED TOOLCHAIN_PREFIX)
         "  CH592F RISC-V cross-compiler not found.\n"
         "  未找到 CH592F RISC-V 交叉编译器。\n"
         "\n"
-        "  Searched: riscv-none-embed-gcc / riscv-wch-elf-gcc / riscv-none-elf-gcc\n"
+        "  Searched: riscv32-wch-elf-gcc / riscv-wch-elf-gcc / riscv-none-embed-gcc / riscv-none-elf-gcc\n"
         "\n"
         "  Fix (choose one):\n"
         "\n"

tools/scripts/targets/ch592/build.py

@@ -97,7 +97,7 @@ def _size_row_from_artifact(build_dir: Path) -> Optional[tuple[int, int, int]]:
     try:
         res = subprocess.run(
             [cross_size, "--format=berkeley", str(elf_file)],
-            capture_output=True, text=True, check=True
+            capture_output=True, text=True, check=True, timeout=3
         )
     except Exception:
         return None
@@ -127,7 +127,7 @@ def _artifact_region_usage_from_objdump(build_dir: Path) -> Optional[dict[str, i
     try:
         res = subprocess.run(
             [cross_objdump, "-h", str(elf_file)],
-            capture_output=True, text=True, check=True
+            capture_output=True, text=True, check=True, timeout=3
         )
     except Exception:
         return None
@@ -303,6 +303,10 @@ def _generator_configure_args() -> list[str]:
     return args
 
 
+def _ninja_build_files_ready(build_dir: Path) -> bool:
+    return (build_dir / "CMakeCache.txt").is_file() and (build_dir / "build.ninja").is_file()
+
+
 def cmake_configure_args(cmake: Path, keyboard: str, profile: str, build_dir: Path) -> list[str]:
     build_type = {"release": "MinSizeRel", "debug": "Debug"}[profile]
     return [
@@ -423,7 +427,7 @@ def build(keyboard: str, profile: str) -> Path:
     cached_keyboard = _parse_cmake_cache_var(cache_file, "KEYBOARD")
     cached_model = _parse_cmake_cache_var(cache_file, "KBD_MODEL")
     if (
-        not cache_file.is_file()
+        not _ninja_build_files_ready(build_dir)
         or (cached_keyboard and _normalize_keyboard(cached_keyboard) != keyboard)
         or (cached_model and _normalize_keyboard(cached_model) != keyboard)
     ):
@@ -573,7 +577,7 @@ def bootloader_build() -> Path:
 
     build_dir = IAP_BUILD_DIR
     cache_file = build_dir / "CMakeCache.txt"
-    if not cache_file.is_file():
+    if not _ninja_build_files_ready(build_dir):
         bootloader_configure()
 
     sep()
@@ -632,7 +636,7 @@ def jumpiap_build() -> Path:
 
     build_dir = JUMPIAP_BUILD_DIR
     cache_file = build_dir / "CMakeCache.txt"
-    if not cache_file.is_file():
+    if not _ninja_build_files_ready(build_dir):
         jumpiap_configure()
 
     sep()

tools/scripts/targets/ch592/profile.py

@@ -14,8 +14,12 @@
 
 
 FIRMWARE_DIR = PROJECT_ROOT / "firmware" / "CH592F"
-_MRS_TOOLCHAIN_BIN_DIRS = ("RISC-V Embedded GCC/bin", "RISC-V Embedded GCC12/bin")
-_RISCV_GCC_PREFIXES = ("riscv-none-embed-", "riscv-wch-elf-", "riscv-none-elf-")
+_MRS_TOOLCHAIN_BIN_DIRS = (
+    "RISC-V Embedded GCC15/bin",
+    "RISC-V Embedded GCC12/bin",
+    "RISC-V Embedded GCC/bin",
+)
+_RISCV_GCC_PREFIXES = ("riscv32-wch-elf-", "riscv-wch-elf-", "riscv-none-embed-", "riscv-none-elf-")
 
 
 def _base_preset(state: dict) -> str:

tools/studio/src/config/layouts.ts

@@ -80,16 +80,16 @@ export const LAYOUT_FIVE_KEYS: LayoutDef = {
  * 说明: + 代表旋钮（被分成3份：左转、按下、右转）
  * 旋钮的3个操作都在同一个位置（row 0, col 0），由 EncoderButton 组件合并显示
  * 实体键顺序按实际物理位置：0=P34, 1=P14, 2=P33, 3=P31
- * 虚拟按键: 0-3=物理键, 4=按下, 5=逆时针, 6=顺时针
+ * 虚拟按键: 0-3=物理键, 4=顺时针, 5=逆时针, 6=按下
  */
 export const LAYOUT_KNOB: LayoutDef = {
   name: '旋钮款',
   cols: 3,
   rows: 2,
   hasEncoder: true,
   keys: [
-    { index: 4, row: 0, col: 0, size: '1u', label: '●', type: 'encoder-press' }, // 旋钮按下（+）
-    { index: 6, row: 0, col: 0, size: '1u', label: '↻', type: 'encoder-cw' }, // 旋钮右转（与按下同一位置）
+    { index: 6, row: 0, col: 0, size: '1u', label: '●', type: 'encoder-press' }, // 旋钮按下（+）
+    { index: 4, row: 0, col: 0, size: '1u', label: '↻', type: 'encoder-cw' }, // 旋钮右转（与按下同一位置）
     { index: 5, row: 0, col: 0, size: '1u', label: '↺', type: 'encoder-ccw' }, // 旋钮左转（与按下同一位置）
     { index: 0, row: 0, col: 1, size: '1u' }, // 按键0（·）
     { index: 1, row: 0, col: 2, size: '2u-v' }, // 按键1（|，竖向2u）