chore(ledger): meas 与 n17 两笔合入后回填台账/凭证/覆盖率并同步计数
task/meas-snap 合入(merge 9c2653c,meas 快照层,分支树冲突由 lead 并集 手工解:id_registry 三族 UIDATA/VOLSYNC/MEAS 共存,JSON 校验过;该合并 提交按 mem 域例外 --no-verify,理由=合并树 .map 滞后,回填本笔兑现)。 task/n17-probe 合入(merge 969fc5c,drop 路径异步化 Flash +16 B/RAM 0)。 合并后 @build 0/0:Code=217,828 / RO=21,600 / RW=1,264 / ZI=132,840; RW_IRAM1 76,664 B(58.5%)、CCM 87.9% 不变。覆盖率 38/38 套件基线登记 (meas.c 入账);凭证按最终 .map 重盖。计数:钩子 44→45、单测钩子 20→21、总闸 37→38 套(AGENTS + 门禁 README)。
This commit is contained in:
@@ -90,7 +90,7 @@
|
||||
|
||||
## 提交门禁(pre-commit)
|
||||
|
||||
- 任一失败即拦截,共 **44 个钩子**(**每种门禁一篇详解(查什么 / 拦下过什么真事 / 限制与盲区 / 基线口径)→ `docs/门禁说明/README.md` 索引**;通用机制与整体口径 → `docs/代码规范/pre-commit使用说明.md`):通用 5 + `gitlint` + `cppcheck` / `test-cppcheck` + `no-mojibake` + `coding-standard` + 文档三件套 `doc-links` / `task-table` / `mem-numbers` + `id-check`(**编号门禁**,`docs/编号规范.md` §8 八项校验;**已关闸为【增量拦截】**:只拦 `scripts/id_known_backlog.json` 台账之外的新错误级问题,存量按指纹豁免、台账只减不增;另有一根恒生效的线——可判定比例跌破 `id_registry.json` 基线即失败)+ `lv-conf-sync`(两份 `lv_conf.h` 特性子集一致)+ `cubemx-survival` + 主机侧单测 20 个(`-unit-test` 后缀,2026-10-25 增补 adc-cal / prot-dim / vol-idle-sync / ui-data 四个)+ `test-coverage`(**覆盖率总闸**:跑全部 37 套并守基线回退;缺 mscoverage 组件时按用户裁定 **FAIL**、不 skip,2026-10-24)+ `test-suite-switch` + `registration-check`(双端注册反向校验 + UI 页面描述符表接线,N-23/U4)+ `mem-budget`(RAM 92% 预算门禁,N-27)+ `font-charset`(UI 字符集差集检查,防缺字白框,U4)+ `ui-golden`(UI 像素回归,菜单 8 状态 + 内容页 11 页黄金参考,U4)+ `layer-deps`(**分层方向**:`Drivers/BSP/**` 不得 include `App/**` 的头;存量 3 条基线只减不增(2026-10-25 记录 reader 注入削掉 UI 记录 3 条边,6→3),报告 S-1)+ `bsp-err`(**BSP 错误码与超时命名约定**:公开 API 不得拿 `HAL_StatusTypeDef`/`bool` 当错误通道、`*_TIMEOUT` 宏不得取负值、非 void 须写「返回值:」、**返回错误码的函数不得裸丢弃返回值**(须接住或显式 `(void)`;实测编译器与 cppcheck 都不报这类,只有这条会响);约定正文 `Drivers/BSP/bsp_err.h`,存量基线只减不增(2026-10-23 首清点 19 条 → 已还 18;`consume-result` 上线又暴露 37 条存量丢弃 → **现 38 条**),报告 S-5)
|
||||
- 任一失败即拦截,共 **45 个钩子**(**每种门禁一篇详解(查什么 / 拦下过什么真事 / 限制与盲区 / 基线口径)→ `docs/门禁说明/README.md` 索引**;通用机制与整体口径 → `docs/代码规范/pre-commit使用说明.md`):通用 5 + `gitlint` + `cppcheck` / `test-cppcheck` + `no-mojibake` + `coding-standard` + 文档三件套 `doc-links` / `task-table` / `mem-numbers` + `id-check`(**编号门禁**,`docs/编号规范.md` §8 八项校验;**已关闸为【增量拦截】**:只拦 `scripts/id_known_backlog.json` 台账之外的新错误级问题,存量按指纹豁免、台账只减不增;另有一根恒生效的线——可判定比例跌破 `id_registry.json` 基线即失败)+ `lv-conf-sync`(两份 `lv_conf.h` 特性子集一致)+ `cubemx-survival` + 主机侧单测 21 个(`-unit-test` 后缀,2026-10-25 增补 adc-cal / prot-dim / vol-idle-sync / ui-data / meas 五个)+ `test-coverage`(**覆盖率总闸**:跑全部 38 套并守基线回退;缺 mscoverage 组件时按用户裁定 **FAIL**、不 skip,2026-10-24)+ `test-suite-switch` + `registration-check`(双端注册反向校验 + UI 页面描述符表接线,N-23/U4)+ `mem-budget`(RAM 92% 预算门禁,N-27)+ `font-charset`(UI 字符集差集检查,防缺字白框,U4)+ `ui-golden`(UI 像素回归,菜单 8 状态 + 内容页 11 页黄金参考,U4)+ `layer-deps`(**分层方向**:`Drivers/BSP/**` 不得 include `App/**` 的头;存量 3 条基线只减不增(2026-10-25 记录 reader 注入削掉 UI 记录 3 条边,6→3),报告 S-1)+ `bsp-err`(**BSP 错误码与超时命名约定**:公开 API 不得拿 `HAL_StatusTypeDef`/`bool` 当错误通道、`*_TIMEOUT` 宏不得取负值、非 void 须写「返回值:」、**返回错误码的函数不得裸丢弃返回值**(须接住或显式 `(void)`;实测编译器与 cppcheck 都不报这类,只有这条会响);约定正文 `Drivers/BSP/bsp_err.h`,存量基线只减不增(2026-10-23 首清点 19 条 → 已还 18;`consume-result` 上线又暴露 37 条存量丢弃 → **现 38 条**),报告 S-5)
|
||||
- **范围 = 项目代码**:第三方(`Lib/`、`Middlewares/`、CMSIS、HAL、`lftpd`、`dhara`、`MDK-ARM`)排除;`cppcheck`/`coding-standard` 另排除 `test/`,规范检查再排除 CubeMX 生成的 `Src/`/`Inc/`。**`simulator/` 已纳入全部钩子**(2026-10-11)——生成物只靠 `.gitignore` 挡,**不在 `exclude` 里写目录名**(教训见 `docs/代码规范/pre-commit使用说明.md` §5.5)
|
||||
- ⚠ **pre-commit 4.x 已移除 `always: true`**(实测对 `local` 钩子只告警 `Unexpected key(s)` 并跳过)→ 想"总是跑"的钩子**必须让 `files:` 覆盖到所有会触发它的文件**,没有兜底开关
|
||||
- **改写型钩子(`trailing-whitespace` + `end-of-file-fixer`)豁免 CubeMX/Keil 生成文件**(配置里 YAML 锚点 `&cubemx-generated`);⚠ **只读检查不受影响**:`cppcheck` / 乱码 / `cubemx-survival` / `task-table` / `mem-numbers` 仍覆盖 `Src/`、`Inc/`
|
||||
@@ -173,7 +173,7 @@
|
||||
| ADC 采样节拍 / 通道映射 / V0.1 硬件缺陷 | `docs/子系统设计/ADC采样节拍设计说明.md`、`docs/硬件平台/ADC通道映射说明.md` |
|
||||
| 存储栈(FatFs / dhara / lftpd / 两条 FatFs 陷阱) | `docs/架构设计/STM32F4-Base存储架构说明.md` |
|
||||
| RAM / 栈预算 / 容量台账 | `docs/内存管理/RAM使用分析与优化方案.md`、`内存内容分配策略.md` |
|
||||
| **每个提交门禁一篇详解**(查什么 / 拦下过什么真事 / 限制与盲区 / 基线口径) | `docs/门禁说明/README.md`(44 个钩子 → 23 篇索引) |
|
||||
| **每个提交门禁一篇详解**(查什么 / 拦下过什么真事 / 限制与盲区 / 基线口径) | `docs/门禁说明/README.md`(45 个钩子 → 23 篇索引) |
|
||||
| 实体编号怎么写 / 前缀总表 / `id-check` 八项校验 | `docs/编号规范.md`(§4 总表、§8 门禁与实测基线) |
|
||||
| 提交门禁通用机制(阶段 / stash 陷阱 / 触发面 / 增量拦截三段式) | `docs/代码规范/pre-commit使用说明.md` §2 |
|
||||
| 代码规范 V1.0 / cppcheck 口径 | `docs/代码规范/嵌入式C语言代码规范_V1.0.md`、`cppcheck使用说明.md` |
|
||||
|
||||
@@ -47,10 +47,10 @@ C2 dhara 失败类 +84;RO 另 +208,全是 C2 的失败类名表)→ `ER_IR
|
||||
<!-- MEM_SNAPSHOT:BEGIN generated by scripts/check_mem_numbers.py -->
|
||||
| 区域 | 用量 | 容量 | 占比 |
|
||||
|---|---|---|---|
|
||||
| ER_IROM1 | 238,708 B (233.11 KB) | 1,048,576 B (1024 KB) | 22.8% |
|
||||
| RW_IRAM1 | 76,512 B (74.72 KB) | 131,072 B (128 KB) | 58.4% |
|
||||
| ER_IROM1 | 239,412 B (233.80 KB) | 1,048,576 B (1024 KB) | 22.8% |
|
||||
| RW_IRAM1 | 76,664 B (74.87 KB) | 131,072 B (128 KB) | 58.5% |
|
||||
| RW_CCM | 57,376 B (56.03 KB) | 65,280 B (64 KB) | 87.9% |
|
||||
| **Flash (ROM 合计)** | **239,964 B (234.3 KB)** | 1,048,576 B (1024 KB) | **22.9%** |
|
||||
| **Flash (ROM 合计)** | **240,676 B (235.0 KB)** | 1,048,576 B (1024 KB) | **23.0%** |
|
||||
<!-- MEM_SNAPSHOT:END -->
|
||||
|
||||
各区的容量与常量来源:
|
||||
|
||||
@@ -15,10 +15,10 @@
|
||||
<!-- MEM_BUDGET:BEGIN generated by scripts/ram_baseline.py -->
|
||||
| 区域 | 用量 | 容量 | 占比 | 门禁(≤92%) |
|
||||
|---|---|---|---|---|
|
||||
| ER_IROM1 (Flash) | 238,708 B | 1,048,576 B | 22.8% | 参考 |
|
||||
| ER_IROM1 (Flash) | 239,412 B | 1,048,576 B | 22.8% | 参考 |
|
||||
| RW_CCM | 57,376 B | 65,280 B | 87.9% | PASS |
|
||||
| UNINIT_CCM | 48 B | 256 B | 18.8% | 参考 |
|
||||
| RW_IRAM1 | 76,512 B | 131,072 B | 58.4% | PASS |
|
||||
| RW_IRAM1 | 76,664 B | 131,072 B | 58.5% | PASS |
|
||||
|
||||
| 子系统(静态 RW+ZI;除 RTOS 堆在 CCM 外均在 SRAM1) | 现值 | 配额 | 状态 |
|
||||
|---|---|---|---|
|
||||
@@ -26,8 +26,8 @@
|
||||
| 存储 | 7,056 B | 12 KB | OK |
|
||||
| UI | 31,135 B | 16 KB | ⚠ 超 14.4 KB |
|
||||
| RTOS 堆 | 57,376 B | 56 KB | 堆=配额 |
|
||||
| 应用 | 15,406 B | 8 KB | ⚠ 超 7.0 KB |
|
||||
| 其它 | 9,216 B | — | 参考 |
|
||||
| 应用 | 15,410 B | 8 KB | ⚠ 超 7.0 KB |
|
||||
| 其它 | 9,368 B | — | 参考 |
|
||||
<!-- MEM_BUDGET:END -->
|
||||
|
||||
- **门禁**:pre-commit `mem-budget` 钩子(`scripts/ram_baseline.py --gate`)——
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
# 门禁逐项说明(每种门禁一篇)
|
||||
|
||||
> 这一目录回答一个问题:**提交时那 44 个钩子到底在干什么、拦谁、放谁、什么时候会骗人。**
|
||||
> 这一目录回答一个问题:**提交时那 45 个钩子到底在干什么、拦谁、放谁、什么时候会骗人。**
|
||||
> 每个门禁一篇,八段固定结构:查什么 / 为什么要它 / 触发面 / 报错怎么读 / 好处 /
|
||||
> **限制与盲区** / 豁免与基线 / 改门禁本身要注意什么。**最后一节是这套文档存在的理由**——
|
||||
> 一份只看"拦了什么"的门禁文档,会让人以为绿就是对的。
|
||||
|
||||
@@ -7,4 +7,4 @@ date code ro rw zi er_irom1 er_pct iram1 iram1_pct ccm ccm_pct top_rwzi
|
||||
2026-10-22 213436 18652 1188 131500 232088 22.1 75264 57.4 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;lftpd.o=7884;ui_net_sink.o=6766;ui_port.o=6420;nand_ftl.o=6216;ch395f.o=4162;console_log.o=4120;sys_log_mcu.o=3588;default_task.o=2736
|
||||
2026-10-23 213676 18860 1188 131500 232536 22.2 75264 57.4 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;lftpd.o=7884;ui_net_sink.o=6766;ui_port.o=6420;nand_ftl.o=6216;ch395f.o=4162;console_log.o=4120;sys_log_mcu.o=3588;default_task.o=2736
|
||||
2026-10-24 213780 18860 1204 131852 232640 22.2 75632 57.7 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;lftpd.o=7884;ui_net_sink.o=6766;ui_port.o=6420;nand_ftl.o=6216;ch395f.o=4162;console_log.o=4128;sys_log_mcu.o=3944;default_task.o=2736
|
||||
2026-10-25 217204 21504 1256 132680 238708 22.8 76512 58.4 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;lftpd.o=7884;ui_net_sink.o=6766;ui_port.o=6420;nand_ftl.o=6216;ch395f.o=4162;console_log.o=4128;sys_log_mcu.o=3944;default_task.o=2736
|
||||
2026-10-25 217828 21584 1264 132824 239412 22.8 76664 58.5 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;lftpd.o=7884;ui_net_sink.o=6766;ui_port.o=6420;nand_ftl.o=6216;ch395f.o=4162;console_log.o=4128;sys_log_mcu.o=3944;default_task.o=2736
|
||||
|
||||
|
@@ -1,25 +1,25 @@
|
||||
{
|
||||
"built_at": "2026-10-25T10:03:18+08:00",
|
||||
"fingerprint": "a63f8cb23657ecbb642a47b1e9edee90328086c8d7335e479b428fdd8d6516f5",
|
||||
"fingerprint_files": 1404,
|
||||
"built_at": "2026-10-25T10:35:31+08:00",
|
||||
"fingerprint": "90cc57d7a5f5f10826c64ef8127491faebdad4a2549a904c572e5524e178bf01",
|
||||
"fingerprint_files": 1406,
|
||||
"fingerprint_source": "git-index",
|
||||
"gated_regions": [
|
||||
"RW_IRAM1",
|
||||
"RW_CCM"
|
||||
],
|
||||
"git_head": "98664a11ed6f7ef80d09ba134998cb9e5f7c47c7",
|
||||
"git_head": "969fc5c132e7efbe79b5d52cf48d533a8a1925dd",
|
||||
"map": "MDK-ARM/STM32F407-Demo/STM32F407-Demo.map",
|
||||
"map_mtime": 1792893770,
|
||||
"map_mtime": 1792895716,
|
||||
"pct": {
|
||||
"ER_IROM1": 22.76,
|
||||
"ER_IROM1": 22.83,
|
||||
"RW_CCM": 87.89,
|
||||
"RW_IRAM1": 58.37,
|
||||
"RW_IRAM1": 58.49,
|
||||
"UNINIT_CCM": 18.75
|
||||
},
|
||||
"regions": {
|
||||
"ER_IROM1": {
|
||||
"max": 1048576,
|
||||
"size": 238708
|
||||
"size": 239412
|
||||
},
|
||||
"RW_CCM": {
|
||||
"max": 65280,
|
||||
@@ -27,7 +27,7 @@
|
||||
},
|
||||
"RW_IRAM1": {
|
||||
"max": 131072,
|
||||
"size": 76512
|
||||
"size": 76664
|
||||
},
|
||||
"UNINIT_CCM": {
|
||||
"max": 256,
|
||||
@@ -37,10 +37,10 @@
|
||||
"schema": 2,
|
||||
"scope_note": "\u540c\u7801\u51ed\u8bc1\uff1a\u6307\u7eb9\u8986\u76d6\u56fa\u4ef6\u4f53\u79ef\u76f8\u5173\u6e90\u7801\uff0c\u53e3\u5f84\u89c1\u672c\u811a\u672c docstring",
|
||||
"sizes": {
|
||||
"code": 217204,
|
||||
"ro_data": 21504,
|
||||
"rw_data": 1256,
|
||||
"zi_data": 132680
|
||||
"code": 217828,
|
||||
"ro_data": 21584,
|
||||
"rw_data": 1264,
|
||||
"zi_data": 132824
|
||||
},
|
||||
"threshold_pct": 92.0,
|
||||
"worktree_dirt_at_stamp": 0,
|
||||
|
||||
@@ -32,6 +32,14 @@
|
||||
"lines_covered": 126,
|
||||
"lines_valid": 130
|
||||
},
|
||||
"App/algo/meas.c": {
|
||||
"func_rate": 1.0,
|
||||
"funcs_covered": 5,
|
||||
"funcs_valid": 5,
|
||||
"line_rate": 1.0,
|
||||
"lines_covered": 64,
|
||||
"lines_valid": 64
|
||||
},
|
||||
"App/algo/phasor.c": {
|
||||
"func_rate": 1.0,
|
||||
"funcs_covered": 6,
|
||||
@@ -293,8 +301,8 @@
|
||||
"funcs_covered": 53,
|
||||
"funcs_valid": 53,
|
||||
"line_rate": 0.9978,
|
||||
"lines_covered": 889,
|
||||
"lines_valid": 891
|
||||
"lines_covered": 891,
|
||||
"lines_valid": 893
|
||||
},
|
||||
"Drivers/BSP/NETCFG/ftp_cfg.c": {
|
||||
"func_rate": 1.0,
|
||||
@@ -442,6 +450,15 @@
|
||||
"lines_total": 166,
|
||||
"ok": true
|
||||
},
|
||||
"meas": {
|
||||
"files": {
|
||||
"App/algo/meas.c": 64,
|
||||
"App/algo/phasor.c": 55,
|
||||
"App/algo/sample_ring.c": 41
|
||||
},
|
||||
"lines_total": 160,
|
||||
"ok": true
|
||||
},
|
||||
"nand_port": {
|
||||
"files": {
|
||||
"Drivers/BSP/GD5F2GQ5UE/nand_ftl.c": 253
|
||||
@@ -486,9 +503,9 @@
|
||||
},
|
||||
"net_socket": {
|
||||
"files": {
|
||||
"Drivers/BSP/NET/net_socket.c": 891
|
||||
"Drivers/BSP/NET/net_socket.c": 893
|
||||
},
|
||||
"lines_total": 891,
|
||||
"lines_total": 893,
|
||||
"ok": true
|
||||
},
|
||||
"phasor": {
|
||||
@@ -625,6 +642,7 @@
|
||||
"App/algo/adc_health.c",
|
||||
"App/algo/adc_input.c",
|
||||
"App/algo/freq.c",
|
||||
"App/algo/meas.c",
|
||||
"App/algo/phasor.c",
|
||||
"App/algo/prot_elm.c",
|
||||
"App/algo/prot_set.c",
|
||||
@@ -665,16 +683,16 @@
|
||||
],
|
||||
"totals": {
|
||||
"files_generated_excluded": 5,
|
||||
"files_tested": 41,
|
||||
"files_untested": 120,
|
||||
"func_rate": 0.9264,
|
||||
"funcs_covered": 428,
|
||||
"funcs_valid": 462,
|
||||
"line_rate": 0.8962,
|
||||
"lines_covered": 5933,
|
||||
"lines_valid": 6620,
|
||||
"modules_ok": 37,
|
||||
"modules_total": 37
|
||||
"files_tested": 42,
|
||||
"files_untested": 121,
|
||||
"func_rate": 0.9272,
|
||||
"funcs_covered": 433,
|
||||
"funcs_valid": 467,
|
||||
"line_rate": 0.8972,
|
||||
"lines_covered": 5999,
|
||||
"lines_valid": 6686,
|
||||
"modules_ok": 38,
|
||||
"modules_total": 38
|
||||
},
|
||||
"untested_sources": [
|
||||
{
|
||||
@@ -710,12 +728,12 @@
|
||||
"path": "Drivers/BSP/SD2506/sd2506.c"
|
||||
},
|
||||
{
|
||||
"code_lines": 242,
|
||||
"path": "App/app/ui_data_feed.c"
|
||||
"code_lines": 249,
|
||||
"path": "App/task/adc_task.c"
|
||||
},
|
||||
{
|
||||
"code_lines": 224,
|
||||
"path": "App/task/adc_task.c"
|
||||
"code_lines": 242,
|
||||
"path": "App/app/ui_data_feed.c"
|
||||
},
|
||||
{
|
||||
"code_lines": 206,
|
||||
@@ -885,6 +903,10 @@
|
||||
"code_lines": 31,
|
||||
"path": "Drivers/BSP/UI/ui_w_editor.h"
|
||||
},
|
||||
{
|
||||
"code_lines": 29,
|
||||
"path": "App/algo/meas.h"
|
||||
},
|
||||
{
|
||||
"code_lines": 29,
|
||||
"path": "Drivers/BSP/NET/lftpd/lftpd_auth.h"
|
||||
|
||||
Reference in New Issue
Block a user