dsh-stm32 0.1.3 → 0.1.4
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 +52 -38
- package/README_EN.md +44 -33
- 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 +1948 -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 +884 -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 +37 -35
- 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 +239 -18
- package/lib/data/db-presets.js +252 -0
- package/lib/data/device-facts.js +99 -26
- package/lib/data/family.js +515 -0
- package/lib/data/firmware-packages.js +562 -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 +42 -1
- 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 +160 -17
- package/lib/engine/facts-acquire.js +416 -0
- package/lib/engine/facts.js +134 -0
- package/lib/engine/firmware-install.js +176 -5
- package/lib/engine/firmware-official.js +451 -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 +4 -4
- package/lib/engine/probe-error.js +25 -6
- package/lib/engine/probe-session.js +50 -14
- package/lib/engine/probe.js +18 -3
- package/lib/engine/register-clock.js +41 -0
- package/lib/engine/register-gpio.js +115 -0
- package/lib/engine/register-linker.js +12 -7
- package/lib/engine/register-template.js +101 -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/toolchain-gate.js +0 -4
- package/lib/engine/watch.js +227 -0
- package/lib/index.js +4 -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 +55 -5
- 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/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/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
|
@@ -0,0 +1,237 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* L3:stm32_ioc_verify —— 让 CubeMX 自己说「这份 .ioc 它认了什么」,用来查「外设被静默丢弃」。
|
|
3
|
+
*
|
|
4
|
+
* 背景:CubeMX 遇到不认识的键不报错、直接丢。我们写对了 USART、却丢了 TIM/ADC 时,
|
|
5
|
+
* 生成日志一个 ERROR 都没有。唯一可靠的办法是让它把「理解结果」写回来再对比。
|
|
6
|
+
*
|
|
7
|
+
* 做法:把 .ioc 复制到 .dsh-stm32/verify/<stamp>/,用无头脚本 `config load` + `config save`
|
|
8
|
+
* 让它重写这份副本(约 25–40 s,不生成代码),再 diff 出:丢了哪些外设、引脚信号被改成什么、
|
|
9
|
+
* 它补了哪些 SH 共享信号块、计划生成哪些 MX_*_Init。工程里的 .ioc 一个字节都不动。
|
|
10
|
+
*/
|
|
11
|
+
import { resolve } from "node:path";
|
|
12
|
+
import { findIocFile } from "../engine/generate.js";
|
|
13
|
+
import { runIocVerify } from "../engine/ioc-verify.js";
|
|
14
|
+
import { resolveProjectDir } from "./project-dir.js";
|
|
15
|
+
export const IOC_VERIFY_TOOL = "stm32_ioc_verify";
|
|
16
|
+
const valueChangeList = {
|
|
17
|
+
type: "array",
|
|
18
|
+
items: {
|
|
19
|
+
type: "object",
|
|
20
|
+
additionalProperties: false,
|
|
21
|
+
properties: { key: { type: "string" }, before: { type: "string" }, after: { type: "string" } },
|
|
22
|
+
required: ["key", "before", "after"],
|
|
23
|
+
},
|
|
24
|
+
};
|
|
25
|
+
const explanationList = {
|
|
26
|
+
type: "array",
|
|
27
|
+
items: {
|
|
28
|
+
type: "object",
|
|
29
|
+
additionalProperties: false,
|
|
30
|
+
properties: {
|
|
31
|
+
key: { type: "string" },
|
|
32
|
+
verdict: { type: "string" },
|
|
33
|
+
detail: { type: "string" },
|
|
34
|
+
},
|
|
35
|
+
required: ["key", "verdict", "detail"],
|
|
36
|
+
},
|
|
37
|
+
};
|
|
38
|
+
const diffSchema = {
|
|
39
|
+
type: "object",
|
|
40
|
+
additionalProperties: false,
|
|
41
|
+
properties: {
|
|
42
|
+
afterPeripherals: { type: "array", items: { type: "string" } },
|
|
43
|
+
droppedPeripherals: { type: "array", items: { type: "string" } },
|
|
44
|
+
addedPeripherals: { type: "array", items: { type: "string" } },
|
|
45
|
+
plannedFunctions: { type: "array", items: { type: "string" } },
|
|
46
|
+
plannedFunctionsRaw: { type: "array", items: { type: "string" } },
|
|
47
|
+
signalRewrites: {
|
|
48
|
+
type: "array",
|
|
49
|
+
items: {
|
|
50
|
+
type: "object",
|
|
51
|
+
additionalProperties: false,
|
|
52
|
+
properties: { pin: { type: "string" }, before: { type: "string" }, after: { type: "string" } },
|
|
53
|
+
required: ["pin", "before", "after"],
|
|
54
|
+
},
|
|
55
|
+
},
|
|
56
|
+
sharedSignals: {
|
|
57
|
+
type: "array",
|
|
58
|
+
items: {
|
|
59
|
+
type: "object",
|
|
60
|
+
additionalProperties: false,
|
|
61
|
+
properties: { key: { type: "string" }, entries: { type: "array", items: { type: "string" } } },
|
|
62
|
+
required: ["key", "entries"],
|
|
63
|
+
},
|
|
64
|
+
},
|
|
65
|
+
removedKeys: { type: "array", items: { type: "string" } },
|
|
66
|
+
addedKeys: { type: "array", items: { type: "string" } },
|
|
67
|
+
changedValues: valueChangeList,
|
|
68
|
+
misorderedKeys: { type: "array", items: { type: "string" } },
|
|
69
|
+
attribution: {
|
|
70
|
+
type: "object",
|
|
71
|
+
additionalProperties: false,
|
|
72
|
+
properties: {
|
|
73
|
+
orderOnly: { type: "array", items: { type: "string" } },
|
|
74
|
+
valueNormalized: valueChangeList,
|
|
75
|
+
valueChanged: valueChangeList,
|
|
76
|
+
missingKeys: { type: "array", items: { type: "string" } },
|
|
77
|
+
addedKeys: { type: "array", items: { type: "string" } },
|
|
78
|
+
droppedPeripherals: { type: "array", items: { type: "string" } },
|
|
79
|
+
autoAddedFunctions: { type: "array", items: { type: "string" } },
|
|
80
|
+
droppedReasons: explanationList,
|
|
81
|
+
addedVerdicts: explanationList,
|
|
82
|
+
ipOrderOnly: { type: "array", items: { type: "string" } },
|
|
83
|
+
derivedRecomputed: valueChangeList,
|
|
84
|
+
derivedAdded: { type: "array", items: { type: "string" } },
|
|
85
|
+
ipParametersAdded: { type: "array", items: { type: "string" } },
|
|
86
|
+
benign: { type: "boolean" },
|
|
87
|
+
},
|
|
88
|
+
required: [
|
|
89
|
+
"orderOnly", "valueNormalized", "valueChanged", "missingKeys", "addedKeys",
|
|
90
|
+
"droppedPeripherals", "autoAddedFunctions", "droppedReasons", "addedVerdicts",
|
|
91
|
+
"ipOrderOnly", "derivedRecomputed", "derivedAdded", "ipParametersAdded", "benign",
|
|
92
|
+
],
|
|
93
|
+
},
|
|
94
|
+
autoAddedFunctions: { type: "array", items: { type: "string" } },
|
|
95
|
+
hints: { type: "array", items: { type: "string" } },
|
|
96
|
+
},
|
|
97
|
+
required: [
|
|
98
|
+
"afterPeripherals", "droppedPeripherals", "addedPeripherals", "plannedFunctions", "plannedFunctionsRaw",
|
|
99
|
+
"signalRewrites", "sharedSignals", "removedKeys", "addedKeys", "changedValues", "misorderedKeys",
|
|
100
|
+
"attribution", "autoAddedFunctions", "hints",
|
|
101
|
+
],
|
|
102
|
+
};
|
|
103
|
+
export const outputSchema = {
|
|
104
|
+
type: "object",
|
|
105
|
+
additionalProperties: false,
|
|
106
|
+
properties: {
|
|
107
|
+
ok: { type: "boolean" },
|
|
108
|
+
projectDir: { type: "string" },
|
|
109
|
+
iocPath: { type: "string" },
|
|
110
|
+
snapshotPath: { type: "string" },
|
|
111
|
+
durationMs: { type: "number" },
|
|
112
|
+
message: { type: "string" },
|
|
113
|
+
notes: { type: "array", items: { type: "string" } },
|
|
114
|
+
errors: { type: "array", items: { type: "string" } },
|
|
115
|
+
diff: diffSchema,
|
|
116
|
+
},
|
|
117
|
+
required: ["ok", "projectDir", "iocPath", "snapshotPath", "durationMs", "message", "notes", "errors", "diff"],
|
|
118
|
+
};
|
|
119
|
+
function format(report) {
|
|
120
|
+
const lines = [];
|
|
121
|
+
lines.push(report.message);
|
|
122
|
+
if (report.errors.length > 0) {
|
|
123
|
+
for (const error of report.errors)
|
|
124
|
+
lines.push("! " + error);
|
|
125
|
+
return lines;
|
|
126
|
+
}
|
|
127
|
+
const diff = report.diff;
|
|
128
|
+
lines.push("CubeMX 认了:" + (diff.afterPeripherals.join(", ") || "(没有外设)"));
|
|
129
|
+
if (diff.droppedPeripherals.length > 0)
|
|
130
|
+
lines.push("被丢弃:" + diff.droppedPeripherals.join(", "));
|
|
131
|
+
if (diff.plannedFunctions.length > 0)
|
|
132
|
+
lines.push("计划生成:" + diff.plannedFunctions.join(", "));
|
|
133
|
+
for (const rewrite of diff.signalRewrites) {
|
|
134
|
+
lines.push("信号被改写: " + rewrite.pin + " " + rewrite.before + " → " + rewrite.after);
|
|
135
|
+
}
|
|
136
|
+
for (const block of diff.sharedSignals) {
|
|
137
|
+
lines.push("共享信号块:SH." + block.key + " → " + block.entries.join(" "));
|
|
138
|
+
}
|
|
139
|
+
for (const change of diff.attribution.valueChanged) {
|
|
140
|
+
lines.push("值被改写: " + change.key + " " + change.before + " → " + change.after);
|
|
141
|
+
}
|
|
142
|
+
for (const change of diff.attribution.valueNormalized) {
|
|
143
|
+
lines.push("值仅重排(语义不变): " + change.key + " " + change.before + " → " + change.after);
|
|
144
|
+
}
|
|
145
|
+
if (diff.attribution.orderOnly.length > 0) {
|
|
146
|
+
lines.push("行序不同(值相同,CubeMX 按自己的顺序重排):" + diff.attribution.orderOnly.join("、"));
|
|
147
|
+
}
|
|
148
|
+
if (diff.attribution.ipOrderOnly.length > 0) {
|
|
149
|
+
lines.push("外设槽位重排(Mcu.IP<i> 换位置但外设集合相同,语义不变):" + diff.attribution.ipOrderOnly.join("、"));
|
|
150
|
+
}
|
|
151
|
+
// 每一条被丢的键都给一句「它为什么不认」——这才是排查时真正要的答案。
|
|
152
|
+
for (const reason of diff.attribution.droppedReasons) {
|
|
153
|
+
if (reason.verdict === "ok")
|
|
154
|
+
continue;
|
|
155
|
+
lines.push("被丢键:" + reason.key + " " + reason.detail);
|
|
156
|
+
}
|
|
157
|
+
const derived = diff.attribution;
|
|
158
|
+
if (derived.derivedRecomputed.length > 0) {
|
|
159
|
+
lines.push("派生频率被重算(*Freq_Value 是 CubeMX 按 PLL/分频算出来的,不是我们写的设定):" +
|
|
160
|
+
derived.derivedRecomputed.map((change) => change.key + " " + change.before + " → " + change.after).join("、"));
|
|
161
|
+
}
|
|
162
|
+
if (derived.derivedAdded.length > 0) {
|
|
163
|
+
lines.push("CubeMX 自己补的派生键(我们没写):" + derived.derivedAdded.join("、"));
|
|
164
|
+
}
|
|
165
|
+
if (derived.ipParametersAdded.length > 0) {
|
|
166
|
+
lines.push("RCC.IPParameters 里它自己追加的派生名:" + derived.ipParametersAdded.join("、"));
|
|
167
|
+
}
|
|
168
|
+
const cosmetic = derived.orderOnly.length > 0 ||
|
|
169
|
+
derived.valueNormalized.length > 0 ||
|
|
170
|
+
derived.derivedRecomputed.length > 0 ||
|
|
171
|
+
derived.derivedAdded.length > 0 ||
|
|
172
|
+
derived.ipParametersAdded.length > 0;
|
|
173
|
+
lines.push(derived.benign
|
|
174
|
+
? "结论:零实质差异" + (cosmetic
|
|
175
|
+
? "(只有行序/成员序规范化与 CubeMX 自己重算的派生频率)" : "")
|
|
176
|
+
: "结论:有实质差异,见上面各条");
|
|
177
|
+
if (diff.autoAddedFunctions.length > 0) {
|
|
178
|
+
lines.push("CubeMX 自己补的初始化清单(我们没写,它保存时按既有编号追加;不影响生成正确性):" +
|
|
179
|
+
diff.autoAddedFunctions.join("、"));
|
|
180
|
+
}
|
|
181
|
+
for (const hint of diff.hints)
|
|
182
|
+
lines.push("* " + hint);
|
|
183
|
+
lines.push("副本:" + report.snapshotPath + "(工程 .ioc 未改动)");
|
|
184
|
+
return lines;
|
|
185
|
+
}
|
|
186
|
+
export function registerIocVerify(ctx) {
|
|
187
|
+
ctx.tools.register({
|
|
188
|
+
name: IOC_VERIFY_TOOL,
|
|
189
|
+
description: "让 CubeMX 自己诊断一份 .ioc:把 .ioc 复制到 .dsh-stm32/verify/ 后用无头脚本 config load + config save 让它写回「它理解的结果」,再对比出「哪些外设被静默丢弃、引脚信号被规范成什么、它补了哪些 SH 共享信号块、计划生成哪些 MX_*_Init」,并给出缺什么的提示。实测一次 100–180 s(load 就要约 98 s,保存完进程有时还不退出,按日志里的 SaveConfig 判定),不生成代码、不动工程 .ioc。改完 .ioc 却不生效、或生成结果里少了某个外设时用它定位。",
|
|
190
|
+
parameters: {
|
|
191
|
+
type: "object",
|
|
192
|
+
additionalProperties: false,
|
|
193
|
+
properties: {
|
|
194
|
+
projectDir: { type: "string", description: "工程根目录;缺省为当前工作目录。" },
|
|
195
|
+
iocPath: { type: "string", description: "显式 .ioc 路径(相对路径按 projectDir 解析);缺省在 projectDir 里找唯一的 *.ioc。" },
|
|
196
|
+
timeoutMs: { type: "number", description: "超时毫秒数,默认 180000。" },
|
|
197
|
+
},
|
|
198
|
+
required: [],
|
|
199
|
+
},
|
|
200
|
+
timeoutMs: 240_000,
|
|
201
|
+
isConcurrencySafe: () => false,
|
|
202
|
+
output: {
|
|
203
|
+
schema: outputSchema,
|
|
204
|
+
render: (_args, value) => [{ type: "text", text: format(value).join("\n") }],
|
|
205
|
+
},
|
|
206
|
+
async execute(rawArgs, exec) {
|
|
207
|
+
const args = rawArgs ?? {};
|
|
208
|
+
const subprocess = ctx.get("subprocess");
|
|
209
|
+
const resolution = await resolveProjectDir(ctx, args.projectDir, exec);
|
|
210
|
+
const empty = {
|
|
211
|
+
ok: false, projectDir: resolution.projectDir, iocPath: "", snapshotPath: "", durationMs: 0,
|
|
212
|
+
message: "", notes: [], errors: [], diff: {
|
|
213
|
+
afterPeripherals: [], droppedPeripherals: [], addedPeripherals: [], plannedFunctions: [],
|
|
214
|
+
plannedFunctionsRaw: [], signalRewrites: [], sharedSignals: [], removedKeys: [], addedKeys: [],
|
|
215
|
+
changedValues: [], misorderedKeys: [], autoAddedFunctions: [], hints: [],
|
|
216
|
+
attribution: {
|
|
217
|
+
orderOnly: [], valueNormalized: [], valueChanged: [], missingKeys: [], addedKeys: [],
|
|
218
|
+
droppedPeripherals: [], autoAddedFunctions: [], droppedReasons: [], addedVerdicts: [],
|
|
219
|
+
ipOrderOnly: [], derivedRecomputed: [], derivedAdded: [], ipParametersAdded: [], benign: true,
|
|
220
|
+
},
|
|
221
|
+
},
|
|
222
|
+
};
|
|
223
|
+
if (subprocess === undefined) {
|
|
224
|
+
return { ...empty, errors: ["宿主缺少 subprocess 服务,无法运行 CubeMX"], message: "没诊断:缺 subprocess 服务" };
|
|
225
|
+
}
|
|
226
|
+
const iocPath = args.iocPath === undefined ? findIocFile(resolution.projectDir) : resolve(resolution.projectDir, args.iocPath);
|
|
227
|
+
if (iocPath === null) {
|
|
228
|
+
return { ...empty, errors: ["在 " + resolution.projectDir + " 里没找到唯一的 *.ioc,请用 iocPath 指定"], message: "没诊断:找不到 .ioc" };
|
|
229
|
+
}
|
|
230
|
+
return runIocVerify(subprocess, {
|
|
231
|
+
projectDir: resolution.projectDir,
|
|
232
|
+
iocPath,
|
|
233
|
+
...(args.timeoutMs === undefined ? {} : { timeoutMs: args.timeoutMs }),
|
|
234
|
+
});
|
|
235
|
+
},
|
|
236
|
+
});
|
|
237
|
+
}
|
|
@@ -17,6 +17,9 @@ import { createProjectScaffold, preflightTarget } from "../engine/scaffold.js";
|
|
|
17
17
|
import { createRegisterProject } from "../engine/register-template.js";
|
|
18
18
|
import { ensureToolchain, gateReportNotes } from "../engine/toolchain-gate.js";
|
|
19
19
|
import { resolveSearchConfig } from "../data/search-roots.js";
|
|
20
|
+
import { generationRiskNotes } from "../engine/facts.js";
|
|
21
|
+
import { ensureFacts } from "../engine/facts-acquire.js";
|
|
22
|
+
import { liveProbeChoice } from "../engine/doctor.js";
|
|
20
23
|
import { validateToolArgs } from "./project-dir.js";
|
|
21
24
|
export const PROJECT_CREATE_TOOL = "stm32_project_create";
|
|
22
25
|
const reportSchema = {
|
|
@@ -114,7 +117,7 @@ function normalizeRoute(value) {
|
|
|
114
117
|
export function registerProjectCreate(ctx) {
|
|
115
118
|
ctx.tools.register({
|
|
116
119
|
name: PROJECT_CREATE_TOOL,
|
|
117
|
-
description: "空目录 → 可编译的 STM32 工程骨架。route=hal(默认):拷 CMake 工程文件、链接脚本、.ioc 与 .vscode,并从本机 CubeMX 固件包复制 Drivers/、startup、system(Core/ 的 C 源还要 stm32_generate 生成,要 CubeMX)。route=register:不用 CubeMX、不用固件包,CMSIS 设备头与启动文件从下载缓存取(第一次联网、之后复用),直接给出寄存器版 main.c,建完即可编译(需要 gcc/cmake/ninja
|
|
120
|
+
description: "空目录 → 可编译的 STM32 工程骨架。route=hal(默认):拷 CMake 工程文件、链接脚本、.ioc 与 .vscode,并从本机 CubeMX 固件包复制 Drivers/、startup、system(Core/ 的 C 源还要 stm32_generate 生成,要 CubeMX)。route=register:不用 CubeMX、不用固件包,CMSIS 设备头与启动文件从下载缓存取(第一次联网、之后复用),直接给出寄存器版 main.c,建完即可编译(需要 gcc/cmake/ninja)。寄存器版按内置资源 chips.json 覆盖 13 族:C0/F0/F1/F2/F3/F4/F7/G0/G4/L0/L1/L4/U0(时钟留复位默认,按族生成 GPIO;其余族会明确拒绝而不是猜文件名)。目标目录非空时默认拒绝。",
|
|
118
121
|
parameters: {
|
|
119
122
|
type: "object",
|
|
120
123
|
additionalProperties: false,
|
|
@@ -124,9 +127,9 @@ export function registerProjectCreate(ctx) {
|
|
|
124
127
|
projectName: { type: "string", description: "工程名(C 标识符);缺省取目录名。" },
|
|
125
128
|
mcu: {
|
|
126
129
|
type: "string",
|
|
127
|
-
description: "芯片型号,例如 STM32F103C8T6 /
|
|
130
|
+
description: "芯片型号,例如 STM32F103C8T6 / STM32F401CBU6 / STM32G431CBT6(两条路线都吃)。route=hal:决定启动文件、设备宏与链接脚本(按 <DeviceId>_FLASH.ld 命名),缺省 STM32F103C8T6;route=register:从内置资源 chips.json 取这颗芯片的启动文件、设备头与设备宏,缺省 STM32F103C8T6。",
|
|
128
131
|
},
|
|
129
|
-
family: { type: "string", description: "只给族时写这里,例如 F1
|
|
132
|
+
family: { type: "string", description: "只给族时写这里,例如 F1。route=register 需要芯片级启动文件名,所以只给族且不给 mcu 时会拒绝(同一族不同 line 的启动文件不同);route=hal 给族即可。" },
|
|
130
133
|
firmwarePackage: { type: "string", description: "CubeMX 固件包目录名,默认 STM32Cube_FW_F1_V1.8.7(只 route=hal 用)。" },
|
|
131
134
|
cubeMxRoots: { type: "array", items: { type: "string" }, description: "STM32CubeMX 安装根目录候选(固件包在 <root>/Repository 下);缺省用默认值/环境变量(只 route=hal 用)。" },
|
|
132
135
|
envCheck: ENV_CHECK_SCHEMA,
|
|
@@ -208,11 +211,11 @@ export function registerProjectCreate(ctx) {
|
|
|
208
211
|
},
|
|
209
212
|
};
|
|
210
213
|
}
|
|
211
|
-
// 设备事实(型号 → 启动文件/设备宏/Flash/RAM
|
|
214
|
+
// 设备事实(型号 → 启动文件/设备宏/Flash/RAM)只从内置资源读:插件不再内置芯片表,
|
|
212
215
|
// 第一次用在这里自动装一次(缓存命中时最坏只是几次 stat,不发网络请求)。
|
|
213
216
|
const assets = await ensureAssets({ signal: exec.signal });
|
|
214
217
|
if (!assets.ok) {
|
|
215
|
-
const message = "设备事实还没就绪,型号 →
|
|
218
|
+
const message = "设备事实还没就绪,型号 → 启动文件/设备宏/容量都算不出来:插件不再内置芯片表,这些事实只从内置资源读。" +
|
|
216
219
|
assets.message;
|
|
217
220
|
const blocked = {
|
|
218
221
|
ok: false,
|
|
@@ -244,6 +247,23 @@ export function registerProjectCreate(ctx) {
|
|
|
244
247
|
const blocked = blockedReport(args.targetDir, args.projectName ?? "", route, gate);
|
|
245
248
|
return { message: blocked.message, report: blocked };
|
|
246
249
|
}
|
|
250
|
+
// 探针实见决定 .vscode/launch.json 与 openocd.cfg 里的 interface。
|
|
251
|
+
// 不探也能建工程(探不到就沿用模板的 cmsis-dap),但实见 ST-Link 却写 cmsis-dap
|
|
252
|
+
// 会让用户按 F5 直接撞 transport 错误——建工程时顺手探一次(pnputil 0.5–2 s)。
|
|
253
|
+
let interfaceConfig;
|
|
254
|
+
const subprocess = ctx.get("subprocess");
|
|
255
|
+
if (subprocess !== undefined) {
|
|
256
|
+
try {
|
|
257
|
+
const live = await liveProbeChoice(subprocess, exec.signal);
|
|
258
|
+
// 任何 SWD 探针都按实见写:ST-Link → stlink-dap、J-Link → jlink、CMSIS-DAP/DAPLink → cmsis-dap。
|
|
259
|
+
// 只认 ST-Link 的旧条件会让 J-Link 用户拿到 cmsis-dap(openocd 找不到探针)。
|
|
260
|
+
if (live.swdProbes.length > 0)
|
|
261
|
+
interfaceConfig = live.cfg;
|
|
262
|
+
}
|
|
263
|
+
catch {
|
|
264
|
+
interfaceConfig = undefined;
|
|
265
|
+
}
|
|
266
|
+
}
|
|
247
267
|
if (route === "register") {
|
|
248
268
|
const report = await createRegisterProject({
|
|
249
269
|
targetDir: args.targetDir,
|
|
@@ -251,6 +271,7 @@ export function registerProjectCreate(ctx) {
|
|
|
251
271
|
...(args.mcu === undefined ? {} : { mcu: args.mcu }),
|
|
252
272
|
...(args.family === undefined ? {} : { family: args.family }),
|
|
253
273
|
...(args.overwrite === undefined ? {} : { overwrite: args.overwrite }),
|
|
274
|
+
...(interfaceConfig === undefined ? {} : { interfaceConfig }),
|
|
254
275
|
onProgress: () => undefined,
|
|
255
276
|
});
|
|
256
277
|
const normalized = {
|
|
@@ -281,6 +302,12 @@ export function registerProjectCreate(ctx) {
|
|
|
281
302
|
normalized.warnings.unshift(gate.message);
|
|
282
303
|
if (assets.status === "refreshed")
|
|
283
304
|
normalized.warnings.unshift(assets.message);
|
|
305
|
+
// R5:建完骨架就把烧录门禁的三态摆出来(寄存器路线的 mcu 由 scaffold 决议带回)
|
|
306
|
+
if (normalized.ok && normalized.mcu !== undefined && normalized.mcu !== null) {
|
|
307
|
+
await ensureFacts(normalized.mcu, process.env, { timeoutMs: 180_000, signal: exec.signal });
|
|
308
|
+
for (const n of generationRiskNotes(normalized.mcu))
|
|
309
|
+
normalized.warnings.push(n);
|
|
310
|
+
}
|
|
284
311
|
return { message: normalized.message, report: normalized };
|
|
285
312
|
}
|
|
286
313
|
const config = resolveSearchConfig(process.env, args.cubeMxRoots === undefined ? {} : { cubeMxRoots: args.cubeMxRoots });
|
|
@@ -292,6 +319,7 @@ export function registerProjectCreate(ctx) {
|
|
|
292
319
|
...(args.overwrite === undefined ? {} : { overwrite: args.overwrite }),
|
|
293
320
|
cubeMxRoots: config.cubeMxRoots,
|
|
294
321
|
binDirs: config.binDirs,
|
|
322
|
+
...(interfaceConfig === undefined ? {} : { interfaceConfig }),
|
|
295
323
|
});
|
|
296
324
|
// ScaffoldReport 没有 notes 字段,warn 档的警告并进 warnings(卡片照样打出来)。
|
|
297
325
|
if (gate !== null && !gate.ok)
|
|
@@ -316,6 +344,14 @@ export function registerProjectCreate(ctx) {
|
|
|
316
344
|
...(scaffold.deviceDefine === undefined ? {} : { deviceDefine: scaffold.deviceDefine }),
|
|
317
345
|
...(scaffold.linkerScript === undefined ? {} : { linkerScript: scaffold.linkerScript }),
|
|
318
346
|
};
|
|
347
|
+
if (halReport.ok) {
|
|
348
|
+
const halMcu = scaffold.mcu ?? args.mcu ?? null;
|
|
349
|
+
if (halMcu !== null) {
|
|
350
|
+
await ensureFacts(halMcu, process.env, { timeoutMs: 180_000, signal: exec.signal });
|
|
351
|
+
for (const n of generationRiskNotes(halMcu))
|
|
352
|
+
halReport.warnings.push(n);
|
|
353
|
+
}
|
|
354
|
+
}
|
|
319
355
|
return { message: halReport.message, report: halReport };
|
|
320
356
|
},
|
|
321
357
|
});
|
package/lib/tools/regs.js
CHANGED
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
* (原来每次 spawn 一个 openocd 要 1493 ms)。Tcl 端口解析不到 / RPC 失败时回退到会话里的 gdb 读。
|
|
8
8
|
* 端口被 VS Code 的调试会话占着时直接报 probe-busy,不抢探针。
|
|
9
9
|
*
|
|
10
|
-
* D2
|
|
10
|
+
* D2:接上内置资源里的 SVD(profile=full 才装)。addresses 的每一项可以是
|
|
11
11
|
* 物理地址(0x4001100C / 4001100C)、寄存器符号(GPIOC.ODR / GPIOC->ODR / RCC.CR),
|
|
12
12
|
* 或者只写外设名(GPIOC)=把该外设的寄存器整体 dump 一遍(最多 REG_DUMP_MAX 个)。
|
|
13
13
|
* 每条样本都会带上 ref(用户写法)、name(规范化名)与 fields(置位位域),报告 schema 同步。
|
|
@@ -87,13 +87,13 @@ const ENV_CHECK_SCHEMA = {
|
|
|
87
87
|
};
|
|
88
88
|
/* ------------------------------ SVD → line ------------------------------ */
|
|
89
89
|
function svdFailureText(failure) {
|
|
90
|
-
const suffix = failure.message.includes(
|
|
90
|
+
const suffix = failure.message.includes(SVD_FULL_PROFILE_HINT) ? "" : ";" + SVD_FULL_PROFILE_HINT;
|
|
91
91
|
return failure.message + suffix;
|
|
92
92
|
}
|
|
93
93
|
/**
|
|
94
94
|
* 工程 → SVD:先按型号查 device facts(chips.json 的 line),查不到再按型号里的三位数字兜底。
|
|
95
95
|
*
|
|
96
|
-
* 为什么要兜底:开发机上常把 DSH_STM32_ASSETS
|
|
96
|
+
* 为什么要兜底:开发机上常把 DSH_STM32_ASSETS 直接指到资源脚本 scripts/assets/本体(未分版本、没有 install.json),
|
|
97
97
|
* 这时 device-facts 读不到,但 SVD 文件其实就在 <root>/device/f1/svd/<line>.json —— 兜底让本地开发可用。
|
|
98
98
|
*/
|
|
99
99
|
export function resolveProjectSvd(projectDir, env = process.env) {
|
|
@@ -125,7 +125,7 @@ export function resolveProjectSvd(projectDir, env = process.env) {
|
|
|
125
125
|
}
|
|
126
126
|
}
|
|
127
127
|
if (line === "") {
|
|
128
|
-
return degraded("型号 " + cpn + " 没能对上 SVD line(device facts
|
|
128
|
+
return degraded("型号 " + cpn + " 没能对上 SVD line(device facts 里没有它,或内置资源没装):这次只按物理地址读,符号名与位域解释不可用;" +
|
|
129
129
|
SVD_FULL_PROFILE_HINT + "。");
|
|
130
130
|
}
|
|
131
131
|
const loaded = loadSvd(line, env);
|
|
@@ -145,7 +145,7 @@ export function resolveProjectSvd(projectDir, env = process.env) {
|
|
|
145
145
|
const pieces = [
|
|
146
146
|
"位域解释来自 SVD line=" + device.line + "(" + device.device + "," +
|
|
147
147
|
String(device.counts.peripherals) + " 个外设 / " + String(device.counts.registers) + " 个寄存器 / " +
|
|
148
|
-
String(device.counts.fields) + " 个位域" + (device.version === "" ? "" : "
|
|
148
|
+
String(device.counts.fields) + " 个位域" + (device.version === "" ? "" : ",内置资源 " + device.version) + ")",
|
|
149
149
|
source === "cpn"
|
|
150
150
|
? "line 是按型号 " + cpn + " 的编号兜底推出来的(device facts 里没有这颗芯片)"
|
|
151
151
|
: "型号 " + cpn + " 来自 device facts",
|
|
@@ -314,7 +314,7 @@ export function planRegReads(refs, device, env = process.env) {
|
|
|
314
314
|
const wanted = groups === null || groups[1] === undefined ? text : groups[1];
|
|
315
315
|
// 外设写错是最常见的笔误:这里统一列出该 line 的前 N 个外设(不把 SVD 的内部文案直接甩给用户)。
|
|
316
316
|
errors.push(error.code === "peripheral-unknown"
|
|
317
|
-
? "
|
|
317
|
+
? "内置资源(line=" + device.line + ")里没有外设 " + wanted.toUpperCase() +
|
|
318
318
|
";可用外设(前 " + String(REGS_SUGGEST_PERIPHERALS) + " 个):" +
|
|
319
319
|
suggestPeripheralNames(device, wanted).join("、") + "(共 " +
|
|
320
320
|
String(device.counts.peripherals) + " 个)"
|
|
@@ -330,7 +330,7 @@ export function planRegReads(refs, device, env = process.env) {
|
|
|
330
330
|
dumpPeripheral(peripheral);
|
|
331
331
|
continue;
|
|
332
332
|
}
|
|
333
|
-
errors.push("
|
|
333
|
+
errors.push("内置资源(line=" + device.line + ")里没有外设 " + text.toUpperCase() +
|
|
334
334
|
",也不像 GPIOC.ODR 这种寄存器写法;可用外设(前 " + String(REGS_SUGGEST_PERIPHERALS) + " 个):" +
|
|
335
335
|
suggestPeripheralNames(device, text).join("、") + "(共 " + String(device.counts.peripherals) + " 个)");
|
|
336
336
|
}
|
|
@@ -418,7 +418,7 @@ export function registerRegsRead(ctx) {
|
|
|
418
418
|
ctx.tools.register({
|
|
419
419
|
name: REGS_TOOL,
|
|
420
420
|
description: "读 STM32 内存映射寄存器:addresses 每项可以是物理地址(0x4001100C / GPIOC_ODR=0x4001100C 这种)、符号名(GPIOC.ODR / GPIOC->ODR / RCC.CR),或只给外设名(GPIOC = 把该外设的寄存器整体 dump 一遍,最多 " +
|
|
421
|
-
String(REG_DUMP_MAX) + " 个)。有 SVD
|
|
421
|
+
String(REG_DUMP_MAX) + " 个)。有 SVD(随插件内置,profile=full 也随包安装)时每条样本带规范化名 name 与置位位域 fields;没有 SVD 时自动退回纯地址读,只是没有名字/位域。复用常驻调试会话的 openocd(B3:Tcl RPC 直读,毫秒级;没有会话就先起一个并保留到租约到期),halt → mdw → resume 不复位芯片;Tcl 不可用时回退 gdb。用来自证固件在跑(例如看 ODR 位在翻转)。",
|
|
422
422
|
parameters: {
|
|
423
423
|
type: "object",
|
|
424
424
|
additionalProperties: false,
|
package/lib/tools/route-plan.js
CHANGED
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
* · CubeMX / 固件包 → 只能人装,给 guides[](含离线整目录拷贝的做法)
|
|
11
11
|
*
|
|
12
12
|
* 不需要设备事实:评分只看 .ioc 与需求里的外设清单(芯片型号取自 .ioc 的 Mcu.CPN),
|
|
13
|
-
*
|
|
13
|
+
* 不查内置资源,所以不在这里 ensureAssets。
|
|
14
14
|
*/
|
|
15
15
|
import { readFileSync } from "node:fs";
|
|
16
16
|
import { resolveSearchConfig } from "../data/search-roots.js";
|