dsh-stm32 0.1.3 → 0.1.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +115 -43
- package/README_EN.md +106 -38
- package/assets/README.md +85 -0
- package/assets/VERSION +1 -0
- package/assets/device/c0/chips.json +1108 -0
- package/assets/device/f0/chips.json +1570 -0
- package/assets/device/f1/chips.json +1238 -0
- package/assets/device/f1/svd/100.json +943 -0
- package/assets/device/f1/svd/101.json +901 -0
- package/assets/device/f1/svd/102.json +522 -0
- package/assets/device/f1/svd/103.json +1139 -0
- package/assets/device/f1/svd/105.json +1117 -0
- package/assets/device/f1/svd/107.json +1195 -0
- package/assets/device/f2/chips.json +674 -0
- package/assets/device/f3/chips.json +1318 -0
- package/assets/device/f4/chips.json +2942 -0
- package/assets/device/f7/chips.json +1710 -0
- package/assets/device/g0/chips.json +2102 -0
- package/assets/device/g4/chips.json +2494 -0
- package/assets/device/h5/chips.json +898 -0
- package/assets/device/h7/chips.json +2639 -0
- package/assets/device/l0/chips.json +2494 -0
- package/assets/device/l1/chips.json +1234 -0
- package/assets/device/l4/chips.json +2130 -0
- package/assets/device/l4+/chips.json +856 -0
- package/assets/device/l5/chips.json +226 -0
- package/assets/device/u0/chips.json +688 -0
- package/assets/device/u3/chips.json +310 -0
- package/assets/device/u5/chips.json +1195 -0
- package/assets/device/wba/chips.json +506 -0
- package/assets/device/wl/chips.json +184 -0
- package/assets/headers/f1/stm32f100xb.h +5972 -0
- package/assets/headers/f1/stm32f100xe.h +6587 -0
- package/assets/headers/f1/stm32f101x6.h +5315 -0
- package/assets/headers/f1/stm32f101xb.h +5446 -0
- package/assets/headers/f1/stm32f101xe.h +6503 -0
- package/assets/headers/f1/stm32f101xg.h +6713 -0
- package/assets/headers/f1/stm32f102x6.h +6448 -0
- package/assets/headers/f1/stm32f102xb.h +6570 -0
- package/assets/headers/f1/stm32f103x6.h +10109 -0
- package/assets/headers/f1/stm32f103xb.h +10240 -0
- package/assets/headers/f1/stm32f103xe.h +11767 -0
- package/assets/headers/f1/stm32f103xg.h +11951 -0
- package/assets/headers/f1/stm32f105xc.h +14340 -0
- package/assets/headers/f1/stm32f107xc.h +15253 -0
- package/assets/headers/f1/stm32f1xx.h +273 -0
- package/assets/headers/f1/system_stm32f1xx.h +96 -0
- package/assets/ioc/family/C0.ioc +82 -0
- package/assets/ioc/family/F0.ioc +71 -0
- package/assets/ioc/family/F2.ioc +91 -0
- package/assets/ioc/family/F3.ioc +94 -0
- package/assets/ioc/family/F4.ioc +91 -0
- package/assets/ioc/family/F7.ioc +102 -0
- package/assets/ioc/family/G0.ioc +90 -0
- package/assets/ioc/family/G4.ioc +110 -0
- package/assets/ioc/family/H5.ioc +116 -0
- package/assets/ioc/family/H7.ioc +133 -0
- package/assets/ioc/family/L0.ioc +92 -0
- package/assets/ioc/family/L1.ioc +87 -0
- package/assets/ioc/family/L4+.ioc +92 -0
- package/assets/ioc/family/L4.ioc +93 -0
- package/assets/ioc/family/L5.ioc +91 -0
- package/assets/ioc/family/U0.ioc +103 -0
- package/assets/ioc/family/U3.ioc +113 -0
- package/assets/ioc/family/U5.ioc +102 -0
- package/assets/ioc/family/WBA.ioc +100 -0
- package/assets/ioc/family/WL.ioc +93 -0
- package/assets/ioc/minimal/STM32F100C8Tx.ioc +113 -0
- package/assets/ioc/minimal/STM32F100RCTx.ioc +113 -0
- package/assets/ioc/minimal/STM32F101C4Tx.ioc +113 -0
- package/assets/ioc/minimal/STM32F101C8Tx.ioc +113 -0
- package/assets/ioc/minimal/STM32F101RCTx.ioc +113 -0
- package/assets/ioc/minimal/STM32F101RFTx.ioc +113 -0
- package/assets/ioc/minimal/STM32F102C4Tx.ioc +113 -0
- package/assets/ioc/minimal/STM32F102C8Tx.ioc +113 -0
- package/assets/ioc/minimal/STM32F103C4Tx.ioc +113 -0
- package/assets/ioc/minimal/STM32F103C8Tx.ioc +113 -0
- package/assets/ioc/minimal/STM32F103RCTx.ioc +113 -0
- package/assets/ioc/minimal/STM32F103RFTx.ioc +113 -0
- package/assets/ioc/minimal/STM32F105RCTx.ioc +113 -0
- package/assets/ioc/minimal/STM32F107RCTx.ioc +113 -0
- package/assets/ld/f1/STM32F100C8Tx_FLASH.ld +249 -0
- package/assets/ld/f1/STM32F100RCTx_FLASH.ld +249 -0
- package/assets/ld/f1/STM32F101C4Tx_FLASH.ld +249 -0
- package/assets/ld/f1/STM32F101C8Tx_FLASH.ld +249 -0
- package/assets/ld/f1/STM32F101RCTx_FLASH.ld +249 -0
- package/assets/ld/f1/STM32F101RFTx_FLASH.ld +249 -0
- package/assets/ld/f1/STM32F102C4Tx_FLASH.ld +249 -0
- package/assets/ld/f1/STM32F102C8Tx_FLASH.ld +249 -0
- package/assets/ld/f1/STM32F103C4Tx_FLASH.ld +249 -0
- package/assets/ld/f1/STM32F103C8Tx_FLASH.ld +249 -0
- package/assets/ld/f1/STM32F103RCTx_FLASH.ld +249 -0
- package/assets/ld/f1/STM32F103RFTx_FLASH.ld +249 -0
- package/assets/ld/f1/STM32F105RCTx_FLASH.ld +249 -0
- package/assets/ld/f1/STM32F107RCTx_FLASH.ld +249 -0
- package/assets/manifest.json +1130 -0
- package/assets/startup/f1/startup_stm32f100xb.s +407 -0
- package/assets/startup/f1/startup_stm32f100xe.s +449 -0
- package/assets/startup/f1/startup_stm32f101x6.s +322 -0
- package/assets/startup/f1/startup_stm32f101xb.s +338 -0
- package/assets/startup/f1/startup_stm32f101xe.s +423 -0
- package/assets/startup/f1/startup_stm32f101xg.s +439 -0
- package/assets/startup/f1/startup_stm32f102x6.s +330 -0
- package/assets/startup/f1/startup_stm32f102xb.s +346 -0
- package/assets/startup/f1/startup_stm32f103x6.s +348 -0
- package/assets/startup/f1/startup_stm32f103xb.s +364 -0
- package/assets/startup/f1/startup_stm32f103xe.s +470 -0
- package/assets/startup/f1/startup_stm32f103xg.s +466 -0
- package/assets/startup/f1/startup_stm32f105xc.s +463 -0
- package/assets/startup/f1/startup_stm32f107xc.s +472 -0
- package/assets/templates/family/C0.ioc +82 -0
- package/assets/templates/family/F0.ioc +71 -0
- package/assets/templates/family/F2.ioc +91 -0
- package/assets/templates/family/F3.ioc +94 -0
- package/assets/templates/family/F4.ioc +91 -0
- package/assets/templates/family/F7.ioc +102 -0
- package/assets/templates/family/G0.ioc +90 -0
- package/assets/templates/family/G4.ioc +110 -0
- package/assets/templates/family/H5.ioc +116 -0
- package/assets/templates/family/H7.ioc +133 -0
- package/assets/templates/family/L0.ioc +92 -0
- package/assets/templates/family/L1.ioc +87 -0
- package/assets/templates/family/L4+.ioc +92 -0
- package/assets/templates/family/L4.ioc +93 -0
- package/assets/templates/family/L5.ioc +91 -0
- package/assets/templates/family/U0.ioc +103 -0
- package/assets/templates/family/U3.ioc +113 -0
- package/assets/templates/family/U5.ioc +102 -0
- package/assets/templates/family/WB.ioc +81 -0
- package/assets/templates/family/WBA.ioc +100 -0
- package/assets/templates/family/WL.ioc +93 -0
- package/docs/reading-guide.md +110 -42
- package/lib/commands/register.js +1 -1
- package/lib/data/chips.js +3 -3
- package/lib/data/clock-db.js +830 -0
- package/lib/data/clock-f1.js +12 -45
- package/lib/data/cmsis-sources.js +371 -18
- package/lib/data/db-presets.js +252 -0
- package/lib/data/device-facts.js +113 -26
- package/lib/data/family.js +515 -0
- package/lib/data/firmware-packages.js +595 -12
- package/lib/data/firmware-pins.js +128 -0
- package/lib/data/install-guides.js +2 -2
- package/lib/data/ioc-presets.js +248 -0
- package/lib/data/ioc-schema.js +1058 -0
- package/lib/data/rm-topics/stm32c0.json +227 -0
- package/lib/data/rm-topics.js +103 -0
- package/lib/data/search-roots.js +59 -4
- package/lib/data/serial-config.js +430 -0
- package/lib/data/stm32f1.js +15 -14
- package/lib/data/svd.js +32 -16
- package/lib/data/toolchain-config.js +0 -14
- package/lib/engine/assets.js +191 -456
- package/lib/engine/breakpoints.js +66 -11
- package/lib/engine/clock-derived.js +101 -0
- package/lib/engine/clock-direct.js +313 -0
- package/lib/engine/clock-plan.js +96 -52
- package/lib/engine/clock-pllmn.js +319 -0
- package/lib/engine/cmake-sources.js +67 -13
- package/lib/engine/cube-mx-guard.js +44 -0
- package/lib/engine/cube-programmer.js +137 -0
- package/lib/engine/cubemx-db.js +273 -0
- package/lib/engine/debug-session.js +423 -17
- package/lib/engine/debug.js +25 -6
- package/lib/engine/doctor.js +239 -19
- package/lib/engine/download.js +242 -0
- package/lib/engine/facts-acquire.js +416 -0
- package/lib/engine/facts.js +134 -0
- package/lib/engine/fetch.js +1 -1
- package/lib/engine/firmware-install.js +333 -39
- package/lib/engine/firmware-official.js +499 -0
- package/lib/engine/flash.js +290 -21
- package/lib/engine/gdb-mi.js +476 -0
- package/lib/engine/generate.js +9 -2
- package/lib/engine/hal-chip.js +124 -41
- package/lib/engine/ioc-plan.js +1244 -60
- package/lib/engine/ioc-rules.js +698 -0
- package/lib/engine/ioc-verify.js +706 -0
- package/lib/engine/ioc.js +43 -4
- package/lib/engine/msys2-install.js +241 -92
- package/lib/engine/probe-error.js +25 -6
- package/lib/engine/probe-session.js +50 -14
- package/lib/engine/probe.js +22 -5
- package/lib/engine/register-clock.js +41 -0
- package/lib/engine/register-gpio.js +132 -0
- package/lib/engine/register-linker.js +37 -13
- package/lib/engine/register-template.js +125 -40
- package/lib/engine/regs.js +41 -8
- package/lib/engine/rm-extract.js +144 -0
- package/lib/engine/rm-sources.js +360 -0
- package/lib/engine/rm-text.js +56 -0
- package/lib/engine/rtt.js +188 -30
- package/lib/engine/scaffold.js +185 -18
- package/lib/engine/serial.js +1692 -0
- package/lib/engine/tar.js +235 -3
- package/lib/engine/toolchain-gate.js +0 -4
- package/lib/engine/watch.js +227 -0
- package/lib/index.js +16 -2
- package/lib/skill/stm32-workflow.js +2 -2
- package/lib/tools/assets.js +39 -108
- package/lib/tools/cache.js +2 -2
- package/lib/tools/debug-session.js +2 -2
- package/lib/tools/doctor.js +61 -5
- package/lib/tools/download.js +303 -0
- package/lib/tools/firmware-install.js +31 -6
- package/lib/tools/flash.js +32 -4
- package/lib/tools/generate.js +22 -0
- package/lib/tools/ioc-inspect.js +1 -1
- package/lib/tools/ioc-plan.js +56 -2
- package/lib/tools/ioc-verify.js +237 -0
- package/lib/tools/project-create.js +41 -5
- package/lib/tools/regs.js +8 -8
- package/lib/tools/route-plan.js +1 -1
- package/lib/tools/rtt.js +157 -34
- package/lib/tools/serial.js +737 -0
- package/lib/tools/watch.js +256 -0
- package/package.json +5 -4
- package/templates/openocd/stm32c0x.cfg +83 -0
- package/templates/openocd/stm32u0x.cfg +64 -0
- package/templates/register/CMakeLists.txt +2 -2
- package/templates/register/Core/Inc/rtt.h +37 -2
- package/templates/register/Core/Src/main.c +17 -25
- package/templates/register/Core/Src/rtt.c +85 -9
- package/templates/scaffold/RTT.md +6 -2
- package/templates/scaffold/STM32F103XX_FLASH.ld +3 -0
- package/templates/scaffold/openocd.cfg +5 -3
- package/templates/scaffold/vscode/launch.json +8 -4
- package/templates/serial/bridge.ps1 +477 -0
- package/docs/development-notes.md +0 -2487
- package/docs/dsh-stm32-plugin-/350/247/204/346/240/274.md +0 -673
- package/docs/logic-audit.md +0 -607
|
@@ -15,6 +15,7 @@
|
|
|
15
15
|
/** 枚举的运行时形态(工具 schema 的 enum 也用它,避免第二个真相)。 */
|
|
16
16
|
export const PROBE_ERROR_KINDS = [
|
|
17
17
|
"no-probe",
|
|
18
|
+
"probe-interface-mismatch",
|
|
18
19
|
"probe-busy",
|
|
19
20
|
"swd-locked",
|
|
20
21
|
"flash-protected",
|
|
@@ -25,15 +26,19 @@ export const PROBE_ERROR_KINDS = [
|
|
|
25
26
|
];
|
|
26
27
|
// ── 文案:hint 是给用户的下一步,cause 是一句话根因 ────────────────────────────────
|
|
27
28
|
export const HINT_PROBE = "找不到 CMSIS-DAP 探针:检查 USB、是否被 openocd/调试会话占用(先停掉正在跑的调试),必要时换一根数据线再试。";
|
|
28
|
-
export const HINT_BUSY = "
|
|
29
|
+
export const HINT_BUSY = "探针没有正常响应:先确认没有第二个 openocd / 调试会话在同时用它(两个 openocd 抢同一个 CMSIS-DAP 时不报错,而是满屏 transfer count mismatch);如果确认只有一个进程,那就是探针固件卡住了——把探针拔下来等 3 秒再插回,然后重试。";
|
|
29
30
|
export const HINT_DP = "连不上芯片(Error connecting DP):固件里可能关了 SWD(__HAL_AFIO_REMAP_SWJ_DISABLE),需要 BOOT0=1 重启进系统 bootloader 再烧,或按住复位键在连接瞬间松开。";
|
|
30
31
|
export const HINT_FLASH_PROTECTED = "Flash 被写保护/读保护挡住:先做一次全片擦除(openocd 的 stm32f1x mass_erase)或解除读保护(RDP)再烧;量产片上确实要保持保护时,这次烧录就不可能成功,别再原地重试。";
|
|
31
32
|
export const HINT_NO_POWER = "目标板没供电:量一下 3V3/GND,检查 BOOT0/BOOT1 跳线与杜邦线接触,USB 供电不足时换独立电源再试。";
|
|
32
33
|
export const HINT_TARGET_MISMATCH = "连上的不是目标芯片:openocd 的 target 配置(stm32f1x)与实测 device id 不符——确认板上确实是 STM32F103 系列,或把 .ioc / 芯片型号参数改对再试。";
|
|
33
34
|
export const HINT_TIMEOUT = "超时:目标没在等(断点没命中、程序跑飞)或探针链路太慢——先把 adapter speed 降到 1000 或 100,确认固件真的会跑到断点,再适度加大 timeoutMs 重试。";
|
|
34
35
|
export const HINT_UNKNOWN = "日志里没有能归类的特征:把 evidence 或日志尾部贴出来核对,并用 stm32_doctor 看探针占用与工具链状态,别盲目重试。";
|
|
36
|
+
const HINT_INTERFACE_MISMATCH = "interface 配置与实插探针不匹配:跑 stm32_doctor 看「USB:探针在线(…)」那行报的类型," +
|
|
37
|
+
"把工程 openocd.cfg 里的 interface/ 那行换成对应驱动(ST-Link→interface/stlink.cfg,CMSIS-DAP/DAPLink→interface/cmsis-dap.cfg);" +
|
|
38
|
+
"工程没有 openocd.cfg 时插件会按 doctor 实见类型自动选,不用手写。stm32_flash 遇到本错误也会先换另一个 interface 自动重试一次。";
|
|
35
39
|
const HINT_BY_KIND = {
|
|
36
40
|
"no-probe": HINT_PROBE,
|
|
41
|
+
"probe-interface-mismatch": HINT_INTERFACE_MISMATCH,
|
|
37
42
|
"probe-busy": HINT_BUSY,
|
|
38
43
|
"swd-locked": HINT_DP,
|
|
39
44
|
"flash-protected": HINT_FLASH_PROTECTED,
|
|
@@ -48,6 +53,7 @@ const HINT_BY_KIND = {
|
|
|
48
53
|
*/
|
|
49
54
|
const RETRYABLE_BY_KIND = {
|
|
50
55
|
"no-probe": true, // 插好线 / 停掉占用就能再烧
|
|
56
|
+
"probe-interface-mismatch": true, // flash 引擎换另一个 interface 自动重试;手写配置时改一行即可
|
|
51
57
|
"probe-busy": true, // 让出探针即可重试
|
|
52
58
|
"swd-locked": true, // 按 hint 用 BOOT0 进 bootloader 后同一条命令能成
|
|
53
59
|
"flash-protected": false, // 要先解保护,不属于"再试一次"
|
|
@@ -66,10 +72,17 @@ const CAUSE_TIMEOUT = {
|
|
|
66
72
|
* 只是从"返回枚举"变成"带根因的有序表"。
|
|
67
73
|
*/
|
|
68
74
|
const MATCHERS = [
|
|
75
|
+
{
|
|
76
|
+
// 2026-11-08 实测教训:工程里的 openocd.cfg 写死了 interface/cmsis-dap.cfg,
|
|
77
|
+
// 插的却是 ST-Link(或反是)——这跟"没插"是两种答案:前者换一行配置就好。
|
|
78
|
+
kind: "probe-interface-mismatch",
|
|
79
|
+
cause: "openocd 找不到配置里指定的探针驱动(interface 配置与实插的探针类型不匹配)",
|
|
80
|
+
re: /unable to find a matching (cmsis-dap|stlink|st-link) device/u,
|
|
81
|
+
},
|
|
69
82
|
{
|
|
70
83
|
kind: "no-probe",
|
|
71
|
-
cause: "openocd
|
|
72
|
-
re: /
|
|
84
|
+
cause: "openocd 找不到探针(没插好 / 被占用 / 本机没认到 USB 设备)",
|
|
85
|
+
re: /no device found|open failed/u,
|
|
73
86
|
},
|
|
74
87
|
{
|
|
75
88
|
kind: "probe-busy",
|
|
@@ -80,7 +93,10 @@ const MATCHERS = [
|
|
|
80
93
|
// 真板子取证(2026-10-28):两个 openocd 同时抓同一个 CMSIS-DAP 时,openocd 不会报"忙",
|
|
81
94
|
// 而是两边交替收发导致 DAP 事务错位——满屏 transfer count mismatch / command mismatch。
|
|
82
95
|
kind: "probe-busy",
|
|
83
|
-
|
|
96
|
+
// 实测两种成因都会落到这里:① 两个 openocd 同时抓探针 → transfer/command mismatch;
|
|
97
|
+
// ② 探针固件卡住(上一次会话被硬杀)→ CMSIS-DAP command CMD_INFO failed,此时没有任何
|
|
98
|
+
// 并发进程,Windows 里 HID 设备状态也正常,只能拔插恢复(2026-10-31 复现两次)。
|
|
99
|
+
cause: "探针没有正常响应(被另一个进程同时访问,或探针固件卡住)",
|
|
84
100
|
re: /cmsis-dap (transfer count mismatch|command mismatch)|cmsis-dap command cmd_\w+ failed|libusb_error_busy/u,
|
|
85
101
|
},
|
|
86
102
|
{
|
|
@@ -101,7 +117,9 @@ const MATCHERS = [
|
|
|
101
117
|
{
|
|
102
118
|
kind: "target-mismatch",
|
|
103
119
|
cause: "连上的芯片 ID 与 target 配置(stm32f1x)不一致",
|
|
104
|
-
|
|
120
|
+
// 不要用 `device id` 这种宽词:openocd 正常烧录时也会打 `Info : device id = 0x20036410`,
|
|
121
|
+
// 一命中就会把成功路径误判成型号不符。只认真正的失败措辞(2026-10-31 实测)。
|
|
122
|
+
re: /cannot identify target|unexpected idcode|unknown device|doesn't match the target/u,
|
|
105
123
|
},
|
|
106
124
|
];
|
|
107
125
|
/** 一条"看起来像根因"的行;只用于 unknown / 超时的 evidence 兜底。 */
|
|
@@ -143,7 +161,8 @@ export function usbNoteFor(kind, detail) {
|
|
|
143
161
|
}
|
|
144
162
|
/** 每一类的默认根因(调用方没给更准的说法时用它,避免出现"未知原因"这种废话)。 */
|
|
145
163
|
const CAUSE_BY_KIND = {
|
|
146
|
-
"no-probe": "
|
|
164
|
+
"no-probe": "找不到探针(没插好 / 被占用 / 本机没认到 USB 设备)",
|
|
165
|
+
"probe-interface-mismatch": "openocd 找不到配置里指定的探针驱动(interface 与实插类型不匹配)",
|
|
147
166
|
"probe-busy": "探针或探针口被另一个进程占着",
|
|
148
167
|
"swd-locked": "芯片侧 SWD 连不上(固件关了调试口 / 调试访问口被锁)",
|
|
149
168
|
"flash-protected": "Flash 被写保护/读保护挡住",
|
|
@@ -61,9 +61,12 @@ export function sessionInfo() {
|
|
|
61
61
|
export function touch() {
|
|
62
62
|
return debugSessions.touch();
|
|
63
63
|
}
|
|
64
|
-
/**
|
|
65
|
-
|
|
66
|
-
|
|
64
|
+
/**
|
|
65
|
+
* 显式释放(stm32_debug_stop、rtt stop、进程退出等)。
|
|
66
|
+
* options.requireOwner 给定时,只有会话的 owner 对得上才关——多 agent 并行时不要收走别人的探针。
|
|
67
|
+
*/
|
|
68
|
+
export async function release(reason = "显式释放", options = {}) {
|
|
69
|
+
return await debugSessions.stop(reason, options);
|
|
67
70
|
}
|
|
68
71
|
/**
|
|
69
72
|
* 保证有一个可用的调试会话:
|
|
@@ -73,15 +76,24 @@ export async function release(reason = "显式释放") {
|
|
|
73
76
|
*/
|
|
74
77
|
export async function ensureSession(projectDir, options = {}) {
|
|
75
78
|
const current = sessionInfo();
|
|
79
|
+
let replacedDead = false;
|
|
76
80
|
if (current !== null && sameProject(current.projectDir, projectDir)) {
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
81
|
+
const probeAlive = options.checkSessionAlive ?? sessionLooksAlive;
|
|
82
|
+
if (await probeAlive(current)) {
|
|
83
|
+
touch();
|
|
84
|
+
return {
|
|
85
|
+
ok: true,
|
|
86
|
+
reused: true,
|
|
87
|
+
replacedDead: false,
|
|
88
|
+
session: sessionInfo(),
|
|
89
|
+
probeError: null,
|
|
90
|
+
message: "复用已有调试会话(gdb 端口 " + String(current.port) + ",tcl 端口 " + String(current.tclPort) + ")",
|
|
91
|
+
};
|
|
92
|
+
}
|
|
93
|
+
// 真机踩过:探针 HID 掉线后 openocd 自己退出,会话记录却还在,于是后续每个工具都报
|
|
94
|
+
// 「复用已有调试会话」然后全程失败。这里发现 Tcl 端口连不上就清掉记录、重起一个。
|
|
95
|
+
await debugSessions.stop("旧会话的 openocd 已经不在了(探针掉线/被 HID 错误带走),清掉记录后重起");
|
|
96
|
+
replacedDead = true;
|
|
85
97
|
}
|
|
86
98
|
if (starting !== null)
|
|
87
99
|
return await starting;
|
|
@@ -90,11 +102,34 @@ export async function ensureSession(projectDir, options = {}) {
|
|
|
90
102
|
starting = null;
|
|
91
103
|
});
|
|
92
104
|
starting = promise;
|
|
93
|
-
|
|
105
|
+
const result = await promise;
|
|
106
|
+
return result.ok && replacedDead
|
|
107
|
+
? { ...result, replacedDead: true, message: "旧会话的 openocd 已经不在了,已重起:" + result.message }
|
|
108
|
+
: result.ok
|
|
109
|
+
? { ...result, replacedDead: false }
|
|
110
|
+
: { ...result, replacedDead };
|
|
111
|
+
}
|
|
112
|
+
/**
|
|
113
|
+
* 会话还活着吗:openocd 的 Tcl 端口还能连上就算活着。
|
|
114
|
+
* 用 Tcl 而不是 gdb 口:Tcl 口在 openocd 起来时先监听,坏掉时也最先断;连一下 500 ms 就够。
|
|
115
|
+
*/
|
|
116
|
+
export async function sessionLooksAlive(info) {
|
|
117
|
+
const port = info.tclPort > 0 ? info.tclPort : info.port;
|
|
118
|
+
if (port <= 0)
|
|
119
|
+
return true; /* 两个端口都没有,没法判,当活着(真失败会在下一步报出来) */
|
|
120
|
+
return await isPortBusy(port, 500);
|
|
94
121
|
}
|
|
95
122
|
async function startSession(projectDir, idleTtlMs, options) {
|
|
96
123
|
if (options.subprocess !== undefined)
|
|
97
124
|
debugSessions.configure(options.subprocess, options.binDirs ?? []);
|
|
125
|
+
if (options.checkSessionAlive !== undefined) {
|
|
126
|
+
// 同一个注入探针也给 manager 用:起会话之后那次「确认 openocd 没当场死」不该去打真端口。
|
|
127
|
+
const injected = options.checkSessionAlive;
|
|
128
|
+
debugSessions.setAliveProbe(async () => {
|
|
129
|
+
const info = sessionInfo();
|
|
130
|
+
return info === null ? true : await injected(info);
|
|
131
|
+
});
|
|
132
|
+
}
|
|
98
133
|
const port = options.port ?? DEFAULT_PROBE_PORT;
|
|
99
134
|
const checkBusy = options.checkPortBusy ?? isPortBusy;
|
|
100
135
|
if (options.portBusyIsError !== false && (await checkBusy(port))) {
|
|
@@ -102,7 +137,7 @@ async function startSession(projectDir, idleTtlMs, options) {
|
|
|
102
137
|
cause: "gdb 端口 " + String(port) + " 已被占用(多半是 VS Code 的调试会话或另一个 openocd 还握着探针)",
|
|
103
138
|
evidence: ["probe port " + String(port) + " busy"],
|
|
104
139
|
});
|
|
105
|
-
return { ok: false, reused: false, session: null, probeError, message: formatProbeError(probeError) };
|
|
140
|
+
return { ok: false, reused: false, replacedDead: false, session: null, probeError, message: formatProbeError(probeError) };
|
|
106
141
|
}
|
|
107
142
|
const started = await debugSessions.start({
|
|
108
143
|
projectDir,
|
|
@@ -117,11 +152,12 @@ async function startSession(projectDir, idleTtlMs, options) {
|
|
|
117
152
|
if (!started.ok) {
|
|
118
153
|
// 起会话失败的日志已经在 report.errors 里:归类只走 probe-error 那一张表。
|
|
119
154
|
const probeError = classifyProbeFailure({ lines: started.errors, stage: "session" });
|
|
120
|
-
return { ok: false, reused: false, session: null, probeError, message: formatProbeError(probeError) };
|
|
155
|
+
return { ok: false, reused: false, replacedDead: false, session: null, probeError, message: formatProbeError(probeError) };
|
|
121
156
|
}
|
|
122
157
|
return {
|
|
123
158
|
ok: true,
|
|
124
159
|
reused: false,
|
|
160
|
+
replacedDead: false,
|
|
125
161
|
session: sessionInfo(),
|
|
126
162
|
probeError: null,
|
|
127
163
|
message: "起了调试会话(gdb 端口 " + String(started.port) + ",tcl 端口 " + String(started.tclPort) + ",空闲 " + String(Math.round(idleTtlMs / 1000)) + " s 后自动关)",
|
package/lib/engine/probe.js
CHANGED
|
@@ -208,7 +208,8 @@ export function buildTargets(config) {
|
|
|
208
208
|
label: "GDB(arm-none-eabi-gdb 或 gdb-multiarch)",
|
|
209
209
|
candidates: ["arm-none-eabi-gdb", "gdb-multiarch"],
|
|
210
210
|
versionArgs: ["--version"],
|
|
211
|
-
|
|
211
|
+
// 只编译/只烧录的机器不需要 GDB;缺了由 capabilities.debug 和 recommendations 针对性说明。
|
|
212
|
+
required: false,
|
|
212
213
|
hint: "调试要 GDB:msys64 里 pacman -S mingw-w64-ucrt-x86_64-gdb-multiarch",
|
|
213
214
|
impact: "调试用不了(F5 / stm32_debug_run 起不来 GDB);只烧录不受影响,纯烧录只需要 openocd。",
|
|
214
215
|
install: [
|
|
@@ -223,7 +224,8 @@ export function buildTargets(config) {
|
|
|
223
224
|
label: "OpenOCD",
|
|
224
225
|
candidates: ["openocd"],
|
|
225
226
|
versionArgs: ["--version"],
|
|
226
|
-
required
|
|
227
|
+
// openocd 不是唯一烧录后端:CubeProgrammer 可顶 ST-LINK。恒 required 会把只装 CubeProgrammer 的机器判成缺件。
|
|
228
|
+
required: false,
|
|
227
229
|
hint: "烧录/调试服务端:msys64 里 pacman -S mingw-w64-ucrt-x86_64-openocd",
|
|
228
230
|
impact: "烧录和调试都用不了(stm32_flash / stm32_debug_run / stm32_stop 全部失败);生成代码、编译、改 USER CODE 不受影响。",
|
|
229
231
|
install: [
|
|
@@ -263,6 +265,21 @@ export function buildTargets(config) {
|
|
|
263
265
|
],
|
|
264
266
|
verify: "ninja --version",
|
|
265
267
|
},
|
|
268
|
+
{
|
|
269
|
+
id: "cubeprogrammer",
|
|
270
|
+
label: "STM32CubeProgrammer(CLI 烧录第二后端)",
|
|
271
|
+
candidates: (config.cubePrgBins ?? []).map((dir) => dir + "/STM32_Programmer_CLI.exe"),
|
|
272
|
+
// 只确认文件在:这货是 Java 启动器,--version 也要起 JVM,别为探测等它 5 秒。
|
|
273
|
+
versionArgs: [],
|
|
274
|
+
required: false,
|
|
275
|
+
hint: "可选:openocd 烧不动时的第二后端(只认 ST-LINK 探针);装在 ST 官网包,或用 STM32_CUBE_PRG_ROOT 指到安装根/bin",
|
|
276
|
+
impact: "只影响烧录兜底:openocd 的 target 脚本覆盖不到这族、或探针驱动对不上时,stm32_flash 会试 STM32_Programmer_CLI 补位;编译/调试/生成都不受影响,DAPLink 探针本来也没这条腿。",
|
|
277
|
+
install: [
|
|
278
|
+
"官网装 STM32CubeProgrammer(默认路径即可被自动发现):https://www.st.com/en/development-tools/stm32cubeprog.html",
|
|
279
|
+
"装到别处:把 bin 目录(含 STM32_Programmer_CLI.exe)写进 STM32_CUBE_PRG_ROOT,或 ~/.dsh-stm32/config.json",
|
|
280
|
+
],
|
|
281
|
+
verify: "STM32_Programmer_CLI.exe -l(列出可用接口)",
|
|
282
|
+
},
|
|
266
283
|
{
|
|
267
284
|
id: "cubemx",
|
|
268
285
|
label: "STM32CubeMX(启动器)",
|
|
@@ -273,10 +290,10 @@ export function buildTargets(config) {
|
|
|
273
290
|
impact: "只影响建工程与重新生成代码:stm32_project_create 和改 .ioc 后的 stm32_generate 用不了;编译、烧录、调试、以及 stm32_ioc_inspect / stm32_ioc_plan 的只读分析都不受影响。",
|
|
274
291
|
install: [
|
|
275
292
|
"官网下载安装(winget 里没有):https://www.st.com/en/development-tools/stm32cubemx.html;装到默认目录 " + cubeMxDefaultRoot + " 会被自动发现",
|
|
276
|
-
"装在别处:设 STM32_CUBEMX_ROOT=<安装根>(根下要有 STM32CubeMX.exe 和 jre/bin/java.exe),或把路径传给
|
|
293
|
+
"装在别处:设 STM32_CUBEMX_ROOT=<安装根>(根下要有 STM32CubeMX.exe 和 jre/bin/java.exe),或把路径传给 stm32_doctor 的 cubeMxRoots",
|
|
277
294
|
"装完自检:<安装根>/jre/bin/java.exe -version 能打印版本",
|
|
278
295
|
],
|
|
279
|
-
verify: "重跑一次
|
|
296
|
+
verify: "重跑一次 stm32_doctor,cubemx 与 cubemx-java 两项都变成 OK",
|
|
280
297
|
},
|
|
281
298
|
{
|
|
282
299
|
id: "cubemx-java",
|
|
@@ -290,7 +307,7 @@ export function buildTargets(config) {
|
|
|
290
307
|
"用官网安装包重装 STM32CubeMX(自带 JRE);只拷一个 exe 是不够的",
|
|
291
308
|
"装完自检:<安装根>/jre/bin/java.exe -version",
|
|
292
309
|
],
|
|
293
|
-
verify: "重跑一次
|
|
310
|
+
verify: "重跑一次 stm32_doctor,cubemx-java 变成 OK",
|
|
294
311
|
},
|
|
295
312
|
];
|
|
296
313
|
}
|
|
@@ -130,3 +130,44 @@ export function renderClockInit(plan) {
|
|
|
130
130
|
push(" cfgr |= ((uint32_t)(DSH_PLL_MUL - 2u) << RCC_CFGR_PLLMULL_Pos);", " } else {", " cfgr |= ((uint32_t)(DSH_HSI_MUL - 2u) << RCC_CFGR_PLLMULL_Pos); /* 0 = HSI/2 进 PLL */", " }", " RCC->CFGR = cfgr;", "", " /* 6) 开 PLL 等锁定,然后把 SYSCLK 切到 PLL 并等 SWS 确认 */", " RCC->CR |= RCC_CR_PLLON;", " spin = 0u;", " while (((RCC->CR & RCC_CR_PLLRDY) == 0u) && (spin < 100000u)) { spin++; }", " cfgr = RCC->CFGR;", " cfgr = (cfgr & ~RCC_CFGR_SW_Msk) | RCC_CFGR_SW_PLL;", " RCC->CFGR = cfgr;", " spin = 0u;", " while (((RCC->CFGR & RCC_CFGR_SWS_Msk) != RCC_CFGR_SWS_PLL) && (spin < 100000u)) { spin++; }", "", " /* 7) 让 SystemCoreClock 跟着变,delay_ms / SysTick 才是对的数 */", " SystemCoreClockUpdate();", "}", "");
|
|
131
131
|
return lines.join("\n");
|
|
132
132
|
}
|
|
133
|
+
/**
|
|
134
|
+
* 非 F1 的时钟:不生成 PLL 配置。
|
|
135
|
+
*
|
|
136
|
+
* 为什么先不做:PLL 源选择、倍频/分频字段、Flash 等待周期、电压调节(L4 的 VOS、G4 的
|
|
137
|
+
* boost)每代都不同,HSE 频率还随板子变(8/16/25 MHz 都有)。凭"看起来差不多"写一段
|
|
138
|
+
* PLL 代码,最常见的结局是用户烧进去板子起不来,而且没有任何提示。
|
|
139
|
+
*
|
|
140
|
+
* 现状是诚实的:复位后由启动文件里的 SystemInit()(system_<族>xx.c)决定时钟,多数族
|
|
141
|
+
* 默认跑 HSI;我们不覆盖它,也不谎称一个频率。要用 PLL 就在 main.c 的 clock_init() 里
|
|
142
|
+
* 按该族 RM 的 RCC 章补,那一块留了注释和空函数。
|
|
143
|
+
*/
|
|
144
|
+
export function planGenericClock(chip) {
|
|
145
|
+
return {
|
|
146
|
+
mcu: chip.cpn,
|
|
147
|
+
family: chip.family,
|
|
148
|
+
sysclkHz: 0,
|
|
149
|
+
summary: "复位默认时钟(由 " + chip.systemC + " 的 SystemInit 决定;寄存器版没有生成 PLL 配置)",
|
|
150
|
+
warnings: [
|
|
151
|
+
"时钟没有配 PLL:复位后由 " + chip.systemC + " 里的 SystemInit() 决定(多数族是 HSI)。" +
|
|
152
|
+
"要跑到芯片上限,请在 main.c 的 clock_init() 里按 " + chip.family + " 参考手册的 RCC 章补 PLL 配置" +
|
|
153
|
+
"(源/倍频/分频/Flash 等待周期各代不同,所以没有替你猜);改完把 DSH_SYSCLK_HZ 与 SystemCoreClock 对上。",
|
|
154
|
+
],
|
|
155
|
+
};
|
|
156
|
+
}
|
|
157
|
+
/** 生成非 F1 的 clock_init():空函数 + 说明,保持复位时钟。 */
|
|
158
|
+
export function renderGenericClockInit(plan) {
|
|
159
|
+
return [
|
|
160
|
+
"/* ---------------------------------------------------------------------------",
|
|
161
|
+
" * 时钟:" + plan.mcu + " —— " + plan.summary,
|
|
162
|
+
" * 这段刻意是空的:PLL 配置按族/按板子(HSE 频率)不同,写错会让芯片起不来。",
|
|
163
|
+
" * 保持 system_<族>xx.c 里 SystemInit() 的结果(SystemCoreClock 已经是真实值),",
|
|
164
|
+
" * delay_ms 与 SysTick 都按它算,所以不改也能正常跑。",
|
|
165
|
+
" * 要更高主频:按本族 RM 的 RCC 章在这里配 PLL,并把 SystemCoreClockUpdate() 调一次。",
|
|
166
|
+
" * -------------------------------------------------------------------------*/",
|
|
167
|
+
"static void clock_init(void)",
|
|
168
|
+
"{",
|
|
169
|
+
" /* 有意留空:复位时钟(见上面注释)。 */",
|
|
170
|
+
"}",
|
|
171
|
+
"",
|
|
172
|
+
].join("\n");
|
|
173
|
+
}
|
|
@@ -0,0 +1,132 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 寄存器版模板里的 LED 初始化(GPIO)——按族给不同的寄存器写法。
|
|
3
|
+
*
|
|
4
|
+
* 为什么必须按族:GPIO 的时钟门与配置寄存器在两代之间都变了。
|
|
5
|
+
* · F1:RCC->APB2ENR 的 IOPxEN + CRL/CRH(每引脚 4 位 MODE/CNF)
|
|
6
|
+
* · F2/F4/F7:RCC->AHB1ENR + MODER(每引脚 2 位)
|
|
7
|
+
* · F0/F3/L1:RCC->AHBENR + MODER
|
|
8
|
+
* · G4/L4/H5/L4+/L5/WBA/WL:RCC->AHB2ENR + MODER
|
|
9
|
+
* · H7:RCC->AHB4ENR + MODER(H7 把 GPIO 挂到 AHB4)
|
|
10
|
+
* · U3/U5:RCC->AHB2ENR1 + MODER(U5 代把 AHB2 拆成 ENR1/ENR2)
|
|
11
|
+
* · C0/G0/L0/U0:RCC->IOPENR + MODER
|
|
12
|
+
* 拿 F1 的写法去配 F4,编译就过(GPIOC->CRH 在 F4 头里不存在?实际是 GPIO_TypeDef 没有 CRH
|
|
13
|
+
* 字段 → 编译期就报错),所以这张表不是"风格选择",是能不能编过的问题。
|
|
14
|
+
*
|
|
15
|
+
* 这张表是按族实测编译过的(见 docs §82 的 build matrix);新增族必须先真编一次再加进来。
|
|
16
|
+
* 2026-11-09 补的 8 族:时钟门寄存器名不是猜的——逐族从 cmsis-device-<族> 的型号头里查到
|
|
17
|
+
* #define RCC_<门>_GPIOCEN(H5/L4+/L5/WBA/WL → RCC_AHB2ENR_GPIOCEN;H7 → RCC_AHB4ENR_GPIOCEN;
|
|
18
|
+
* U3/U5 → RCC_AHB2ENR1_GPIOCEN),MODER 的位布局与 G4/L4 一致(2 位/引脚)。
|
|
19
|
+
* 编译证据:H5(STM32H503CBT6)已用 arm-none-eabi-gcc 13.3 真编过一次(含时钟门行);
|
|
20
|
+
* 其余 7 族随交付的 8 族编译矩阵逐族验证。
|
|
21
|
+
*/
|
|
22
|
+
// 这张表是编译器逼出来的,不是抄手册的:F2 的 GPIO 已经是 MODER、时钟在 AHB1ENR(拿 F1 的 CRH
|
|
23
|
+
// 直接报 "GPIO_TypeDef has no member named CRH");F3 有 MODER 但时钟门叫 AHBENR(不是 AHB1ENR)。
|
|
24
|
+
const STYLE_BY_FAMILY = {
|
|
25
|
+
F1: "f1-legacy",
|
|
26
|
+
F2: "moder-ahb1",
|
|
27
|
+
F3: "moder-ahb",
|
|
28
|
+
F4: "moder-ahb1",
|
|
29
|
+
F7: "moder-ahb1",
|
|
30
|
+
F0: "moder-ahb",
|
|
31
|
+
L1: "moder-ahb",
|
|
32
|
+
G4: "moder-ahb2",
|
|
33
|
+
L4: "moder-ahb2",
|
|
34
|
+
H5: "moder-ahb2",
|
|
35
|
+
"L4+": "moder-ahb2",
|
|
36
|
+
L5: "moder-ahb2",
|
|
37
|
+
WBA: "moder-ahb2",
|
|
38
|
+
WL: "moder-ahb2",
|
|
39
|
+
H7: "moder-ahb4",
|
|
40
|
+
U3: "moder-ahb2enr1",
|
|
41
|
+
U5: "moder-ahb2enr1",
|
|
42
|
+
C0: "moder-iopenr",
|
|
43
|
+
G0: "moder-iopenr",
|
|
44
|
+
L0: "moder-iopenr",
|
|
45
|
+
U0: "moder-iopenr",
|
|
46
|
+
};
|
|
47
|
+
export function ledStyleOf(family) {
|
|
48
|
+
return STYLE_BY_FAMILY[family.toUpperCase()] ?? "none";
|
|
49
|
+
}
|
|
50
|
+
/** 生成 led_init()/led_toggle()。默认 PC13(蓝丸/多数最小系统板)。 */
|
|
51
|
+
export function renderLedFunctions(family) {
|
|
52
|
+
const style = ledStyleOf(family);
|
|
53
|
+
if (style === "none") {
|
|
54
|
+
return {
|
|
55
|
+
text: [
|
|
56
|
+
"/* 这一族还没有验证过的 GPIO 写法:led_init()/led_toggle() 留空,工程照常编译/烧录。",
|
|
57
|
+
" * 点灯请按本族参考手册的 GPIO 章补(时钟门 + MODER/CRL/CRH),或改用 HAL 路线。 */",
|
|
58
|
+
"static void led_init(void)",
|
|
59
|
+
"{",
|
|
60
|
+
"}",
|
|
61
|
+
"",
|
|
62
|
+
"static void led_toggle(void)",
|
|
63
|
+
"{",
|
|
64
|
+
"}",
|
|
65
|
+
"",
|
|
66
|
+
].join("\n"),
|
|
67
|
+
warnings: ["这一族(" + family + ")还没有验证过的寄存器版 GPIO 写法:模板的 LED 是空函数,工程能编译能烧,但不会闪。"],
|
|
68
|
+
};
|
|
69
|
+
}
|
|
70
|
+
const clockLine = {
|
|
71
|
+
"moder-ahb1": " RCC->AHB1ENR |= RCC_AHB1ENR_GPIOCEN;",
|
|
72
|
+
"moder-ahb": " RCC->AHBENR |= RCC_AHBENR_GPIOCEN;",
|
|
73
|
+
"moder-ahb2": " RCC->AHB2ENR |= RCC_AHB2ENR_GPIOCEN;",
|
|
74
|
+
"moder-ahb4": " RCC->AHB4ENR |= RCC_AHB4ENR_GPIOCEN;",
|
|
75
|
+
"moder-ahb2enr1": " RCC->AHB2ENR1 |= RCC_AHB2ENR1_GPIOCEN;",
|
|
76
|
+
"moder-iopenr": " RCC->IOPENR |= RCC_IOPENR_GPIOCEN;",
|
|
77
|
+
};
|
|
78
|
+
if (style === "f1-legacy") {
|
|
79
|
+
return {
|
|
80
|
+
text: [
|
|
81
|
+
"static void led_init(void)",
|
|
82
|
+
"{",
|
|
83
|
+
"#if LED_PIN == 13u",
|
|
84
|
+
" RCC->APB2ENR |= RCC_APB2ENR_IOPCEN;",
|
|
85
|
+
" GPIOC->CRH &= ~(GPIO_CRH_MODE13 | GPIO_CRH_CNF13);",
|
|
86
|
+
" GPIOC->CRH |= GPIO_CRH_MODE13_0; /* 推挽输出 10 MHz */",
|
|
87
|
+
" GPIOC->BSRR = GPIO_BSRR_BS13; /* 先给高电平:PC13 低电平点亮 → LED 灭 */",
|
|
88
|
+
"#else",
|
|
89
|
+
"#error \"只写好了 PC13 的初始化;换引脚请在 led_init() 里补对应的 CRL/CRH 设置\"",
|
|
90
|
+
"#endif",
|
|
91
|
+
"}",
|
|
92
|
+
"",
|
|
93
|
+
"static void led_toggle(void)",
|
|
94
|
+
"{",
|
|
95
|
+
"#if LED_PIN == 13u",
|
|
96
|
+
" GPIOC->ODR ^= GPIO_ODR_ODR13;",
|
|
97
|
+
"#else",
|
|
98
|
+
"#error \"只写好了 PC13 的翻转;换引脚请改这里\"",
|
|
99
|
+
"#endif",
|
|
100
|
+
"}",
|
|
101
|
+
"",
|
|
102
|
+
].join("\n"),
|
|
103
|
+
warnings: [],
|
|
104
|
+
};
|
|
105
|
+
}
|
|
106
|
+
return {
|
|
107
|
+
text: [
|
|
108
|
+
"static void led_init(void)",
|
|
109
|
+
"{",
|
|
110
|
+
"#if LED_PIN == 13u",
|
|
111
|
+
clockLine[style],
|
|
112
|
+
" /* MODER:每引脚 2 位;01 = 通用输出 */",
|
|
113
|
+
" GPIOC->MODER = (GPIOC->MODER & ~(3u << (13u * 2u))) | (1u << (13u * 2u));",
|
|
114
|
+
" GPIOC->BSRR = (1u << 13u); /* 先给高电平:PC13 低电平点亮 → LED 灭 */",
|
|
115
|
+
"#else",
|
|
116
|
+
"#error \"只写好了 PC13 的初始化;换引脚请改 MODER 的位\"",
|
|
117
|
+
"#endif",
|
|
118
|
+
"}",
|
|
119
|
+
"",
|
|
120
|
+
"static void led_toggle(void)",
|
|
121
|
+
"{",
|
|
122
|
+
"#if LED_PIN == 13u",
|
|
123
|
+
" GPIOC->ODR ^= (1u << 13u);",
|
|
124
|
+
"#else",
|
|
125
|
+
"#error \"只写好了 PC13 的翻转;换引脚请改这里\"",
|
|
126
|
+
"#endif",
|
|
127
|
+
"}",
|
|
128
|
+
"",
|
|
129
|
+
].join("\n"),
|
|
130
|
+
warnings: [],
|
|
131
|
+
};
|
|
132
|
+
}
|
|
@@ -8,6 +8,10 @@
|
|
|
8
8
|
* 内存上,烧进去就是 HardFault。所以寄存器路线不从模板拷死脚本,而是改 MEMORY 两行。
|
|
9
9
|
*
|
|
10
10
|
* 时间/复杂度上这也是最省的做法:链接脚本是 ASCII 文本,改两行比引一个链接脚本生成器简单。
|
|
11
|
+
*
|
|
12
|
+
* 例外:H7/U5 的 RAM 不是一块连续内存(H7 = DTCM 128K + AXI SRAM;U5 = 主 SRAM + SRAM4@0x28000000)。
|
|
13
|
+
* 这时 chips.json 的 ramBytes 会把不相邻的区域加在一起,按它写 LENGTH 会让 _estack 落进空洞。
|
|
14
|
+
* 这类族在 chips.json 里带 linkerRam(连续窗口的 origin/sizeBytes),本文件优先用它并同时改 ORIGIN。
|
|
11
15
|
*/
|
|
12
16
|
/**
|
|
13
17
|
* F100/F101/F102 的 RAM 兜底表(KB),取值来自 STM32CubeMX 的 db/mcu/*.xml:
|
|
@@ -33,9 +37,9 @@ const RAM_FALLBACK_KB = {
|
|
|
33
37
|
"105xc": 64,
|
|
34
38
|
"107xc": 64,
|
|
35
39
|
};
|
|
36
|
-
/** line 代号:STM32F103 → 103
|
|
40
|
+
/** line 代号:STM32F103 → 103;通用事实没有 prefix 时给空串。 */
|
|
37
41
|
function lineOf(chip) {
|
|
38
|
-
return chip.prefix.slice(6);
|
|
42
|
+
return (chip.prefix ?? "").slice(6);
|
|
39
43
|
}
|
|
40
44
|
/**
|
|
41
45
|
* ST 的器件代号:完整型号去掉温度/封装尾号换成 x(STM32F103C8T6 → STM32F103C8Tx),
|
|
@@ -44,6 +48,11 @@ function lineOf(chip) {
|
|
|
44
48
|
* 沿用同一约定,用户从 HAL 工程切过来时一眼认得出这是哪颗芯片的脚本。
|
|
45
49
|
*/
|
|
46
50
|
export function deviceIdFor(chip) {
|
|
51
|
+
// chips.json 已经把 CubeMX 的 DeviceId 算好了(STM32F401CBUx 这种),直接用;
|
|
52
|
+
// 只有 F1Chip 走下面按型号命名的兜底。
|
|
53
|
+
if (chip.deviceId !== undefined && chip.deviceId !== "")
|
|
54
|
+
return chip.deviceId;
|
|
55
|
+
const prefix = chip.prefix ?? chip.cpn.slice(0, "STM32F103".length);
|
|
47
56
|
const cpn = chip.cpn.toUpperCase();
|
|
48
57
|
if (/^STM32F\d{3}[A-Z][0-9A-G]/u.test(cpn) && cpn.length >= 11) {
|
|
49
58
|
if (/[67]$/u.test(cpn) && cpn.length >= 12)
|
|
@@ -52,7 +61,7 @@ export function deviceIdFor(chip) {
|
|
|
52
61
|
return cpn + "Tx";
|
|
53
62
|
return cpn.slice(0, -1) + "x";
|
|
54
63
|
}
|
|
55
|
-
return
|
|
64
|
+
return prefix + "x" + chip.group.slice(1).toUpperCase();
|
|
56
65
|
}
|
|
57
66
|
function kbOf(bytes) {
|
|
58
67
|
return Math.round(bytes / 1024);
|
|
@@ -61,34 +70,45 @@ function kbOf(bytes) {
|
|
|
61
70
|
export function planRegisterLinker(chip) {
|
|
62
71
|
const warnings = [];
|
|
63
72
|
const line = lineOf(chip);
|
|
64
|
-
const key =
|
|
73
|
+
const key = line + chip.group;
|
|
65
74
|
const deviceId = deviceIdFor(chip);
|
|
66
75
|
const flashBytes = chip.flashBytes ?? 0;
|
|
67
76
|
if (flashBytes <= 0) {
|
|
68
|
-
warnings.push("这颗芯片的 Flash
|
|
77
|
+
warnings.push("这颗芯片的 Flash 大小没收录(内置资源 chips.json 里这一档没有 flashBytes),链接脚本按 64K 生成;确认后请更新内置资源。");
|
|
69
78
|
}
|
|
70
79
|
const exactRam = chip.ramBytes ?? null;
|
|
80
|
+
// 连续窗口优先:ramBytes 只是「芯片共有多少 RAM」,H7/U5 里包含不相邻区域。
|
|
81
|
+
const window = chip.linkerRam !== undefined && chip.linkerRam.sizeBytes > 0 ? chip.linkerRam : null;
|
|
71
82
|
const fallbackKb = RAM_FALLBACK_KB[key];
|
|
72
|
-
const ramBytes = exactRam !== null ? exactRam : (fallbackKb ?? 20) * 1024;
|
|
83
|
+
const ramBytes = window !== null ? window.sizeBytes : (exactRam !== null ? exactRam : (fallbackKb ?? 20) * 1024);
|
|
84
|
+
if (window !== null && exactRam !== null && exactRam > window.sizeBytes) {
|
|
85
|
+
warnings.push("这颗芯片共 " + kbOf(exactRam) + "K RAM,但其中有不连续区域;链接脚本按官方连续窗口 0x" +
|
|
86
|
+
window.origin.toString(16).toUpperCase().padStart(8, "0") + " 起 " + kbOf(window.sizeBytes) + "K 生成,栈顶 = 0x" +
|
|
87
|
+
(window.origin + window.sizeBytes).toString(16).toUpperCase().padStart(8, "0") +
|
|
88
|
+
"(" + (window.region ?? "连续 RAM") + ")。需要更多 RAM 时手工在 MEMORY 里加分区,别直接把 LENGTH 改大。");
|
|
89
|
+
}
|
|
73
90
|
if (exactRam === null && fallbackKb === undefined) {
|
|
74
|
-
warnings.push("F" + line + " 的档位 " + chip.group + " 的 RAM 大小没收录,链接脚本按 20K
|
|
91
|
+
warnings.push((line === "" ? "这颗芯片" : "F" + line + " 的档位 " + chip.group) + " 的 RAM 大小没收录,链接脚本按 20K 兜底;确认后请更新内置资源(chips.json 的 ramBytes)。");
|
|
75
92
|
}
|
|
76
93
|
else if (exactRam === null) {
|
|
77
|
-
warnings.push("F" + line + " 的档位 " + chip.group + " 的 RAM
|
|
94
|
+
warnings.push("F" + line + " 的档位 " + chip.group + " 的 RAM 没收录,链接脚本按 CubeMX db 的最小值 " + kbOf(ramBytes) + "K 生成(宁可小,栈不会越界);封装更大时可以把 LENGTH 改大。");
|
|
78
95
|
}
|
|
79
96
|
if (ramBytes > 0 && ramBytes <= 8 * 1024) {
|
|
80
97
|
warnings.push("这颗芯片只有 " + kbOf(ramBytes) + "K RAM,链接脚本仍保留默认的 1K 栈 + 512B 堆(_Min_Stack_Size/_Min_Heap_Size),紧张时请调小。");
|
|
81
98
|
}
|
|
82
99
|
const flashKb = flashBytes > 0 ? kbOf(flashBytes) : 64;
|
|
83
100
|
const ramKb = kbOf(ramBytes);
|
|
101
|
+
const ramRegion = window?.region;
|
|
84
102
|
return {
|
|
85
103
|
mcu: chip.cpn,
|
|
86
104
|
deviceId,
|
|
87
105
|
fileName: deviceId + "_FLASH.ld",
|
|
88
106
|
flashBytes: flashKb * 1024,
|
|
89
107
|
ramBytes: ramBytes,
|
|
90
|
-
|
|
91
|
-
|
|
108
|
+
ramOrigin: window?.origin ?? 0x20000000,
|
|
109
|
+
...(ramRegion === undefined || ramRegion === "" ? {} : { ramRegion }),
|
|
110
|
+
ramExact: window !== null || exactRam !== null,
|
|
111
|
+
summary: flashKb + "K FLASH + " + ramKb + "K RAM" + (ramRegion === undefined || ramRegion === "" ? "" : "(" + ramRegion + ")"),
|
|
92
112
|
warnings,
|
|
93
113
|
};
|
|
94
114
|
}
|
|
@@ -96,8 +116,10 @@ export function planRegisterLinker(chip) {
|
|
|
96
116
|
* 把模板链接脚本里写死 C8T6 的四处改掉:
|
|
97
117
|
* 注释 :9 "Linker script for STM32F103C8Tx series"
|
|
98
118
|
* 注释 :10 "64Kbytes FLASH and 20Kbytes RAM"
|
|
99
|
-
* MEMORY :58 RAM LENGTH = 20K
|
|
119
|
+
* MEMORY :58 RAM ORIGIN = 0x20000000, LENGTH = 20K
|
|
100
120
|
* MEMORY :59 FLASH LENGTH = 64K
|
|
121
|
+
* RAM 的 ORIGIN 也要改:H7 的连续窗口虽然从 0x20000000 起,但别的族可能有偏移;
|
|
122
|
+
* 统一按 plan.ramOrigin 写,F1 的输出逐字不变(还是 0x20000000)。
|
|
101
123
|
* 任何一处找不到(模板被人改过)就返回 null,让调用方明确报错,而不是生成一个尺寸错的脚本。
|
|
102
124
|
*/
|
|
103
125
|
export function renderLinkerScript(plan, template) {
|
|
@@ -115,9 +137,11 @@ export function renderLinkerScript(plan, template) {
|
|
|
115
137
|
text = text.replace(commentSizes, "$1" + flashKb + "Kbytes FLASH and " + ramKb + "Kbytes RAM");
|
|
116
138
|
patched++;
|
|
117
139
|
}
|
|
118
|
-
|
|
140
|
+
// ORIGIN 与 LENGTH 一起改:模板写死的 0x20000000 只对连续族成立(H7/U5 靠 linkerRam 给真值)。
|
|
141
|
+
const ramLine = /^([ \t]*RAM \(xrw\)[ \t]*:[ \t]*ORIGIN = )0x[0-9A-Fa-f]+, LENGTH = [0-9]+[KM][ \t]*$/mu;
|
|
119
142
|
if (ramLine.test(text)) {
|
|
120
|
-
|
|
143
|
+
const origin = "0x" + Math.trunc(plan.ramOrigin).toString(16).toUpperCase().padStart(8, "0");
|
|
144
|
+
text = text.replace(ramLine, "$1" + origin + ", LENGTH = " + ramKb + "K");
|
|
121
145
|
patched++;
|
|
122
146
|
}
|
|
123
147
|
const flashLine = /^([ \t]*FLASH \(rx\)[ \t]*:[ \t]*ORIGIN = 0x8000000, LENGTH = )[0-9]+[KM][ \t]*$/mu;
|