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,227 @@
|
|
|
1
|
+
{
|
|
2
|
+
"family": "stm32c0",
|
|
3
|
+
"lines": [
|
|
4
|
+
"STM32C011",
|
|
5
|
+
"STM32C031",
|
|
6
|
+
"STM32C051",
|
|
7
|
+
"STM32C071",
|
|
8
|
+
"STM32C091",
|
|
9
|
+
"STM32C092"
|
|
10
|
+
],
|
|
11
|
+
"doc": {
|
|
12
|
+
"id": "RM0490",
|
|
13
|
+
"rev": "Rev 6",
|
|
14
|
+
"title": "RM0490: STM32C0 series advanced Arm-based 32-bit MCUs",
|
|
15
|
+
"lang": "en",
|
|
16
|
+
"pages": 1023
|
|
17
|
+
},
|
|
18
|
+
"topics": [
|
|
19
|
+
{
|
|
20
|
+
"id": "c0.boot.table",
|
|
21
|
+
"statement": "自举区域由 BOOT_LOCK / nBOOT1 / BOOT0 引脚 / nBOOT_SEL / nBOOT0 共同选择(RM0490 Rev 6 表 9,7 行组合)",
|
|
22
|
+
"page": 53,
|
|
23
|
+
"anchors": [
|
|
24
|
+
"select the boot area through the boot configuration pin BOOT0 and bits"
|
|
25
|
+
],
|
|
26
|
+
"rows": [
|
|
27
|
+
[
|
|
28
|
+
"0",
|
|
29
|
+
"x",
|
|
30
|
+
"0",
|
|
31
|
+
"0",
|
|
32
|
+
"x",
|
|
33
|
+
"Main flash"
|
|
34
|
+
],
|
|
35
|
+
[
|
|
36
|
+
"0",
|
|
37
|
+
"1",
|
|
38
|
+
"1",
|
|
39
|
+
"0",
|
|
40
|
+
"x",
|
|
41
|
+
"System memory"
|
|
42
|
+
],
|
|
43
|
+
[
|
|
44
|
+
"0",
|
|
45
|
+
"0",
|
|
46
|
+
"1",
|
|
47
|
+
"0",
|
|
48
|
+
"x",
|
|
49
|
+
"Embedded SRAM"
|
|
50
|
+
],
|
|
51
|
+
[
|
|
52
|
+
"0",
|
|
53
|
+
"x",
|
|
54
|
+
"x",
|
|
55
|
+
"1",
|
|
56
|
+
"1",
|
|
57
|
+
"Main flash"
|
|
58
|
+
],
|
|
59
|
+
[
|
|
60
|
+
"0",
|
|
61
|
+
"1",
|
|
62
|
+
"x",
|
|
63
|
+
"1",
|
|
64
|
+
"0",
|
|
65
|
+
"System memory"
|
|
66
|
+
],
|
|
67
|
+
[
|
|
68
|
+
"0",
|
|
69
|
+
"0",
|
|
70
|
+
"x",
|
|
71
|
+
"1",
|
|
72
|
+
"0",
|
|
73
|
+
"Embedded SRAM"
|
|
74
|
+
],
|
|
75
|
+
[
|
|
76
|
+
"1",
|
|
77
|
+
"x",
|
|
78
|
+
"x",
|
|
79
|
+
"x",
|
|
80
|
+
"x",
|
|
81
|
+
"Main flash memory"
|
|
82
|
+
]
|
|
83
|
+
],
|
|
84
|
+
"svd": [
|
|
85
|
+
{
|
|
86
|
+
"reg": "FLASH_OPTR",
|
|
87
|
+
"field": "nBOOT_SEL",
|
|
88
|
+
"bitOffset": 24
|
|
89
|
+
},
|
|
90
|
+
{
|
|
91
|
+
"reg": "FLASH_OPTR",
|
|
92
|
+
"field": "nBOOT1",
|
|
93
|
+
"bitOffset": 25
|
|
94
|
+
},
|
|
95
|
+
{
|
|
96
|
+
"reg": "FLASH_OPTR",
|
|
97
|
+
"field": "nBOOT0",
|
|
98
|
+
"bitOffset": 26
|
|
99
|
+
},
|
|
100
|
+
{
|
|
101
|
+
"reg": "FLASH_SECR",
|
|
102
|
+
"field": "BOOT_LOCK",
|
|
103
|
+
"bitOffset": 16
|
|
104
|
+
}
|
|
105
|
+
]
|
|
106
|
+
},
|
|
107
|
+
{
|
|
108
|
+
"id": "c0.boot.latch",
|
|
109
|
+
"statement": "boot mode 配置在 reset 后锁存(latched after a reset);退出 Standby 时重新采样,Standby 期间要保持所需自举配置",
|
|
110
|
+
"page": 53,
|
|
111
|
+
"anchors": [
|
|
112
|
+
"boot mode configuration is latched after a reset",
|
|
113
|
+
"sampled when exiting Standby mode"
|
|
114
|
+
]
|
|
115
|
+
},
|
|
116
|
+
{
|
|
117
|
+
"id": "c0.boot.nrst-sample",
|
|
118
|
+
"statement": "BOOT0 引脚采样发生在 NRST(外部复位)上升沿;PF2-NRST 引脚模式影响采样(p.54 Caution)",
|
|
119
|
+
"page": 54,
|
|
120
|
+
"anchors": [
|
|
121
|
+
"BOOT0 pin sampling is done on NRST (external reset) rising edge"
|
|
122
|
+
]
|
|
123
|
+
},
|
|
124
|
+
{
|
|
125
|
+
"id": "c0.boot.empty",
|
|
126
|
+
"statement": "FLASH_ACR.EMPTY=1 时强制从系统存储器自举(表 9 脚注 1:Boot forced to system memory when EMPTY flag is set);首次编程若 EMPTY 未更新,复位后仍选系统存储器",
|
|
127
|
+
"page": 53,
|
|
128
|
+
"anchors": [
|
|
129
|
+
"EMPTY flag in the FLASH access control register (FLASH_ACR) is set"
|
|
130
|
+
],
|
|
131
|
+
"svd": [
|
|
132
|
+
{
|
|
133
|
+
"reg": "FLASH_ACR",
|
|
134
|
+
"field": "EMPTY",
|
|
135
|
+
"bitOffset": 16
|
|
136
|
+
}
|
|
137
|
+
]
|
|
138
|
+
},
|
|
139
|
+
{
|
|
140
|
+
"id": "c0.boot.swd",
|
|
141
|
+
"statement": "BOOT0 引脚与 SWD 时钟 SWCLK 共用同一 GPIO(C0 即 PA14);检测到调试器访问时硬件强制 BOOT0 低(从用户 Flash 自举)以保证 SWCLK 可用于调试,直到下一次上电",
|
|
142
|
+
"page": 53,
|
|
143
|
+
"anchors": [
|
|
144
|
+
"BOOT0 pin shares the same GPIO with serial wire clock (SWCLK)",
|
|
145
|
+
"hardware mechanism to force BOOT0 low"
|
|
146
|
+
]
|
|
147
|
+
},
|
|
148
|
+
{
|
|
149
|
+
"id": "c0.bootloader.interface",
|
|
150
|
+
"statement": "嵌入式 bootloader 位于 system memory,串口为 USART / I2C / SPI(仅 C051/C071/C091/92)/ USB DFU(仅 C071)/ FDCAN(仅 C092),详见 AN2606",
|
|
151
|
+
"page": 54,
|
|
152
|
+
"anchors": [
|
|
153
|
+
"embedded bootloader is located in the system memory",
|
|
154
|
+
"application note AN2606"
|
|
155
|
+
]
|
|
156
|
+
},
|
|
157
|
+
{
|
|
158
|
+
"id": "c0.bootlock",
|
|
159
|
+
"statement": "BOOT_LOCK(FLASH_SECR)置 1 强制从主 Flash 唯一入口自举,无视其余自举配置与 EMPTY;用于建立信任链(4.5.6)",
|
|
160
|
+
"page": 54,
|
|
161
|
+
"anchors": [
|
|
162
|
+
"Setting the BOOT_LOCK bit forces the boot from a unique entry point in the main flash memory"
|
|
163
|
+
],
|
|
164
|
+
"svd": [
|
|
165
|
+
{
|
|
166
|
+
"reg": "FLASH_SECR",
|
|
167
|
+
"field": "BOOT_LOCK",
|
|
168
|
+
"bitOffset": 16,
|
|
169
|
+
"enums": [
|
|
170
|
+
"0x0",
|
|
171
|
+
"0x1"
|
|
172
|
+
]
|
|
173
|
+
}
|
|
174
|
+
]
|
|
175
|
+
},
|
|
176
|
+
{
|
|
177
|
+
"id": "c0.dbg.swen",
|
|
178
|
+
"statement": "FLASH_ACR.DBG_SWEN 由软件控制内核调试访问:0 关(敏感代码/可保护存储区场景)、1 开(4.5.5,Figure 4)",
|
|
179
|
+
"page": 75,
|
|
180
|
+
"anchors": [
|
|
181
|
+
"Disabling core debug access",
|
|
182
|
+
"DBG_SWEN = 0"
|
|
183
|
+
],
|
|
184
|
+
"svd": [
|
|
185
|
+
{
|
|
186
|
+
"reg": "FLASH_ACR",
|
|
187
|
+
"field": "DBG_SWEN",
|
|
188
|
+
"bitOffset": 18,
|
|
189
|
+
"enums": [
|
|
190
|
+
"0x0",
|
|
191
|
+
"0x1"
|
|
192
|
+
]
|
|
193
|
+
}
|
|
194
|
+
]
|
|
195
|
+
},
|
|
196
|
+
{
|
|
197
|
+
"id": "c0.ob.program",
|
|
198
|
+
"statement": "选项字节编程:先清 FLASH_CR.OPTLOCK(含 LOCK 解锁序列),再向 FLASH_OPTKEYR 依次写 OPTKEY1=0x0819 2A3B、OPTKEY2=0x4C5D 6E7F;错序锁死到下次复位并触发总线错误/HardFault(4.4.2)",
|
|
199
|
+
"page": 67,
|
|
200
|
+
"anchors": [
|
|
201
|
+
"Write OPTKEY1 = 0x0819 2A3B of the FLASH option key register",
|
|
202
|
+
"Write OPTKEY2 = 0x4C5D 6E7F"
|
|
203
|
+
]
|
|
204
|
+
},
|
|
205
|
+
{
|
|
206
|
+
"id": "c0.rdp.default",
|
|
207
|
+
"statement": "RDP[7:0]:0xAA=Level 0 不保护、0xCC=Level 2 全片保护、Other(除 0xAA/0xCC 的一切值)=Level 1(4.7.x FLASH_OPTR 位域)",
|
|
208
|
+
"page": 85,
|
|
209
|
+
"anchors": [
|
|
210
|
+
"0xAA: Level 0, read protection not active",
|
|
211
|
+
"0xCC: Level 2, chip read protection active",
|
|
212
|
+
"Other: Level 1, memories read protection active"
|
|
213
|
+
],
|
|
214
|
+
"svd": [
|
|
215
|
+
{
|
|
216
|
+
"reg": "FLASH_OPTR",
|
|
217
|
+
"field": "RDP",
|
|
218
|
+
"bitOffset": 0,
|
|
219
|
+
"enums": [
|
|
220
|
+
"0xAA",
|
|
221
|
+
"0xCC"
|
|
222
|
+
]
|
|
223
|
+
}
|
|
224
|
+
]
|
|
225
|
+
}
|
|
226
|
+
]
|
|
227
|
+
}
|
|
@@ -0,0 +1,103 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* rm-topics(主题/锚点清单)的两层装载。
|
|
3
|
+
*
|
|
4
|
+
* 为什么要有「spec」这层:机器是阅卷人不是出题人——自动抽取必须有人(或踩过坑后的会话)
|
|
5
|
+
* 给出「要采信哪几条结论 + 在 RM 里逐字回查什么」,机器才能核验并落 semantics。
|
|
6
|
+
*
|
|
7
|
+
* 装载顺序(两层合并,同 id 用户赢):
|
|
8
|
+
* 1) 插件自带的族级 spec:lib/data/rm-topics/<族>.json(源在 src/data/rm-topics/,
|
|
9
|
+
* 随包发布;scripts/copy-data.mjs 负责进 lib)。
|
|
10
|
+
* 2) 用户芯片级 spec:<factsRoot>/topics/<族>/<线>.json——只覆盖手上这颗。
|
|
11
|
+
* 用户踩了坑(比如某条选项字节规则害得板子连不上),把「这条结论 + 回查锚点」
|
|
12
|
+
* 写成一份小 JSON 放进这里,这颗芯片下一次烧录前就必须过机检;没写过的其它
|
|
13
|
+
* 芯片不受影响(族级判据太粗,坑通常是芯片级的,见 2026-11-07 决定)。
|
|
14
|
+
*
|
|
15
|
+
* 判定「这颗芯片要不要过机检」= 合并后主题数 > 0。
|
|
16
|
+
*/
|
|
17
|
+
import { existsSync, readFileSync } from "node:fs";
|
|
18
|
+
import { join } from "node:path";
|
|
19
|
+
import { fileURLToPath } from "node:url";
|
|
20
|
+
const EMPTY = { topics: [], lines: [], docId: "", origins: [], hasSpec: false };
|
|
21
|
+
function normalize(raw, fallbackLines) {
|
|
22
|
+
if (typeof raw !== "object" || raw === null)
|
|
23
|
+
return null;
|
|
24
|
+
const o = raw;
|
|
25
|
+
if (!Array.isArray(o.topics) || o.topics.length === 0)
|
|
26
|
+
return null;
|
|
27
|
+
const topics = o.topics.filter((x) => {
|
|
28
|
+
if (typeof x !== "object" || x === null)
|
|
29
|
+
return false;
|
|
30
|
+
const e = x;
|
|
31
|
+
return typeof e.id === "string" && Array.isArray(e.anchors) && e.anchors.length > 0;
|
|
32
|
+
});
|
|
33
|
+
if (topics.length === 0)
|
|
34
|
+
return null;
|
|
35
|
+
const lines = Array.isArray(o.lines) ? o.lines.map((x) => String(x).toUpperCase()) : fallbackLines;
|
|
36
|
+
const docId = typeof o.doc?.id === "string" ? o.doc.id : "";
|
|
37
|
+
return { topics, lines, docId };
|
|
38
|
+
}
|
|
39
|
+
function readJson(file) {
|
|
40
|
+
try {
|
|
41
|
+
return JSON.parse(readFileSync(file, "utf8"));
|
|
42
|
+
}
|
|
43
|
+
catch {
|
|
44
|
+
return null;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
/**
|
|
48
|
+
* 插件自带族级 spec 的目录:lib/data/rm-topics/(JSON 不进 tsc,由
|
|
49
|
+
* scripts/copy-data.mjs 在 build 时复制;仓库里 lib/ 是入库的,装包侧也带)。
|
|
50
|
+
* 没有退回 src 的兜底:那条相对路径在插件真实安装位置(node_modules 深处)
|
|
51
|
+
* 基本不可能存在,留着只会把「没跑 copy-data」伪装成「清单在但读不到」。
|
|
52
|
+
*/
|
|
53
|
+
export function bundledTopicsDir() {
|
|
54
|
+
return fileURLToPath(new URL("./rm-topics/", import.meta.url));
|
|
55
|
+
}
|
|
56
|
+
/** 用户芯片级 spec 的路径(暴露给用户/会话往里放)。 */
|
|
57
|
+
export function userTopicsPath(factsRoot, family, line) {
|
|
58
|
+
return join(factsRoot, "topics", family.toLowerCase(), line.toUpperCase() + ".json");
|
|
59
|
+
}
|
|
60
|
+
/**
|
|
61
|
+
* 两层合并装载。factsRoot 由调用方传入(engine/facts 的 factsRoot(env)),
|
|
62
|
+
* 本模块不 import engine——data 层保持无环。
|
|
63
|
+
*/
|
|
64
|
+
export function loadRmTopics(family, line, factsRoot) {
|
|
65
|
+
const fam = family.toLowerCase();
|
|
66
|
+
const ln = line.toUpperCase();
|
|
67
|
+
const merged = new Map();
|
|
68
|
+
const lines = new Set();
|
|
69
|
+
const origins = [];
|
|
70
|
+
let docId = "";
|
|
71
|
+
const famFile = join(bundledTopicsDir(), fam + ".json");
|
|
72
|
+
if (existsSync(famFile)) {
|
|
73
|
+
const n = normalize(readJson(famFile), []);
|
|
74
|
+
if (n !== null) {
|
|
75
|
+
for (const tp of n.topics)
|
|
76
|
+
merged.set(tp.id, tp);
|
|
77
|
+
for (const l of n.lines)
|
|
78
|
+
lines.add(l);
|
|
79
|
+
docId = n.docId;
|
|
80
|
+
origins.push("bundled:" + famFile);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
const userFile = userTopicsPath(factsRoot, fam, ln);
|
|
84
|
+
if (existsSync(userFile)) {
|
|
85
|
+
const n = normalize(readJson(userFile), [ln]);
|
|
86
|
+
if (n !== null) {
|
|
87
|
+
for (const tp of n.topics)
|
|
88
|
+
merged.set(tp.id, tp); // 同 id 用户赢
|
|
89
|
+
for (const l of n.lines)
|
|
90
|
+
lines.add(l);
|
|
91
|
+
if (docId === "")
|
|
92
|
+
docId = n.docId;
|
|
93
|
+
origins.push("user:" + userFile);
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
const topics = [...merged.values()];
|
|
97
|
+
if (topics.length === 0)
|
|
98
|
+
return EMPTY;
|
|
99
|
+
// 用户 spec 没写 lines 时只管自己这颗(fallbackLines 兜底);族级有 lines 尊重族级
|
|
100
|
+
if (lines.size === 0)
|
|
101
|
+
lines.add(ln);
|
|
102
|
+
return { topics, lines: [...lines].sort(), docId, origins, hasSpec: true };
|
|
103
|
+
}
|
package/lib/data/search-roots.js
CHANGED
|
@@ -101,6 +101,34 @@ export function discoverBinDirs(probe) {
|
|
|
101
101
|
}
|
|
102
102
|
return dedupePaths(found);
|
|
103
103
|
}
|
|
104
|
+
/** CubeProgrammer CLI 在任何机器上的 Windows 默认安装位置(与 CubeMX 同风格:只放通用位置)。 */
|
|
105
|
+
export const DEFAULT_CUBE_PRG_BINS = [
|
|
106
|
+
"C:/Program Files/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin",
|
|
107
|
+
];
|
|
108
|
+
/** 一个目录是不是 CubeProgrammer 的 bin:认它的 CLI 主程序(32 位子目录不算,本插件只在 64 位路径找)。 */
|
|
109
|
+
export function looksLikeCubePrgBin(dir, exists = existsSync) {
|
|
110
|
+
return exists(dir + "/STM32_Programmer_CLI.exe");
|
|
111
|
+
}
|
|
112
|
+
/** CubeProgrammer 安装散布在 ST 系目录旁边(CubeMX 的兄弟目录最常见),复用同一套 bases。 */
|
|
113
|
+
export function discoverCubePrgBins(probe) {
|
|
114
|
+
const found = [];
|
|
115
|
+
for (const base of cubeMxBases(probe)) {
|
|
116
|
+
const direct = base.replace(/\/+$/u, "") + "/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin";
|
|
117
|
+
if (looksLikeCubePrgBin(direct, probe.exists))
|
|
118
|
+
found.push(direct);
|
|
119
|
+
for (const child of probe.listDirs(base + "/STMicroelectronics/STM32Cube")) {
|
|
120
|
+
const bin = child + "/STM32CubeProgrammer/bin";
|
|
121
|
+
if (looksLikeCubePrgBin(bin, probe.exists))
|
|
122
|
+
found.push(bin);
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
for (const dir of probe.registryInstallDirs()) {
|
|
126
|
+
const normalized = normalizePathEntry(dir);
|
|
127
|
+
if (normalized !== "" && looksLikeCubePrgBin(normalized, probe.exists))
|
|
128
|
+
found.push(normalized);
|
|
129
|
+
}
|
|
130
|
+
return dedupePaths(found);
|
|
131
|
+
}
|
|
104
132
|
function cubeMxBases(probe) {
|
|
105
133
|
const bases = [];
|
|
106
134
|
for (const drive of probe.driveRoots()) {
|
|
@@ -267,6 +295,7 @@ export function discoverInstalls() {
|
|
|
267
295
|
cached = {
|
|
268
296
|
binDirs: discoverBinDirs(probe),
|
|
269
297
|
cubeMxRoots: discoverCubeMxRoots(probe),
|
|
298
|
+
cubePrgBins: discoverCubePrgBins(probe),
|
|
270
299
|
};
|
|
271
300
|
}
|
|
272
301
|
return cached;
|
|
@@ -339,11 +368,12 @@ export function resolveSearchConfig(env = process.env, overrides = {},
|
|
|
339
368
|
discoveredOverride) {
|
|
340
369
|
const binFromEnv = splitList(env["STM32_BIN_DIRS"]);
|
|
341
370
|
const rootsFromEnv = splitList(env["STM32_CUBEMX_ROOT"]);
|
|
371
|
+
const prgFromEnv = splitList(env["STM32_CUBE_PRG_ROOT"]);
|
|
342
372
|
const userConfig = configReadingDisabled(env) ? null : readToolchainConfig(env).config;
|
|
343
373
|
const binFromConfig = binDirsFromConfig(userConfig);
|
|
344
374
|
const rootsFromConfig = cubeMxRootsFromConfig(userConfig);
|
|
345
375
|
const discovered = discoveryDisabled(env)
|
|
346
|
-
? { binDirs: [], cubeMxRoots: [] }
|
|
376
|
+
? { binDirs: [], cubeMxRoots: [], cubePrgBins: [] }
|
|
347
377
|
: (discoveredOverride ?? discoverInstalls());
|
|
348
378
|
const binBase = overrides.binDirs
|
|
349
379
|
?? (binFromEnv.length > 0
|
|
@@ -353,8 +383,19 @@ discoveredOverride) {
|
|
|
353
383
|
?? (rootsFromEnv.length > 0
|
|
354
384
|
? rootsFromEnv
|
|
355
385
|
: (rootsFromConfig.length > 0 ? rootsFromConfig : [...DEFAULT_CUBEMX_ROOTS]));
|
|
386
|
+
const prgBase = overrides.cubePrgBins
|
|
387
|
+
?? (prgFromEnv.length > 0
|
|
388
|
+
? prgFromEnv.map((dir) => {
|
|
389
|
+
const n = dir.replace(/\/+$/u, "");
|
|
390
|
+
if (looksLikeCubePrgBin(n))
|
|
391
|
+
return n;
|
|
392
|
+
const asBin = n + "/STM32CubeProgrammer/bin";
|
|
393
|
+
return looksLikeCubePrgBin(asBin) ? asBin : n; // 都没命中就原样保留(让 searchConfigWarnings 去报告不存在)
|
|
394
|
+
})
|
|
395
|
+
: [...DEFAULT_CUBE_PRG_BINS]);
|
|
356
396
|
return {
|
|
357
397
|
binDirs: dedupePaths([...binBase, ...(overrides.binDirs === undefined ? discovered.binDirs : [])]),
|
|
358
398
|
cubeMxRoots: dedupePaths([...rootsBase, ...(overrides.cubeMxRoots === undefined ? discovered.cubeMxRoots : [])]),
|
|
399
|
+
cubePrgBins: dedupePaths([...prgBase, ...(overrides.cubePrgBins === undefined ? discovered.cubePrgBins ?? [] : [])]),
|
|
359
400
|
};
|
|
360
401
|
}
|
package/lib/data/stm32f1.js
CHANGED
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* L1:STM32F1 型号 → 芯片事实(容量档 / 启动文件 / 设备宏 / 设备头 / Flash / RAM / 引脚数)。
|
|
3
3
|
*
|
|
4
|
-
*
|
|
4
|
+
* 这里只剩**解析逻辑**,没有事实:事实全部来自内置资源里的 device/f1/chips.json,
|
|
5
5
|
* 经 src/data/device-facts.ts 读入(用户 2026-10-31「内置表删了吧」的决定)。
|
|
6
6
|
* 所以本文件不再有 F1_LINES / GROUP_BY_LETTER / FLASH_BY_LETTER / RAM_BY_LINE_LETTER
|
|
7
|
-
*
|
|
7
|
+
* 这类表——加一款芯片只改 scripts/assets/ 的 scripts/build-assets.mjs,插件一个字都不用动。
|
|
8
8
|
*
|
|
9
9
|
* 支持三种输入(与 0.2 一致,调用方不用改):
|
|
10
10
|
* - 完整型号:STM32F103C8T6 / STM32F103RCT6 / STM32F107VCT6
|
|
11
11
|
* - 去掉温度后缀:STM32F103C8(按 chips.json 里同前缀的唯一一颗归一化)
|
|
12
|
-
* - 显式容量档:F103:xb(脚本与 cmsis 缓存 id
|
|
12
|
+
* - 显式容量档:F103:xb(脚本与 cmsis 缓存 id 用;取该档在内置资源里的一个代表型号)
|
|
13
13
|
*
|
|
14
14
|
* 认不出时返回 chip: null + 人话原因,绝不编一个不存在的启动文件。
|
|
15
|
-
*
|
|
15
|
+
* 缺内置资源时同样返回 chip: null,原因里带「重装插件后重试(stm32_assets verify 可定位缺件)」。
|
|
16
16
|
*/
|
|
17
17
|
import { DEVICE_FACTS_HINT, loadDeviceFacts } from "./device-facts.js";
|
|
18
18
|
/** 完整型号:STM32F103RCT6 → line 103 / 封装 R / 容量 C / 后缀 T / 温度 6。 */
|
|
@@ -61,7 +61,7 @@ export function resolveF1Chip(input) {
|
|
|
61
61
|
return { chip: chipFromFact(fact), reason: "" };
|
|
62
62
|
}
|
|
63
63
|
/**
|
|
64
|
-
* 型号 →
|
|
64
|
+
* 型号 → 内置资源里的那颗。先精确匹配 cpn;没有再按「cpn 以输入开头」归一化
|
|
65
65
|
* (STM32F103C8 → STM32F103C8T6,即用户省略了温度后缀)。
|
|
66
66
|
* 多命中时取 cpn 最短、再按字典序——同一份事实永远给同一个结果。
|
|
67
67
|
*/
|
|
@@ -80,18 +80,18 @@ function matchFact(facts, text) {
|
|
|
80
80
|
return candidates[0] ?? null;
|
|
81
81
|
}
|
|
82
82
|
function lineMissing(facts, code) {
|
|
83
|
-
return ("F1 里没有 F" + code + " 这一 line
|
|
83
|
+
return ("F1 里没有 F" + code + " 这一 line(内置资源已知:" + facts.lines.join("/") + ");" + DEVICE_FACTS_HINT + ",看有没有新版插件。");
|
|
84
84
|
}
|
|
85
85
|
function groupMissing(facts, code, group) {
|
|
86
86
|
const groups = facts.groupsByLine.get(code) ?? [];
|
|
87
|
-
return ("STM32F" + code + " 没有 " + group + "
|
|
88
|
-
DEVICE_FACTS_HINT + "
|
|
87
|
+
return ("STM32F" + code + " 没有 " + group + " 这一容量档(内置资源里的档位:" + groups.join("/") + ");" +
|
|
88
|
+
DEVICE_FACTS_HINT + ",看有没有新版插件。");
|
|
89
89
|
}
|
|
90
90
|
/**
|
|
91
|
-
* 格式对、line
|
|
91
|
+
* 格式对、line 在,但内置资源里没有这一颗。
|
|
92
92
|
* 分两种情况说清楚,别把「没收录」说成「不存在」:
|
|
93
|
-
* ·
|
|
94
|
-
* · 这个容量档根本没收录(上游 CubeMX 没给出这档的 RAM/Flash
|
|
93
|
+
* · 这个容量档在内置资源里有,只是没有这个封装/温度后缀的组合(例如 C8T7);
|
|
94
|
+
* · 这个容量档根本没收录(上游 CubeMX 没给出这档的 RAM/Flash,或者内置资源还没覆盖,例如 F100RCT6)。
|
|
95
95
|
*/
|
|
96
96
|
function unknownChip(facts, text, code, densityLetter) {
|
|
97
97
|
const groups = facts.groupsByLine.get(code) ?? [];
|
|
@@ -99,10 +99,10 @@ function unknownChip(facts, text, code, densityLetter) {
|
|
|
99
99
|
const inGroup = groups.includes(direct);
|
|
100
100
|
const detail = inGroup
|
|
101
101
|
? "这一容量档在,但没有「封装 + 温度后缀」正好是这串的组合"
|
|
102
|
-
: "这一档没有收录(上游没给这档的 RAM/Flash
|
|
103
|
-
return ("
|
|
102
|
+
: "这一档没有收录(上游没给这档的 RAM/Flash,或内置资源还没覆盖)";
|
|
103
|
+
return ("内置资源(" + (facts.version === "" ? "未知版本" : facts.version) + ")里没有 " + text + " 这一颗:" +
|
|
104
104
|
"STM32F" + code + " 收录了 " + groups.join("/") + " 容量档;" + detail + ";" +
|
|
105
|
-
DEVICE_FACTS_HINT + "
|
|
105
|
+
DEVICE_FACTS_HINT + ",看有没有新版插件,或换一颗同档的常见型号(内置资源共 " + String(facts.chips.length) + " 颗)。");
|
|
106
106
|
}
|
|
107
107
|
function chipFromFact(fact) {
|
|
108
108
|
const lineMatch = /^STM32F(\d{3})/u.exec(fact.cpn);
|
|
@@ -116,6 +116,7 @@ function chipFromFact(fact) {
|
|
|
116
116
|
deviceDefine: fact.deviceDefine,
|
|
117
117
|
deviceHeader: fact.deviceHeader,
|
|
118
118
|
pinCount: fact.pinCount,
|
|
119
|
+
mcuName: fact.mcuName,
|
|
119
120
|
flashBytes: fact.flashBytes,
|
|
120
121
|
ramBytes: fact.ramBytes,
|
|
121
122
|
notes: [],
|
package/lib/data/svd.js
CHANGED
|
@@ -5,22 +5,22 @@
|
|
|
5
5
|
* "GPIOC_ODR" / "GPIOC.ODR",读回来的 0x00000004 也没人告诉你那是 ODR2(PC2 输出高)。
|
|
6
6
|
* SVD 里这些都有:外设 baseAddress + 寄存器 addressOffset + 字段 bitOffset/bitWidth。
|
|
7
7
|
*
|
|
8
|
-
*
|
|
8
|
+
* 数据来源只有一个:内置资源 插件内置 assets/ 的 device/f1/svd/<line>.json,装到
|
|
9
9
|
* <DSH_STM32_ASSETS 根或 ~/.dsh-stm32/assets>/<version>/device/f1/svd/ 之后复用。
|
|
10
10
|
* 兼容两种布局:
|
|
11
11
|
* · 装好的缓存:<root>/<version>/device/f1/svd/103.json(install.json 里有 version);
|
|
12
|
-
* · 直接检出/自定义布局:<root>/device/f1/svd/103.json(开发时把 DSH_STM32_ASSETS
|
|
12
|
+
* · 直接检出/自定义布局:<root>/device/f1/svd/103.json(开发时把 DSH_STM32_ASSETS 指到资源脚本 scripts/assets/)。
|
|
13
13
|
*
|
|
14
14
|
* 关键约定:
|
|
15
15
|
* · SVD 只在 profile=full 里。缺了不是"静默降级",而是结构化失败 + 一句能照着敲的
|
|
16
|
-
* "
|
|
16
|
+
* "随插件内置(profile=full 也随包安装)"(见 SVD_FULL_PROFILE_HINT);
|
|
17
17
|
* · 读不到不抛:loadSvd() 返回 { device, failure },loadSvdForLine() 复用前者的便捷版(返回 null);
|
|
18
18
|
* 只有"明确要一个寄存器/一段地址"的 API(resolveRegisterRef / describeAddress)才抛 SvdError,
|
|
19
19
|
* 因为那时候没有数据就已经是错误,而不是"可选增强";
|
|
20
|
-
* · 缓存键是 path+size+mtimeMs
|
|
20
|
+
* · 缓存键是 path+size+mtimeMs:资源升级/重装/手改后自动失效,不需要 reset 钩子。
|
|
21
21
|
* 单测靠 svdCacheStats() + resetSvdCache() 验证"命中不重复读盘";
|
|
22
22
|
* · 严格解析:外设/寄存器/字段有任何一条不合法就整份拒绝(装错文件比没装更危险,
|
|
23
|
-
*
|
|
23
|
+
* 半个位域表会解释出错误的位)。资源脚本(scripts/assets/)的产物是脚本生成的,这份严格性目前一次都没误伤。
|
|
24
24
|
*
|
|
25
25
|
* 只读:本文件不写盘、不联网、不起进程,只读 fs + 内存缓存。
|
|
26
26
|
*/
|
|
@@ -28,14 +28,14 @@ import fs from "node:fs";
|
|
|
28
28
|
import path from "node:path";
|
|
29
29
|
import { assetsRootInfo, errText, listInstalledVersions } from "../engine/assets.js";
|
|
30
30
|
import { findChipFact } from "./device-facts.js";
|
|
31
|
-
/** SVD
|
|
31
|
+
/** SVD 在内置资源里的目录(相对版本目录)。 */
|
|
32
32
|
export const SVD_REL_DIR = "device/f1/svd";
|
|
33
33
|
/**
|
|
34
34
|
* 缺 SVD 时反复出现的那句提示。SVD 只在 profile=full 里,所以文案必须带
|
|
35
|
-
* "
|
|
35
|
+
* "随插件内置(profile=full 也随包安装)"——用户照着敲就能补齐,不用翻文档。
|
|
36
36
|
*/
|
|
37
|
-
export const SVD_FULL_PROFILE_HINT = "SVD 只在 profile=full
|
|
38
|
-
/**
|
|
37
|
+
export const SVD_FULL_PROFILE_HINT = "SVD 只在 profile=full 里:重装插件(或确认安装完整)";
|
|
38
|
+
/** 资源脚本 scripts/assets/当前发布的 F1 SVD(只用于报错文案,不做硬校验:上游加 line 不用改这里)。 */
|
|
39
39
|
export const SVD_KNOWN_LINES = ["100", "101", "102", "103", "105", "107"];
|
|
40
40
|
export class SvdError extends Error {
|
|
41
41
|
code;
|
|
@@ -70,7 +70,7 @@ function isDirectory(dir) {
|
|
|
70
70
|
}
|
|
71
71
|
}
|
|
72
72
|
/**
|
|
73
|
-
* SVD
|
|
73
|
+
* SVD 里的数值:内置资源写的是十六进制字符串("0x40011000" / "0x0C"),
|
|
74
74
|
* 也接受数字与纯十进制字符串,别的都算坏数据。
|
|
75
75
|
*/
|
|
76
76
|
export function parseSvdNumber(value) {
|
|
@@ -151,8 +151,8 @@ export function resetSvdCache() {
|
|
|
151
151
|
}
|
|
152
152
|
/**
|
|
153
153
|
* 可能装着 SVD 的目录,按优先级:
|
|
154
|
-
* 1.
|
|
155
|
-
* 2. 未分版本的自定义布局(DSH_STM32_ASSETS
|
|
154
|
+
* 1. 已安装的资源版本(新 → 旧,listInstalledVersions 已排好);
|
|
155
|
+
* 2. 未分版本的自定义布局(DSH_STM32_ASSETS 直接指到资源脚本 scripts/assets//自建目录)。
|
|
156
156
|
*/
|
|
157
157
|
function svdLocations(env) {
|
|
158
158
|
const out = [];
|
|
@@ -294,6 +294,20 @@ export function parseSvd(text, filePath = "", version = "", expectedLine = "") {
|
|
|
294
294
|
return textOf(raw["url"]) || textOf(raw["file"]) || textOf(raw["repo"]);
|
|
295
295
|
return "";
|
|
296
296
|
})();
|
|
297
|
+
// 中断表:内置资源新版才带(2026-11-01 起)。老包没有这个字段 → 空表,R20 自动跳过。
|
|
298
|
+
const interrupts = [];
|
|
299
|
+
const rawInterrupts = parsed["interrupts"];
|
|
300
|
+
if (Array.isArray(rawInterrupts)) {
|
|
301
|
+
for (const raw of rawInterrupts) {
|
|
302
|
+
if (!isRecord(raw))
|
|
303
|
+
continue;
|
|
304
|
+
const name = textOf(raw["name"]);
|
|
305
|
+
const value = parseSvdNumber(raw["value"]);
|
|
306
|
+
if (name === "" || value === null)
|
|
307
|
+
continue;
|
|
308
|
+
interrupts.push({ name, value });
|
|
309
|
+
}
|
|
310
|
+
}
|
|
297
311
|
return {
|
|
298
312
|
device: {
|
|
299
313
|
line,
|
|
@@ -307,6 +321,8 @@ export function parseSvd(text, filePath = "", version = "", expectedLine = "") {
|
|
|
307
321
|
peripherals,
|
|
308
322
|
byName,
|
|
309
323
|
peripheralNames: peripherals.map((peripheral) => peripheral.name),
|
|
324
|
+
interrupts,
|
|
325
|
+
interruptNames: new Set(interrupts.map((item) => item.name)),
|
|
310
326
|
flat,
|
|
311
327
|
byAddress,
|
|
312
328
|
},
|
|
@@ -333,7 +349,7 @@ export function loadSvd(line, env = process.env) {
|
|
|
333
349
|
const root = assetsRootInfo(env).root;
|
|
334
350
|
return {
|
|
335
351
|
device: null,
|
|
336
|
-
failure: failureOf("assets-missing", wanted, path.join(root, SVD_REL_DIR, wanted + ".json"), "
|
|
352
|
+
failure: failureOf("assets-missing", wanted, path.join(root, SVD_REL_DIR, wanted + ".json"), "本地还缺内置资源(" + root + "),读不到 " + SVD_REL_DIR + "/" + wanted + ".json;" + SVD_FULL_PROFILE_HINT + "。"),
|
|
337
353
|
};
|
|
338
354
|
}
|
|
339
355
|
const tried = [];
|
|
@@ -381,7 +397,7 @@ export function loadSvd(line, env = process.env) {
|
|
|
381
397
|
const versioned = locations.filter((location) => location.layout === "versioned");
|
|
382
398
|
const onlyCore = versioned.length > 0 && versioned.every((location) => location.profiles.length > 0 && !location.profiles.includes("full"));
|
|
383
399
|
const where = versioned.length === 0 ? "(" + assetsRootInfo(env).root + ")" : "(版本 " + versioned.map((location) => location.version).join("、") + ")";
|
|
384
|
-
const message = "
|
|
400
|
+
const message = "本地资源" + where + "里没有 " + SVD_REL_DIR + "/" + wanted + ".json" +
|
|
385
401
|
(onlyCore ? ":已装的版本只装了 profile=core" : "") +
|
|
386
402
|
";" + SVD_FULL_PROFILE_HINT + "。";
|
|
387
403
|
return { device: null, failure: failureOf("svd-missing", wanted, tried[0] ?? "", message) };
|
|
@@ -402,7 +418,7 @@ export function requireSvd(line, env = process.env) {
|
|
|
402
418
|
hint: SVD_FULL_PROFILE_HINT,
|
|
403
419
|
});
|
|
404
420
|
}
|
|
405
|
-
/** 型号 → SVD line
|
|
421
|
+
/** 型号 → SVD line(用内置资源 device facts 的 line 字段);没有这颗芯片/没有内置资源返回 null。 */
|
|
406
422
|
export function svdLineForChip(cpn, env = process.env) {
|
|
407
423
|
const chip = findChipFact(cpn, env);
|
|
408
424
|
return chip === null ? null : chip.line;
|
|
@@ -502,7 +518,7 @@ export function resolveRegisterRef(ref, line, env = process.env) {
|
|
|
502
518
|
const registerName = match[2] ?? "";
|
|
503
519
|
const peripheral = findPeripheral(device, peripheralName);
|
|
504
520
|
if (peripheral === null) {
|
|
505
|
-
throw new SvdError("peripheral-unknown", "
|
|
521
|
+
throw new SvdError("peripheral-unknown", "内置资源(line=" + device.line + ")里没有外设 " + peripheralName.toUpperCase() + ";已知外设:" + listNames(device.peripheralNames) + "。", { line: device.line, ref: text });
|
|
506
522
|
}
|
|
507
523
|
const register = findRegister(peripheral, registerName);
|
|
508
524
|
if (register === null) {
|
|
@@ -294,17 +294,3 @@ export function cubeMxRootsFromConfig(config) {
|
|
|
294
294
|
export function resetToolchainConfigCache() {
|
|
295
295
|
cache = null;
|
|
296
296
|
}
|
|
297
|
-
/** 给报告 / 命令卡片用的一句话描述。 */
|
|
298
|
-
export function describeToolchainConfig(read) {
|
|
299
|
-
if (!read.exists)
|
|
300
|
-
return "还没有配置(没有 " + read.path + ")";
|
|
301
|
-
if (read.config === null)
|
|
302
|
-
return "配置读不了:" + (read.errors[0] ?? "未知原因");
|
|
303
|
-
const parts = [];
|
|
304
|
-
parts.push(read.config.msys64 === "" ? "MSYS2 未配置" : "MSYS2 " + read.config.msys64);
|
|
305
|
-
if (read.config.packages.length > 0)
|
|
306
|
-
parts.push("包 " + String(read.config.packages.length) + " 个");
|
|
307
|
-
if (read.config.cubeMxRoot !== "")
|
|
308
|
-
parts.push("CubeMX " + read.config.cubeMxRoot);
|
|
309
|
-
return parts.join(";") + "(" + read.path + ")";
|
|
310
|
-
}
|