wandering1
be18b81e82
merge: 104 协议栈收编为项目自有代码(目录合并 + 裁剪 + 解除第三方钉死)
把 7 个提交合并进主树,主线是「App/protocol 这一层去掉,104 只维护一份」。
- 目录:App/protocol/iec60870 -> App/iec60870,适配层 104_port 并入 104,
App/protocol 整层删除
- 裁剪:删 12 个无实现的纯头 + 4 个声明了却无实现的死头,信息对象裁 9 个
用不到的类型,Flash 省约 2 KB
- 收编:删 UPSTREAM.sha256,IMPORT.md 改 README.md,许可证口径改为团队自有,
coding-standard 排除面从整个 104/ 收窄到只排 business/ 与 IEC104*
- 测试:补回 104 适配层与服务层的主机单测,覆盖率门禁从红转绿
合并冲突共 4 处,全是内存数字(ram_baseline.tsv、size_attestation.json、
RAM 台账、RAM 使用分析):两个分支各自构建过,谁的值都不是合并后的真值。
处理方式是先按主树侧收口让树可构建,再重新构建取真值回填 —— 实测合并后
ER_IROM1 = 414,128 B,两边都不等于这个数(主树 416,092 / 分支 413,992)。
验证:Keil 0 errors 0 warnings;模拟器构建 OK;ioboard 131/131、
ui_data 305/305、104 TCP 回环 13/13、覆盖率 89.3% 无 REGRESS;
全量 pre-commit 20 Passed / 0 Failed。
2026-11-18 21:54:05 +08:00
..
2026-11-16 23:59:49 +08:00
2026-11-13 14:23:06 +08:00
2026-11-13 14:23:06 +08:00
2026-11-18 19:17:25 +08:00
2026-11-18 21:54:05 +08:00
2026-10-20 21:14:14 +08:00
2026-09-09 17:15:04 +08:00
2026-11-16 23:59:49 +08:00
2026-11-16 23:30:35 +08:00
2026-11-16 23:30:35 +08:00
2026-10-30 09:50:31 +08:00
2026-10-20 21:14:14 +08:00
2026-11-02 22:19:58 +08:00
2026-11-02 22:19:58 +08:00
2026-11-16 23:59:49 +08:00
2026-11-16 23:59:49 +08:00
2026-11-10 20:33:30 +08:00
2026-11-10 20:33:30 +08:00
2026-11-13 14:23:06 +08:00
2026-10-20 21:14:14 +08:00
2026-11-06 03:49:18 +08:00
2026-10-28 07:23:16 +08:00
2026-10-26 22:43:54 +08:00
2026-10-26 22:43:54 +08:00
2026-11-06 03:49:18 +08:00
2026-10-28 07:23:16 +08:00
2026-11-09 16:13:57 +08:00
2026-10-27 05:07:18 +08:00
2026-11-09 16:13:57 +08:00
2026-11-09 16:13:57 +08:00
2026-11-13 14:51:49 +08:00
2026-11-09 16:13:57 +08:00
2026-11-10 20:33:30 +08:00
2026-10-27 11:29:23 +08:00
2026-11-13 14:51:49 +08:00
2026-10-20 21:14:14 +08:00
2026-11-09 16:13:57 +08:00
2026-10-27 05:07:18 +08:00
2026-11-13 14:51:49 +08:00
2026-10-20 21:14:14 +08:00
2026-10-20 21:14:14 +08:00
2026-10-20 21:14:14 +08:00
2026-11-18 14:32:40 +08:00
2026-10-28 07:23:16 +08:00
2026-10-20 21:14:14 +08:00
2026-10-20 21:14:14 +08:00
2026-11-16 23:30:35 +08:00
2026-11-16 23:30:35 +08:00
2026-11-18 14:32:40 +08:00
2026-11-09 16:13:57 +08:00
2026-11-15 21:30:07 +08:00
2026-11-16 23:59:49 +08:00
2026-11-13 14:51:49 +08:00
2026-10-28 07:23:16 +08:00
2026-11-15 21:30:07 +08:00
2026-11-16 23:59:49 +08:00
2026-11-04 16:20:22 +08:00
2026-11-04 16:20:22 +08:00
2026-10-25 14:44:45 +08:00
2026-10-25 14:44:45 +08:00
2026-11-06 03:49:18 +08:00
2026-10-28 07:23:16 +08:00
2026-10-26 15:51:12 +08:00
2026-10-25 14:44:47 +08:00
2026-10-26 15:51:12 +08:00
2026-10-25 14:44:47 +08:00
2026-10-26 15:51:12 +08:00
2026-10-25 14:44:47 +08:00
2026-10-26 15:51:12 +08:00
2026-10-25 14:44:47 +08:00
2026-11-09 16:13:57 +08:00
2026-10-29 19:23:15 +08:00
2026-11-07 19:16:21 +08:00
2026-10-29 19:23:15 +08:00
2026-11-18 14:32:40 +08:00
2026-10-28 07:23:16 +08:00
2026-11-18 14:25:32 +08:00
2026-10-25 15:33:04 +08:00
2026-10-30 09:50:31 +08:00
2026-10-30 09:50:31 +08:00
2026-09-10 11:36:33 +08:00
2026-11-15 21:30:07 +08:00
2026-11-15 21:30:07 +08:00
2026-10-26 12:28:14 +08:00
2026-10-26 12:28:14 +08:00
2026-10-26 12:28:14 +08:00
2026-10-25 04:34:43 +08:00
2026-10-25 04:34:43 +08:00
2026-11-17 11:59:45 +08:00
2026-11-17 11:59:45 +08:00
2026-10-26 15:51:12 +08:00
2026-11-09 16:13:57 +08:00
2026-10-26 15:51:12 +08:00
2026-11-17 11:59:45 +08:00
2026-10-28 07:23:16 +08:00
2026-11-17 11:59:45 +08:00
2026-10-27 05:07:18 +08:00
2026-11-09 16:13:57 +08:00