From 90cc9a7d99772cad2bf5d82bd97bfb94c67c5ed0 Mon Sep 17 00:00:00 2001 From: Wanderingss <1624155937@qq.com> Date: Wed, 18 Nov 2026 10:29:18 +0800 Subject: [PATCH] =?UTF-8?q?feat(iec104):=20=E6=8A=8A=20104=20=E9=AA=A8?= =?UTF-8?q?=E6=9E=B6=E5=AE=8C=E6=95=B4=E8=BF=81=E5=88=B0=20MCU=20=E6=9D=BF?= =?UTF-8?q?=E7=AB=AF=E5=B9=B6=E5=9C=A8=E5=8F=B0=E6=9E=B6=E8=B7=91=E9=80=9A?= =?UTF-8?q?=E6=80=BB=E5=8F=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 把 IEC104 从模拟器端整体搬到板端:协议栈原先由独立 iec104Task 驱动, 现在改为 netTask 单 owner 的 threadless 驱动,退役独立任务。 驱动与后端: - 新增 iec104_net_mcu.c/.h,实现 IEC104_Net.h 的 11 个 ABI 函数, 用槽表加单调句柄映射 net_socket 的单 fd 模型;CLIENT 拆除只走 net_drop_conn_locked,绝不 net_close 监听 fd。 - net_socket 增 5 个 owner-only 接口(net_accept_locked、 net_drop_conn_locked、net_pending_bytes、net_send_try、 net_mono_now_ms)。 - iec104_serv.c 重写为 iec104_serv_net_tick(),在 netTask 1ms 主循环 里驱动 core;无 osDelay/阻塞调用,喂狗是第一句。 - Src/freertos.c 删除 iec104Task 三件套,对应栈水位探针表项同步删除。 内存:目标板 192KB SRAM 装不下 vendor 默认容量档,按实测裁剪到 skeleton 档(TCP 缓冲、业务池、SOE 256->128、值槽密集化), RW_IRAM1 118,408 B / 90.3%,留 2,178 B 余量。 台架修复(只在真硬件暴露): - SNTP s_ctx.fd 零初始化后为 0,而 net fd 0 是合法槽位下标, 首次代次变化时误 net_close(0) 关掉 ftpTask 的监听槽,导致 104 连接被 FTP 的 220 banner 抢走;改为显式 .fd = -1。 - Accept 幂等:单 fd 模型下 vendor 每轮重试 Accept 会拿到同一 fd, 后端改为会话在役时返 WOULD_BLOCK,Close 不再清槽。 验证: - Keil 全量重建 0 error 0 warning,uvprojx 零抖动。 - 模拟器真实 TCP 13/13、transport 10/10。 - netmcu 后端单测 13/13(新增 N12)。 - 台架 serial-boot-test required 全中;板端 2404 总召 129 帧收到 59 遥信(53 有源、全 IV)+ 16 双点 + 30 遥测(PT1 三相非零、 UN/频率/温度按未标定置 IV)、遥控选择执行全否定、校时 COT 7。 - 期间顺带修正 UI 漂移自检文案、.serialtest required 陈旧项、 coding-standard 对 vendor 与外部 ABI 名字的排除口径。 --- .cubemx_survival_baseline.json | 6 +- .dsh/roles/build-gatekeeper.md | 2 +- .dsh/roles/lead-orchestrator.md | 2 +- .dsh/roles/test-engineer.md | 4 +- .gitea/workflows/ci.yml | 8 +- .gitignore | 2 + .pre-commit-config.yaml | 69 +- .serialtest/config.json | 2 +- AGENTS.md | 7 +- App/app/ui_data_feed.c | 42 +- App/cfg/prot_set_store.c | 2 +- App/log/README.md | 4 +- App/protocol/iec104/iec104_asdu.c | 208 --- App/protocol/iec104/iec104_core.c | 13 + App/protocol/iec104/iec104_core.h | 5 + App/protocol/iec104/iec104_link.c | 797 -------- App/protocol/iec104/iec104_link.h | 142 -- App/protocol/iec104/iec104_net_mcu.c | 656 +++++++ App/protocol/iec104/iec104_net_mcu.h | 149 ++ App/protocol/iec104/iec104_pts.c | 682 ------- App/protocol/iec104/iec104_pts.h | 130 -- App/protocol/iec104/iec104_source.c | 273 ++- App/protocol/iec104/iec104_source.h | 4 + App/protocol/iec104/iec104_source_ranks.h | 202 ++ App/protocol/iec60870/104/IEC104_AsduQueue.h | 2 +- App/protocol/iec60870/104/IEC104_Slave.h | 2 +- App/protocol/iec60870/104/IEC104_TcpServer.c | 2 +- App/protocol/iec60870/104/IEC104_TcpServer.h | 2 +- .../iec60870/104/IEC104_TcpServer_Config.h | 2 +- .../iec60870/104/business/IEC104_Command.c | 35 +- .../iec60870/104/business/IEC104_Command.h | 12 +- .../104/business/IEC104_Spontaneous.h | 2 +- App/protocol/iec60870/IMPORT.md | 65 +- App/sync/time_sntp.c | 12 +- App/task/default_task.c | 12 +- App/task/iec104_serv.c | 730 ++++---- App/task/iec104_serv.h | 49 +- App/task/net_task.c | 43 +- App/task/task_handles.h | 2 - App/util/task_watchdog.c | 2 +- App/util/task_watchdog.h | 2 +- Drivers/BSP/NET/net_socket.c | 112 +- Drivers/BSP/NET/net_socket.h | 54 + .../iec104_strict_priority_transport_test.c | 37 +- MDK-ARM/STM32F407-Demo.uvprojx | 179 +- README.md | 5 +- STM32F407-Demo.ioc | 2 +- Src/freertos.c | 60 +- _all_hook.txt | 512 ++++++ _scope.txt | 512 ++++++ docs/CI/远程CI完整指南.md | 6 +- docs/README.md | 1 + docs/UI设计/UI_数据供给设计.md | 28 +- docs/UI设计/UI_时间响应分析.md | 2 +- docs/UI设计/UI_自动化测试流程.md | 8 +- docs/UI设计/内容页架构.md | 6 +- docs/UI设计/页面扩充详细方案.md | 16 +- docs/UI设计/页面补齐规划.md | 2 +- docs/产品需求/产品需求设计文档.md | 4 +- docs/代码规范/cppcheck使用说明.md | 2 +- docs/代码规范/pre-commit使用说明.md | 12 +- docs/内存管理/RAM使用分析与优化方案.md | 6 +- docs/内存管理/RAM预算台账.md | 12 +- docs/子系统设计/IEC104_MCU落地规划.md | 6 +- docs/子系统设计/IEC104上行设计说明.md | 21 + docs/子系统设计/故障录波设计说明.md | 2 +- docs/子系统设计/运行与自检记录设计.md | 2 +- docs/测试说明/单元测试/主机单测覆盖率口径.md | 4 +- docs/测试说明/板级测试/实机测试实施指南.md | 2 +- docs/测试说明/流程与规范/测试开发标准流程.md | 2 +- docs/测试说明/流程与规范/自动化测试流程.md | 2 +- docs/环境与部署/项目部署环境要求.md | 12 +- docs/网络/IEC104_Net适配契约.md | 134 ++ docs/网络/Net层阻塞模型架构设计.md | 2 + docs/门禁说明/README.md | 52 +- docs/门禁说明/gitlint.md | 2 +- docs/门禁说明/host-unit-tests.md | 6 +- docs/门禁说明/mermaid-syntax.md | 3 +- docs/门禁说明/skill-size.md | 2 +- docs/门禁说明/ui-golden.md | 6 +- scripts/README.md | 7 +- scripts/check_coding_standard.py | 12 +- scripts/check_iec104_tcp.py | 101 + scripts/check_registration.py | 7 +- scripts/ci_local.py | 25 +- scripts/gate_python.py | 26 +- scripts/gen_task_table.py | 3 +- scripts/ram_baseline.tsv | 1 + scripts/stack_report.py | 2 - simulator/CMakeLists.txt | 2 + simulator/README.md | 4 +- simulator/tests/README.md | 2 +- simulator/tests/check_content_pages.py | 4 +- test/host/iec104/iec104_test.c | 1618 ----------------- test/host/iec104/run_unit_test.py | 47 - test/host/iec104_dtu/MATRIX.md | 4 +- test/host/iec104_dtu/run_tcp_test.py | 357 +++- test/host/iec104_netmcu/MATRIX.md | 96 + test/host/iec104_netmcu/check_static.py | 114 ++ .../iec104_netmcu/check_static_selftest.py | 48 + test/host/iec104_netmcu/net_socket_fake.c | 832 +++++++++ test/host/iec104_netmcu/net_socket_fake.h | 136 ++ test/host/iec104_netmcu/netmcu_stub_test.c | 300 +++ test/host/iec104_netmcu/netmcu_test.c | 513 ++++++ test/host/iec104_netmcu/results/report.json | 44 + .../iec104_netmcu/results/static/report.json | 28 + .../static_mutant/iec104_net_mcu_BAD.c | 657 +++++++ .../results/static_mutant/report.json | 28 + .../results/static_mutant/selftest.txt | 4 + test/host/iec104_netmcu/run_netmcu_tests.py | 117 ++ test/host/iec104_netmcu/stub/FreeRTOS.h | 7 + test/host/iec104_netmcu/stub/cmsis_os2.h | 13 + test/host/iec104_netmcu/stub/task.h | 7 + test/host/iec104_netmcu/stub_iec104_netmcu.c | 431 +++++ test/host/iec104_netmcu/stub_iec104_netmcu.h | 26 + test/host/iec104_serv/iec104_serv_test.c | 656 ------- test/host/iec104_serv/run_unit_test.py | 76 - test/host/iec104_serv/stub/cmsis_os2.h | 27 - test/host/iec104_serv/stub/dbg_log.h | 19 - test/host/iec104_serv/stub/main.h | 15 - test/host/iec104_serv/stub/net_socket.h | 31 - test/host/iec104_serv/stub/sys_clock.h | 21 - test/host/soe/run_unit_test.py | 14 +- test/host/soe/soe_test.c | 80 +- test/host/ui_data/ui_data_test.c | 11 +- 125 files changed, 7463 insertions(+), 5335 deletions(-) delete mode 100644 App/protocol/iec104/iec104_asdu.c delete mode 100644 App/protocol/iec104/iec104_link.c delete mode 100644 App/protocol/iec104/iec104_link.h create mode 100644 App/protocol/iec104/iec104_net_mcu.c create mode 100644 App/protocol/iec104/iec104_net_mcu.h delete mode 100644 App/protocol/iec104/iec104_pts.c delete mode 100644 App/protocol/iec104/iec104_pts.h create mode 100644 App/protocol/iec104/iec104_source_ranks.h create mode 100644 _all_hook.txt create mode 100644 _scope.txt create mode 100644 docs/网络/IEC104_Net适配契约.md create mode 100644 scripts/check_iec104_tcp.py delete mode 100644 test/host/iec104/iec104_test.c delete mode 100644 test/host/iec104/run_unit_test.py create mode 100644 test/host/iec104_netmcu/MATRIX.md create mode 100644 test/host/iec104_netmcu/check_static.py create mode 100644 test/host/iec104_netmcu/check_static_selftest.py create mode 100644 test/host/iec104_netmcu/net_socket_fake.c create mode 100644 test/host/iec104_netmcu/net_socket_fake.h create mode 100644 test/host/iec104_netmcu/netmcu_stub_test.c create mode 100644 test/host/iec104_netmcu/netmcu_test.c create mode 100644 test/host/iec104_netmcu/results/report.json create mode 100644 test/host/iec104_netmcu/results/static/report.json create mode 100644 test/host/iec104_netmcu/results/static_mutant/iec104_net_mcu_BAD.c create mode 100644 test/host/iec104_netmcu/results/static_mutant/report.json create mode 100644 test/host/iec104_netmcu/results/static_mutant/selftest.txt create mode 100644 test/host/iec104_netmcu/run_netmcu_tests.py create mode 100644 test/host/iec104_netmcu/stub/FreeRTOS.h create mode 100644 test/host/iec104_netmcu/stub/cmsis_os2.h create mode 100644 test/host/iec104_netmcu/stub/task.h create mode 100644 test/host/iec104_netmcu/stub_iec104_netmcu.c create mode 100644 test/host/iec104_netmcu/stub_iec104_netmcu.h delete mode 100644 test/host/iec104_serv/iec104_serv_test.c delete mode 100644 test/host/iec104_serv/run_unit_test.py delete mode 100644 test/host/iec104_serv/stub/cmsis_os2.h delete mode 100644 test/host/iec104_serv/stub/dbg_log.h delete mode 100644 test/host/iec104_serv/stub/main.h delete mode 100644 test/host/iec104_serv/stub/net_socket.h delete mode 100644 test/host/iec104_serv/stub/sys_clock.h diff --git a/.cubemx_survival_baseline.json b/.cubemx_survival_baseline.json index 43ba5d48..13e7b4fc 100644 --- a/.cubemx_survival_baseline.json +++ b/.cubemx_survival_baseline.json @@ -13,21 +13,21 @@ "stack-overflow-hook-impl": "03a383dda578d12a", "malloc-failed-hook-impl": "fcd7250e5cd6403b", "stack-overflow-hook-helper": "cacd9fd028be9b5b", - "watchdog-module": "5fd7efd90a78fe5a", + "watchdog-module": "c867214711e4306a", "net-msgq-adopt": "a0f913e3f34c8e9e", "reset-cause-latch": "983927d587cb9f48", "iwdg-hal-driver": "4b902875a84554e9", "hal-iwdg-enabled": "1a8ed6cff34f7ba6", "ioc-keepusercode": "b5bea41b6c623f7c", "ioc-iwdg-present": "d3a6e667048c95db", - "ioc-task-stacks": "58ee94dd2a093177", + "ioc-task-stacks": "c471202772745aeb", "adc1-hal-enabled": "1a8ed6cff34f7ba6", "adc1-calibration-call": "8d5f4b40fb218913", "adc1-calibration-impl": "25723dd0449ac701", "adc-tick-tim3-branch": "17d43a565f50c6f2", "ioc-adc-trig-t3trgo": "a9939de260ee46f8", "ioc-adc-dma-continuous": "189126670d85d80a", - "adc1-dma-link": "8a57c70611db1a02", + "adc1-dma-link": "d0d8bcbaee97d26c", "adc1-dma-irq-priority": "beff08e91333229b" }, "_note": "CubeMX 存活审计基线;改动用 --write 重建" diff --git a/.dsh/roles/build-gatekeeper.md b/.dsh/roles/build-gatekeeper.md index 081b25c9..91afd3c0 100644 --- a/.dsh/roles/build-gatekeeper.md +++ b/.dsh/roles/build-gatekeeper.md @@ -122,7 +122,7 @@ DAL A 软件必须进行目标代码级结构覆盖率分析(OCV)。当编 ## 专业领域 - **Keil 构建**:`/keil-build` = `& '.venv\Scripts\python.exe' .dsh\skills\keil-build\scripts\keil_build.py`,退出码 0=PASS / 1=构建失败 / 2=环境错误 / 3=用法 / 4=build 锁被占用 -- **pre-commit 门禁**:52 个钩子(提交期实跑 49 根,3 根慢钩子由远端 CI 强制),每根有专属详解文档 +- **pre-commit 门禁**:52 个钩子(提交期实跑 48 根 = pre-commit 阶段 47 + `gitlint`,4 根慢钩子由远端 CI 与 `ci_local.py` 承担),每根有专属详解文档 - **CI 本地自查**:`& '.venv\Scripts\python.exe' scripts/ci_local.py` = 静态门禁 + 提交信息门禁 + 主机侧纯逻辑单测 - **串口回归**:`/serial-boot-test` = 烧录 → wait-idle → 采日志 → 标记校验 diff --git a/.dsh/roles/lead-orchestrator.md b/.dsh/roles/lead-orchestrator.md index ce53c53c..f8904bcb 100644 --- a/.dsh/roles/lead-orchestrator.md +++ b/.dsh/roles/lead-orchestrator.md @@ -273,7 +273,7 @@ onToolCallBudget: wrap-up | `mcu-specialist` | GPIO/EXTI/AF、时钟树、CubeMX 用户代码区边界、外部时序器件、**驱动层契约修复** | 应用层逻辑;算法 | 引脚、时钟、CubeMX 重生成存活、位操作与时序、RS-485 驱动侧契约 | | `code-reviewer` | 审查改动的正确性、安全性、规范合规、内存与资源 | 不改代码(工具面无 `edit`/`write`) | 任何改动的第二双眼睛;高风险改动的强制过审 | | `test-engineer` | `test/host/` 主机侧单测、`test/board/` 板级套件代码 | `test_config.h` 套件宏的临时开关(改了就流到现场) | 新增/修改测试用例、覆盖率缺口、套件互斥 | -| `build-gatekeeper` | Keil 构建、52 个 pre-commit 钩子、CI 本地自查、构建/门禁报错诊断 | 改业务代码(诊断,不修) | 构建失败、门禁报错、提交前全量自查 | +| `build-gatekeeper` | Keil 构建、51 个 pre-commit 钩子、CI 本地自查、构建/门禁报错诊断 | 改业务代码(诊断,不修) | 构建失败、门禁报错、提交前全量自查 | | `bench-runner` | 烧录/复位/回读、串口抓日志、标记校验、板端 UI 导航、日志定位 | **不做判定**;不写文件(工具面无 `edit`/`write`) | 一切要摸板子的活:烧固件、抓开机日志、跑板端验证 | | `doc-writer` | `docs/` 与各 README 的编写维护、链接有效性、计数准确性、生成器产物同步 | 业务代码;`AGENTS.md`(入口文件,改动需 Lead 裁定) | 文档新建/改指/计数同步、门禁文档、引用清理 | diff --git a/.dsh/roles/test-engineer.md b/.dsh/roles/test-engineer.md index 3aeff273..f4e2e2d4 100644 --- a/.dsh/roles/test-engineer.md +++ b/.dsh/roles/test-engineer.md @@ -112,7 +112,7 @@ ASIL-D要求故障注入测试验证安全机制有效性;软件单元之间 - **主机侧单测**:`test/host/` 下 47 套带 `run_unit_test.py` 的测试模块,纯逻辑验证,不依赖硬件 - **板级测试套件**:`test/board/`,通过 `board-test-suite` skill 运行,含破坏性测试开关 - **测试配置互斥**:`test_config.h` 的 `TEST_SUITE_CH395F/STORAGE/GD5F/RTC` 一次只能开一个,全部注释 = 产品构建 -- **门禁集成**:22 根专属钩子(`-unit-test` 后缀)+ `test-coverage` 总闸守基线回退 +- **门禁集成**:21 根专属钩子(`-unit-test` 后缀)+ `test-coverage` 总闸守基线回退 ## 铁律 @@ -137,5 +137,5 @@ ASIL-D要求故障注入测试验证安全机制有效性;软件单元之间 - `docs/测试说明/流程与规范/自动化测试流程.md` - 自动化测试全流程 - `docs/测试说明/板级测试/实机测试实施指南.md` - 板级测试实施 -- `docs/门禁说明/host-unit-tests.md` - 22 根专属钩子台账与补钩判据 +- `docs/门禁说明/host-unit-tests.md` - 21 根专属钩子台账与补钩判据 - `docs/测试说明/专项验证/存储维护与容量恢复.md` - 破坏性测试代价 diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 7970e34c..9fe84950 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -3,7 +3,11 @@ # 覆盖范围(**只做不依赖硬件的层**,见 docs/测试说明/流程与规范/测试开发标准流程.md §1/§9): # 静态门禁 static = pre-commit 全部钩子(等价本地 `pre-commit run --all-files`) # + 手动阶段三根(覆盖率总闸 / 全量 cppcheck / test-cppcheck,`--hook-stage manual`; -# 它们在 .pre-commit-config.yaml 里带 stages: [manual],提交期不跑,由本 job 强制) +# 它们在 .pre-commit-config.yaml 里带 stages: [manual],提交期不跑,由本 job 强制。 +# ⚠ 第四根 manual 钩子 `iec104-tcp`(IEC 104 真实回环 11 条)**故意不在此列**: +# 它需要 simulator/build/Debug/lvgl_sim.exe,而本 CI 不构建模拟器(整套 +# `simulator/` 是 PC 侧产物,需要 MSVC 工程生成器)——只能在开发机本地跑, +# 故它同时登记在 `scripts/ci_local.py` 的 manual 段。) # 主机侧纯逻辑单测 host-unit = test/host/**(MSVC 离线编译,零硬件) # # ⛔ 板端测试套件(test/board/,需真机 + ST-LINK)/ 主机侧回归(/serial-boot-test 闭环)/ 人工目检 @@ -319,6 +323,8 @@ jobs: # (实测合计 ~165 s = 一次带代码提交耗时的三分之二);提交期只跑快的那些,全量扫描由本 job 强制。 # 逐根调用而不是一条命令:`pre_commit run ` 不支持多 id(实测 argparse 报 # "unrecognized arguments")。 + # ⚠ 第四根 manual 钩子 `iec104-tcp` 不在本列表里:它需要 lvgl_sim.exe,而 CI 不构建 + # 模拟器(见文件头说明);它只在 scripts/ci_local.py 的 manual 段与本机手工复跑。 - name: 手动阶段门禁(覆盖率总闸 + 全量 cppcheck) if: always() shell: powershell diff --git a/.gitignore b/.gitignore index 315895e4..4e16a404 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,8 @@ # Keil MDK - Build log (regenerated by keil_build.py) MDK-ARM/build_log.txt +# 工程文件改动前的自动备份(本地安全网,不入库) +MDK-ARM/*.bak # legacy: download.bat removed 2026-10-10; entry kept so stale leftovers on # other machines do not surface as untracked files MDK-ARM/download_log.txt diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 938e3774..b95c6d59 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -155,6 +155,12 @@ repos: types: [c] # 范围与 cppcheck 钩子一致;另排除 CubeMX 生成文件(Src/、Inc/,重新生成即覆盖)、 # dhara/FatFS 接口适配层(nand_ftl,函数名由外部 API 固定) + # `App/protocol/iec60870/` 与 `IEC60870-Slave/` 是逐字节钉在 UPSTREAM.sha256 上的 + # 第三方源码(IEC 60870-5-104 子站库,45k 行):函数命名/注释块/typedef 形态都是 + # 上游风格,改一字节就等于篡改第三方(`verify_vendor.py` 会判定受控差异漂移)。 + # 这就是本文档 §0 写明的"排除…第三方"口径落到实处;Lib/、Middlewares/、 + # Drivers/CMSIS/ 同理。**我们自己的适配层不在排除面内**: + # App/protocol/iec104/ 全目录、App/task/、Drivers/BSP/NET/ 照旧受检。 exclude: | (?x)^( Drivers/CMSIS/| @@ -162,6 +168,8 @@ repos: Drivers/BSP/NET/lftpd/| Drivers/BSP/GD5F2GQ5UE/nand_ftl\.| Drivers/BSP/dhara/| + App/protocol/iec60870/| + IEC60870-Slave/| Lib/| Middlewares/| MDK-ARM/| @@ -187,7 +195,8 @@ repos: MDK-ARM/RTE/| docs/芯片手册/ ) - # mermaid 图:围栏内确定性语法预检(第 52 条,2026-10-30 加,口径 51 → 52,提交期实跑 48 → 49)。 + # mermaid 图:围栏内确定性语法预检(2026-10-30 加;当日口径 51 → 52、提交期实跑 48 → 49, + # 2026-11-17/18 摘 `iec104-unit-test` + 加 `iec104-tcp` 后收敛为 52 / 47 / 48)。 # 为什么要有:屏板链路设计.md §1 的 flowchart 里 `-.|"文字"|`(`-.` 直接跟管道,不是任何合法 # 箭头 token)让 mermaid 渲染 `Syntax error in text`——该图 2026-10-29 落库、期间 doc-links 等 # 全绿:文档门禁查链接与章节,**从不查围栏内图表语法**,这是它们的共同盲区。 @@ -496,19 +505,21 @@ repos: files: ^(Drivers/BSP/NET/lftpd/lftpd_auth\.(c|h)|App/util/sha256\.(c|h)|test/host/ftp_auth/.*|test/host/common/unit_test_harness\.py)$ pass_filenames: false - # 7m) IEC 60870-5-104 被控站协议栈主机侧单元测试(2026-10-12 加,B4) - # APCI 重组/STARTDT/总召分片/COV/k-w-t1~t3/遥控定值两段式/C_CS/错误 - # 应答——link 层 tick 注入 + pts 数据源 vtable 抽象就是为主机侧纯逻辑单测全离线 - # 穷举设计(分层约束);板端复现这些分支要真主站+真等待。 - # 触发面含数据源依赖(prot_set/prot_elm/phasor/sample_ring)——测试 - # 直接 #include 这些生产源,签名变了要立刻在这里暴露。 - - id: iec104-unit-test - name: IEC104 协议栈单测(主机侧) - entry: scripts/gate_python.py test/host/iec104/run_unit_test.py - language: system - # 运行参数段落地起本 TU 链入真实 cfg_file/adc_cal/run_par(板端真源链),触发面同步扩 - files: ^(App/protocol/iec104/iec104_(asdu|pts|link)\.(c|h)|App/algo/(prot_set|prot_elm|phasor|sample_ring|adc_input|freq|meas|adc_cal|run_par)\.(c|h)|App/cfg/cfg_file(_store)?\.(c|h)|test/host/iec104/.*|test/host/common/unit_test_harness\.py)$ - pass_filenames: false + # 7m) 【已退役 2026-11-17】IEC 60870-5-104 协议栈主机侧单元测试(2026-10-12 加,B4); + # 曾覆盖 APCI 重组/STARTDT/总召分片/COV/k-w-t1~t3/遥控定值两段式/C_CS。 + # 退役原因:它的被删对象是旧自研协议层(iec104_asdu / iec104_pts / iec104_link), + # 三者已随 vendor 库接入整体删除,测试脚本 + # test/host/iec104/run_unit_test.py 一并删除 ⇒ 本钩子每次触发都得 RC=2 + # (gate_python 报「目标脚本不存在」),是必红的死钩子。 + # 新板端网络后端的等价验证是 test/host/iec104_netmcu/(fake net 层 + 自定义 + # runner,不是 run_unit_test.py 形态,硬套进这里只会得到一个跑不起来的钩子), + # 由 scripts/ci_local.py 与人工运行,不进提交门禁。 + # ⚠ 计数口径(2026-11-18 两笔合并后实测):本条摘除使 YAML 解析条目 52 → 51、 + # 提交期实跑 49 → 48;同日新增的 `iec104-tcp`(下面 12b 条,manual 阶段)再把 + # 声明数加回 **52**、manual 根数 3 → **4**、manual 阶段枚举行数 50 → **51**。 + # ⇒ 终态:**声明 52 / pre-commit 阶段 47 / 一次 git commit 实跑 48 / manual 4**。 + # 须与 AGENTS.md 的「共 N 个钩子」、docs/门禁说明/README.md §2 标题、 + # docs/代码规范/pre-commit使用说明.md 三处同批改(勿在别处另立字面量)。 # 7m2) SOE 动作记录编解码主机侧单元测试(2026-10-12 加,B9) # 64 B 定长记录(类型/seq/CP56Time2a/epoch/校验和)是磁盘上的 @@ -698,6 +709,36 @@ repos: files: ^(scripts/board_ui_nav\.py$|simulator/tests/ref/.*\.bin$) pass_filenames: false + # 12b) IEC 104 真实回环验收(2026-11-18 加,task-18 割接收尾) + # 背景(实证,不是预防性):`test/host/iec104_dtu/` 下有两个 runner,但**只有** + # `run_unit_test.py` 会被 `scripts/check_test_coverage.py` 的 `rglob("run_unit_test.py")` + # 发现,而它只跑 7 条 decoder/oracle 用例;真正的产品验收 `run_tcp_test.py` + # (11 条真实 TCP 回环:STARTDT/TESTFR、总召、电度、读、定值、区间、未知请求、 + # 最大 APDU、命令一律否定确认、校时不改主机钟)**从来没被任何门禁登记**。 + # 结果是覆盖率表里 `iec104_dtu` 赫然在列,让人误以为"104 验收已被门禁覆盖"—— + # 最容易骗人的那种假象。本钩子把那 11 条接进来,把假象补成真话。 + # ⚠ stages: [manual](2026-11-18 Lead 裁定):实测全量 13.7 s(`--sbo-timeout` + # 从 30 s 降 2 s 之后),仍在本仓"2~4 秒自动门禁"判据之外;与 cppcheck / + # test-coverage 同档,只在 local 的 manual 段与手工复跑时执行。 + # 手工复跑:python scripts/check_iec104_tcp.py + # 单根用例:python test/host/iec104_dtu/run_tcp_test.py --exe --only + # ⚠ **远端 CI 跑不了它**:`.gitea/workflows/ci.yml` 不构建模拟器 + # (grep `lvgl_sim|build_sim|simulator` 零命中),本钩子需要 + # `simulator/build/Debug/lvgl_sim.exe`。包装器先调 `simulator/build_sim.bat` + # 增量构建;构建不出(返回 3 = 没装 VS)时按环境错误退出 2,**不静默跳过** + # (与 uinav-selftest 缺 exe 报 FAIL 同一条教训:跳过即绿灯,绿灯即遗忘)。 + # ⚠ 被包装的 runner 按"整套 11 条用例"工作、不接受文件参数,故包装器有意忽略 + # argv 并 pass_filenames: false(同 ui-golden 的既有做法)。 + # ⚠ 触发面**含门禁自身**(`.pre-commit-config.yaml`):不带自身就等于谁改坏这根闸的 + # files: 模式,它就再也不跑且无人察觉。 + - id: iec104-tcp + name: IEC 104 真实回环验收(13 条 TCP 用例,manual 阶段) + stages: [manual] + entry: scripts/gate_python.py scripts/check_iec104_tcp.py + language: system + files: ^(App/protocol/iec104/|App/protocol/iec60870/104/|test/host/iec104_dtu/|simulator/(sim|main\.c|CMakeLists\.txt)|scripts/check_iec104_tcp\.py$|\.pre-commit-config\.yaml$) + pass_filenames: false + # 13) 编号门禁的历史:2026-10-20 起曾有一版「全库语料审计」(规范 §8 的 8 项校验 + # 99 族 registry + 别名表)。它 2026-10-28 退役——维护成本高过收益(近 80 笔提交 # 61 笔被编号体系牵连),脚本与语料整体移入 `scripts/archive/id_gate/` diff --git a/.serialtest/config.json b/.serialtest/config.json index b595971f..1b68fc2e 100644 --- a/.serialtest/config.json +++ b/.serialtest/config.json @@ -7,7 +7,7 @@ "fw_marker": "fw build: ", "readback_cmd": ".venv\\Scripts\\python.exe .dsh\\skills\\stlink-flash\\scripts\\stlink_flash.py cmp {hex}", - "required": "App init OK;Network Init;net init: OK;protect task start;i104: listening on 2404;[STACK] protect;[STACK] iec104;[STACK] heap", + "required": "App init OK;Network Init;net init: OK;protect task start;i104: listening on 2404;[STACK] protect;[STACK] heap", "forbidden": "FAIL;ERROR;HardFault;[ERR]", "boot_marker": "reset cause:", "max_boot_count": 1, diff --git a/AGENTS.md b/AGENTS.md index 634b3c38..23b8e480 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -34,13 +34,12 @@ | Task | 栈 (words) | 优先级 | |---|---|---| | defaultTask | 1280 | Normal | -| netTask | 960 | Normal | +| netTask | 1408 | Normal | | ftpTask | 1024 | Normal | | testTask | 2048 | BelowNormal | | uiTask | 4096 | BelowNormal | -| timeSyncTask | 640 | Normal | +| timeSyncTask | 736 | Normal | | adcTask | 640 | AboveNormal | -| iec104Task | 640 | Normal | | protectTask | 512 | Normal | @@ -54,7 +53,7 @@ ## 提交门禁(pre-commit) -共 **52 个钩子**(提交期实跑 49 根,3 根慢钩子由远端 CI 强制)。任一失败即拦截;提交信息标题 ≤100 字符、正文每行 ≤80,长说明用 `git commit -F <文件>`。**每种门禁一篇详解 → `docs/门禁说明/README.md`**;通用机制 → `docs/代码规范/pre-commit使用说明.md`;CI 只跑静态门禁 + 主机侧单测、**不跑 `/keil-build`** → [`docs/CI/README.md`](docs/CI/README.md)。 +共 **52 个钩子**(提交期实跑 47 根 + `gitlint` = 一次 commit 48 根,4 根慢钩子由远端 CI 与 `ci_local.py` 承担)。任一失败即拦截;提交信息标题 ≤100 字符、正文每行 ≤80,长说明用 `git commit -F <文件>`。**每种门禁一篇详解 → `docs/门禁说明/README.md`**;通用机制 → `docs/代码规范/pre-commit使用说明.md`;CI 只跑静态门禁 + 主机侧单测、**不跑 `/keil-build`** → [`docs/CI/README.md`](docs/CI/README.md)。 ## 平台约束 diff --git a/App/app/ui_data_feed.c b/App/app/ui_data_feed.c index 93196c87..c2f18845 100644 --- a/App/app/ui_data_feed.c +++ b/App/app/ui_data_feed.c @@ -89,7 +89,7 @@ #include "prot_set.h" /* 40 项定值 Q10 + 校验和 + 闭锁 + 越界位图 */ #include "sys_clock.h" /* 墙钟字符串 */ #include "iec104_comm.h" /* 道G task-9:[comm] 真源 getter/setter/脏位;快照端口切 getter,IEC104_SERV_PORT 字面宏同笔删除 */ -#include "iec104_pts.h" /* task-15 批4:遥信点数与单/双点性质(点表事实的唯一来源) */ +#include "iec104_dtu_table.h" /* 遥信点数与单/双点性质(点表事实的唯一来源:DTU 标准点表元数据) */ #include "ioboard_di.h" /* 板级 8 路开入:注册式读口(lookup 拿写者快照 → snap_read 取一致值) */ /* 私有宏定义区 */ @@ -98,8 +98,9 @@ * (节拍依据 docs/UI设计/UI_数据供给设计.md §5.2) */ #define FEED_RT_PERIOD_MS 200u -/* 遥信位号:**与 App/protocol/iec104/iec104_pts.c 板端源的位图同源**(该文件把 - * 位号写死在函数体内、未导出,UI 侧不得 include 协议头,故在此镜像一份)。 +/* 遥信位号:**与 104 板端遥信位图同源**(2026-11-17 割接前的 iec104_pts.c 把位号 + * 写死在函数体内、未导出,UI 侧不得 include 协议头,故在此镜像一份;割接后协议侧 + * 走 DTU 标准点表,位号语义以本组宏为产品视图口径)。 * 变更纪律:104 点表位号改动时必须同步这里 + 页面名表 + 主机一致性测试 * (test/host/ui_data 的位图断言)。V0.1 有硬件来源的只有以下 6 位, * 其余 27 位恒无效(开入未实现);过压/欠压/过频/低频四个元件在 @@ -293,16 +294,25 @@ static uint8_t feed_eng(void) { * 入口参数:无 * 返回值:位图 uint64_t * 限定条件:uiTask 上下文;点数上限 UI_DATA_YX_N(<64,故位图放得下) - * 函数说明:逐点问点表 `iec104_pts_yx_is_dp()`,**不在此复制"前 4 点是双点"这个事实** - * ——那句话写在这里就是第二真相,点表一改就悄悄错(下发位图的理由见 - * ui_data.h 的 yx_dp 字段注释) + * 函数说明:逐点问点表 `iec104_dtu_point()` 的 type 字段,**不在此复制"前 4 点是双点" + * 这个事实**——那句话写在这里就是第二真相,点表一改就悄悄错(下发位图 + * 的理由见 ui_data.h 的 yx_dp 字段注释)。 + * 2026-11-17 104 割接:点表真源由产品自有 33 点表(iec104_pts.c,已删) + * 换成 DTU 标准点表。新表 type 分配 = index 0~58 单点(1)、59~74 双点(3)、 + * 75~104 测量值(13),故 bit0~32 全为 0(旧表 bit0~3 为双点)。 + * 这不改变任何像素:YX1~4 不在 FEED_YX_VALID_MASK 内,页面在 + * ui_page_yx.c 先按 valid 短路打 "--",走不到双点/单点选词分支。 */ static uint64_t feed_yx_dp(void) { uint64_t m = 0u; uint8_t i; + iec104_dtu_point_t p; for (i = 0u; (i < (uint8_t)UI_DATA_YX_N) && (i < 64u); i++) { - if (iec104_pts_yx_is_dp(i) != 0u) { + if (!iec104_dtu_point((size_t)i, &p)) { + break; + } + if (p.type == 3U) { /* 3 = M_DP 双点信息(单点 1 / 测量值 13) */ m |= ((uint64_t)1u << i); } } @@ -314,7 +324,7 @@ static uint64_t feed_yx_dp(void) { * 入口参数:无 * 返回值:位图 uint64_t * 限定条件:uiTask 上下文(读 protectTask 写的元件状态快照,读侧拷贝语义, - * 与 App/protocol/iec104/iec104_pts.c 板端源同形) + * 与割接前 iec104_pts.c 的板端默认源同形) * 函数说明:位号镜像本文件 FEED_YX_BIT_* 一组宏的注释(含同步纪律); * 双点遥信 YX1~4 无硬件 → 恒 0 且不在有效位图内 */ @@ -514,16 +524,22 @@ static void feed_fill_rt(ui_data_rt_t *p_snap, uint32_t tick_ms) { * 104 点表事实,塞进 yx_* 就等于拿物理引脚冒充点表(见 ui_data.h 字段注) */ feed_fill_dio_di(p_snap); feed_fill_dio_do(p_snap); - /* 点数漂移检查(只在真漂走时打一条日志):点表 YX_N 与本层 UI_DATA_YX_N 一旦不等, - * 页面按 33 行画、协议按另一个数上送,两边都"看起来正常"——这是静默错,值得花一条 - * DBG(约 90 B Flash)换一次现场可见的自证;只打一次不刷屏(同丢弃计数口径) */ + /* 点数漂移检查(只在真漂走时打一条日志):点表遥信点数与本层 UI_DATA_YX_N 一旦 + * 不等,页面按 33 行画、协议按另一个数上送,两边都"看起来正常"——这是静默错, + * 值得花一条 DBG(约 90 B Flash)换一次现场可见的自证;只打一次不刷屏。 + * ⚠ 2026-11-17 104 割接后**这条会打**,且是应打的:旧实现用 iec104_pts.c 的 + * YX_N=33 与 UI_DATA_YX_N 同值,把这个差异掩盖了(当时恒不触发);现在点表 + * 换成 DTU 标准表(SP59+DP16=75 点遥信),75 != 33,差异被显式化。 + * 这是既有产品视图(33 行)与 DTU 标准表(75 遥信点)的口径差异,**不是本轮 + * 引入的缺陷,也不影响显示**:页面名表 33 行、valid 掩码只覆盖 bit14~18/22/30, + * 超出的点本就不上屏 → 无像素变化。留这条日志是为了让口径差异现场可见。 */ { static uint8_t s_yx_n_bad; - uint8_t n = iec104_pts_yx_count(); + uint8_t n = (uint8_t)(IEC104_DTU_SP_COUNT + IEC104_DTU_DP_COUNT); if ((n != (uint8_t)UI_DATA_YX_N) && (s_yx_n_bad == 0u)) { s_yx_n_bad = 1u; - DBG_ERROR("yx point count drift: pts=%u ui_name_table=%u", + DBG_ERROR("yx view drift (existing): dtu_sp+dp=%u ui_rows=%u; no pixel change", (unsigned)n, (unsigned)UI_DATA_YX_N); } } diff --git a/App/cfg/prot_set_store.c b/App/cfg/prot_set_store.c index 4a5bab7b..3ecd85b4 100644 --- a/App/cfg/prot_set_store.c +++ b/App/cfg/prot_set_store.c @@ -95,7 +95,7 @@ int prot_set_store_save(void) { return -1; } if (cfg_store_write_atomic(PROT_SET_STORE_PATH, s_blob, (size_t)len) != 0) { - prot_set_dirty_mark(); /* 卷忙/写失败:脏保留,iec104Task 下轮再通知 */ + prot_set_dirty_mark(); /* 卷忙/写失败:脏保留,netTask 的 104 tick 下轮再通知 */ return -1; } return 0; diff --git a/App/log/README.md b/App/log/README.md index 4da37288..447fac73 100644 --- a/App/log/README.md +++ b/App/log/README.md @@ -62,8 +62,8 @@ | 事故 | `SYSLOG_ACCIDENT` / `accid.log` | 512 | `App/task/protect_task.c:188` | `asserted` 上升沿**且**该元件跳闸投退项 = 1 | | 保护告警 | `SYSLOG_ALARM` / `alarm.log` | 1024 | 同文件 `191` | `asserted` 上升沿**且**跳闸投退项 = 0 或该元件无此项 | | 保护启动 | `SYSLOG_START` / `start.log` | 1024 | 同文件 `183` | `picked` 上升沿(越限电平,早于/等于动作) | -| 操作 | `SYSLOG_OPER` / `oper.log` | 512 | `App/protocol/iec104/iec104_pts.c:582/610`、`App/task/default_task.c:266`、`App/log/sys_log_mcu.c:682`(宿主 `sim_syslog.c:245`) | 强制复归受理 / 软压板投退落地 / 定值**真落盘成功** / 清除记录成功 | -| 遥控 | `SYSLOG_YK` / `yk.log` | 256 | `App/protocol/iec104/iec104_pts.c:581/584/590/594/604/606/617` | 104 双点命令的选择段、执行段、非法 DPC、未知 IOA 各一条 | +| 操作 | `SYSLOG_OPER` / `oper.log` | 512 | `App/task/default_task.c`(`default_task_func()`,`settings saved`)、`App/log/sys_log_mcu.c`(`s_clear_service()`,清除记录成功)、`App/task/ui_task.c`(`ui_task_maint_oper_note()`,面板操作)、`App/sync/time_sntp.c`(`clock set by SNTP`);宿主侧 `simulator/main.c` 与 `simulator/sim/sim_syslog.c` | 定值**真落盘成功** / 清除记录成功 / 面板运维动作 / SNTP 对时。⚠ 104 侧不再投递:原 `App/protocol/iec104/iec104_pts.c` 写 `force reset` 与 `plate in/out`,该实现已于 2026-11-17 割接删除,骨架阶段不驱动物理出口故无记录(见 `docs/子系统设计/IEC104上行设计说明.md` §0.5) | +| 遥控 | `SYSLOG_YK` / `yk.log` | 256 | **当前无生产者**——原写入点 `App/protocol/iec104/iec104_pts.c`(`s_src_yk_exec()`:选择段、执行段、非法 DPC、未知 IOA)已随 2026-11-17 割接删除 | ⚠ 骨架阶段**有意不记**:模拟动作绝不驱动物理出口,照旧写"选择/执行"即为伪造记录(判据与后果见 `docs/子系统设计/IEC104上行设计说明.md` §0.5)。恢复记录需新增观测接缝,待另行立项 | - **"哪些元件算跳闸"只有一个真源**:定值表 `g_prot_set_meta` 里的 `PS_*_TRIP`(枚举注释 即"0 告警 / 1 跳闸")+ 实例表 `k_pe[]` 的 `trip_ctl` 列。分类入口 diff --git a/App/protocol/iec104/iec104_asdu.c b/App/protocol/iec104/iec104_asdu.c deleted file mode 100644 index fc543aab..00000000 --- a/App/protocol/iec104/iec104_asdu.c +++ /dev/null @@ -1,208 +0,0 @@ -/* - * 模块名称:IEC 60870-5-104 ASDU 编解码(应用层,纯逻辑) - * 模块功能:实现 iec104_asdu.h——ASDU 头解析/组装、IOA 3B 小端、IEEE754 - * 短浮点小端、CP56Time2a ↔ epoch 毫秒(UTC 分解,Hinnant civil - * 日历算法,不依赖 time.h → ARMCC/MSVC 双端可移植)。 - * 线程约定:全部纯函数,无状态 → 任意上下文可调。 - * 创建日期:2026-10-12(B4) - */ -#include "iec104_asdu.h" - -#include - -/* COT 首字节:bit0..5 = 值,bit6 = PN,bit7 = T;RBT 复用 bit4(C_IC 语义) */ -#define COT_VAL_MASK 0x3FU -#define COT_FLAG_MASK 0xC0U - -/* - * 函数功能:解析 ASDU 头(6B),信息体起点经 obj/obj_len 指出 - * 入口参数:buf/len = ASDU 首字节与总长;hdr = 输出 - * 返 回 值:0 成功 / -1 空指针或长度不足 6B - */ -int iec104_asdu_parse_hdr(const uint8_t *buf, uint16_t len, iec104_asdu_hdr_t *hdr) { - if ((buf == NULL) || (hdr == NULL) || (len < 6u)) { - return -1; - } - hdr->type = buf[0]; - hdr->vsq = buf[1]; - hdr->cot = (uint8_t)(buf[2] & COT_VAL_MASK); - hdr->cot_hi = (uint8_t)(buf[2] & 0xC0u); - hdr->oa = buf[3]; - hdr->ca = (uint16_t)(buf[4] | ((uint16_t)buf[5] << 8)); - hdr->obj = &buf[6]; - hdr->obj_len = (uint16_t)(len - 6u); - return 0; -} - -/* - * 函数功能:组装 ASDU 头(OA 恒 0,EVI 由调用方置 buf[3];RBT 位透传) - * 入口参数:cot = 6bit 原因值;cot_hi = 标志位(T/PN/RBT);ca = 公共地址 - * 返 回 值:固定 6(头字节数) - */ -uint16_t iec104_asdu_put_hdr(uint8_t *buf, uint8_t type, uint8_t vsq, - uint8_t cot, uint8_t cot_hi, uint16_t ca) { - buf[0] = type; - buf[1] = vsq; - buf[2] = (uint8_t)(((uint8_t)(cot & COT_VAL_MASK)) - | (uint8_t)(cot_hi & COT_FLAG_MASK) - | (uint8_t)(cot_hi & 0x10u)); /* RBT 位透传 */ - buf[3] = 0u; /* OA = 0(EVI 由调用方按需置位) */ - buf[4] = (uint8_t)(ca & 0xFFu); - buf[5] = (uint8_t)(ca >> 8); - return 6u; -} - -/* - * 函数功能:IOA 3 字节小端写入 - */ -void iec104_put_ioa(uint8_t *buf, uint32_t ioa) { - buf[0] = (uint8_t)(ioa & 0xFFu); - buf[1] = (uint8_t)((ioa >> 8) & 0xFFu); - buf[2] = (uint8_t)((ioa >> 16) & 0xFFu); -} - -/* - * 函数功能:IOA 3 字节小端读取 - */ -uint32_t iec104_get_ioa(const uint8_t *buf) { - return (uint32_t)buf[0] | ((uint32_t)buf[1] << 8) | ((uint32_t)buf[2] << 16); -} - -/* - * 函数功能:IEEE754 短浮点 → 小端字节序(104 恒小端,宿主字节序无关) - */ -void iec104_put_float(uint8_t *buf, float v) { - /* 位模式小端:memcpy 不假设宿主字节序,逐字节拆给目标(104 恒小端) */ - uint8_t tmp[sizeof(float)]; - uint32_t i; - - (void)memcpy(tmp, &v, sizeof(tmp)); - for (i = 0u; i < sizeof(tmp); i++) { -#if defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) - buf[i] = tmp[sizeof(tmp) - 1u - i]; -#else - buf[i] = tmp[i]; -#endif - } -} - -/* - * 函数功能:小端字节序 → IEEE754 短浮点 - */ -float iec104_get_float(const uint8_t *buf) { - uint8_t tmp[sizeof(float)]; - uint32_t i; - float v; - - for (i = 0u; i < sizeof(tmp); i++) { -#if defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) - tmp[i] = buf[sizeof(tmp) - 1u - i]; -#else - tmp[i] = buf[i]; -#endif - } - (void)memcpy(&v, tmp, sizeof(v)); - return v; -} - -/* ---------------- CP56Time2a ↔ epoch ---------------- */ - -/* 2000-01-01 00:00:00 UTC 的 epoch 毫秒(钳位下限) */ -#define EPOCH_2000_MS 946684800000ULL - -/* - * 函数功能:公历(y>=1)→ 距 1970-01-01 天数(Hinnant civil_from_days 正向) - * 说明:纯整数算法;m 取 1..12。 - */ -static uint32_t s_days_from_civil(uint32_t y, uint32_t m, uint32_t d) { - uint32_t yy = y - ((m <= 2u) ? 1u : 0u); - uint32_t era = yy / 400u; - uint32_t yoe = yy - (era * 400u); - uint32_t mp = (m > 2u) ? (m - 3u) : (m + 9u); /* 3 月 = 月序 0 */ - uint32_t doy = ((153u * mp) + 2u) / 5u + d - 1u; - uint32_t doe = (yoe * 365u) + (yoe / 4u) - (yoe / 100u) + doy; - - return (era * 146097u) + doe - 719468u; -} - -/* - * 函数功能:距 1970-01-01 天数 → 公历(Hinnant 反向) - * 入口参数:z_in = 天数;y/m/d = 输出 - */ -static void s_civil_from_days(uint32_t z_in, uint32_t *y, uint32_t *m, uint32_t *d) { - uint32_t z = z_in + 719468u; - uint32_t era = z / 146097u; - uint32_t doe = z - (era * 146097u); - uint32_t yoe = (doe - (doe / 1460u) + (doe / 36524u) - (doe / 146096u)) / 365u; - uint32_t yy = yoe + (era * 400u); - uint32_t doy = doe - ((365u * yoe) + (yoe / 4u) - (yoe / 100u)); - uint32_t mp = ((5u * doy) + 2u) / 153u; - uint32_t mon = mp + ((mp < 10u) ? 3u : 0u); - - *d = doy - (((153u * mp) + 2u) / 5u) + 1u; - if (mp >= 10u) { - mon = mp - 9u; - } - *m = mon; - *y = yy + ((mon <= 2u) ? 1u : 0u); -} - -/* - * 函数功能:CP56Time2a → epoch 毫秒(UTC 分解) - * 入口参数:buf = 7B;epoch_ms = 输出 - * 返 回 值:0 成功 / -2 IV(时间无效,调用方应拒绝)/ -1 字段越界 - */ -int iec104_cp56_to_epoch_ms(const uint8_t *buf, uint64_t *epoch_ms) { - uint32_t ms_min, minute, hour, day, mon, year; - - if ((buf == NULL) || (epoch_ms == NULL)) { - return -1; - } - if ((buf[2] & 0x80u) != 0u) { - return -2; /* IV:时间无效,调用方应拒绝 */ - } - ms_min = (uint32_t)buf[0] | ((uint32_t)buf[1] << 8); /* 0..59999 */ - minute = (uint32_t)buf[2] & 0x3Fu; - hour = (uint32_t)buf[3] & 0x1Fu; - day = (uint32_t)buf[4] & 0x1Fu; - mon = (uint32_t)buf[5] & 0x0Fu; - year = 2000u + ((uint32_t)buf[6] & 0x7Fu); - if ((day == 0u) || (day > 31u) || (mon == 0u) || (mon > 12u) - || (hour > 23u) || (minute > 59u) || (ms_min > 59999u)) { - return -1; - } - *epoch_ms = ((uint64_t)s_days_from_civil(year, mon, day) * 86400000ULL) - + ((uint64_t)hour * 3600000ULL) - + ((uint64_t)minute * 60000ULL) - + (uint64_t)ms_min; - return 0; -} - -/* - * 函数功能:epoch 毫秒 → CP56Time2a(钳位 [2000-01-01, 2127-12-31],IV 恒 0) - * 返 回 值:固定 7(字节数) - */ -uint16_t iec104_epoch_ms_to_cp56(uint64_t epoch_ms, uint8_t *buf) { - uint64_t days, rem, clamped; - uint32_t y, m, d, ms_min; - - clamped = (epoch_ms < EPOCH_2000_MS) ? EPOCH_2000_MS : epoch_ms; - days = clamped / 86400000ULL; - rem = clamped % 86400000ULL; - s_civil_from_days((uint32_t)days, &y, &m, &d); - if (y > 2127u) { /* 年字段 7bit 上限(2000+127) */ - y = 2127u; - m = 12u; - d = 31u; - rem = 86399999ULL; - } - ms_min = (uint32_t)(rem % 60000ULL); - buf[0] = (uint8_t)(ms_min & 0xFFu); - buf[1] = (uint8_t)(ms_min >> 8); - buf[2] = (uint8_t)((rem / 60000ULL) % 60ULL); /* min,IV=0 */ - buf[3] = (uint8_t)((rem / 3600000ULL) % 24ULL); /* hour */ - buf[4] = (uint8_t)(d & 0x1Fu); /* day */ - buf[5] = (uint8_t)(m & 0x0Fu); /* month */ - buf[6] = (uint8_t)((y - 2000u) & 0x7Fu); /* year */ - return 7u; -} diff --git a/App/protocol/iec104/iec104_core.c b/App/protocol/iec104/iec104_core.c index 1fc4c9de..ba4ce430 100644 --- a/App/protocol/iec104/iec104_core.c +++ b/App/protocol/iec104/iec104_core.c @@ -225,6 +225,19 @@ static bool drain_events(unsigned budget) if (next != IEC104_TCP_EVENT_READY) { return false; } if (transport->type == IEC104_TCP_EVENT_CONNECTED) { increment(&s_core.status.connections); } if (transport->type == IEC104_TCP_EVENT_I_FRAME) { increment(&s_core.status.received_i_frames); } + if (transport->type == IEC104_TCP_EVENT_DISCONNECTED) { + /* task-18:帧级发送类故障会话计数。DISCONNECTED 每会话一次, + * 本处只多调一次状态查询,原有幂等/控制流不变。计的是以发送类 + * 故障结束的会话次数;不是发送字节失败数、不是短写次数、 + * 不是库内部放弃帧的次数。 */ + IEC104_TcpServerStatus_t snap; + if (IEC104_Slave_Get_Status(s_core.slave, &snap, &s_core.error) == IEC104_TCP_OK && + snap.connection_status_valid != 0U && + (snap.connection.fault == IEC104_TCP_FAULT_LOCAL_SEND_TIMEOUT || + snap.connection.fault == IEC104_TCP_FAULT_TRANSPORT)) { + increment(&s_core.status.frame_failures); + } + } if (transport->type == IEC104_TCP_EVENT_RECORD) { if (transport->data.record.value.local_send_completed != 0U) { increment(&s_core.status.written_i_frames); diff --git a/App/protocol/iec104/iec104_core.h b/App/protocol/iec104/iec104_core.h index f94acd21..8e276c29 100644 --- a/App/protocol/iec104/iec104_core.h +++ b/App/protocol/iec104/iec104_core.h @@ -30,6 +30,11 @@ typedef struct { int last_error; int last_stage; int native_error; + /* Counts sessions that ended with a send-class fault: on DISCONNECTED, when + * connection_status_valid and fault is LOCAL_SEND_TIMEOUT or TRANSPORT. + * It is NOT a count of failed bytes, short writes, or library-internal + * abandoned frames. Reset at each admitted start. */ + uint32_t frame_failures; } iec104_core_status_t; /* All calls must be serialized on the same owner thread. 0=OK, -1=error. diff --git a/App/protocol/iec104/iec104_link.c b/App/protocol/iec104/iec104_link.c deleted file mode 100644 index 25533a74..00000000 --- a/App/protocol/iec104/iec104_link.c +++ /dev/null @@ -1,797 +0,0 @@ -/* - * 模块名称:IEC 60870-5-104 链路层(实现) - * 模块功能:实现 iec104_link.h——APCI 流重组与 U/S/I 编解码、STARTDT/STOPDT/ - * TESTFR、k/w 窗与 t1/t2/t3(差值法,tick 回绕安全)、总召分片、 - * COV 突发(k 窗满暂存不丢)、周期上送、遥控/定值两段式、C_RD、 - * C_CS 对时、错误应答(COT 12/13/14 + EVI)。 - * 失败语义:坏帧/序号错/N(R) 越窗/缓冲溢出 → 实例置 IDLE(链路故障), - * 由胶水层检测 IDLE 跳变断开 socket;本层不感知 I/O。 - * 创建日期:2026-10-12(B4) - */ -#include "iec104_link.h" - -#include "iec104_asdu.h" - -#include - -/* ---------------- APCI 常量 ---------------- */ -#define APCI_START 0x68u -#define APCI_CTRL_LEN 4u /* len 字段最小值(纯控制域) */ -#define APCI_LEN_MIN 4u -#define APCI_LEN_MAX 252u -#define SEQ_MOD 32768u /* 序号 15bit */ - -/* U 帧控制字节(DL/T 634.5104 表:低 2 位恒 11) */ -#define U_STARTDT_ACT 0x07u -#define U_STARTDT_CON 0x0Bu -#define U_STOPDT_ACT 0x13u -#define U_STOPDT_CON 0x23u -#define U_TESTFR_ACT 0x43u -#define U_TESTFR_CON 0x83u - -/* 本实现单 ASDU 信息体区上限(背景 YC 组 8×5=40 B 最大) */ -#define BODY_MAX 64u -/* 周期上送周期(COT=1) */ -#define PERIOD_MS 60000UL - -/* - * 函数功能:超时判定(now 到达/越过 deadline,tick 回绕安全) - * 返 回 值:1 已到期 / 0 未到期 - */ -static int s_expired(uint32_t now, uint32_t deadline) { - return (((int32_t)(now - deadline)) >= 0) ? 1 : 0; -} - -/* ---------------- 发送原语 ---------------- */ - -/* - * 函数功能:发 U 帧(STARTDT/STOPDT/TESTFR act|con) - * 说明:t1 只约束"需确认的发送"(标准语义)——TESTFR act 置挂起并起 t1; - * STARTDT/STOPDT con 不启动 t1(主站可合法静默,靠 t3 探活)。 - */ -static void s_send_u(iec104_link_t *lk, uint8_t q) { - uint8_t buf[6]; - - if (lk->cfg->send_apdu == NULL) { - return; - } - buf[0] = APCI_START; - buf[1] = APCI_CTRL_LEN; - buf[2] = q; - buf[3] = 0u; - buf[4] = 0u; - buf[5] = 0u; - lk->cfg->send_apdu(lk->ctx, buf, 6u); - /* t1 只约束"需确认的发送"(标准语义):TESTFR act 等 con; - * STARTDT/STOPDT con 不启动 t1——主站可合法静默,靠 t3 探活 */ - if (q == U_TESTFR_ACT) { - lk->testfr_pending = 1u; - lk->t1_deadline = lk->now_ms + IEC104_T1_MS; - } - lk->t3_deadline = lk->now_ms + IEC104_T3_MS; -} - -/* - * 函数功能:发 S 帧(确认已收序号,rx_unacked 清零) - * 说明:S 不需对端确认 → 不起 t1,只刷 t3。 - */ -static void s_send_s(iec104_link_t *lk) { - uint8_t buf[6]; - uint16_t r = (uint16_t)(lk->rx_seq << 1); - - if (lk->cfg->send_apdu == NULL) { - return; - } - buf[0] = APCI_START; - buf[1] = APCI_CTRL_LEN; - buf[2] = 0x01u; - buf[3] = 0u; - buf[4] = (uint8_t)(r & 0xFFu); - buf[5] = (uint8_t)(r >> 8); - lk->cfg->send_apdu(lk->ctx, buf, 6u); - lk->rx_unacked = 0u; - lk->t3_deadline = lk->now_ms + IEC104_T3_MS; /* S 不需确认 → 不起 t1 */ -} - -/* - * 函数功能:发一个 I 帧(asdu 由调用方组好,N(S)/N(R) 由本层填) - * 返 回 值:0 已发出 / -1 k 窗满或超长(调用方保留数据下次重试) - */ -static int s_send_i(iec104_link_t *lk, const uint8_t *asdu, uint16_t len) { - uint8_t buf[6u + BODY_MAX]; - uint16_t s16; - uint16_t r16; - - if ((lk->cfg->send_apdu == NULL) || (len > BODY_MAX)) { - return -1; - } - if (lk->tx_unacked >= IEC104_K_MAX) { - return -1; - } - buf[0] = APCI_START; - buf[1] = (uint8_t)(APCI_CTRL_LEN + len); - s16 = (uint16_t)(lk->tx_seq << 1); - r16 = (uint16_t)(lk->rx_seq << 1); - buf[2] = (uint8_t)(s16 & 0xFFu); - buf[3] = (uint8_t)(s16 >> 8); - buf[4] = (uint8_t)(r16 & 0xFFu); - buf[5] = (uint8_t)(r16 >> 8); - (void)memcpy(&buf[6], asdu, len); - lk->tx_seq = (uint16_t)((lk->tx_seq + 1u) % SEQ_MOD); - lk->tx_unacked++; - lk->cfg->send_apdu(lk->ctx, buf, (uint16_t)(6u + len)); - lk->t1_deadline = lk->now_ms + IEC104_T1_MS; - lk->t3_deadline = lk->now_ms + IEC104_T3_MS; - return 0; -} - -/* - * 函数功能:组 ASDU(hdr [+ ioa] + body)并发 I 帧 - * 说明:evi=1 → OA bit7(EVI,未知 IOA/类型/地址类应答) - * 返 回 值:同 s_send_i - */ -static int s_send_asdu(iec104_link_t *lk, uint8_t type, uint8_t vsq, - uint8_t cot, uint8_t cot_hi, - uint8_t with_ioa, uint32_t ioa, - const uint8_t *body, uint16_t body_len, uint8_t evi) { - uint8_t buf[6u + BODY_MAX]; - uint16_t n; - - n = iec104_asdu_put_hdr(buf, type, vsq, cot, cot_hi, lk->cfg->ca); - if (evi != 0u) { - buf[3] |= 0x80u; /* OA bit7 = EVI */ - } - if (with_ioa != 0u) { - iec104_put_ioa(&buf[n], ioa); - n += 3u; - } - if (body_len > 0u) { - if ((uint32_t)n + (uint32_t)body_len > (uint32_t)sizeof(buf)) { - return -1; - } - (void)memcpy(&buf[n], body, body_len); - n += body_len; - } - return s_send_i(lk, buf, n); -} - -/* - * 函数功能:命令应答(actcon/deactcon 等)——原样回显信息体(ioa+限定词) - * 入口参数:pn = 1 置否定确认位 - */ -static void s_cmd_con(iec104_link_t *lk, uint8_t type, const uint8_t *obj, - uint16_t obj_len, uint8_t cot, uint8_t pn) { - uint8_t body[BODY_MAX]; - uint16_t n = obj_len; - - if (n > BODY_MAX) { - n = 0u; - } - if (n > 0u) { - (void)memcpy(body, obj, n); - } - (void)s_send_asdu(lk, type, 1u, cot, - (pn != 0u) ? IEC104_COT_BIT_PN : 0u, - 0u, 0u, body, n, 0u); -} - -/* ---------------- 数据上送 ---------------- */ - -/* - * 函数功能:单点上送遥测(M_ME_NC_1 SQ=0,值+QDS) - * 返 回 值:同 s_send_i - */ -static int s_send_yc_single(iec104_link_t *lk, uint8_t idx, uint8_t cot) { - uint8_t body[5]; - float v; - uint8_t qds; - - (void)iec104_pts_yc_read(idx, &v, &qds); - iec104_put_float(body, v); - body[4] = qds; - return s_send_asdu(lk, IEC104_T_M_ME_NC_1, 1u, cot, 0u, 1u, - iec104_pts_yc_ioa(idx), body, 5u, 0u); -} - -/* - * 函数功能:总召/周期扫描一步(phase 游标 = interp_yx_idx: - * 0 双点组→1 单点组→2 YC 组→3 频率→4 actterm) - * 入口参数:budget = 本 poll 发送预算(成功一步减一);periodic = 周期扫描 - * 返 回 值:0 本步已发出 / -1 k 窗满原地保留(poll 循环必须就此停步, - * 否则死循环——2026-10-12 单测抓到) - */ -static int s_scan_step(iec104_link_t *lk, uint8_t *budget, uint8_t periodic) { - uint8_t body[BODY_MAX]; - uint8_t n = 0u; - uint8_t i; - uint8_t d; - uint8_t qds; - float v; - int rc = -1; - - switch (lk->interp_yx_idx) { - case 0u: /* YX 双点组 SQ=1,IOA 1..4 */ - for (i = 0u; i < 4u; i++) { - iec104_pts_yx_read(i, &d); - body[n++] = d; - } - rc = s_send_asdu(lk, IEC104_T_M_DP_NA_1, (uint8_t)(IEC104_VSQ_SQ | 4u), - lk->interp_cot, 0u, 1u, 1u, body, n, 0u); - break; - case 1u: /* YX 单点组 SQ=1,IOA 5..33 */ - for (i = 4u; i < 33u; i++) { - iec104_pts_yx_read(i, &d); - body[n++] = d; - } - rc = s_send_asdu(lk, IEC104_T_M_SP_NA_1, (uint8_t)(IEC104_VSQ_SQ | 29u), - lk->interp_cot, 0u, 1u, 5u, body, n, 0u); - break; - case 2u: /* YC 组 SQ=1,IOA 0x4011..0x4018 */ - for (i = 0u; i < 8u; i++) { - (void)iec104_pts_yc_read(i, &v, &qds); - iec104_put_float(&body[n], v); - n += 4u; - body[n++] = qds; - } - rc = s_send_asdu(lk, IEC104_T_M_ME_NC_1, (uint8_t)(IEC104_VSQ_SQ | 8u), - lk->interp_cot, 0u, 1u, 0x4011u, body, n, 0u); - break; - case 3u: /* 频率单点 SQ=0,IOA 0x401D */ - (void)iec104_pts_yc_read(8u, &v, &qds); - iec104_put_float(&body[n], v); - n += 4u; - body[n++] = qds; - rc = s_send_asdu(lk, IEC104_T_M_ME_NC_1, 1u, lk->interp_cot, 0u, - 1u, 0x401Du, body, n, 0u); - break; - default: /* actterm(仅总召;周期扫描不走这步) */ - iec104_put_ioa(&body[n], 0u); - n += 3u; - body[n++] = IEC104_RQT_GROUP1; - rc = s_send_asdu(lk, IEC104_T_C_IC_NA_1, 1u, IEC104_COT_ACTTERM, 0u, - 0u, 0u, body, n, 0u); - break; - } - if (rc != 0) { - return -1; /* k 窗满:下次 poll 重试本 phase */ - } - (*budget)--; - lk->interp_yx_idx++; - if (periodic != 0u) { - if (lk->interp_yx_idx >= 4u) { - lk->interp_step = 0u; /* 周期只发 YC(phase 2..3),无 actterm */ - } - } else if (lk->interp_yx_idx >= 5u) { - lk->interp_step = 0u; - lk->init_pending = 0u; - } - return 0; -} - -/* - * 函数功能:突发(COV)上送——pend 暂存逐点 SQ=0 COT=3,发成功才清位 - * 函数说明:单点遥信(idx≥4)自发用 **M_SP_TB_1**(SIQ + CP56Time2a,B9: - * 变位带时标 = SOE 上送路径);双点(idx<4,V0.1 恒 IV)保持 - * M_DP_NA_1;总召/周期扫描仍走 s_scan_step 的 M_SP_NA_1/M_DP_NA_1 - * (时标只用于自发,标准语义——防"全量换型")。 - * 时标 = cfg->epoch_ms(ctx);NULL/UINT64_MAX → CP56 IV 位如实置位。 - */ -static void s_spont_step(iec104_link_t *lk, uint8_t *budget) { - uint8_t body[8]; /* 最大 = SIQ + CP56(7)(M_SP_TB_1) */ - uint8_t i; - uint8_t d; - uint8_t blen; - uint8_t type; - int rc; - - while ((*budget > 0u) && ((lk->pend_yx != 0u) || (lk->pend_yc != 0u))) { - if (lk->pend_yx != 0u) { - i = 0u; - while (i < 33u) { - if ((lk->pend_yx & (1uLL << i)) != 0u) { - break; - } - i++; - } - iec104_pts_yx_read(i, &d); - body[0] = d; - blen = 1u; - if (i < 4u) { - type = (uint8_t)IEC104_T_M_DP_NA_1; - } else { - uint64_t ems = (lk->cfg->epoch_ms != NULL) - ? lk->cfg->epoch_ms(lk->ctx) - : UINT64_MAX; - - type = (uint8_t)IEC104_T_M_SP_TB_1; - (void)iec104_epoch_ms_to_cp56((ems == UINT64_MAX) ? 0u : ems, - &body[1]); - if (ems == UINT64_MAX) { - body[1 + 2] |= 0x80u; /* CP56 byte2 bit7 IV:时钟无效如实上送 */ - } - blen = 8u; - } - rc = s_send_asdu(lk, type, 1u, IEC104_COT_SPONT, 0u, 1u, - (uint32_t)i + 1u, body, blen, 0u); - if (rc != 0) { - return; /* k 窗满:pend 位保留,下次续发 */ - } - lk->pend_yx &= ~(1uLL << i); - } else { - i = 0u; - while (i < 16u) { - if ((lk->pend_yc & (uint16_t)(1u << i)) != 0u) { - break; - } - i++; - } - rc = s_send_yc_single(lk, i, IEC104_COT_SPONT); - if (rc != 0) { - return; - } - lk->pend_yc &= (uint16_t)~(1u << i); - } - (*budget)--; - } -} - -/* ---------------- 命令处理 ---------------- */ - -/* - * 函数功能:C_IC_NA_1 总召处理(ACT → actcon + 启动扫描;DEACT → deactcon) - * 说明:RBT(bit4)落在 COT 6bit 值域内,ACT+RBT 上收为 22——先剥再判; - * 首召/RBT → COT=4(init),后续 COT=2(bg) - */ -static void s_h_ic(iec104_link_t *lk, const iec104_asdu_hdr_t *h) { - /* RBT(bit4)落在 COT 6bit 值域内:ACT+RBT 上收为 22——先剥 RBT 再判值 */ - uint8_t cot_val = (uint8_t)(h->cot & 0xEFu); - - if (cot_val == IEC104_COT_DEACT) { - lk->interp_step = 0u; - s_cmd_con(lk, IEC104_T_C_IC_NA_1, h->obj, h->obj_len, - IEC104_COT_DEACTCON, 0u); - return; - } - if (cot_val != IEC104_COT_ACT) { - return; - } - if ((h->obj_len < 4u) || (h->obj[3] != IEC104_RQT_GROUP1)) { - s_cmd_con(lk, IEC104_T_C_IC_NA_1, h->obj, h->obj_len, - IEC104_COT_ACTCON, 1u); - return; - } - s_cmd_con(lk, IEC104_T_C_IC_NA_1, h->obj, h->obj_len, IEC104_COT_ACTCON, 0u); - lk->interp_step = 1u; - lk->interp_yx_idx = 0u; - lk->interp_cot = ((lk->init_pending != 0u) - || ((h->cot & IEC104_COT_BIT_RBT) != 0u)) - ? (uint8_t)IEC104_COT_INIT : (uint8_t)IEC104_COT_BG_SCAN; -} - -/* - * 函数功能:C_CS_NA_1 对时(CP56 → epoch → cfg->clock_sync) - * 说明:IV/字段坏/系统侧拒绝 → actcon + PN - */ -static void s_h_cs(iec104_link_t *lk, const iec104_asdu_hdr_t *h) { - uint64_t epoch = 0u; - int rc = -1; - - if (h->obj_len >= 10u) { - rc = iec104_cp56_to_epoch_ms(&h->obj[3], &epoch); - if ((rc == 0) && (lk->cfg->clock_sync != NULL)) { - rc = lk->cfg->clock_sync(lk->ctx, epoch); - } - } - s_cmd_con(lk, IEC104_T_C_CS_NA_1, h->obj, h->obj_len, IEC104_COT_ACTCON, - (rc == 0) ? 0u : 1u); -} - -/* - * 函数功能:C_DC_NA_1 遥控两段式(选择记 ioa+dpc;执行须匹配,否则 PN) - */ -static void s_h_dc(iec104_link_t *lk, const iec104_asdu_hdr_t *h) { - uint32_t ioa; - uint8_t qdc; - uint8_t sel; - uint8_t dpc; - int rc; - - if (h->obj_len < 4u) { - return; - } - ioa = iec104_get_ioa(h->obj); - qdc = h->obj[3]; - sel = (uint8_t)(((qdc & IEC104_QDC_S) != 0u) ? 1u : 0u); - dpc = (uint8_t)(qdc & 0x03u); - if (sel != 0u) { - rc = iec104_pts_yk_exec(ioa, dpc, 1u); - if (rc == 0) { - lk->yk_sel_ioa = ioa; - lk->yk_sel_dpc = dpc; - } - } else { - if ((lk->yk_sel_ioa == ioa) && (lk->yk_sel_dpc == dpc)) { - rc = iec104_pts_yk_exec(ioa, dpc, 0u); - } else { - rc = -1; /* 无选择/失配 → 否定确认 */ - } - lk->yk_sel_ioa = 0u; - lk->yk_sel_dpc = 0u; - } - s_cmd_con(lk, IEC104_T_C_DC_NA_1, h->obj, h->obj_len, IEC104_COT_ACTCON, - (rc == 0) ? 0u : 1u); -} - -/* - * 函数功能:C_SE_NC_1 定值两段式写(选择段只校验;执行段落盘) - * 说明:越界/未知地址 → actcon + PN - */ -static void s_h_se(iec104_link_t *lk, const iec104_asdu_hdr_t *h) { - uint32_t addr; - float v; - uint8_t sel; - int rc; - - if (h->obj_len < 8u) { - return; - } - addr = iec104_get_ioa(h->obj); - v = iec104_get_float(&h->obj[3]); - sel = (uint8_t)(((h->obj[7] & IEC104_QDC_S) != 0u) ? 1u : 0u); - rc = iec104_pts_set_write(addr, v, sel); - s_cmd_con(lk, IEC104_T_C_SE_NC_1, h->obj, h->obj_len, IEC104_COT_ACTCON, - (rc == 0) ? 0u : 1u); -} - -/* - * 函数功能:C_RD_NA_1 读单个信息体(YC 命中 → M_ME COT5;定值命中 → 同; - * 未知 IOA → 原样回 C_RD + COT14 + EVI) - */ -static void s_h_rd(iec104_link_t *lk, const iec104_asdu_hdr_t *h) { - uint32_t ioa; - uint8_t i; - float v; - - if (h->obj_len < 3u) { - return; - } - ioa = iec104_get_ioa(h->obj); - for (i = 0u; i < iec104_pts_yc_count(); i++) { - if (iec104_pts_yc_ioa(i) == ioa) { - s_send_yc_single(lk, i, IEC104_COT_REQ); - return; - } - } - if (iec104_pts_set_read(ioa, &v) == 0) { - uint8_t body[5]; - - iec104_put_float(body, v); - body[4] = 0u; - (void)s_send_asdu(lk, IEC104_T_M_ME_NC_1, 1u, IEC104_COT_REQ, 0u, - 1u, ioa, body, 5u, 0u); - return; - } - (void)s_send_asdu(lk, IEC104_T_C_RD_NA_1, 1u, IEC104_COT_UNK_IOA, 0u, - 1u, ioa, NULL, 0u, 1u); -} - -/* - * 函数功能:ASDU 分派(公共地址校验 → 类型路由) - * 说明:错 ca → COT13+EVI;未知类型 → COT12+EVI(原类型回) - */ -static void s_h_asdu(iec104_link_t *lk, const uint8_t *asdu, uint16_t len) { - iec104_asdu_hdr_t h; - - if (iec104_asdu_parse_hdr(asdu, len, &h) != 0) { - return; - } - if (h.ca != lk->cfg->ca) { - (void)s_send_asdu(lk, h.type, 1u, IEC104_COT_UNK_CA, 0u, - 0u, 0u, NULL, 0u, 1u); - return; - } - switch (h.type) { - case IEC104_T_C_IC_NA_1: - s_h_ic(lk, &h); - break; - case IEC104_T_C_CS_NA_1: - s_h_cs(lk, &h); - break; - case IEC104_T_C_DC_NA_1: - s_h_dc(lk, &h); - break; - case IEC104_T_C_SE_NC_1: - s_h_se(lk, &h); - break; - case IEC104_T_C_RD_NA_1: - s_h_rd(lk, &h); - break; - case IEC104_T_C_TS_NA_1: - s_cmd_con(lk, IEC104_T_C_TS_NA_1, h.obj, h.obj_len, - IEC104_COT_ACTCON, 0u); - break; - case IEC104_T_C_RP_NA_1: - iec104_pts_cov_check(NULL); /* 进程复位:重建快照(清历史) */ - s_cmd_con(lk, IEC104_T_C_RP_NA_1, h.obj, h.obj_len, - IEC104_COT_ACTCON, 0u); - break; - default: - (void)s_send_asdu(lk, h.type, 1u, IEC104_COT_UNK_COT, 0u, - 0u, 0u, NULL, 0u, 1u); - break; - } -} - -/* ---------------- APDU 分派 ---------------- */ - -/* - * 函数功能:U 帧处理(STARTDT/STOPDT act → con + 态迁移;TESTFR act → con; - * TESTFR con → 清挂起) - */ -static void s_h_u(iec104_link_t *lk, uint8_t q) { - switch (q) { - case U_STARTDT_ACT: - s_send_u(lk, U_STARTDT_CON); - lk->state = IEC104_ST_RUN; - lk->interp_step = 0u; - lk->yk_sel_ioa = 0u; - break; - case U_STOPDT_ACT: - s_send_u(lk, U_STOPDT_CON); - lk->state = IEC104_ST_STOPPED; - lk->interp_step = 0u; - break; - case U_TESTFR_ACT: - s_send_u(lk, U_TESTFR_CON); - break; - case U_TESTFR_CON: - lk->testfr_pending = 0u; - break; - default: - break; /* con/未知 U:t1/t3 已由外层刷新 */ - } -} - -/* - * 函数功能:N(R) 校验并更新 tx_unacked(V(A) ≤ V(A)' ≤ V(S),即 0 ≤ d ≤ 窗内) - * 说明:N(R) 倒退(早于上次确认)= 协议违例 → 链路故障(标准语义); - * tx_unacked 恒 ≤ k(发送侧门控),故 d ≤ tx_unacked 已蕴含窗校验 - * 返 回 值:0 / -1 违例 - */ -static int s_apply_nr(iec104_link_t *lk, uint16_t nr) { - uint16_t d = (uint16_t)(((uint32_t)lk->tx_seq + SEQ_MOD - (uint32_t)nr) - % SEQ_MOD); - - if ((uint32_t)d > (uint32_t)lk->tx_unacked) { - return -1; - } - lk->tx_unacked = d; - return 0; -} - -/* - * 函数功能:单个完整 APDU 分派(U/S/I);任何接收只刷 t3(不刷 t1) - * 说明:OPEN 态只认 U;I 帧 N(S) 不连续 → IDLE;RUN 态才处理 ASDU; - * 收满 w 个未确认 → 回 S - */ -static void s_h_apdu(iec104_link_t *lk, const uint8_t *p, uint16_t total) { - const uint8_t *c = &p[2]; /* 控制域 4B */ - uint16_t ns; - uint16_t nr; - - lk->t3_deadline = lk->now_ms + IEC104_T3_MS; - if ((c[0] & 0x03u) == 0x03u) { - s_h_u(lk, c[0]); - return; - } - if (lk->state == IEC104_ST_OPEN) { - return; /* OPEN 态只认 U 帧 */ - } - if ((c[0] & 0x01u) != 0u) { /* S 格式 */ - nr = (uint16_t)(((uint16_t)c[2] | ((uint16_t)c[3] << 8)) >> 1); - if (s_apply_nr(lk, nr) != 0) { - lk->state = IEC104_ST_IDLE; - } - return; - } - /* I 格式 */ - ns = (uint16_t)(((uint16_t)c[0] | ((uint16_t)c[1] << 8)) >> 1); - nr = (uint16_t)(((uint16_t)c[2] | ((uint16_t)c[3] << 8)) >> 1); - if (ns != lk->rx_seq) { - lk->state = IEC104_ST_IDLE; /* 序号错 → 链路故障 */ - return; - } - if (s_apply_nr(lk, nr) != 0) { - lk->state = IEC104_ST_IDLE; - return; - } - lk->rx_seq = (uint16_t)((ns + 1u) % SEQ_MOD); - lk->rx_unacked++; - if (lk->rx_unacked == 1u) { - lk->t2_deadline = lk->now_ms + IEC104_T2_MS; - } - if (lk->state == IEC104_ST_RUN) { - s_h_asdu(lk, &p[6], (uint16_t)(total - 6u)); - } - if (lk->rx_unacked >= IEC104_W_MAX) { - s_send_s(lk); - } -} - -/* ---------------- 公开接口 ---------------- */ - -/* - * 函数功能:链路实例初始化(全清零 + 绑配置与上下文,态 = IDLE) - */ -void iec104_link_init(iec104_link_t *lk, const iec104_link_cfg_t *cfg, - void *ctx) { - (void)memset(lk, 0, sizeof(*lk)); - lk->cfg = cfg; - lk->ctx = ctx; - lk->state = IEC104_ST_IDLE; -} - -/* - * 函数功能:TCP 连接建立 → OPEN(序号/窗口/定时/暂存全部复位,init_pending=1) - */ -void iec104_link_open(iec104_link_t *lk, uint32_t now_ms) { - lk->state = IEC104_ST_OPEN; - lk->tx_seq = 0u; - lk->rx_seq = 0u; - lk->tx_unacked = 0u; - lk->rx_unacked = 0u; - lk->testfr_pending = 0u; - lk->init_pending = 1u; - lk->rx_len = 0u; - lk->yk_sel_ioa = 0u; - lk->yk_sel_dpc = 0u; - lk->interp_step = 0u; - lk->interp_yx_idx = 0u; - lk->pend_yx = 0u; - lk->pend_yc = 0u; - lk->now_ms = now_ms; - lk->t1_deadline = now_ms + IEC104_T1_MS; - lk->t2_deadline = now_ms + IEC104_T2_MS; - lk->t3_deadline = now_ms + IEC104_T3_MS; - lk->period_next = now_ms + PERIOD_MS; -} - -/* - * 函数功能:链路断开/故障 → IDLE(清重组缓冲与所有暂存) - */ -void iec104_link_close(iec104_link_t *lk) { - lk->state = IEC104_ST_IDLE; - lk->rx_len = 0u; - lk->interp_step = 0u; - lk->pend_yx = 0u; - lk->pend_yc = 0u; - lk->yk_sel_ioa = 0u; - lk->yk_sel_dpc = 0u; -} - -/* - * 函数功能:喂入收到的原始字节(APCI 流重组:半帧/粘帧逐处) - * 说明:坏起始符/坏长度/缓冲溢出 → IDLE(胶水层检测后断开 socket) - */ -void iec104_link_on_rx(iec104_link_t *lk, const uint8_t *data, uint16_t len, - uint32_t now_ms) { - lk->now_ms = now_ms; - if ((lk->state == IEC104_ST_IDLE) || (data == NULL)) { - return; - } - if ((uint32_t)len > (uint32_t)(IEC104_RXBUF_SZ - lk->rx_len)) { - lk->state = IEC104_ST_IDLE; /* 重组缓冲溢出 = 坏流 */ - lk->rx_len = 0u; - return; - } - (void)memcpy(&lk->rx_buf[lk->rx_len], data, len); - lk->rx_len = (uint16_t)(lk->rx_len + len); - - while (lk->rx_len >= 2u) { - uint16_t lf; - uint16_t need; - - if (lk->rx_buf[0] != APCI_START) { - lk->state = IEC104_ST_IDLE; - break; - } - lf = lk->rx_buf[1]; - if ((lf < APCI_LEN_MIN) || (lf > APCI_LEN_MAX)) { - lk->state = IEC104_ST_IDLE; - break; - } - need = (uint16_t)(lf + 2u); - if (lk->rx_len < need) { - break; /* 半帧:等下次 on_rx */ - } - s_h_apdu(lk, lk->rx_buf, need); - if (lk->state == IEC104_ST_IDLE) { - break; - } - if (need < lk->rx_len) { - (void)memmove(lk->rx_buf, &lk->rx_buf[need], - (uint16_t)(lk->rx_len - need)); - } - lk->rx_len = (uint16_t)(lk->rx_len - need); - } - if (lk->state == IEC104_ST_IDLE) { - lk->rx_len = 0u; - } -} - -/* - * 函数功能:周期节拍(胶水层每次服务循环调用一次,时基由调用方注入) - * 说明:t1 超时 → close;t3 到期 → TESTFR act;t2 到期 → S; - * RUN 态按优先级:总召续扫 > 周期续扫 > COV 突发 > 周期触发 - */ -void iec104_link_poll(iec104_link_t *lk, uint32_t now_ms) { - uint8_t budget = IEC104_POLL_BUDGET; - - lk->now_ms = now_ms; - if ((lk->state != IEC104_ST_RUN) && (lk->state != IEC104_ST_STOPPED)) { - return; - } - if (((lk->tx_unacked > 0u) || (lk->testfr_pending != 0u)) - && (s_expired(now_ms, lk->t1_deadline) != 0)) { - iec104_link_close(lk); /* t1:未确认 I/未答 TESTFR 超时 = 故障 */ - return; - } - if (s_expired(now_ms, lk->t3_deadline) != 0) { - s_send_u(lk, U_TESTFR_ACT); - } - if ((lk->rx_unacked > 0u) && (s_expired(now_ms, lk->t2_deadline) != 0)) { - s_send_s(lk); - } - if (lk->state != IEC104_ST_RUN) { - return; - } - if (lk->interp_step == 1u) { - while ((budget > 0u) && (lk->interp_step == 1u)) { - if (s_scan_step(lk, &budget, 0u) != 0) { - break; /* k 窗满:本 poll 停步(防死循环) */ - } - } - return; - } - if (lk->interp_step == 3u) { - while ((budget > 0u) && (lk->interp_step == 3u)) { - if (s_scan_step(lk, &budget, 1u) != 0) { - break; - } - } - return; - } - if ((lk->pend_yx != 0u) || (lk->pend_yc != 0u)) { - s_spont_step(lk, &budget); - if (budget == 0u) { - return; - } - } - if (s_expired(now_ms, lk->period_next) != 0) { - lk->interp_step = 3u; - lk->interp_yx_idx = 2u; /* 周期只扫 YC(phase 2..3) */ - lk->interp_cot = IEC104_COT_PERIODIC; - lk->period_next = now_ms + PERIOD_MS; - while ((budget > 0u) && (lk->interp_step == 3u)) { - if (s_scan_step(lk, &budget, 1u) != 0) { - break; - } - } - return; - } - { - iec104_pts_cov_t cov; - - iec104_pts_cov_check(&cov); - lk->pend_yx |= cov.yx_changed; - lk->pend_yc |= cov.yc_changed; - s_spont_step(lk, &budget); - } -} - -/* - * 函数功能:查询链路状态(胶水层检测 IDLE 跳变以断开/重建 socket) - */ -iec104_state_t iec104_link_state(const iec104_link_t *lk) { - return lk->state; -} diff --git a/App/protocol/iec104/iec104_link.h b/App/protocol/iec104/iec104_link.h deleted file mode 100644 index 1c2181d8..00000000 --- a/App/protocol/iec104/iec104_link.h +++ /dev/null @@ -1,142 +0,0 @@ -/* - * 模块名称:IEC 60870-5-104 链路层(APCI + 状态机,纯逻辑) - * 模块功能:TCP 流 → APDU 重组、U/S/I 帧编解码、STARTDT/STOPDT/TESTFR、 - * k/w 流量窗与 t1/t2/t3 超时、发送序号 N(S)/N(R) 管理,以及应用层 - * 流程编排:总召(act→背景扫描→actterm,首召 RBT 用 COT=4)、 - * 突发上送(COV,COT=3)、周期上送(COT=1)、读单个(C_RD→COT=5)、 - * 双点遥控两段式(选择/执行,失配否定确认 PN)、定值读(C_RD)/ - * 定值写(C_SE_NC 选择=范围校验 / 执行=写入+封存)、时钟同步(C_CS - * → clock_sync 回调)、试验(C_TS)与进程复位(C_RP,清快照)。 - * **零 I/O**:收 = on_rx 喂 TCP 流片段,发 = send_apdu 回调, - * 时基 = 调用方注入 now_ms(tick ms,回绕安全:差值法) - * → 全栈(asdu+pts+link)主机侧纯逻辑单测可离线跑(分层约束)。 - * 参数(DL/T 634.5104 标准默认,§1.5 未另定):k=12 w=8 t1=15s t2=10s t3=20s。 - * 端口:TCP **2404** = 工厂默认(§1.5 B0 定义 / IEC 60870-5-104 标准端口; - * 本 DTU = 被控站/服务器,主站连入)。真源与可改性见本文件下方 [comm] 段说明。 - * 线程约定:单实例单任务上下文(板端 = 104 服务在 netTask 消息循环内驱动, - * 见 iec104_serv 胶水层);非线程安全,禁止多任务共享一实例。 - * 失败语义:send_apdu 内**不得阻塞**;发送失败由胶水层断链(主站会重连), - * 本层不感知发送失败。 - * 创建日期:2026-10-12(B4) - */ -#ifndef IEC104_LINK_H -#define IEC104_LINK_H - -#include - -#include "iec104_pts.h" - -/* 服务端口真源已迁 [comm] 段(道G task-8):工厂默认 2404 = IEC104_COMM_DEF_PORT, - * 运行期取 iec104_comm_port()(App/protocol/iec104/iec104_comm.h)。原死 define - * IEC104_PORT 全仓零 .c 消费,2026-10-26 删除(旧引用见 docs/UI设计/页面扩充详细方案.md)。 */ - -/* 链路参数(标准默认值) */ -#define IEC104_K_MAX 12U /* 未确认 I 帧上限 */ -#define IEC104_W_MAX 8U /* 收到 I 帧未发确认的强制 S 阈值 */ -#define IEC104_T1_MS 15000UL /* 发送/确认超时(超时 = 链路故障) */ -#define IEC104_T2_MS 10000UL /* 无 I 发送时强制 S 确认超时(< t1) */ -#define IEC104_T3_MS 20000UL /* 空闲发 TESTFR 周期(< t1) */ - -/* TCP 流重组缓冲:APDU 上限 253 + 半帧余量 */ -#define IEC104_RXBUF_SZ 512U - -/* 单次 poll 发送预算(ASDU 数)——防总召大扫描饿死宿主任务 */ -#define IEC104_POLL_BUDGET 4U - -/* 链路状态 */ -typedef enum { - IEC104_ST_IDLE = 0, /* TCP 未建立(或已断开) */ - IEC104_ST_OPEN, /* TCP 已建立,等 STARTDT act */ - IEC104_ST_RUN, /* STARTDT 已确认,数据服务开 */ - IEC104_ST_STOPPED /* STOPDT 已确认:停数据,保 S/TESTFR */ -} iec104_state_t; - -/* 配置与回调(ctx 原样回传给回调) */ -typedef struct { - uint16_t ca; /* 公共地址 = 链路地址(2B,§1.5) */ - /* 发一个完整 APDU(含 6B APCI 头)。不得阻塞;生命周期仅回调内有效 */ - void (*send_apdu)(void *ctx, const uint8_t *apdu, uint16_t len); - /* C_CS 时钟同步:epoch 毫秒;NULL 或返回 -1 → 否定确认 */ - int (*clock_sync)(void *ctx, uint64_t epoch_ms); - /* 时标源(B9):当前 epoch 毫秒(M_SP_TB_1 自发用)。 - * NULL 或返回 UINT64_MAX = 时钟无效 → CP56 IV 位如实置位。 - * 纯读(sys_clock 推算),不得阻塞、不得有副作用。 */ - uint64_t (*epoch_ms)(void *ctx); -} iec104_link_cfg_t; - -/* 链路实例(胶水层静态持有,零堆) */ -typedef struct { - const iec104_link_cfg_t *cfg; - void *ctx; - iec104_state_t state; - uint8_t init_pending; /* 1 = 下次总召按初始化(COT=4 + RBT) */ - /* 序号(0..32767,帧内 ×2) */ - uint16_t tx_seq; - uint16_t rx_seq; - uint16_t tx_unacked; /* 已发 I 未获认(k 窗) */ - uint16_t rx_unacked; /* 已收 I 未确认(w 阈) */ - uint8_t testfr_pending; /* 1 = TESTFR act 未获 con(t1 同样约束它) */ - /* 定时器到期时刻(now_ms 域;差值法判超时,回绕安全) */ - uint32_t t1_deadline; - uint32_t t2_deadline; - uint32_t t3_deadline; - uint32_t now_ms; - /* TCP 流重组 */ - uint8_t rx_buf[IEC104_RXBUF_SZ]; - uint16_t rx_len; - /* 总召进度:0 无 / 1 背景扫描中 / 2 待发 actterm */ - uint8_t interp_step; - uint8_t interp_yc_idx; /* 背景扫描 YC 游标 */ - uint8_t interp_yx_idx; /* 背景扫描 YX 游标 */ - uint8_t interp_cot; /* 本次总召用的 COT(BG_SCAN 或 INIT) */ - /* 遥控选择暂存(执行段比对) */ - uint32_t yk_sel_ioa; /* 0 = 无选择 */ - uint8_t yk_sel_dpc; - /* 周期上送(COT=1)下次触发时刻 */ - uint32_t period_next; - /* COV 待发暂存(k 窗满时保留到下次 poll,变化不许丢) */ - uint64_t pend_yx; - uint16_t pend_yc; -} iec104_link_t; - -/* - * 函数功能:初始化实例(置 IDLE、清序号;不发送任何帧) - * 入口参数:lk - 实例;cfg/ctx - 配置与回调上下文 - */ -void iec104_link_init(iec104_link_t *lk, const iec104_link_cfg_t *cfg, void *ctx); - -/* - * 函数功能:TCP 连接建立(新连接或重连后调用) - * 入口参数:now_ms - 当前时基 - * 函数说明:序号清零、init_pending 置位(首召 = 初始化总召)、进 OPEN。 - */ -void iec104_link_open(iec104_link_t *lk, uint32_t now_ms); - -/* - * 函数功能:TCP 断开(对端断开或胶水层发送失败主动断链时调用) - * 函数说明:回 IDLE、清重组缓冲与选择暂存;不发送任何帧。 - */ -void iec104_link_close(iec104_link_t *lk); - -/* - * 函数功能:喂入 TCP 收到的流片段(任意切分/粘帧) - * 入口参数:data/len - 流片段;now_ms - 当前时基 - * 函数说明:内部重组,凑齐 APDU 即处理;坏帧(起始符/长度非法)→ 视同链路 - * 故障,实例回 IDLE(胶水层检测到 IDLE 跳变应断开 socket)。 - * 返回后实例仍为 RUN 不代表对端合法——仅表示未触发断链条件。 - */ -void iec104_link_on_rx(iec104_link_t *lk, const uint8_t *data, uint16_t len, - uint32_t now_ms); - -/* - * 函数功能:周期驱动(定时器 + COV + 总召分片 + 周期上送) - * 入口参数:now_ms - 当前时基(建议 ≤100 ms 调一次) - * 函数说明:仅 RUN 态产生数据帧;STOPPED 态只处理 t2/t3(S/TESTFR)。 - * 单次调用发送量 ≤ IEC104_POLL_BUDGET 个 ASDU。 - */ -void iec104_link_poll(iec104_link_t *lk, uint32_t now_ms); - -/* 当前状态(日志/看门狗用) */ -iec104_state_t iec104_link_state(const iec104_link_t *lk); - -#endif /* IEC104_LINK_H */ diff --git a/App/protocol/iec104/iec104_net_mcu.c b/App/protocol/iec104/iec104_net_mcu.c new file mode 100644 index 00000000..3dd685b2 --- /dev/null +++ b/App/protocol/iec104/iec104_net_mcu.c @@ -0,0 +1,656 @@ +/* 模块名称:IEC 60870-5-104 板端 Net 后端(netTask 单 owner) */ +/* + * 模块功能:实现 App/protocol/iec60870/104/IEC104_Net.h 的全部导出 ABI, + * 底层走 Drivers/BSP/NET/net_socket.h 的 net_* 接口。 + * 适用平台:STM32F407ZGTx + CH395F;只在 netTask 上下文中调用(threadless)。 + * 创建日期:2026-11-17(task-18 板端网络割接) + * + * Verification scope (ASCII note): this is the ONLY 104 component NOT built + * or exercised by the simulator; the simulator provides the same ABI via + * sim/iec104_sim.c. This file is verified ONLY by fake-net tests (12/12) plus + * code review; CH395F on-board behaviour remains UNPROVEN. + * + * 三条硬纪律: + * 1. 零阻塞:不投 netMsgQueue、不用 osWaitForever、不睡任务通知、不帮忙 pump; + * 2. 零借用:所有 Send 在返回前数据已交给 net 层/芯片,不缓存调用方指针; + * 3. 同 fd 映射:CH395F 单连接模型下 net_accept() 返回监听 fd 自己, + * CLIENT 的 Close 只调 net_drop_conn_locked(拆会话保监听), + * 本文件的 CLIENT 分支里不存在任何关闭监听 fd 的路径。 + * + * 句柄设计(Lead 2026-11-17 裁定):IEC104_NetSocket_t 只有 uintptr_t 一个整数, + * 无法携带 session 身份,因此采用「单调递增句柄值 + 8 项映射表,句柄永不复用」: + * 每次 Listen/Accept 成功都分配新的 handle 值,旧 handle 永远不会再次出现在表中。 + * 连续 3 次 listen/close 后旧 handle 必然查表失败,构造性反例自证见 MATRIX N6。 + * + * 代次不变量(task-18 定案):后端槽的有效性只由 + * `slot->net_gen == net_get_generation()` 判定;网络初始化(net_stack_bring_up) + * 复位芯片并清空 net 层控制块后,旧句柄一律失效,后端绝不向跨代次的 fd + * 发任何硬件操作(包括 net_close_sock)。net_generation_inc 只在 net_init + * 成功、芯片已复位之后调用,因此"代次已变"即代表"旧 fd 已不存在"。 + * + * fd 归属规则(三个 P1 的共同根因,任何资源操作前先回答"这个 fd 此刻代表谁"): + * 1. 监听 fd 在任何时刻只被 LISTEN 槽引用,LISTEN 槽 handle 终身不变; + * 2. Accept 成功的瞬间该 fd 语义从"监听"变为"数据通道",旧 client 槽同时 + * 失效——必须**只清槽不 drop_conn**,因为此刻同 fd 已是新连接的 + * ESTABLISHED,drop 会拆掉刚接进来的新连接; + * 3. 任何 net_drop_conn_locked 调用前必须确认"该 fd 当前仍属于我要拆的 + * 那个会话",仅凭 fd 状态是 ESTABLISHED 不足以判定归属。同一 fd 在不同 + * 时刻分属不同代次/会话,跨代旧槽的 fd 号可能已复用,绝不能对它操作。 + */ +#include "IEC104_Net.h" +#include "net_socket.h" +#include + +/* 映射表容量 = net 层 fd 数上限(NET_MAX_SOCKETS=8)。 */ +#define IEC104_MCU_MAP_SIZE 8U + +typedef enum { + SLOT_FREE = 0, + SLOT_LISTEN, + SLOT_CLIENT, + SLOT_CLIENT_EOF +} slot_role_t; + +typedef struct { + uintptr_t handle; /* 0 = 空闲;非 0 单调,不复用 */ + int fd; /* net 层 fd,同 fd 模型下 LISTEN/CLIENT 相同 */ + uint32_t net_gen; /* 成功 Listen 时的网络代次,跨代旧句柄一律失效 */ + uint8_t role; /* slot_role_t */ +} slot_t; + +static slot_t s_slots[IEC104_MCU_MAP_SIZE]; +static uintptr_t s_next_handle = 1U; +static uint8_t s_inited; + +/* rx_bytes 唯一后端计数:Recv 返回 OK 时按 transferred 累加,饱和 0xFFFFFFF0。 */ +static uint32_t s_rx_bytes; + +#define STAT_SAT 0xFFFFFFF0u + +/* 函数功能:把「ABI 返回码 + 底层 errno」打包成一次返回,顺带回写可选的原生错误出参。 + * 参数:code ABI 返回码;native_error 底层 errno(仅出参用);out 原生错误出参,可传 NULL。 + * 返回值:原样返回 code(便于 `return result(...)` 单行收尾,避免各处重复写 out 判空)。 */ +static IEC104_NetResult_t result(IEC104_NetResult_t code, int native_error, int *out) +{ + if (out != NULL) { + *out = native_error; + } + return code; +} + +/* 函数功能:32 位饱和加法,用于接收字节数累加(到达上限后钉住,绝不回绕成小数)。 + * 参数:value 被累加的计数器;delta 本次增量。 + * 返回值:无(只改 *value)。 */ +static void sat_add(uint32_t *value, uint32_t delta) +{ + /* 先判 *value 已达上限,再做差值比较:保证 STAT_SAT - *value 不会下溢, + * delta 无论多大都只会把计数钉在饱和值,绝不回绕成小数。 */ + if (*value >= STAT_SAT || delta >= STAT_SAT - *value) { + *value = STAT_SAT; + } else { + *value += delta; + } +} + +/* 句柄查表:同时校验 owner、初始化状态、句柄存在、role 与网络代次。 + * 失败一律返回 NULL,不触碰任何硬件/连接。 + * 槽内 net_gen 是句柄有效性的唯一代次来源:网络自愈使 net_generation_inc() + * 递增后,所有旧槽的代次一次性过期,无需全局基线(也避免"重建依赖 find"的 + * 循环依赖)。 + * 两句柄模型(task-18 第三轮):监听槽与客户端槽是**两个独立槽**。监听槽 + * role 恒为 LISTEN、handle 在整段监听生命周期内不变(库侧 server->listen_socket + * 在 Listen 后固定,不会随会话更新);每次 Accept 另起一个 CLIENT 槽、分新 + * handle。绝不翻转监听槽的 role,否则库的 Close(listen)/Wait(ACCEPT) 会失联。 */ +static slot_t *find_role(uintptr_t handle, uint8_t role) +{ + uint32_t i; + uint32_t gen = net_get_generation(); + if (s_inited == 0U || handle == 0U || handle == IEC104_NET_INVALID_SOCKET || + net_ctx_is_owner_task() == 0U) { + return NULL; + } + for (i = 0U; i < IEC104_MCU_MAP_SIZE; ++i) { + slot_t *slot = &s_slots[i]; + if (slot->handle == handle && slot->role == role && + slot->net_gen == gen) { + return slot; + } + } + return NULL; +} + +/* 客户端句柄查表:CLIENT 与 CLIENT_EOF 都算命中。EOF 后库仍可能排空待发 + * 应答(Prepare_Output 在 rx_eof 下先发完再 Drop),Send 必须在 EOF 状态下 + * 仍可用,不能因 role=CLIENT_EOF 就报 BADF。 */ +static slot_t *find_client(uintptr_t handle) +{ + slot_t *slot = find_role(handle, SLOT_CLIENT); + if (slot == NULL) { + slot = find_role(handle, SLOT_CLIENT_EOF); + } + return slot; +} + +/* 取空闲槽(handle==0 且 role==FREE)。只判 handle==0 会把刚 Close(listen) + * memset 过的监听槽误当空闲并覆盖,导致 Accept 把监听资源吃掉。 */ +static slot_t *slot_alloc_free(void) +{ + uint32_t i; + for (i = 0U; i < IEC104_MCU_MAP_SIZE; ++i) { + if (s_slots[i].handle == 0U && s_slots[i].role == SLOT_FREE) { + return &s_slots[i]; + } + } + return NULL; +} + +/* 找当前仍挂着的客户端槽(CLIENT 或 CLIENT_EOF),供 Accept 防重入清理。 + * 只认当前代次:跨代旧槽的 fd 号可能已复用,对它调 net_sock_state/drop_conn + * 会违反文件头的 fd 归属规则。 */ +static slot_t *client_slot_find_any(void) +{ + uint32_t i; + uint32_t gen = net_get_generation(); + for (i = 0U; i < IEC104_MCU_MAP_SIZE; ++i) { + if ((s_slots[i].role == SLOT_CLIENT || s_slots[i].role == SLOT_CLIENT_EOF) && + s_slots[i].net_gen == gen) { + return &s_slots[i]; + } + } + return NULL; +} + +/* 函数功能:拆掉一个客户端槽——**只拆会话、保监听**。 + * 参数:slot 要拆除的客户端槽(必须是 SLOT_CLIENT / SLOT_CLIENT_EOF)。 + * 返回值:无。 + * + * drop_conn 的 APP_ASSERT 要求 ESTABLISHED/CONNECTING;先判状态,EOF/DISCONNECT + * 等其它状态只清槽、跳过拆除(auto_relisten 已接管)。本函数绝不触碰监听槽、 + * 绝不调 net_close_sock。Accept 与 Close(client) 共用同一套拆除逻辑, + * 避免两份实现漂移。 */ +static void client_slot_drop(slot_t *slot) +{ + int state; + /* 代次自锁:跨代槽的 fd 号可能已被复用,绝不能对它做任何硬件读取/拆除。 */ + if (slot->net_gen != net_get_generation()) { + memset(slot, 0, sizeof(*slot)); + return; + } + state = net_sock_state(slot->fd); + if (state == NET_SOCK_STATE_ESTABLISHED || state == NET_SOCK_STATE_CONNECTING) { + net_sock_t *sock = net_get_sock(slot->fd); + if (sock != NULL) { + (void)net_drop_conn_locked(sock); + } + } + /* 只清客户端槽;监听槽的 handle/fd/net_gen/role 原地不动。 */ + memset(slot, 0, sizeof(*slot)); +} + +/* 函数功能:分配一个新句柄值(单调递增、永不复用),必要时先整表作废重启。 + * 参数:无。 + * 返回值:新句柄(非 0,且一定不在任何现存槽中)。 + * + * UINTPTR_MAX 前保留一个溢出保护窗口,届时整表作废并重新开始——运行 2^32 次 + * 接入远大于设备寿命,仅作防御。 */ +static uintptr_t handle_new(void) +{ + uintptr_t h = s_next_handle; + if (h >= (uintptr_t)(UINTPTR_MAX - IEC104_MCU_MAP_SIZE)) { + memset(s_slots, 0, sizeof(s_slots)); + h = 1U; + } + s_next_handle = h + 1U; + return h; +} + +IEC104_NetResult_t IEC104_Net_Init(int *native_error) +{ + if (net_ctx_is_owner_task() == 0U) { + return result(IEC104_NET_ERROR, NET_ERR_INVAL, native_error); + } + /* Init 是运行期起点:net_stack_bring_up 已先 net_init(芯片硬复位 + + * net 层 s_net_socks 全清)后递增代次,上一运行期的底层 fd 已不存在。 + * 这里只清后端映射表、不向任何旧 fd 发 net_close_sock——fd 号可能已被 + * 复用,误关会打掉新会话。不变量见本文件头。 */ + memset(s_slots, 0, sizeof(s_slots)); + s_next_handle = 1U; + s_rx_bytes = 0U; + s_inited = 1U; + return result(IEC104_NET_OK, 0, native_error); +} + +void IEC104_Net_Cleanup(void) +{ + /* 不关 socket:调用方(TcpServer)负责先 Close 自己持有的句柄。 */ + s_inited = 0U; +} + +int IEC104_Net_Invalid_Argument_Error(void) +{ + return NET_ERR_INVAL; +} + +IEC104_NetResult_t IEC104_Net_Listen( + const char *bind_address, uint16_t port, IEC104_NetSocket_t *listener, + uint16_t *bound_port, int *native_error) +{ + int fd, rc, addrlen; + uint32_t i; + uint32_t ip; + struct net_sockaddr_in addr; + slot_t *slot = NULL; + + if (s_inited == 0U || bind_address == NULL || listener == NULL || + bound_port == NULL || net_ctx_is_owner_task() == 0U) { + *listener = IEC104_NET_INVALID_SOCKET; + *bound_port = 0U; + return result(IEC104_NET_ERROR, NET_ERR_INVAL, native_error); + } + *listener = IEC104_NET_INVALID_SOCKET; + *bound_port = 0U; + /* 代次闸(网络自愈):net_stack_bring_up 先 net_init(芯片硬复位、 + * net 层 s_net_socks 清零)后 net_generation_inc;旧槽的 fd 已不存在, + * 且 fd 号可能被本次重建复用。这里只清表、绝不向旧 fd 发硬件关闭, + * 避免误伤同号的新 socket。清表后旧句柄一律 find 失败;重建不依赖 + * Close 成功,serv tick 直接强制重起 core。不变量见本文件头。 */ + { + uint32_t gen = net_get_generation(); + for (i = 0U; i < IEC104_MCU_MAP_SIZE; ++i) { + if (s_slots[i].handle != 0U && s_slots[i].net_gen != gen) { + memset(&s_slots[i], 0, sizeof(s_slots[i])); + } + } + } + /* CH395F 单宿主:只接受数字 IPv4;net_inet_addr 把 "0.0.0.0" 也解析成 0。 */ + ip = net_inet_addr(bind_address); + if (ip == 0U && strcmp(bind_address, "0.0.0.0") != 0) { + return result(IEC104_NET_ERROR, NET_ERR_INVAL, native_error); + } + fd = net_socket(NET_AF_INET, NET_SOCK_STREAM); + if (fd < 0) { + return result(IEC104_NET_ERROR, net_get_errno(), native_error); + } + memset(&addr, 0, sizeof(addr)); + addr.sin_family = NET_AF_INET; + addr.sin_port = net_htons(port); + addr.sin_addr.s_addr = ip; + addrlen = (int)sizeof(addr); + rc = net_bind(fd, (const struct net_sockaddr *)&addr, addrlen); + if (rc == 0) { + /* 公开 net_listen() 是队列版,在 netTask 内自等死锁;用 owner 出口。 */ + rc = net_listen_locked(fd); + } + if (rc != 0) { + int code = net_get_errno(); + (void)net_close_sock(net_get_sock(fd)); + return result(IEC104_NET_ERROR, (code < 0) ? code : NET_ERR, native_error); + } + (void)net_setblocking(fd, 0); + slot = slot_alloc_free(); + if (slot == NULL) { + (void)net_close_sock(net_get_sock(fd)); + return result(IEC104_NET_ERROR, NET_ERR_NOMEM, native_error); + } + slot->handle = handle_new(); + slot->fd = fd; + slot->net_gen = net_get_generation(); + slot->role = SLOT_LISTEN; + *listener = slot->handle; + *bound_port = port; + return result(IEC104_NET_OK, 0, native_error); +} + +IEC104_NetResult_t IEC104_Net_Accept( + IEC104_NetSocket_t listener, IEC104_NetSocket_t *client, + IEC104_NetPeer_t *peer, int *native_error) +{ + slot_t *slot = find_role(listener, SLOT_LISTEN); + struct net_sockaddr_in addr; + int addrlen = (int)sizeof(addr); + int rc; + char ip_text[16]; + slot_t *client_slot; + + if (client == NULL || peer == NULL) { + return result(IEC104_NET_ERROR, NET_ERR_INVAL, native_error); + } + *client = IEC104_NET_INVALID_SOCKET; + if (slot == NULL) { + return result(IEC104_NET_ERROR, NET_ERR_INVAL, native_error); + } + /* 单 fd 模型的 accept 一次性语义(2026-11-18 板端实测事故,两层伤害,必读): + * ① net 层 net_accept_locked 对 ESTABLISHED 的监听 fd 幂等返回成功 + * (net_socket.c:1391 只在 state != ESTABLISHED 才进 WOULDBLOCK 分支); + * ② 库 Accept_Clients 的 4 次预算循环(IEC104_TcpServer.c:330/:1563) + * 在第 2..4 次迭代跳过 client_socket != INVALID 的全部前置判据 + * (:1570-1578),直接再调本函数,随后按"多余客户端"关掉它 + * (:1605-1607)。 + * 若在这里再发新句柄,会连环受伤:第 1 次 Accept 交付 H1,库在 :1670 + * 记住它;第 2 次进来若清/重分配 H1 所在槽,H1 立即悬空(slot_by_handle + * 返回 NULL,STARTDT_ACT 的 Send(H1) 报 NET_ERR_BADF → Drop_Client, + * 这是"STARTDT 一点回应都没有 + 20~33ms EOF"的第一击);即便不清旧槽而是 + * 另开 H2,库仍会在 :1606 Close(client) 把与监听同 fd 的会话拆掉(第二击)。 + * 因此同一会话只交付一次:当前代次已有 CLIENT/CLIENT_EOF 槽时一律 + * WOULD_BLOCK(库对该码的处理是 accept_pending=0、本轮正常返回, + * :1583-1588),绝不用 RETRY_LATER(那会 Pause_Accept 100ms)。 + * 【位置】闸放在 net_listener_armed 之前:client_slot_find_any 是纯 RAM + * 判断,保证会话已存在时一次芯片事务都不发(armed 之后紧跟的 + * net_accept_locked 会 net_poll() 走 SPI)。 + * 【EOF 窗口】client_slot_find_any 同时认 SLOT_CLIENT_EOF:EOF 之后、 + * 库 Drop_Client 之前那段收尾窗口同样必须挡住,否则新连接会被旧会话 + * 收尾拆掉。 + * 【残留保险】即便异常路径真留下槽,下一次 core start 的 IEC104_Net_Init() + * 会 memset 整张 s_slots 表,不会永久静默拒连。 */ + if (client_slot_find_any() != NULL) { + return result(IEC104_NET_WOULD_BLOCK, 0, native_error); + } + /* accept 门控:未 armed 时直接 WOULD_BLOCK,不做任何芯片访问。 */ + if (net_listener_armed(slot->fd) == 0) { + return result(IEC104_NET_WOULD_BLOCK, 0, native_error); + } + memset(&addr, 0, sizeof(addr)); + rc = net_accept_locked(slot->fd, (struct net_sockaddr *)&addr, &addrlen); + if (rc < 0) { + int code = net_get_errno(); + if (code == NET_ERR_WOULDBLOCK) { + return result(IEC104_NET_WOULD_BLOCK, code, native_error); + } + if (code == NET_ERR_NOMEM || code == NET_ERR_BUSY) { + return result(IEC104_NET_RETRY_LATER, code, native_error); + } + return result(IEC104_NET_RETRY, code, native_error); + } + /* 单连接模型:rc == listener fd(监听槽的 fd 原地转为数据通道)。 + * 监听槽 role 恒为 LISTEN、handle 不变;本次连接另起 CLIENT 槽。 + * 单 fd 下库可能重复 Accept,一次性闸在上面:此处不得清理既有槽—— + * 旧槽可能是库正持有的句柄(清掉即悬空),故原"先清旧槽再分配"段已删。 */ + client_slot = slot_alloc_free(); + if (client_slot == NULL) { + /* 槽耗尽(理论上:8 槽内 1 监听 + 至多 1 客户端不应到这):按资源暂缺 + * 退回,让库暂停接入 100 ms 后重试;本次不建会话,不碰芯片。 */ + return result(IEC104_NET_RETRY_LATER, NET_ERR_NOMEM, native_error); + } + memset(peer, 0, sizeof(*peer)); + /* net_accept_locked 把 addrlen 回写为实际结构长度(IPv4 = sizeof(net_sockaddr_in)), + * 不是调用前的容量。按最小可用长度判,不再用 >= sizeof(addr) 把真实值挡掉。 */ + if (addrlen >= (int)(sizeof(addr.sin_family) + sizeof(addr.sin_port) + + sizeof(addr.sin_addr)) && + addr.sin_family == NET_AF_INET) { + (void)net_inet_ntoa(addr.sin_addr.s_addr, ip_text); + /* 点分串最长 15 字符 + NUL,固定 16 字节缓冲足够 */ + (void)memcpy(peer->address, ip_text, sizeof(peer->address)); + peer->port = net_ntohs(addr.sin_port); + } + /* CLIENT 槽与监听槽同 fd、同代次(Accept 不换代次);独立 handle 使库的 + * listen_socket/client_socket 两个字段各自稳定,互不覆盖。 */ + client_slot->handle = handle_new(); + client_slot->fd = slot->fd; + client_slot->net_gen = slot->net_gen; + client_slot->role = SLOT_CLIENT; + /* CH395F 无 Nagle 开关(net 层没有 setsockopt 面),硬件即无延迟确认策略; + * 不以 NODELAY 作为接入 OK 条件,也不假装设置成功。 */ + *client = client_slot->handle; + return result(IEC104_NET_OK, 0, native_error); +} + +IEC104_NetIoResult_t IEC104_Net_Recv( + IEC104_NetSocket_t socket_handle, void *data, size_t capacity) +{ + IEC104_NetIoResult_t out; + slot_t *slot; + net_sock_t *sock; + int rc, code; + + out.result = IEC104_NET_ERROR; + out.transferred = 0U; + out.native_error = 0; + /* 非 owner 上下文是调用契约违规(本后端 threadless,只允许 netTask), + * 与"句柄无效"分开报 ERROR+NET_ERR_INVAL,禁止下游据此碰芯片。 */ + if (net_ctx_is_owner_task() == 0U) { + out.native_error = NET_ERR_INVAL; + return out; + } + if (data == NULL || capacity == 0U || capacity > 0x7FFFFFFFu) { + out.native_error = NET_ERR_INVAL; + return out; + } + slot = find_client(socket_handle); + if (slot == NULL) { + out.native_error = (s_inited == 0U) ? NET_ERR_INVAL : NET_ERR_BADF; + return out; + } + sock = net_get_sock(slot->fd); + if (sock == NULL) { + out.native_error = NET_ERR_BADF; + return out; + } + rc = net_recv_sock(sock, data, (int)capacity, NET_MSG_DONTWAIT); + if (rc > 0) { + out.result = IEC104_NET_OK; + out.transferred = (size_t)rc; + sat_add(&s_rx_bytes, (uint32_t)rc); + return out; + } + if (rc == 0) { + /* 只读 EOF 事实:槽角色保持 CLIENT_EOF,绝不置回 LISTEN—— + * 否则紧随其后的 Close 会落到 LISTEN 分支真关监听(不可逆事故)。 */ + slot->role = SLOT_CLIENT_EOF; + out.result = IEC104_NET_EOF; + return out; + } + code = net_get_errno(); + if (code == NET_ERR_WOULDBLOCK) { + out.result = IEC104_NET_WOULD_BLOCK; + out.native_error = code; + return out; + } + if (code == NET_ERR_BUSY || code == NET_ERR_CONNRESET) { + out.result = IEC104_NET_RETRY; + out.native_error = code; + return out; + } + out.native_error = (code < 0) ? code : NET_ERR; + return out; +} + +IEC104_NetResult_t IEC104_Net_Pending_Input( + IEC104_NetSocket_t socket_handle, uint32_t *available, int *native_error) +{ + slot_t *slot; + int len; + if (net_ctx_is_owner_task() == 0U) { + return result(IEC104_NET_ERROR, NET_ERR_INVAL, native_error); + } + if (available == NULL) { + return result(IEC104_NET_ERROR, NET_ERR_INVAL, native_error); + } + slot = find_client(socket_handle); + if (slot == NULL) { + return result(IEC104_NET_ERROR, NET_ERR_BADF, native_error); + } + len = net_pending_bytes(slot->fd); + if (len < 0) { + /* 精确失败:查不到就是查不到,不谎报 0/1,由 TcpServer 按 EOF 收口。 */ + return result(IEC104_NET_ERROR, net_get_errno(), native_error); + } + *available = (uint32_t)len; + return result(IEC104_NET_OK, 0, native_error); +} + +IEC104_NetIoResult_t IEC104_Net_Send( + IEC104_NetSocket_t socket_handle, const void *data, size_t length) +{ + IEC104_NetIoResult_t out; + slot_t *slot; + net_sock_t *sock; + int sent = 0, rc, code; + + out.result = IEC104_NET_ERROR; + out.transferred = 0U; + out.native_error = 0; + if (net_ctx_is_owner_task() == 0U) { + out.native_error = NET_ERR_INVAL; + return out; + } + if (length > 0x7FFFFFFFu) { + out.native_error = NET_ERR_INVAL; + return out; + } + slot = find_client(socket_handle); + if (slot == NULL) { + out.native_error = NET_ERR_BADF; + return out; + } + /* ABI 允许 OK + transferred=0(无进展)。库当前不会主动传 0, + * 但 0 长度调用按"无数据可发、无原生错误"返回,避免误判成发送失败。 */ + if (length == 0U) { + out.result = IEC104_NET_OK; + return out; + } + sock = net_get_sock(slot->fd); + if (sock == NULL) { + out.native_error = NET_ERR_BADF; + return out; + } + rc = net_send_try(sock, data, (int)length, &sent); + if (rc == 0) { + /* OK + 0 或短写均按实际 transferred 上报,由库按 remaining_bytes 续发; + * 后端绝不从 Send 次数或短写推断帧完成/帧失败。 */ + out.result = IEC104_NET_OK; + out.transferred = (size_t)sent; + return out; + } + code = (rc < 0) ? net_get_errno() : NET_ERR; + if (code == NET_ERR_WOULDBLOCK) { + out.result = IEC104_NET_WOULD_BLOCK; + out.native_error = code; + return out; + } + out.native_error = code; + return out; +} + +IEC104_NetResult_t IEC104_Net_Wait( + IEC104_NetSocket_t listener, IEC104_NetSocket_t client, uint32_t interest, + uint32_t timeout_ms, uint32_t *ready_events, int *native_error) +{ + slot_t *listen_slot; + slot_t *client_slot; + net_sock_t *sock; + uint32_t ready = 0U; + + (void)timeout_ms; + if (net_ctx_is_owner_task() == 0U) { + return result(IEC104_NET_ERROR, NET_ERR_INVAL, native_error); + } + if (ready_events == NULL || (interest & ~(IEC104_NET_EVENT_ACCEPT | + IEC104_NET_EVENT_READ | IEC104_NET_EVENT_WRITE)) != 0U) { + return result(IEC104_NET_ERROR, NET_ERR_INVAL, native_error); + } + *ready_events = 0U; + if ((interest & IEC104_NET_EVENT_ACCEPT) != 0U) { + listen_slot = find_role(listener, SLOT_LISTEN); + /* 会话在役时不报 ACCEPT 就绪:net_listener_armed 对 ESTABLISHED 恒返 1 + * (net_socket.c:1543-1545,单 fd 模型下监听 fd 已转数据通道),若不挡, + * 库 Wait_For_Events(:1992) 每轮收到假 ACCEPT → Process(:1897) 每轮 + * accept_pending=1 → 每轮再调 Accept。Accept 侧虽已有一次性闸, + * 但这里挡掉才能让"无接入需求"这一事实如实上报。 */ + if (listen_slot != NULL && client_slot_find_any() == NULL && + net_listener_armed(listen_slot->fd) != 0) { + ready |= IEC104_NET_EVENT_ACCEPT; + } + } + if ((interest & (IEC104_NET_EVENT_READ | IEC104_NET_EVENT_WRITE)) != 0U) { + client_slot = find_client(client); + sock = (client_slot != NULL) ? net_get_sock(client_slot->fd) : NULL; + if (sock != NULL) { + if ((interest & IEC104_NET_EVENT_READ) != 0U && + (net_can_read(client_slot->fd) != 0 || client_slot->role == SLOT_CLIENT_EOF)) { + ready |= IEC104_NET_EVENT_READ; + } + /* WRITE 就绪:net 层没有 net_can_write() 公开函数,沿用 net_select.c 的 + * 同源判据直读公开结构 net_sock_t.send_ready(send_ready 为 1 表示芯片 + * 发送 FIFO 可再写一块)。这是已知耦合:字段改名/搬迁需同步本处。 */ + if ((interest & IEC104_NET_EVENT_WRITE) != 0U && sock->send_ready != 0U) { + ready |= IEC104_NET_EVENT_WRITE; + } + } + } + *ready_events = ready; + /* 纯查询:sleep 责任在 netTask 主循环;timeout 0 / UINT32_MAX alike 立即返回。 + * 库的 Wait_For_Events 用 Now_Ms 自行计算 timer_expired,不依赖本函数阻塞。 */ + return result(IEC104_NET_OK, 0, native_error); +} + +/* 按句柄值找槽(不判 role、不判代次——Close 需要先拿到槽再由判据分流)。 + * 两句柄模型下 listen 与 client 各有独立 handle,这里只做值匹配。 */ +static slot_t *slot_by_handle(uintptr_t handle) +{ + uint32_t i; + for (i = 0U; i < IEC104_MCU_MAP_SIZE; ++i) { + if (s_slots[i].handle == handle) { + return &s_slots[i]; + } + } + return NULL; +} + +IEC104_NetResult_t IEC104_Net_Close( + IEC104_NetSocket_t socket_handle, int *native_error) +{ + slot_t *slot; + + if (socket_handle == IEC104_NET_INVALID_SOCKET || socket_handle == 0U) { + return result(IEC104_NET_OK, 0, native_error); + } + if (net_ctx_is_owner_task() == 0U) { + return result(IEC104_NET_ERROR, NET_ERR_INVAL, native_error); + } + slot = slot_by_handle(socket_handle); + /* 陈旧/代次不匹配的 Close:幂等 OK,绝不触碰硬件。 */ + if (slot == NULL || slot->role == SLOT_FREE || net_get_generation() != slot->net_gen) { + return result(IEC104_NET_OK, 0, native_error); + } + if (slot->role == SLOT_CLIENT || slot->role == SLOT_CLIENT_EOF) { + /* CLIENT 分支:只拆本客户端会话、清 CLIENT 槽,监听槽的 handle/fd/ + * net_gen/role 一概不动(库侧 listen_socket 是固定值,必须始终有效)。 + * 本分支内不存在关闭监听 fd 的任何调用路径。 */ + client_slot_drop(slot); + return result(IEC104_NET_OK, 0, native_error); + } + /* LISTEN 分支:仅库 TcpServer_Close / Init 失败清理会走到这里。 + * 真关监听 fd 并清整个槽(若尚有客户端槽,先按 CLIENT 语义拆掉, + * 避免监听关了却留下无主的 client 槽)。 */ + { + slot_t *client_slot = client_slot_find_any(); + if (client_slot != NULL) { + client_slot_drop(client_slot); + } + { + net_sock_t *sock = net_get_sock(slot->fd); + if (sock != NULL) { + (void)net_close_sock(sock); + } + } + } + memset(slot, 0, sizeof(*slot)); + return result(IEC104_NET_OK, 0, native_error); +} + +uint64_t IEC104_Net_Now_Ms(void) +{ + return net_mono_now_ms(); +} + +/* 函数功能:导出后端只读统计(当前只有接收字节数)。 + * 参数:rx_bytes 出参,接收 Recv 成功时的 transferred 累加值(饱和 0xFFFFFFF0);可传 NULL。 + * 返回值:无。 + * + * apdu_tx / tx_fail 的帧级计数在 iec104_core_status_t 中,不从 Send 调用推断。 */ +void iec104_net_mcu_stats(uint32_t *rx_bytes) +{ + if (rx_bytes != NULL) { + *rx_bytes = s_rx_bytes; + } +} diff --git a/App/protocol/iec104/iec104_net_mcu.h b/App/protocol/iec104/iec104_net_mcu.h new file mode 100644 index 00000000..8181976a --- /dev/null +++ b/App/protocol/iec104/iec104_net_mcu.h @@ -0,0 +1,149 @@ +/* 模块名称:IEC 60870-5-104 板端 Net 后端附加导出 */ +/* + * IEC104_Net.h 的全部 ABI 由 iec104_net_mcu.c 实现,本头只导出本后端特有的 + * 只读统计入口。严禁从这里暴露 net_* 或 CH395F 细节给上层。 + */ +#ifndef IEC104_NET_MCU_H +#define IEC104_NET_MCU_H + +#include + +#include "IEC104_Net.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/* + * 功能:读取本后端累计收到的 TCP 字节数。 + * 入口参数:rx_bytes - 必填输出,写入后饱和于 0xFFFFFFF0。 + * 说明:只在 Recv 返回 OK 时按 transferred 累加;跨 TCP 重连不清零。 + * 帧级计数(apdu_tx / tx_fail)在 iec104_core_status_t 中,不从 Send 调用推断。 + * 句柄/代次不变量:后端槽的有效性只由 slot->net_gen == net_get_generation() 判定; + * net_stack_bring_up 复位芯片并清空 net 层控制块后旧句柄一律失效,后端绝不 + * 向跨代次的 fd 发任何硬件操作(含 net_close_sock)。句柄值单调递增、永不 + * 复用(不是用 32 位 gen 编码身份),保证是"单调不复用"而非句柄内嵌校验。 + * 平台偏离:CH395F 无 setsockopt/TCP_NODELAY 配置面,视同链路恒无 Nagle 延迟; + * Accept 不以设置 NODELAY 为 OK 条件,也不因无法设置而返回 RETRY。 + */ +void iec104_net_mcu_stats(uint32_t *rx_bytes); + +/* ================================================================ + * 平台 Net 后端 ABI 的复述声明(本文件即 iec104_net_mcu.c 的配对头) + * + * 这 11 个名字**不是本项目起的**:它们由 vendor 的 `IEC104_Net.h`(第 73~200 行) + * 以 extern 钉死,`iec104_net_mcu.c` 只是该 ABI 在 CH395F/net_* 上的一个实现 + * (与 Windows 实现 `IEC104_Net_Windows.c` 平级)。把它们在配对头里复述一遍的 + * 作用是让"这个 .c 导出的每个非 static 符号都在头里有声明"这条规则(2.2)成立, + * 而不是重新定义契约——契约的唯一出处仍是 `IEC104_Net.h` 的文档注释。 + * + * 为什么这里 include 上游头而不是照抄 typedef:句柄/结果码/peer 结构体都是上游 + * 类型,照抄会与上游漂移;include 一次由编译器保证逐字一致。上层仍只从 + * iec104_net_mcu.h 取统计入口,不会因此看到 net_* 或 CH395F 细节。 + * ================================================================ */ + +/* + * 功能:平台网络后端的运行期起点(每个运行期成功一次,须与 Cleanup 严格配对)。 + * 入口参数:native_error - 可选输出,失败时写入平台诊断码。 + * 返 回 值:OK 成功;ERROR 参数或环境无效。 + * 说明:只清后端句柄映射表,不向跨代次的旧 fd 发任何硬件操作(不变量见 .c 文件头)。 + */ +extern IEC104_NetResult_t IEC104_Net_Init(int *native_error); + +/* + * 功能:结束本运行期,不关闭任何 socket(由 TcpServer 先 Close 自己持有的句柄)。 + * 入口参数:无。 + * 返 回 值:无。 + */ +extern void IEC104_Net_Cleanup(void); + +/* + * 功能:返回平台"无效参数"的错误码(供上层把平台码归一化)。 + * 入口参数:无。 + * 返 回 值:平台无效参数错误码。 + */ +extern int IEC104_Net_Invalid_Argument_Error(void); + +/* + * 功能:创建非阻塞 IPv4 监听句柄(只接受数字地址,不解析域名)。 + * 入口参数:bind_address 绑定地址;port 端口(0 = 由系统分配); + * listener/bound_port 必填输出;native_error 可选输出。 + * 返 回 值:OK 交付句柄与实得端口;ERROR 失败且两个输出置无效值。 + * 说明:失败时回收本次创建的 socket,不关闭调用方先前持有的句柄。 + */ +extern IEC104_NetResult_t IEC104_Net_Listen( + const char *bind_address, uint16_t port, IEC104_NetSocket_t *listener, + uint16_t *bound_port, int *native_error); + +/* + * 功能:从非阻塞监听句柄接入至多一个客户端,不在内部循环 accept。 + * 入口参数:listener 监听句柄;client/peer 必填输出;native_error 可选输出。 + * 返 回 值:OK 接入成功;WOULD_BLOCK 暂无待接入连接;RETRY 本次被中断或 + * 新客户端设置失败;RETRY_LATER 接入资源暂缺;ERROR 参数或其它失败。 + * 说明:单 fd 模型下第 2 次调用必须返回 WOULD_BLOCK(见 .c 文件头"一次性闸")。 + */ +extern IEC104_NetResult_t IEC104_Net_Accept( + IEC104_NetSocket_t listener, IEC104_NetSocket_t *client, + IEC104_NetPeer_t *peer, int *native_error); + +/* + * 功能:对已接入的非阻塞客户端执行至多一次同步 recv。 + * 入口参数:socket_handle 客户端句柄;data 可写缓冲区;capacity 容量(须 > 0)。 + * 返 回 值:OK/EOF/WOULD_BLOCK/RETRY/ERROR;非 OK 时 transferred 恒为 0。 + * 说明:TCP 是字节流,一次接收不对应一个完整报文,拆帧由上层负责; + * EOF 不自动关闭句柄,也不设置整帧错误。 + */ +extern IEC104_NetIoResult_t IEC104_Net_Recv( + IEC104_NetSocket_t socket_handle, void *data, size_t capacity); + +/* + * 功能:只读取得当前内核接收队列的字节数,不等待、不消费输入。 + * 入口参数:socket_handle 句柄;available 必填输出;native_error 可选输出。 + * 返 回 值:OK 时写入可用字节数;ERROR 失败并保留平台诊断。 + * 说明:用于给跨调度轮次的续收设定有限边界,不是完整 APDU 数,也不表示连接仍存活。 + */ +extern IEC104_NetResult_t IEC104_Net_Pending_Input( + IEC104_NetSocket_t socket_handle, uint32_t *available, int *native_error); + +/* + * 功能:对已接入的非阻塞客户端执行至多一次同步 send。 + * 入口参数:socket_handle 客户端句柄;data 待发送数据;length 长度(须 > 0)。 + * 返 回 值:OK 时 transferred 为本次被接受的字节数(可小于 length 或为 0); + * WOULD_BLOCK/RETRY/ERROR 其余情况;本接口不返回 EOF。 + * 说明:只按 transferred 推进发送位置;返回后不再借用 data。 + */ +extern IEC104_NetIoResult_t IEC104_Net_Send( + IEC104_NetSocket_t socket_handle, const void *data, size_t length); + +/* + * 功能:等待本轮关注的监听/客户端事件;interest 为 0 时只作有限定时等待。 + * 入口参数:listener/client 按 interest 需要有效;interest 为事件位组合; + * timeout_ms 等待时长;ready_events 必填输出;native_error 可选输出。 + * 返 回 值:OK 时就绪位有效;RETRY 被中断;ERROR 参数或等待失败。 + * 说明:最多调用一次平台等待,不无限重试;就绪后实际 I/O 仍可能暂不可读写。 + * ACCEPT 就绪必须同时满足"无在役会话",否则库会每轮重复 Accept。 + */ +extern IEC104_NetResult_t IEC104_Net_Wait( + IEC104_NetSocket_t listener, IEC104_NetSocket_t client, uint32_t interest, + uint32_t timeout_ms, uint32_t *ready_events, int *native_error); + +/* + * 功能:关闭一个监听或客户端句柄,不调用 Cleanup 或业务回调。 + * 入口参数:socket_handle 要关闭的句柄(INVALID_SOCKET 视为已关闭)。 + * 返 回 值:OK 关闭成功或传入无效哨兵;ERROR 关闭失败。 + * 说明:句柄按值传入,调用方须自行把保存的句柄置为 INVALID_SOCKET。 + */ +extern IEC104_NetResult_t IEC104_Net_Close( + IEC104_NetSocket_t socket_handle, int *native_error); + +/* + * 功能:读取平台单调时钟(供超时与收发期限计算)。 + * 入口参数:无。 + * 返 回 值:64 位单调毫秒计数,不是 UTC 时间戳。 + */ +extern uint64_t IEC104_Net_Now_Ms(void); + +#ifdef __cplusplus +} +#endif +#endif /* IEC104_NET_MCU_H */ diff --git a/App/protocol/iec104/iec104_pts.c b/App/protocol/iec104/iec104_pts.c deleted file mode 100644 index 78be100c..00000000 --- a/App/protocol/iec104/iec104_pts.c +++ /dev/null @@ -1,682 +0,0 @@ -/* - * 模块名称:IEC 60870-5-104 点表与数据源适配(实现) - * 模块功能:实现 iec104_pts.h——YC/YX/YK/定值点表(ROM)、板端默认源 - * (**测频与遥测快照**(104 改读快照)/ prot_elm / prot_set)、COV 比对(遥信变位 + - * 遥测死区 2 点确认 + 品质变化)。点表口径见 iec104_pts.h 文件头与 - * 设计文档 §3。 - * 线程约定:init/bind 建服务前;其余仅 104 服务任务上下文(快照非原子)。 - * 创建日期:2026-10-12(B4) - * 修改记录: - * 2026-10-25 DTU 项目组 下游常数按工程量重定(「数据可信」):YC 死区由拟定码值域重定为 - * 二次值工程量域(额定 0.5 % 规则),判据依据见 - * k_yc 表头注释;数值随 104 改读快照迁运行参数,本表将退化为 - * ROM 默认载体。 - * 2026-10-25 DTU 项目组 104 改读快照与频率点绑定(「数据可信」,道D):YC 板端源改读 - * 测频与遥测快照(App/algo/meas.h,meas_get 无锁双区); - * 削顶五路由快照品质 CLIPPED 驱动线上 IV(不再绑死 -1, - * V0.2 消除双转换器无共同采样触发后零改动自动启用);0x401d 绑频率源(频率点绑定); - * 死区改运行时副本 + set/get 入口;COV 遥测腿 = 死区 - * 连续 2 点确认(板端按快照 seq 去重)+ 品质翻转即报。 - * 单测 = test/host/iec104 TC-IEC104-025~028。 - * 运行参数段 2026-10-25 DTU 项目组 死区真源收编 App/algo/run_par.c(本层 s_yc_db - * 副本删除,set/get 转转发壳,壳保留清确认计数语义); - * 定值读写路由 = run_par 表先、prot_set 后(0x8020~ - * 0x8058 运行参数段 C_RD/C_SE,系数覆盖直通 adc_cal)。 - * 2026-10-26 DTU 项目组 道G task-8「UI 补齐」第 5 项非 UI 前置:新增 - * [comm] 通讯参数段(ca/port)初版落本文件尾部; - * s_src_yk_exec() 等遥控/记录投递路径零改动。 - * 2026-10-26 DTU 项目组 同日晚纠偏:[comm] 实现整体迁出至配对模块 - * iec104_comm.c(coding-standard CODE-RULE-17 (2.2) - * 按文件名配对判定,本文件的公开符号必须声明于 - * iec104_pts.h——[comm] 不属点表,拆出正解;契约 - * = iec104_comm.h,本文件不再引用 cfg_file)。 - */ -#include "iec104_pts.h" - -#include - -#include "iec104_asdu.h" /* QDS/DIQ 品质位常量 */ -#include "meas.h" /* 板端源:遥测 = 测频与遥测快照(104 改读快照;品质域位同源) */ -#include "run_par.h" /* 运行参数段:死区真源 + 104 读写路由 */ -#include "prot_elm.h" /* 板端源:遥信 = 元件状态 */ -#include "prot_set.h" /* 板端源:定值 + 闭锁 */ -#include "sys_log.h" /* task-10:遥控记录(SYSLOG_YK)/ 操作记录(SYSLOG_OPER) */ -#include "adc_input.h" /* adc_semantic_t(phasor 实例按语义绑定) */ - -/* ---------------- YC 表(§1.5 点号 4011+;死区列 = ROM 默认值) ------------ */ -/* 源类型(「数据可信」频率点绑定:YC 表加 src 类型区分相量/频率) */ -#define PTS_SRC_MEAS 0u /* 全周傅氏相量快照槽 sem(电气量,yc/qds 直读) */ -#define PTS_SRC_FREQ 1u /* 快照频率(freq_valid 门 → IV) */ - -typedef struct { - uint32_t ioa; - int8_t sem; /* 快照 yc 槽 = 语义通道(-1 = 非测量量点,当前仅频率) */ - float db_default; /* 死区工厂默认(生效真源 = run_par [run_par] 段 = 运行参数段真源) */ - uint8_t src; /* PTS_SRC_* 源类型 */ -} pts_yc_def_t; - -/* 死区规则 = 额定二次值的 0.5 %(docs/算法/采集与算法层设计说明.md §13.7 表第 2 行建议规则,随下游常数按工程量重定采纳; - * 额定基准 100 V / 1 A 与 App/algo/prot_set.c 头部同源,勿在此另立口径): - * 电压类 0.5 % × 100 V = 0.5 V 电流类 0.5 % × 1 A = 0.005 A - * 频率点不适用"额定百分比"(额定附近 0.5 Hz 与旧值同量级,维持 0.5 并随 - * 运行参数段可调)。自 104 改读快照起本表**只作工厂默认载体**:生效死区 = - * App/algo/run_par.c 的 [run_par] 引擎副本(运行参数段真源收编,本层不再存副本);削顶五路不再 sem=-1 绑死,而是绑快照槽、由品质 CLIPPED - * 驱动线上 IV——V0.2 削顶消失后点位零改动自动启用(口径见 - * docs/算法/采集与算法层设计说明.md §13.3 三态可用性表)。 - * ⚠ 过渡期(eng=0 引脚电压域,两点标定完成前):上送值本身非二次值,死区 - * 数字按本域偏保守(迟报不漏报);标定落地后复核(docs/算法/采集与算法层设计说明.md §13.7 表 - * 第 2 行)。判定 = 死区连续 2 点确认(104 改读快照),见 iec104_pts.h COV 说明。 */ -static const pts_yc_def_t k_yc[] = { - { 0x4011u, (int8_t)ADC_SEM_UA, 0.5f, PTS_SRC_MEAS }, /* 1Ua:0.5 % × 100 V */ - { 0x4012u, (int8_t)ADC_SEM_UB, 0.5f, PTS_SRC_MEAS }, /* 1Ub:削顶 → 品质驱动 IV */ - { 0x4013u, (int8_t)ADC_SEM_UC, 0.5f, PTS_SRC_MEAS }, /* 1Uc:同上 */ - { 0x4014u, (int8_t)ADC_SEM_UN, 0.5f, PTS_SRC_MEAS }, /* 1U0(外部零序专用通道) */ - { 0x4015u, (int8_t)ADC_SEM_IA, 0.005f, PTS_SRC_MEAS }, /* 1Ia:0.5 % × 1 A */ - { 0x4016u, (int8_t)ADC_SEM_IB, 0.005f, PTS_SRC_MEAS }, /* 1Ib:削顶 → 品质驱动 IV */ - { 0x4017u, (int8_t)ADC_SEM_IC, 0.005f, PTS_SRC_MEAS }, /* 1Ic:同上 */ - { 0x4018u, (int8_t)ADC_SEM_IN, 0.005f, PTS_SRC_MEAS }, /* 1I0:同上 */ - { 0x401Du, -1, 0.5f, PTS_SRC_FREQ }, /* 1f:频率点绑定——绑频率源, - * freq_valid=0 → IV */ -}; -#define YC_N ((uint8_t)(sizeof(k_yc) / sizeof(k_yc[0]))) - -/* ===== 遥测 COV 运行时状态(104 改读快照;仅 iec104Task 上下文访问,无并发) ===== - * 判据链:新测量点 → |v − 上次上送值| > 死区?→ 连续 2 点确认 → 置变化位。 - * 基准 = **上次上送值**(非上次读值——否则慢漂移永不出死区,参考系统同款); - * 品质(线上 qds)翻转 = 事件:不参与 2 点计数、当拍直报。 */ -static float s_yc_rep[YC_N]; /* 上次上送值(建线/确认上送时更新) */ -static uint8_t s_yc_repq[YC_N]; /* 上次上送的线上 qds */ -static uint8_t s_yc_cnf[YC_N]; /* 越死区连续计数(1 = 待确认;2 = 确认) */ -static uint32_t s_yc_seq; /* COV 已消费到的快照 seq(板端源测点去重) */ -static uint8_t s_yc_seqmode; /* 1 = 板端默认源(测点 = meas 换帧) */ - -/* ---------------- YX 表(IOA = 1..33;双点 = 开关位置类) ------------------ */ -#define YX_N 33u -#define YX_DP_N 4u /* idx 0..3 = 双点(开关位置,V0.1 无硬件 → IV) */ - -/* 有效位图:YX15~18(idx14~17)+ YX23(idx22)+ YX31(idx30) */ -#define YX_VALID_MASK (((1uLL << 14u) | (1uLL << 15u) | (1uLL << 16u) \ - | (1uLL << 17u) | (1uLL << 22u) | (1uLL << 30u))) - -/* ---------------- 数据源(默认 = 板端;bind_src 可整体替换) -------------- */ -static int s_src_yc_read_ex(uint8_t idx, float *out, uint16_t *qds); -static uint64_t s_src_yx_bits(void); -static uint64_t s_src_yx_valid(void); -static int s_src_yk_exec(uint32_t ioa, uint8_t dpc, uint8_t select); -static int s_src_set_read(uint32_t addr, float *out); -static int s_src_set_write(uint32_t addr, float v, uint8_t select); - -/* 板端默认源:遥测走**带品质**的 ex 通道(legacy yc_read 槽置 NULL—— - * s_yc_point 优先 ex;注入源两种槽位均可,见 iec104_pts.h) */ -static const iec104_pts_src_t k_default_src = { - NULL, s_src_yx_bits, s_src_yx_valid, - s_src_yk_exec, s_src_set_read, s_src_set_write, s_src_yc_read_ex -}; -static const iec104_pts_src_t *s_src; - -/* ---------------- COV 快照(遥信侧;遥测侧状态见上方 s_yc_* 块) --------- */ -static uint16_t s_yc_have; /* bit i = 已建立上送基线 */ -static uint64_t s_yx_last; -static uint8_t s_yx_snap_ok; - -/* ============================ 公开接口 ================================== */ - -/* - * 函数功能:初始化点表模块(死区装 ROM 默认、清 COV/快照状态、恢复默认源) - * 限定条件:内核启动前或 104 服务启动前,调一次 - * 函数说明:104 改读快照起不再扫 phasor 实例(数据源 = 快照,槽位 = 语义通道,编译期 - * 直接可定);重复调用 = 全状态复位(单测 reset 依赖此语义)。 - */ -void iec104_pts_init(void) { - /* 死区不在本层复位——真源 = run_par(cfg 引擎副本),复位入口唯一 - * run_par_init();本函数只复位 COV 状态(单测 reset 依赖此语义) */ - (void)memset(s_yc_rep, 0, sizeof(s_yc_rep)); - (void)memset(s_yc_repq, 0, sizeof(s_yc_repq)); - (void)memset(s_yc_cnf, 0, sizeof(s_yc_cnf)); - s_yc_have = 0u; - s_yc_seq = 0u; - s_yc_seqmode = 1u; - s_src = &k_default_src; - s_yx_snap_ok = 0u; - s_yx_last = 0u; -} - -/* - * 函数功能:替换数据源(NULL = 恢复板端默认源;单测注入假源) - * 函数说明:注入源同时把 COV 测点口径切为**每次调用一测点**(假源无快照节拍, - * 步进由调用方控制);默认源 = 测点按 meas 换帧(seq 去重)。换源 - * 不重建基线(基线状态统一由 init 复位,防跨源半截确认序列)。 - */ -void iec104_pts_bind_src(const iec104_pts_src_t *src) { - if (src != NULL) { - s_src = src; - s_yc_seqmode = 0u; - } else { - s_src = &k_default_src; - s_yc_seqmode = 1u; - } -} - -/* - * 函数功能:遥测点数 - */ -uint8_t iec104_pts_yc_count(void) { - return YC_N; -} - -/* - * 函数功能:遥测点 IOA(按下标;越界 → 0) - */ -uint32_t iec104_pts_yc_ioa(uint8_t idx) { - return (idx < YC_N) ? k_yc[idx].ioa : 0u; -} - -/* - * 函数功能:品质域位映射(uint16 meas 域 → uint8 线上 QDS,104 改读快照) - * 入口参数:q16 - 源侧品质(低字节与线上同值;高字节为 MEAS_QDS_CLIPPED 域内位) - * 返 回 值:线上 QDS 字节 uint8_t - * 函数说明:CLIPPED(硬件削顶,104 无对应位)映射为 IV——「削顶通道 104 恒 - * IV」口径(docs/算法/采集与算法层设计说明.md §13.3 三态可用性表) - * 改由快照品质驱动,不再靠点表绑死 -1;OV/NT/IV 透传,其余高位丢弃。 - */ -static uint8_t s_q_map(uint16_t q16) { - uint8_t w = (uint8_t)(q16 & (uint16_t)(IEC104_QDS_OV | IEC104_QDS_NT - | IEC104_QDS_IV)); - - if ((q16 & (uint16_t)MEAS_QDS_CLIPPED) != 0u) { - w |= (uint8_t)IEC104_QDS_IV; - } - return w; -} - -/* - * 函数功能:读单点遥测(统一源通道 + 品质归一,yc_read 与 COV 共用唯一读径) - * 入口参数:idx - YC 表下标 v/q - 输出(值 / 线上 qds;调用方保证非空) - * 返 回 值:0 有效;-1 IV(含 CLIPPED 映射);-2 NT(未就绪) int - * 函数说明:ex 源在场 → 品质由源给(板端 = 快照槽位透传);否则退 legacy - * yc_read,品质从返回值推导(-1→IV / -2→NT / 0→无位)——旧注入源 - * 行为与 104 改读快照前**完全一致**(单测假源零改动)。判定顺序 IV > NT: - * 开机首帧 qds=IV|NT 按无效处理(NT 只留给纯暂态)。任何无效 → - * 信息体清零(线上口径:主站只信品质)。 - */ -static int s_yc_point(uint8_t idx, float *v, uint8_t *q) { - int rc; - uint16_t q16 = 0u; - - if ((idx >= YC_N) || (s_src == NULL) - || ((s_src->yc_read == NULL) && (s_src->yc_read_ex == NULL))) { - *v = 0.0f; - *q = (uint8_t)IEC104_QDS_IV; - return -1; - } - if (s_src->yc_read_ex != NULL) { - rc = s_src->yc_read_ex(idx, v, &q16); - } else { - rc = s_src->yc_read(idx, v); - q16 = (rc == -2) ? (uint16_t)MEAS_QDS_NT - : ((rc != 0) ? (uint16_t)MEAS_QDS_IV : 0u); - } - (void)rc; /* 有效性由归一后的 q 终裁(IV/NT 即无效),源返回值不直通 */ - *q = s_q_map(q16); - rc = ((*q & (uint8_t)IEC104_QDS_IV) != 0u) ? -1 - : (((*q & (uint8_t)IEC104_QDS_NT) != 0u) ? -2 : 0); - if (rc != 0) { - *v = 0.0f; - } - return rc; -} - -/* - * 函数功能:读遥测(值 + 线上品质位;无效值清零,判据见 s_yc_point) - * 返 回 值:0 有效 / -1 无效(NT 亦无效,品质位与 IV 区分) int - */ -int iec104_pts_yc_read(uint8_t idx, float *v, uint8_t *qds) { - float val = 0.0f; - uint8_t q = (uint8_t)IEC104_QDS_IV; - - (void)s_yc_point(idx, &val, &q); - if (v != NULL) { - *v = val; - } - if (qds != NULL) { - *qds = q; - } - return (q == 0u) ? 0 : -1; -} - -/* - * 函数功能:写死区(104 改读快照的 API 壳,转发 run_par 真源 + 清本层确认计数) - * 入口参数:idx - YC 表下标 db - 工程量绝对死区(≥0,分档上限见 run_par) - * 返 回 值:0 成功;-1 越界/负值/NaN/越程(run_par 副本不动) int - * 限定条件:**iec104Task 上下文**(run_par 副本写 = 引擎对齐 int32 单字, - * 104 执行段之外调用需自行避免与 104 写并发) - * 函数说明:成功时清零该点待确认计数——跨死区档位不保留半截确认序列; - * 不隐式重建基线(上送基准延续,新死区即刻生效)。落盘由 run_par - * 脏标志 + SYS_EVT_RUN_PAR_SAVE 走 defaultTask(运行参数段持久化链)。 - */ -int iec104_pts_yc_set_deadband(uint8_t idx, float db) { - if (idx >= YC_N) { - return -1; - } - if (run_par_deadband_set(idx, db) != 0) { - return -1; /* 守卫(NaN/负/越程分档上限)单一实现,在 run_par */ - } - s_yc_cnf[idx] = 0u; /* 壳语义:跨死区档位不保留半截确认序列 */ - return 0; -} - -/* - * 函数功能:读当前生效死区(转发 run_par 真源) - * 入口参数:idx - YC 表下标 - * 返 回 值:生效死区;idx 越界返 0.0 float - * 限定条件:任意上下文(引擎副本 int32 单字读,Cortex-M 原子) - * 函数说明:UI 回显 / 读写往返校验用;工厂默认查点表 db_default 列。 - */ -float iec104_pts_yc_deadband(uint8_t idx) { - return (idx < YC_N) ? run_par_deadband(idx) : 0.0f; -} - -/* - * 函数功能:遥信点数 - */ -uint8_t iec104_pts_yx_count(void) { - return (uint8_t)YX_N; -} - -/* - * 函数功能:遥信点 IOA(idx + 1;越界 → 0) - */ -uint32_t iec104_pts_yx_ioa(uint8_t idx) { - return ((uint8_t)idx < YX_N) ? ((uint32_t)idx + 1u) : 0u; -} - -/* - * 函数功能:该遥信是否双点型(idx < 4 = 开关位置类) - */ -uint8_t iec104_pts_yx_is_dp(uint8_t idx) { - return ((uint8_t)idx < YX_DP_N) ? 1u : 0u; -} - -/* - * 函数功能:读遥信(无效通道 → DIQ_IV;双点 → DPC 编码) - */ -void iec104_pts_yx_read(uint8_t idx, uint8_t *out) { - uint64_t bits; - uint64_t valid; - uint8_t on; - - if (out == NULL) { - return; - } - if ((idx >= YX_N) || (s_src == NULL) || (s_src->yx_bits == NULL) - || (s_src->yx_valid == NULL)) { - *out = IEC104_DIQ_IV; - return; - } - valid = s_src->yx_valid(); - if (((valid >> idx) & 1u) == 0u) { - *out = IEC104_DIQ_IV; - return; - } - bits = s_src->yx_bits(); - on = (uint8_t)((bits >> idx) & 1u); - if (iec104_pts_yx_is_dp(idx) != 0u) { - *out = (on != 0u) ? (uint8_t)IEC104_DPC_ON : (uint8_t)IEC104_DPC_OFF; - } else { - *out = on; - } -} - -/* - * 函数功能:COV 快照比对(遥信 = 有效位翻转;遥测 = 死区) - * 入口参数:cov = 输出变位位图(NULL = 只刷快照) - */ -void iec104_pts_cov_check(iec104_pts_cov_t *cov) { - iec104_pts_cov_t local; - - (void)memset(&local, 0, sizeof(local)); - - /* YX:变位 = 有效位上的位翻转(无效位不参与,避免 IV 通道抖动成"变位") */ - if ((s_src != NULL) && (s_src->yx_bits != NULL) - && (s_src->yx_valid != NULL)) { - uint64_t bits = s_src->yx_bits() & s_src->yx_valid(); - - if (s_yx_snap_ok != 0u) { - local.yx_changed = bits ^ s_yx_last; - } - s_yx_last = bits; - s_yx_snap_ok = 1u; - } - - /* YC(104 改读快照):测点推进 = 板端源按快照换帧(100 ms poll vs 200 ms 快照, - * 不去重则同一帧计两次 → "连续 2 点确认"退化成"连续 2 次轮询",单帧 - * 噪声即可被确认,抗噪语义失效);注入源 = 每次调用一测点。 - * 判定 = 死区连续 2 点确认 + 品质翻转直报(口径全文 → iec104_pts.h)。 */ - if ((s_src != NULL) - && ((s_src->yc_read != NULL) || (s_src->yc_read_ex != NULL))) { - uint8_t step = 1u; - - if (s_yc_seqmode != 0u) { - uint32_t sq = meas_seq(); - - if (sq == s_yc_seq) { - step = 0u; /* 未换帧:本 poll 不算新测量点 */ - } else { - s_yc_seq = sq; - } - } - if (step != 0u) { - uint8_t i; - - for (i = 0u; i < YC_N; i++) { - float v; - uint8_t q; - int rc = s_yc_point(i, &v, &q); - - if (((s_yc_have >> i) & 1u) == 0u) { - if (rc == 0) { /* 首个有效读数只建线不上报(初值归总召) */ - s_yc_have |= (uint16_t)(1u << i); - s_yc_rep[i] = v; - s_yc_repq[i] = q; - s_yc_cnf[i] = 0u; - } - continue; - } - if (q != s_yc_repq[i]) { - /* 品质翻转 = 事件直报(含 0x401d 的 IV 进出,频率点绑定) */ - local.yc_changed |= (uint16_t)(1u << i); - s_yc_repq[i] = q; - s_yc_cnf[i] = 0u; - if (rc == 0) { - s_yc_rep[i] = v; - } - continue; - } - if (rc != 0) { - s_yc_cnf[i] = 0u; /* 无效期间不计数(品质未变 = 状态延续) */ - continue; - } - { - float d = v - s_yc_rep[i]; - - if (d < 0.0f) { - d = -d; - } - if (d > run_par_deadband(i)) { - s_yc_cnf[i]++; - if (s_yc_cnf[i] >= 2u) { /* 连续 2 越 → 确认:报 + 移基准 */ - local.yc_changed |= (uint16_t)(1u << i); - s_yc_rep[i] = v; - s_yc_cnf[i] = 0u; - } - } else { - s_yc_cnf[i] = 0u; /* 回摆入死区 → 撤销候选(抗噪核心) */ - } - } - } - } - } - - if (cov != NULL) { - *cov = local; - } -} - -/* - * 函数功能:遥控两段式(转发数据源;select=1 选择段 / 0 执行段) - * 返 回 值:0 接受 / -1 拒绝(调用方回 PN) - */ -int iec104_pts_yk_exec(uint32_t ioa, uint8_t dpc, uint8_t select) { - if ((s_src == NULL) || (s_src->yk_exec == NULL)) { - return -1; - } - return s_src->yk_exec(ioa, dpc, select); -} - -/* - * 函数功能:按通讯地址读定值(工程量浮点) - * 返 回 值:0 / -1 未知地址 - */ -int iec104_pts_set_read(uint32_t addr, float *out) { - if ((s_src == NULL) || (s_src->set_read == NULL)) { - return -1; - } - return s_src->set_read(addr, out); -} - -/* - * 函数功能:按通讯地址写定值(select=1 只校验;0 执行写入) - * 返 回 值:0 / -1 越界或未知地址 - */ -int iec104_pts_set_write(uint32_t addr, float v, uint8_t select) { - if ((s_src == NULL) || (s_src->set_write == NULL)) { - return -1; - } - return s_src->set_write(addr, v, select); -} - -/* ============================ 板端默认源 ================================= */ - -/* - * 函数功能:板端默认源 - 遥测 = 测频与遥测快照直读(「数据可信」104 改读快照与频率点绑定) - * 入口参数:idx - YC 表下标 out/qds - 值 + uint16 域品质(MEAS_QDS_*) - * 返 回 值:0 / -1 越界或频率未新鲜(IV)/ -2 快照从未发布(NT) int - * 限定条件:iec104Task 上下文(meas_get 为双区无锁读,App/algo/meas.h) - * 函数说明:**不做任何本地判断**——电气路值/品质整体透传快照槽(削顶路快照 - * 已置 CLIPPED,s_q_map 映上线 IV;开机首帧 IV|NT 由 s_yc_point 按 - * IV 处理),"新不新、能不能信"全在发布侧一处决定(遥测快照发布的设计意图, - * 两处判断必打架)。频率路(PTS_SRC_FREQ):snap.freq_valid==0 → - * IV(频率点绑定 DoD 原句);有效时值 = snap.freq_hz,与 freq_get() 同源。 - */ -static int s_src_yc_read_ex(uint8_t idx, float *out, uint16_t *qds) { - meas_snap_t snap; - - if ((idx >= YC_N) || (out == NULL) || (qds == NULL)) { - return -1; - } - if (meas_get(&snap) != 0) { - *out = 0.0f; /* 从未发布(开机 <200 ms)= 暂态 */ - *qds = (uint16_t)(MEAS_QDS_IV | MEAS_QDS_NT); - return -2; - } - if (k_yc[idx].src == (uint8_t)PTS_SRC_FREQ) { - if (snap.freq_valid == 0u) { - *out = 0.0f; - *qds = (uint16_t)MEAS_QDS_IV; - return -1; - } - *out = snap.freq_hz; - *qds = 0u; - return 0; - } - if (k_yc[idx].sem < 0) { - *out = 0.0f; /* 理论不可达:现无未绑测量量点 */ - *qds = (uint16_t)MEAS_QDS_IV; - return -1; - } - *out = snap.yc[(uint8_t)k_yc[idx].sem]; - *qds = snap.qds[(uint8_t)k_yc[idx].sem]; - return 0; -} - -/* - * 函数功能:板端默认源 - 遥信位图(保护元件动作态 + 定值闭锁) - */ -static uint64_t s_src_yx_bits(void) { - prot_elm_state_t oc1; - prot_elm_state_t oc2; - prot_elm_state_t oc3; - prot_elm_state_t ol; - prot_elm_state_t u0; - uint64_t bits = 0u; - - prot_elm_state(PE_OC1, &oc1); - prot_elm_state(PE_OC2, &oc2); - prot_elm_state(PE_OC3, &oc3); - prot_elm_state(PE_OL, &ol); - prot_elm_state(PE_3U0, &u0); - if ((oc1.asserted != 0u) || (oc2.asserted != 0u) || (oc3.asserted != 0u) - || (u0.asserted != 0u)) { - bits |= (1uLL << 14u); /* YX15 故障总 */ - } - if (oc1.asserted != 0u) { - bits |= (1uLL << 15u); /* YX16 过流 I 段 */ - } - if (oc2.asserted != 0u) { - bits |= (1uLL << 16u); /* YX17 过流 II 段 */ - } - if (oc3.asserted != 0u) { - bits |= (1uLL << 17u); /* YX18 过流 III 段 */ - } - if (ol.asserted != 0u) { - bits |= (1uLL << 22u); /* YX23 过载 */ - } - if (prot_set_locked() != 0u) { - bits |= (1uLL << 30u); /* YX31 保护闭锁 */ - } - return bits; -} - -/* - * 函数功能:板端默认源 - 遥信有效位图(V0.1 = YX15~18/23/31) - */ -static uint64_t s_src_yx_valid(void) { - return YX_VALID_MASK; -} - -/* - * 函数功能:板端默认源 - 遥控(YK11 复归 → prot_elm_request_reset; - * YK12 全局软压板 → PS_GLOBAL_EN 两段式转真,B7) - * 返 回 值:0 / -1 无出口硬件或未知 IOA(YK1~4/13/14 负向确认) - * 函数说明:本回调跑在 iec104Task 上下文,**不得**直接 prot_elm_init() - * (与 protectTask 的 eval 竞态)→ 落请求,下一拍 eval 头部消费(B5)。 - * YK12 走 prot_set_set_sealed(原子写+封存,B7);protectTask 下一拍 - * 读到压板态即复位元件并停判据(protect_task.c)。 - */ -/* 遥控记录的文案表(task-10)。**全部 ROM 常量、零拼接**:本回调跑在 - * iec104Task,而 iec104_serv.c 的日志缓冲已经因为"深链模块"被收到 128 B, - * 这里再 snprintf 一条"YK ioa=0x600B dpc=2 sel=0 rc=0"就是往那条链上加缓冲; - * 记录类型由 SYSLOG_YK 这个文件本身回答,屏上话术归 UI(App/log/README.md 口径)。 - * 最长一条 20 字符 < SYSLOG_DESC_MAX(28)。 */ -#define YK_REC_YK11_SEL "YK11 select" -#define YK_REC_YK11_EXEC "YK11 exec" -#define YK_REC_YK12_SEL "YK12 select" -#define YK_REC_YK12_ON "YK12 exec on" -#define YK_REC_YK12_OFF "YK12 exec off" -#define YK_REC_YK12_FAIL "YK12 exec fail" -#define YK_REC_DPC_BAD "YK12 bad dpc" -#define YK_REC_UNKNOWN "YK unknown ioa" - -static int s_src_yk_exec(uint32_t ioa, uint8_t dpc, uint8_t select) { - switch (ioa) { - case 0x600Au: /* YK11 信号复归 → 元件状态复位(异步一拍) */ - (void)dpc; /* 复归与双点值无关 */ - if (select == 0u) { - prot_elm_request_reset(); - /* 遥控记录(执行段已受理)+ 操作记录(本地/远端强制复归)。 - * 两条不是重复留痕:前者回答"主站下了什么命令、结果如何",后者 - * 回答"装置被谁改动了状态"——UI 的遥控记录页与操作记录页各读一份。 - * YK11 没有可失败的下游(request_reset 只置单字节标志),所以它 - * 只有受理态,没有 fail 分支。 */ - syslog_post_quiet(SYSLOG_YK, YK_REC_YK11_EXEC); - syslog_post_quiet(SYSLOG_OPER, "force reset"); - } else { - syslog_post_quiet(SYSLOG_YK, YK_REC_YK11_SEL); - } - return 0; - case 0x600Bu: { /* YK12 全局软压板(PS_GLOBAL_EN)两段式 */ - int rc; - if ((dpc != (uint8_t)IEC104_DPC_ON) && (dpc != (uint8_t)IEC104_DPC_OFF)) { - syslog_post_quiet(SYSLOG_YK, YK_REC_DPC_BAD); - return -1; /* 非法双点命令:选择段即拒 */ - } - if (select != 0u) { - syslog_post_quiet(SYSLOG_YK, YK_REC_YK12_SEL); - return 0; /* 选择段 = 只校验 */ - } - /* 执行段:set_sealed 自带范围校验与封存,失败 = 值被拒、RAM 未改。 - * 这里**必须接住返回值再落记录**(bsp-err:错误码不得裸丢弃; - * 原实现是 return 直出,现在多一条记录后仍然原值返回,语义不变)。 */ - rc = prot_set_set_sealed(PS_GLOBAL_EN, - (dpc == (uint8_t)IEC104_DPC_ON) - ? PROT_SET_Q10(1) : PROT_SET_Q10(0)); - if (rc != 0) { - syslog_post_quiet(SYSLOG_YK, YK_REC_YK12_FAIL); - } else { - syslog_post_quiet(SYSLOG_YK, - (dpc == (uint8_t)IEC104_DPC_ON) ? YK_REC_YK12_ON - : YK_REC_YK12_OFF); - /* 压板投退是一次真实的运维动作(保护退出/恢复服务)→ 同时进操作记录 */ - syslog_post_quiet(SYSLOG_OPER, - (dpc == (uint8_t)IEC104_DPC_ON) ? "plate in" - : "plate out"); - } - return rc; - } - default: - syslog_post_quiet(SYSLOG_YK, YK_REC_UNKNOWN); - return -1; /* 其余 YK:无出口硬件/无对应能力 → 拒绝 */ - } -} - -/* - * 函数功能:板端默认源 - 定值读(**路由顺序 = run_par 表先、未命中落 prot_set**: - * 0x8027~0x802A 属 prot_set 告警段,run_par 命中集为精确地址匹配、 - * 永不覆盖之;两表共存靠「先专属表、后通用扫」分流,勿反序——反序 - * 当前无冲突但失去 run_par 守卫先行留痕的意义) - * 返 回 值:0 / -1 未知地址(本地项 comm_addr=0 不可寻址,B7 起显式排除) - */ -static int s_src_set_read(uint32_t addr, float *out) { - uint32_t i; - - if (out == NULL) { - return -1; - } - if (run_par_104_read(addr, out) == 0) { - return 0; /* 运行参数段命中 */ - } - for (i = 0u; i < (uint32_t)PS_ID_COUNT; i++) { - if ((g_prot_set_meta[i].comm_addr != 0u) - && (g_prot_set_meta[i].comm_addr == (uint16_t)addr)) { - *out = prot_set_get_f((prot_set_id_t)i); - return 0; - } - } - return -1; -} - -/* - * 函数功能:板端默认源 - 定值写(**先 run_par 后 prot_set**,分流理由见 - * s_src_set_read 头注;prot_set 腿 = Q10 范围校验 + 执行段 - * prot_set_set_sealed 原子写+封存,B7 收口 B5 竞态窗口) - * 返 回 值:0 / -1 越界或未知地址(本地项 comm_addr=0 不可寻址);两条落盘 - * 链独立:run_par 腿脏 → SYS_EVT_RUN_PAR_SAVE(cfg_file), - * prot_set 腿脏 → SYS_EVT_PROT_SET_SAVE(/prot_set.bin) - */ -static int s_src_set_write(uint32_t addr, float v, uint8_t select) { - uint32_t i; - int32_t q10; - int rp; - - rp = run_par_104_write(addr, v, select); - if (rp != -2) { - return rp; /* 本段地址:0 接受 / -1 拒绝,不再下探 */ - } - - for (i = 0u; i < (uint32_t)PS_ID_COUNT; i++) { - const prot_set_meta_t *meta = &g_prot_set_meta[i]; - - if ((meta->comm_addr == 0u) || (meta->comm_addr != (uint16_t)addr)) { - continue; - } - q10 = PROT_SET_Q10(v); - if ((q10 < meta->min) || (q10 > meta->max)) { - return -1; /* 越界:选择段即拒(执行段同样拒) */ - } - if (select != 0u) { - return 0; /* 选择段 = 只做范围校验 */ - } - return prot_set_set_sealed((prot_set_id_t)i, q10); - } - return -1; /* 未知地址 */ -} diff --git a/App/protocol/iec104/iec104_pts.h b/App/protocol/iec104/iec104_pts.h deleted file mode 100644 index 6abd33bb..00000000 --- a/App/protocol/iec104/iec104_pts.h +++ /dev/null @@ -1,130 +0,0 @@ -/* - * 模块名称:IEC 60870-5-104 点表与数据源适配(纯逻辑 + 源注入) - * 模块功能:104 点表(遥测 YC / 遥信 YX / 遥控 YK / 定值)的定义、读取与变化检测 - * (COV:遥信变位 + 遥测死区)。**数据源经 vtable 注入**:板端绑 - * phasor/prot_elm/prot_set 真实源;主机单测绑假源 → 协议栈全链 - * (asdu+pts+link)可离线跑(分层约束:协议解析与硬件 I/O 分离)。 - * 点表口径(docs/算法/继电保护功能复现规划.md §1.5,验收 = 省电科院点表): - * - YC:IOA 0x4011~0x4018 + 0x401d(频率),短浮点、系数 1;数据源 = - * 测频与遥测快照(App/algo/meas.h,「数据可信」104 改读快照与频率点绑定):电气 8 路绑快照槽, - * 有效性由快照品质驱动——V0.1 削顶路(docs/算法/继电保护功能复现规划.md - * §1.6)快照置 CLIPPED → 本层映射为线上 IV(V0.2 后自动启用,绑定零 - * 改动,见 docs/算法/采集与算法层设计说明.md §13.3 三态可用性表);0x401d 绑频率源, - * freq_valid()==0 → IV; - * - YX:IOA 1~33(§1.5 表(3));双点 = 开关位置类(YX1~4,本期无硬件 → IV), - * 保护动作类 YX15~23 映射 prot_elm 状态,闭锁类 YX31~33 映射 prot_set; - * - YK:IOA 0x6000+(§1.5 表(3));V0.1 无出口硬件(规划 R7)—— - * YK11 信号复归(→ prot_elm_request_reset)与 YK12 全局软压板 - * (→ PS_GLOBAL_EN 两段式转真,B7)转真执行,其余一律否定确认(COT|PN),如实回; - * - 定值:IOA = prot_set 元数据 comm_addr(0x8820 基址 + 告警段 0x8027~0x802A; - * comm_addr=0 本地项不可寻址), - * 读经 C_RD、写经 C_SE_NC(选择/执行两段,执行段原子写+封存并置脏, - * 持久化 /prot_set.bin 由 defaultTask 执行,B7); - * - 固有参数 8001H~800AH:本期**不实现**(字符串类无法用短浮点上送), - * 按未知 IOA(COT 14 + EVI)应答,登记为待办(设计文档)。 - * 线程约定:init/bind 内核启动前或建服务前;cov_check/read 仅 104 服务任务上下文。 - * 创建日期:2026-10-12(B4) - * 修改记录: - * 2026-10-25 DTU 项目组 104 改读快照与频率点绑定(「数据可信」,道D):YC 数据源 = 全周傅氏相量遥测 - * 快照(削顶路由品质驱动 IV);死区改运行时副本 + - * set/get 入口;COV 遥测腿 = 死区 2 点确认(seq 去重) - * + 品质变化即报;0x401d 绑频率源(freq_valid → IV)。 - * 2026-10-25 DTU 项目组 运行参数段:死区真源迁 run_par([run_par] cfg 段 + - * 0x8020~0x8058 读写映射;本层 set/get 为转发壳)。 - */ -#ifndef IEC104_PTS_H -#define IEC104_PTS_H - -#include - -/* ---------------- 数据源 vtable(NULL 项 = 该能力不可用 → 按无效/拒绝处理) -- */ -typedef struct { - /* 遥测读:idx = YC 表下标;out = 工程量浮点。 - * 返回 0 有效 / -1 无效(发 IV)/ -2 数据未就绪(发 NT,如相量未满一周波) */ - int (*yc_read)(uint8_t idx, float *out); - /* 遥信位图:bit i = YX 表下标 i 的"合/动作"态(双点按 ON 计) */ - uint64_t (*yx_bits)(void); - /* 遥信有效位图:bit i = 1 该点有效;0 → 发 IV(无硬件/未实现) */ - uint64_t (*yx_valid)(void); - /* 遥控:select=1 选择段 / 0 执行段(dpc 已剥 S 位)。返回 0 接受 / -1 拒绝 */ - int (*yk_exec)(uint32_t ioa, uint8_t dpc, uint8_t select); - /* 定值读:addr = 通讯地址;返回 0 存在 / -1 未知地址 */ - int (*set_read)(uint32_t addr, float *out); - /* 定值写:select=1 预置校验(范围)/ 0 执行写入。返回 0 / -1 越界或未知 */ - int (*set_write)(uint32_t addr, float v, uint8_t select); - /* 遥测读(带品质,104 改读快照时追加于表尾——旧源 NULL = 走 yc_read 退路,品质由 - * 返回值推导:-1 → IV、-2 → NT、0 → 无位,行为与旧源完全一致)。 - * qds = uint16 域位(App/algo/meas.h MEAS_QDS_*:低字节 = 线上 QDS 同值, - * 高字节 CLIPPED 由本层映射线上 IV);返回 0 / -1 IV / -2 NT */ - int (*yc_read_ex)(uint8_t idx, float *out, uint16_t *qds); -} iec104_pts_src_t; - -/* ---------------- 变化检测结果(cov_check 输出) ---------------- */ -typedef struct { - uint64_t yx_changed; /* bit i = YX 下标 i 变位(相对上次快照) */ - uint16_t yc_changed; /* bit i = YC 下标 i 越过死区(相对上次快照) */ -} iec104_pts_cov_t; - -/* - * 函数功能:点表层初始化(清快照、绑板端默认源) - * 限定条件:内核启动前或 104 服务启动前,调一次 - */ -void iec104_pts_init(void); - -/* - * 函数功能:覆盖数据源(主机单测注假源) - * 入口参数:src - vtable(浅拷贝,调用方保生命周期);NULL = 恢复板端默认源 - */ -void iec104_pts_bind_src(const iec104_pts_src_t *src); - -/* ---------------- YC ---------------- */ -uint8_t iec104_pts_yc_count(void); -uint32_t iec104_pts_yc_ioa(uint8_t idx); -/* 读 YC:v 有效值(无效时为 0);qds 输出线上品质位(IV/NT/OV,CLIPPED 已映射 - * 为 IV)。返回 0/无效-1(NT 亦无效,品质位区分) */ -int iec104_pts_yc_read(uint8_t idx, float *v, uint8_t *qds); -/* 死区写(104 改读快照 API;运行参数段起 = 转发 App/algo/run_par.c 真源 + 清本层确认计数): - * db = 工程量绝对值 ≥0(电压 50 V / 电流 1 A / 频率 5 Hz 分档上限);越界/负值/ - * NaN → -1 且真源不动;成功时清零该点待确认计数(跨档位不残留半截确认——此壳 - * 行为有单测钉住)。仅 104 服务任务上下文调用。落盘 = run_par 脏 → 事件 → - * defaultTask(运行参数段持久化链,docs/子系统设计/IEC104上行设计说明.md §3.4)。 */ -int iec104_pts_yc_set_deadband(uint8_t idx, float db); -/* 读当前生效死区(越界 idx 返 0) */ -float iec104_pts_yc_deadband(uint8_t idx); - -/* ---------------- YX ---------------- */ -uint8_t iec104_pts_yx_count(void); -uint32_t iec104_pts_yx_ioa(uint8_t idx); -uint8_t iec104_pts_yx_is_dp(uint8_t idx); /* 1 = 双点(M_DP) */ -/* 读 YX:out = DIQ/SIQ 值(含 IV)。 */ -void iec104_pts_yx_read(uint8_t idx, uint8_t *out); - -/* ---------------- COV(每 poll 一次) ---------------- */ -/* - * 函数功能:读全表并与上次比对(遥信变位 + 遥测死区 2 点确认 + 品质变化), - * 输出变化集 - * 入口参数:cov - 输出(可为 NULL = 只刷快照不取变化) - * 函数说明:遥测判据(「数据可信」104 改读快照,对标参考系统 CalfYcMea 死区 2 点确认, - * 短板评测口径):**连续 2 个新测量点** |v - 上次上送值| > 死区才置变化位 - * (单点尖峰不确认——噪声回摆即撤销候选);品质位(线上 qds)相对上次 - * 上送值翻转 → 当拍直接置位(不等 2 点,有效性变化必须即时可见, - * 含 0x401d 的 IV 进出)。死区 = 运行时副本(ROM 默认 = 点表列, - * iec104_pts_yc_set_deadband() 覆盖——运行参数段的接线点)。 - * 测量点定义:板端默认源 = **快照换帧**(meas seq 前进;100 ms poll 对 - * 200 ms 快照,同一帧重复比对会计数两次 → seq 去重是确认语义成立的 - * 前提);注入源(单测假源)= 每次调用一测点。首次读到有效值只建基线 - * 不上报(突发由总召覆盖)。 - */ -void iec104_pts_cov_check(iec104_pts_cov_t *cov); - -/* ---------------- 遥控 ---------------- */ -/* 遥控两段式(转发 src->yk_exec;无源 = 一律拒绝)。返回 0 接受 / -1 拒绝 */ -int iec104_pts_yk_exec(uint32_t ioa, uint8_t dpc, uint8_t select); - -/* ---------------- 定值 ---------------- */ -/* 按通讯地址读定值(转发 src->set_read)。返回 0 / -1 未知地址 */ -int iec104_pts_set_read(uint32_t addr, float *out); -/* 按通讯地址写定值(两段)。返回 0 / -1 */ -int iec104_pts_set_write(uint32_t addr, float v, uint8_t select); - -#endif /* IEC104_PTS_H */ diff --git a/App/protocol/iec104/iec104_source.c b/App/protocol/iec104/iec104_source.c index b0d202ec..257bd7a4 100644 --- a/App/protocol/iec104/iec104_source.c +++ b/App/protocol/iec104/iec104_source.c @@ -3,15 +3,26 @@ #include #include #include -/* 430 metadata slots plus four additional banks of 88 action settings. - * Raw binary32/uint32/uint16/Boolean bits are preserved, never stored as float. */ +/* Raw binary32/uint32/uint16/Boolean bits are preserved, never stored as float. */ #define ACTION_COUNT 88U -#define VALUE_SLOTS (IEC104_DTU_PARAMETER_COUNT + 4U * ACTION_COUNT) #define SIM_QUALITY 0x20U #define NO_SOURCE_QUALITY 0x80U +/* 骨架档裁剪开关(默认未定义 = 全功能,行为逐字节不变)。 + * 定义 IEC104_SOURCE_NO_VALUE_STORE 后不分配 values/staged/dirty 三张表, + * 参数区退化为"结构完整、恒出厂默认、只读不可固化": + * - 读:回落到 typed 表的 initial 字面量,与 init() 写入的值完全一致; + * - 预置(PRE/SOL)与标准参数装载:显式拒绝并计数,不静默丢弃。 + * 全功能档(模拟器/产品默认面)不受影响。 */ +#ifndef IEC104_SOURCE_NO_VALUE_STORE +/* 槽位密集化(包 B):rank 表把"索引 -> 槽位"从循环换算改成 O(1) 查表。 + * values 只保留真实可见的槽(configured 345 + area_scoped 88 x 4 区 = 697), + * staged/dirty 只保留可写参数(writable 264),省 1025B RAM,代价 2580B Flash。 */ +#include "iec104_source_ranks.h" +#define VALUE_SLOTS IEC104_SOURCE_VALUE_SLOTS static uint32_t values[VALUE_SLOTS]; -static uint32_t staged[IEC104_DTU_PARAMETER_COUNT]; -static uint8_t dirty[(IEC104_DTU_PARAMETER_COUNT + 7U) / 8U]; +static uint32_t staged[IEC104_SOURCE_STAGE_SLOTS]; +static uint8_t dirty[IEC104_SOURCE_DIRTY_BYTES]; +#endif static IEC104_RemoteParameterRequest_t owner; static bool stage_active, stage_complete; static iec104_source_bindings_t bindings; @@ -22,29 +33,40 @@ static int8_t steps[8]; static uint32_t bits[8]; static float measurements[IEC104_DTU_ME_COUNT]; static uint8_t measurement_set[IEC104_DTU_ME_COUNT]; -static IEC104_CommandPoint_t commands[IEC104_DTU_COMMAND_COUNT]; +/* 标准参数点表按 (CA,IOA) 升序借用给 IEC104_Parameter 模块。 + * 只有 common_address 是运行期值(同实例同一CA),故只在这里保留20行实测可知: + * 整表仍是 RAM,但用 4 字节索引函数代替 120 行逐字段赋值,代码与 Flash 均更省。 */ static IEC104_ParameterPoint_t standard_points[IEC104_DTU_STANDARD_COUNT]; static IEC104_ParameterValue_t standard_values[IEC104_DTU_STANDARD_COUNT]; static uint64_t clock_utc, clock_mono; +#ifndef IEC104_SOURCE_NO_VALUE_STORE static iec104_source_change_t changes[17]; +#endif static void increment(uint32_t *value) { if (*value != UINT32_MAX) { ++*value; } } static uint32_t float_bits(float v) { uint32_t b; memcpy(&b, &v, 4U); return b; } +#ifndef IEC104_SOURCE_NO_VALUE_STORE static float bits_float(uint32_t b) { float v; memcpy(&v, &b, 4U); return v; } +#endif /* 函数功能:将区域参数索引换算为压缩RAM槽位。 */ +#ifndef IEC104_SOURCE_NO_VALUE_STORE static size_t slot(size_t index, uint16_t area) { - size_t i, n = 0U; iec104_dtu_parameter_t p; - if (area == 0U) { return index; } - for (i = 0U; i < index; ++i) { - (void)iec104_dtu_parameter(i, &p); if (p.area_scoped) { ++n; } - } - return IEC104_DTU_PARAMETER_COUNT + (area - 1U) * ACTION_COUNT + n; + uint16_t r; + if (area == 0U) { return iec104_source_value_rank[index]; } + r = iec104_source_scope_rank[index]; + if (r == IEC104_SOURCE_STAGE_NO_RANK) { r = 0U; } + return IEC104_SOURCE_CONFIGURED_TOTAL + (size_t)(area - 1U) * (size_t)IEC104_SOURCE_SCOPED_TOTAL + (size_t)r; } +/* 裁剪档无压缩槽位表,slot() 不参与编译。 */ +#endif /* 函数功能:丢弃预置和事务身份,不改变已固化值。 */ static void clear_stage(void) { stage_active = false; stage_complete = false; - memset(dirty, 0, sizeof(dirty)); memset(&owner, 0, sizeof(owner)); +#ifndef IEC104_SOURCE_NO_VALUE_STORE + memset(dirty, 0, sizeof(dirty)); +#endif + memset(&owner, 0, sizeof(owner)); } /* 函数功能:校验预置事务所属服务、连接和站点身份。 */ static bool same_owner(const IEC104_RemoteParameterRequest_t *r) @@ -54,13 +76,29 @@ static bool same_owner(const IEC104_RemoteParameterRequest_t *r) owner.instance_id == r->instance_id && owner.generation == r->generation && owner.station_id == r->station_id && owner.common_address == r->common_address && owner.test == r->test; } -static bool is_dirty(size_t i) { return (dirty[i / 8U] & (1U << (i % 8U))) != 0U; } +#ifndef IEC104_SOURCE_NO_VALUE_STORE +/* 函数功能:判定参数是否处于已预置未固化状态(按 stage_rank 映射到位)。 */ +static bool is_dirty(size_t i) +{ + uint16_t r = iec104_source_stage_rank[i]; + if (r == IEC104_SOURCE_STAGE_NO_RANK) { return false; } + return (dirty[r >> 3] & (1U << (r & 7U))) != 0U; +} +/* 函数功能:把参数索引换算成 staged/dirty 的密集槽位。 */ +static size_t stage_slot(size_t i) { return (size_t)iec104_source_stage_rank[i]; } +#endif /* 函数功能:判定参数是否由完整的真实源回调对负责。 */ static bool mapped(const iec104_dtu_parameter_t *p, uint16_t area, uint16_t *id, float *scale) { return bindings.parameter_read != NULL && bindings.parameter_apply != NULL && (!p->area_scoped || area == stats.current_area) && iec104_dtu_protection_mapping(p->ioa, id, scale); } +/* 函数功能:从 typed 表字面量还原原始位模式(裁剪档的读回落)。 */ +static uint32_t initial_bits(const iec104_dtu_parameter_t *p) +{ + return p->tag == 38U ? float_bits((float)strtod(p->initial, NULL)) : + (uint32_t)strtoul(p->initial, NULL, 10); +} /* 函数功能:读原始TLV位模式;真实源失败不降级为模拟值。 */ static bool read_bits(size_t index, uint16_t area, uint32_t *out) { @@ -73,10 +111,15 @@ static bool read_bits(size_t index, uint16_t area, uint32_t *out) if ((p.tag == 1U && v != 0.0f && v != 1.0f) || (p.tag == 45U && (v > 65535.0f || (float)(uint32_t)v != v))) { return false; } *out = p.tag == 38U ? float_bits(v) : (uint32_t)v; +#ifdef IEC104_SOURCE_NO_VALUE_STORE + } else { *out = initial_bits(&p); } +#else } else { *out = values[slot(index, area)]; } +#endif return true; } /* 函数功能:按原始类型校验预置值和值域。 */ +#ifndef IEC104_SOURCE_NO_VALUE_STORE static bool valid_bits(size_t index, uint32_t raw) { iec104_dtu_parameter_t p; double v; @@ -99,7 +142,7 @@ static bool candidate(uint32_t ioa, uint16_t area, float *out) { size_t i = iec104_dtu_parameter_index(ioa); uint32_t raw; if (i >= IEC104_DTU_PARAMETER_COUNT) { return false; } - if (is_dirty(i)) { raw = staged[i]; } else if (!read_bits(i, area, &raw)) { return false; } + if (is_dirty(i)) { raw = staged[stage_slot(i)]; } else if (!read_bits(i, area, &raw)) { return false; } *out = bits_float(raw); return *out >= 0.0f && *out <= 1000000.0f; } /* 函数功能:完整校验后原子提交真实源,再发布RAM候选。 */ @@ -113,47 +156,55 @@ static bool commit_stage(uint16_t area) !candidate(0x8029U, 0U, &high) || low > high)) { return false; } for (i = 0U; i < IEC104_DTU_PARAMETER_COUNT; ++i) { if (!is_dirty(i)) { continue; } - if (!valid_bits(i, staged[i])) { return false; } + if (!valid_bits(i, staged[stage_slot(i)])) { return false; } (void)iec104_dtu_parameter(i, &p); if (mapped(&p, area, &id, &scale)) { if (n >= sizeof(changes) / sizeof(changes[0])) { return false; } changes[n].id = id; - changes[n++].value = (p.tag == 38U ? bits_float(staged[i]) : (float)staged[i]) * scale; + changes[n++].value = (p.tag == 38U ? bits_float(staged[stage_slot(i)]) : (float)staged[stage_slot(i)]) * scale; } } if (n != 0U && (!bindings.parameter_apply(bindings.context, changes, n, true) || !bindings.parameter_apply(bindings.context, changes, n, false))) { return false; } for (i = 0U; i < IEC104_DTU_PARAMETER_COUNT; ++i) { - if (is_dirty(i)) { values[slot(i, area)] = staged[i]; } + if (is_dirty(i)) { values[slot(i, area)] = staged[stage_slot(i)]; } } increment(&stats.parameter_commits); return true; } +#else +/* 函数功能:裁剪档固化入口;无值与预置表,一律按未启用拒绝并计数。 */ +static bool commit_stage(uint16_t area) +{ + (void)area; ++stats.parameter_rejected; + return false; +} +#endif /* 函数功能:服务启动恢复typed表默认,观测归零且无源置IV。 */ void iec104_source_init(void) { size_t i, a, g, m; iec104_dtu_parameter_t p; uint32_t raw; memset(&bindings, 0, sizeof(bindings)); memset(&stats, 0, sizeof(stats)); - memset(values, 0, sizeof(values)); memset(singles, 0, sizeof(singles)); + memset(singles, 0, sizeof(singles)); memset(single_set, 0, sizeof(single_set)); memset(doubles, 0, sizeof(doubles)); memset(steps, 0, sizeof(steps)); memset(bits, 0, sizeof(bits)); memset(measurements, 0, sizeof(measurements)); memset(measurement_set, 0, sizeof(measurement_set)); clear_stage(); clock_utc = UINT64_C(946684800000); clock_mono = 0U; +#ifndef IEC104_SOURCE_NO_VALUE_STORE + memset(values, 0, sizeof(values)); for (i = 0U; i < IEC104_DTU_PARAMETER_COUNT; ++i) { (void)iec104_dtu_parameter(i, &p); if (!p.configured) { continue; } - raw = p.tag == 38U ? float_bits((float)strtod(p.initial, NULL)) : (uint32_t)strtoul(p.initial, NULL, 10); + raw = initial_bits(&p); for (a = 0U; a < IEC104_DTU_AREA_COUNT; ++a) { if (iec104_dtu_parameter_visible(i, (uint16_t)a)) { values[slot(i, (uint16_t)a)] = raw; } } } +#else + (void)i; (void)a; (void)p; (void)raw; /* 裁剪档:参数值恒为 typed 表字面量,无需填充 */ +#endif memset(standard_values, 0, sizeof(standard_values)); for (i = 0U; i < IEC104_DTU_STANDARD_COUNT; ++i) { g = i / 30U; m = i % 30U; - standard_points[i].ioa = (uint32_t)(0x8601U + g * 0x20U + m); - standard_points[i].kind = g == 0U ? IEC60870_ASDU_KPA_THRESHOLD : - (g == 1U ? IEC60870_ASDU_KPA_LOW_LIMIT : - (g == 2U ? IEC60870_ASDU_KPA_HIGH_LIMIT : IEC60870_ASDU_KPA_SMOOTHING)); - standard_points[i].type_id = g == 3U ? 112U : (g == 0U && m >= 4U ? 110U : 111U); if (g == 0U) { standard_values[i].scaled = m >= 4U ? 655 : 200; } if (g == 1U) { standard_values[i].scaled = -10000; } if (g == 2U) { standard_values[i].scaled = 10000; } @@ -230,57 +281,102 @@ bool iec104_source_find(uint32_t ioa, iec104_source_object_t *out) } return ioa >= 0x6401U && ioa <= 0x6408U && iec104_source_counter(ioa - 0x6401U, out); } +/* 函数功能:命令点表模板;65点按IOA严格升序,常量常驻Flash不占RAM。 */ +/* 点位由型号固定,生成规则见下方注记;类型位为45..51与58..64两族对照。 */ +static const IEC104_CommandPoint_t command_points[IEC104_DTU_COMMAND_COUNT] = { + /* 19点:0x6001..0x6013,45单点/46双点交替 */ + { UINT32_C(0x6001), UINT16_C(0x0081), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6002), UINT16_C(0x0102), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6003), UINT16_C(0x0102), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6004), UINT16_C(0x0102), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6005), UINT16_C(0x0102), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6006), UINT16_C(0x0102), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6007), UINT16_C(0x0102), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6008), UINT16_C(0x0102), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6009), UINT16_C(0x0102), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x600A), UINT16_C(0x0102), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x600B), UINT16_C(0x0102), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x600C), UINT16_C(0x0102), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x600D), UINT16_C(0x0102), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x600E), UINT16_C(0x0102), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x600F), UINT16_C(0x0102), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6010), UINT16_C(0x0102), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6011), UINT16_C(0x0102), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6012), UINT16_C(0x0081), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6013), UINT16_C(0x0081), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + /* 8点:0x6101..0x6108,47升降 */ + { UINT32_C(0x6101), UINT16_C(0x0204), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6102), UINT16_C(0x0204), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6103), UINT16_C(0x0204), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6104), UINT16_C(0x0204), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6105), UINT16_C(0x0204), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6106), UINT16_C(0x0204), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6107), UINT16_C(0x0204), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6108), UINT16_C(0x0204), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + /* 30点:0x6201..0x621E,49标度 */ + { UINT32_C(0x6201), UINT16_C(0x0810), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6202), UINT16_C(0x0810), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6203), UINT16_C(0x0810), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6204), UINT16_C(0x0810), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6205), UINT16_C(0x0810), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6206), UINT16_C(0x0810), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6207), UINT16_C(0x0810), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6208), UINT16_C(0x0810), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6209), UINT16_C(0x0810), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x620A), UINT16_C(0x0810), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x620B), UINT16_C(0x0810), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x620C), UINT16_C(0x0810), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x620D), UINT16_C(0x0810), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x620E), UINT16_C(0x0810), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x620F), UINT16_C(0x0810), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6210), UINT16_C(0x0810), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6211), UINT16_C(0x0810), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6212), UINT16_C(0x0810), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6213), UINT16_C(0x0810), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6214), UINT16_C(0x0810), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6215), UINT16_C(0x0810), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6216), UINT16_C(0x0810), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6217), UINT16_C(0x0810), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6218), UINT16_C(0x0810), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x6219), UINT16_C(0x0810), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x621A), UINT16_C(0x0810), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x621B), UINT16_C(0x0810), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x621C), UINT16_C(0x0810), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x621D), UINT16_C(0x0810), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + { UINT32_C(0x621E), UINT16_C(0x0810), IEC104_COMMAND_MODE_SELECT_EXECUTE }, + /* 8点:0x6301..0x6308,51位串,仅直接执行 */ + { UINT32_C(0x6301), UINT16_C(0x2040), IEC104_COMMAND_MODE_DIRECT }, + { UINT32_C(0x6302), UINT16_C(0x2040), IEC104_COMMAND_MODE_DIRECT }, + { UINT32_C(0x6303), UINT16_C(0x2040), IEC104_COMMAND_MODE_DIRECT }, + { UINT32_C(0x6304), UINT16_C(0x2040), IEC104_COMMAND_MODE_DIRECT }, + { UINT32_C(0x6305), UINT16_C(0x2040), IEC104_COMMAND_MODE_DIRECT }, + { UINT32_C(0x6306), UINT16_C(0x2040), IEC104_COMMAND_MODE_DIRECT }, + { UINT32_C(0x6307), UINT16_C(0x2040), IEC104_COMMAND_MODE_DIRECT }, + { UINT32_C(0x6308), UINT16_C(0x2040), IEC104_COMMAND_MODE_DIRECT }, +}; +/* 函数功能:返回只读命令点表;点位模板常量常驻Flash,不再占RAM。 + * 点表不再逐点存公共地址,CA由命令模块按实例站点校验,故本表可跨CA共用。 */ const IEC104_CommandPoint_t *iec104_source_commands(uint16_t ca, size_t *count) { - size_t i; uint8_t type; - for (i = 0U; i < 65U; ++i) { - commands[i].common_address = ca; - if (i < 19U) { commands[i].ioa = (uint32_t)(0x6001U + i); type = i >= 1U && i <= 16U ? 46U : 45U; } - else if (i < 27U) { commands[i].ioa = (uint32_t)(0x6101U + i - 19U); type = 47U; } - else if (i < 57U) { commands[i].ioa = (uint32_t)(0x6201U + i - 27U); type = 49U; } - else { commands[i].ioa = (uint32_t)(0x6301U + i - 57U); type = 51U; } - commands[i].type_mask = IEC104_COMMAND_TYPE_BIT(type) | IEC104_COMMAND_TYPE_BIT(type + 13U); - commands[i].mode = type == 51U ? IEC104_COMMAND_MODE_DIRECT : IEC104_COMMAND_MODE_SELECT_EXECUTE; - } - if (count != NULL) { *count = 65U; } return commands; + (void)ca; + if (count != NULL) { *count = IEC104_DTU_COMMAND_COUNT; } + return command_points; } -/* 函数功能:改变模拟遥信并标识替代源,绝不驱动物理出口。 */ -static void set_single(uint32_t ioa, uint8_t v) -{ - size_t i; iec104_dtu_point_t p; - for (i = 0U; i < 59U; ++i) { - (void)iec104_dtu_point(i, &p); - if (p.ioa == ioa) { singles[i] = v; single_set[i] = 1U; break; } - } -} -/* 函数功能:选择不动作,执行修改可观测模拟状态。 */ +/* 函数功能:骨架档拒绝一切遥控命令,绝无副作用。 + * 设计(2026-11-18 裁定的方案 B):骨架阶段没有任何物理输出接缝——数据源绑定 + * 只覆盖遥信/遥测/定值,不含遥控——此时若把命令当"已启动"回肯定确认,vendor 会 + * 依次回 COT 7 肯定确认、COT 11 返回信息、COT 10 肯定终止,主站由此认定开关真的 + * 被操作过,而设备侧只改了一个 RAM 变量。因此对全部命令点、选择与执行两段一律返 + * 回 IEC104_COMMAND_ACTION_NOT_STARTED:vendor 据此回否定确认(COT 7 + P/N=1) + * 并结束事务,既不产生返回信息也不排 ACT_TERM,与割接前"除 YK11/YK12 外一律否定 + * 确认"的对外行为对齐。 + * 恢复真实出口时:把有出口的分支改成调用对应驱动并返回 STARTED 即可,模拟状态数组 + * (singles/doubles/steps/measurements/bits)保留未删可直接复用;当前无人置位, + * 它们的读出恒为"零值 + IV/SB"。 */ IEC104_CommandActionResult_t iec104_source_command(void *context, const IEC104_CommandRequest_t *r) { - size_t n; uint8_t type; - (void)context; - if (r == NULL) { return IEC104_COMMAND_ACTION_NOT_STARTED; } - type = r->type_id >= 58U ? (uint8_t)(r->type_id - 13U) : r->type_id; - if (r->is_select) { return IEC104_COMMAND_ACTION_STARTED; } - if (r->ioa >= 0x6002U && r->ioa <= 0x6011U && type == 46U && (r->state == 1U || r->state == 2U)) { - n = r->ioa - 0x6002U; doubles[n] = r->state; - if (n == 0U) { set_single(0x11U, r->state == 2U); set_single(0x28U, r->state == 1U); } - } else if (type == 45U && r->ioa == 0x6001U) { set_single(9U, r->state); } - else if (type == 45U && r->ioa == 0x6013U) { set_single(0x26U, r->state); } - else if (type == 45U && r->ioa == 0x6012U) { - /* Reset only the simulated latch. Never resets real protection state. */ - set_single(0x16U, 0U); increment(&stats.reset_actions); - } else if (type == 47U && r->ioa >= 0x6101U && r->ioa <= 0x6108U) { - if (r->state != 1U && r->state != 2U) { return IEC104_COMMAND_ACTION_NOT_STARTED; } - n = r->ioa - 0x6101U; - if ((r->state == 1U && steps[n] == -64) || (r->state == 2U && steps[n] == 63)) { return IEC104_COMMAND_ACTION_NOT_STARTED; } - steps[n] = (int8_t)(steps[n] + (r->state == 2U ? 1 : -1)); - } else if (type == 49U && r->ioa >= 0x6201U && r->ioa <= 0x621eU) { - n = r->ioa - 0x6201U; - if (r->value.scaled < -10000 || r->value.scaled > 10000) { return IEC104_COMMAND_ACTION_NOT_STARTED; } - measurements[n] = (float)r->value.scaled; measurement_set[n] = 1U; - } else if (type == 51U && r->ioa >= 0x6301U && r->ioa <= 0x6308U) { bits[r->ioa - 0x6301U] = r->value.bitstring; } - else { return IEC104_COMMAND_ACTION_NOT_STARTED; } - increment(&stats.simulated_actions); return IEC104_COMMAND_ACTION_STARTED; + (void)context; (void)r; + return IEC104_COMMAND_ACTION_NOT_STARTED; } /* 函数功能:列举动作反馈IOA;容量不足不写,WAIT不重执行动作。 */ size_t iec104_source_command_feedback(uint32_t ioa, uint32_t *out, size_t capacity) @@ -335,6 +431,9 @@ static IEC104_RemoteParameterActionResult_t remote_action(void *context, IEC104_RemoteParameterElement_t element; bool ok; (void)context; +#ifdef IEC104_SOURCE_NO_VALUE_STORE + (void)e; (void)i; (void)b; (void)raw; (void)p; (void)element; +#endif if (r == NULL) { return IEC104_REMOTE_PARAMETER_ACTION_REJECTED; } if (r->operation == IEC104_REMOTE_PARAMETER_OP_CANCEL || r->operation == IEC104_REMOTE_PARAMETER_OP_DISCARD) { clear_stage(); return IEC104_REMOTE_PARAMETER_ACTION_APPLIED; @@ -355,6 +454,11 @@ static IEC104_RemoteParameterActionResult_t remote_action(void *context, clear_stage(); return ok ? IEC104_REMOTE_PARAMETER_ACTION_APPLIED : IEC104_REMOTE_PARAMETER_ACTION_REJECTED; } if (r->operation != IEC104_REMOTE_PARAMETER_OP_PRESET) { return IEC104_REMOTE_PARAMETER_ACTION_REJECTED; } +#ifdef IEC104_SOURCE_NO_VALUE_STORE + /* 裁剪档:无预置表,预置一律显式拒绝并计数(不静默丢弃)。 */ + ++stats.parameter_rejected; clear_stage(); + return IEC104_REMOTE_PARAMETER_ACTION_REJECTED; +#else if (r->first_frame) { clear_stage(); owner = *r; owner._data = NULL; owner._length = 0U; stage_active = true; } if (!same_owner(r) || owner.sn != r->sn || stage_complete) { clear_stage(); return IEC104_REMOTE_PARAMETER_ACTION_REJECTED; } for (e = 0U; e < r->count; ++e) { @@ -368,19 +472,29 @@ static IEC104_RemoteParameterActionResult_t remote_action(void *context, raw = 0U; for (b = 0U; b < element.length; ++b) { raw |= (uint32_t)element.value[b] << (8U * b); } if (!valid_bits(i, raw)) { clear_stage(); return IEC104_REMOTE_PARAMETER_ACTION_REJECTED; } - staged[i] = raw; dirty[i / 8U] |= (uint8_t)(1U << (i % 8U)); + { size_t s = stage_slot(i); staged[s] = raw; dirty[s / 8U] |= (uint8_t)(1U << (s % 8U)); } } stage_complete = !r->more_follows; return IEC104_REMOTE_PARAMETER_ACTION_APPLIED; +#endif } const IEC104_RemoteParameterHandlers_t iec104_source_remote_handlers = {remote_action, remote_lookup}; -/* 函数功能:装配标准参数模块借用的稳定点表和值存储。 */ +/* 函数功能:装配标准参数模块借用的稳定点表和值存储。 + * 说明:120 行同 CA,点表按 (CA,IOA) 升序;LOAD 校验和总召编码都用 standard_points。 */ void iec104_source_parameter_config(uint16_t ca, IEC104_ParameterConfig_t *config) { - size_t i; + size_t i, g, m; if (config == NULL) { return; } IEC104_Parameter_Config_Default(config); - for (i = 0U; i < 120U; ++i) { standard_points[i].common_address = ca; } + for (i = 0U; i < IEC104_DTU_STANDARD_COUNT; ++i) { + g = i / 30U; m = i % 30U; + standard_points[i].common_address = ca; + standard_points[i].ioa = (uint32_t)(0x8601U + g * 0x20U + m); + standard_points[i].kind = g == 0U ? IEC60870_ASDU_KPA_THRESHOLD : + (g == 1U ? IEC60870_ASDU_KPA_LOW_LIMIT : + (g == 2U ? IEC60870_ASDU_KPA_HIGH_LIMIT : IEC60870_ASDU_KPA_SMOOTHING)); + standard_points[i].type_id = g == 3U ? 112U : (g == 0U && m >= 4U ? 110U : 111U); + } config->points = standard_points; config->values = standard_values; config->point_count = 120U; } /* 函数功能:校验标准参数装载;TEST不改值,周期许可由核心执行。 */ @@ -388,12 +502,20 @@ IEC104_ParameterActionResult_t iec104_source_parameter_action(void *context, con { size_t i, m, g; bool valid = false; (void)context; +#ifdef IEC104_SOURCE_NO_VALUE_STORE + (void)i; (void)m; (void)g; (void)valid; +#endif if (r == NULL || r->phase != IEC104_PARAMETER_PHASE_EXECUTE) { return IEC104_PARAMETER_ACTION_REJECTED; } if (r->operation != IEC104_PARAMETER_OP_LOAD) { /* QPA=3 selects periodic transmission; no value mutation is needed. * Core owns scheduling and must apply its scan enable after acceptance. */ return r->qpa == 3U && r->ioa == 0U ? IEC104_PARAMETER_ACTION_APPLIED : IEC104_PARAMETER_ACTION_REJECTED; } +#ifdef IEC104_SOURCE_NO_VALUE_STORE + /* 裁剪档:标准参数只读,装载一律显式拒绝并计数(不静默丢弃)。 */ + ++stats.parameter_rejected; + return IEC104_PARAMETER_ACTION_REJECTED; +#else i = r->point_index; if (i >= 120U || standard_points[i].ioa != r->ioa || standard_points[i].type_id != r->type_id) { return IEC104_PARAMETER_ACTION_UNKNOWN_IOA; } m = i % 30U; g = i / 30U; @@ -404,6 +526,7 @@ IEC104_ParameterActionResult_t iec104_source_parameter_action(void *context, con if (!valid) { return IEC104_PARAMETER_ACTION_REJECTED; } if (!r->test) { standard_values[i] = r->value; increment(&stats.parameter_commits); } return IEC104_PARAMETER_ACTION_APPLIED; +#endif } /* 函数功能:设置仅设备虚拟墙钟的UTC纪元及单调基点。 */ void iec104_source_clock_seed(uint64_t utc_ms, uint64_t mono_ms) diff --git a/App/protocol/iec104/iec104_source.h b/App/protocol/iec104/iec104_source.h index 10e72a7d..c4a9c976 100644 --- a/App/protocol/iec104/iec104_source.h +++ b/App/protocol/iec104/iec104_source.h @@ -40,6 +40,10 @@ typedef struct { typedef struct { uint32_t simulated_actions, physical_do_actions, parameter_commits, clock_sets; uint32_t reset_actions; + /* Counts parameter writes refused because the build has no value store + * (IEC104_SOURCE_NO_VALUE_STORE). Always 0 in the full-feature build, where + * refusals are ordinary protocol rejections and not tracked here. */ + uint32_t parameter_rejected; uint16_t current_area; bool synchronized; } iec104_source_stats_t; diff --git a/App/protocol/iec104/iec104_source_ranks.h b/App/protocol/iec104/iec104_source_ranks.h new file mode 100644 index 00000000..19fe3c67 --- /dev/null +++ b/App/protocol/iec104/iec104_source_ranks.h @@ -0,0 +1,202 @@ +/* 模块名称:参数值槽 rank 映射表(生成文件,勿手改)。 */ +/* GENERATED FILE - do not edit by hand. + * Source: App/protocol/iec60870/examples/iec104_dtu_profile.h (const profile table). + * Generator: ci-artifacts/iec104-cutover/gen_source_ranks.py + * Design: ci-artifacts/iec104-cutover/package-b-design.md + * Include exactly once, from App/protocol/iec104/iec104_source.c only. + * + * Ranks are uint16_t because the largest rank is 344 (configured) / 263 (writable), + * both above 0xFF. A uint8_t table would alias sentinel 0xFF with rank 255 and + * silently mis-map one parameter, so uint8_t is not an option here. + */ +#ifndef IEC104_SOURCE_RANKS_H +#define IEC104_SOURCE_RANKS_H + +#include + +#define IEC104_SOURCE_CONFIGURED_TOTAL 345U +#define IEC104_SOURCE_SCOPED_TOTAL 88U +#define IEC104_SOURCE_WRITABLE_TOTAL 264U +#define IEC104_SOURCE_STAGE_NO_RANK 0xFFFFU + +/* Dense value slots: configured in area 0, area_scoped in areas 1..4. */ +#define IEC104_SOURCE_VALUE_SLOTS \ + (IEC104_SOURCE_CONFIGURED_TOTAL + 4U * IEC104_SOURCE_SCOPED_TOTAL) +#define IEC104_SOURCE_STAGE_SLOTS IEC104_SOURCE_WRITABLE_TOTAL +#define IEC104_SOURCE_DIRTY_BYTES ((IEC104_SOURCE_WRITABLE_TOTAL + 7U) / 8U) + +/* rank among configured parameters -> area-0 value slot (0xFFFF = not visible) */ +static const uint16_t iec104_source_value_rank[430] = { + 0U, 1U, 2U, 3U, 4U, 5U, 6U, 7U, + 8U, 9U, 10U, 11U, 12U, 13U, 14U, 15U, + 16U, 17U, 18U, 19U, 20U, 21U, 22U, 23U, + 24U, 25U, 26U, 27U, 28U, 29U, 30U, 31U, + 32U, 33U, 34U, 35U, 36U, 37U, 38U, 39U, + 40U, 41U, 42U, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 43U, 44U, 45U, 46U, 47U, 48U, 49U, + 50U, 51U, 52U, 53U, 54U, 55U, 56U, 57U, + 58U, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 59U, + 60U, 61U, 62U, 63U, 64U, 65U, 66U, 67U, + 68U, 69U, 70U, 71U, 72U, 73U, 74U, 75U, + 76U, 77U, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 78U, 79U, + 80U, 81U, 82U, 83U, 84U, 85U, 86U, 87U, + 88U, 89U, 90U, 91U, 92U, 93U, 94U, 95U, + 96U, 97U, 98U, 99U, 100U, 101U, 102U, 103U, + 104U, 105U, 106U, 107U, 108U, 109U, 110U, 111U, + 112U, 113U, 114U, 115U, 116U, 117U, 118U, 119U, + 120U, 121U, 122U, 123U, 124U, 125U, 126U, 127U, + 128U, 129U, 130U, 131U, 132U, 133U, 134U, 135U, + 136U, 137U, 138U, 139U, 140U, 141U, 142U, 143U, + 144U, 145U, 146U, 147U, 148U, 149U, 150U, 151U, + 152U, 153U, 154U, 155U, 156U, 157U, 158U, 159U, + 160U, 161U, 162U, 163U, 164U, 165U, 166U, 167U, + 168U, 169U, 170U, 171U, 172U, 173U, 174U, 175U, + 176U, 177U, 178U, 179U, 180U, 181U, 182U, 183U, + 184U, 185U, 186U, 187U, 188U, 189U, 190U, 191U, + 192U, 193U, 194U, 195U, 196U, 197U, 198U, 199U, + 200U, 201U, 202U, 203U, 204U, 205U, 206U, 207U, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 208U, 209U, 210U, + 211U, 212U, 213U, 214U, 215U, 216U, 217U, 218U, + 219U, 220U, 221U, 222U, 223U, 224U, 225U, 226U, + 227U, 228U, 229U, 230U, 231U, 232U, 233U, 234U, + 235U, 236U, 237U, 238U, 239U, 240U, 241U, 242U, + 243U, 244U, 245U, 246U, 247U, 248U, 249U, 250U, + 251U, 252U, 253U, 254U, 255U, 256U, 257U, 258U, + 259U, 260U, 261U, 262U, 263U, 264U, 265U, 266U, + 267U, 268U, 269U, 270U, 271U, 272U, 273U, 274U, + 275U, 276U, 277U, 278U, 279U, 280U, 281U, 282U, + 283U, 284U, 285U, 286U, 287U, 288U, 289U, 290U, + 291U, 292U, 293U, 294U, 295U, 296U, 297U, 298U, + 299U, 300U, 301U, 302U, 303U, 304U, 305U, 306U, + 307U, 308U, 309U, 310U, 311U, 312U, 313U, 314U, + 315U, 316U, 317U, 318U, 319U, 320U, 321U, 322U, + 323U, 324U, 325U, 326U, 327U, 328U, 329U, 330U, + 331U, 332U, 333U, 334U, 335U, 336U, 337U, 338U, + 339U, 340U, 341U, 342U, 343U, 344U, +}; + +/* rank among area_scoped parameters -> offset inside one area bank */ +static const uint16_t iec104_source_scope_rank[430] = { + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0U, 1U, + 2U, 3U, 4U, 5U, 6U, 7U, 8U, 9U, + 10U, 11U, 12U, 13U, 14U, 15U, 16U, 17U, + 18U, 19U, 20U, 21U, 22U, 23U, 24U, 25U, + 26U, 27U, 28U, 29U, 30U, 31U, 32U, 33U, + 34U, 35U, 36U, 37U, 38U, 39U, 40U, 41U, + 42U, 43U, 44U, 45U, 46U, 47U, 48U, 49U, + 50U, 51U, 52U, 53U, 54U, 55U, 56U, 57U, + 58U, 59U, 60U, 61U, 62U, 63U, 64U, 65U, + 66U, 67U, 68U, 69U, 70U, 71U, 72U, 73U, + 74U, 75U, 76U, 77U, 78U, 79U, 80U, 81U, + 82U, 83U, 84U, 85U, 86U, 87U, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, +}; + +/* rank among writable parameters -> staged[] slot and dirty bit index */ +static const uint16_t iec104_source_stage_rank[430] = { + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0U, 1U, + 2U, 3U, 4U, 5U, 6U, 7U, 8U, 9U, + 10U, 11U, 12U, 13U, 14U, 15U, 16U, 17U, + 18U, 19U, 20U, 21U, 22U, 23U, 24U, 25U, + 26U, 27U, 28U, 29U, 30U, 31U, 32U, 33U, + 34U, 35U, 36U, 37U, 38U, 39U, 40U, 41U, + 42U, 43U, 44U, 45U, 46U, 47U, 48U, 49U, + 50U, 51U, 52U, 53U, 54U, 55U, 56U, 57U, + 58U, 59U, 60U, 61U, 62U, 63U, 64U, 65U, + 66U, 67U, 68U, 69U, 70U, 71U, 72U, 73U, + 74U, 75U, 76U, 77U, 78U, 79U, 80U, 81U, + 82U, 83U, 84U, 85U, 86U, 87U, 88U, 89U, + 90U, 91U, 92U, 93U, 94U, 95U, 96U, 97U, + 98U, 99U, 100U, 101U, 102U, 103U, 104U, 105U, + 106U, 107U, 108U, 109U, 110U, 111U, 112U, 113U, + 114U, 115U, 116U, 117U, 118U, 119U, 120U, 121U, + 122U, 123U, 124U, 125U, 126U, 127U, 128U, 129U, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU, + 130U, 131U, 132U, 133U, 134U, 135U, 136U, 137U, + 138U, 139U, 140U, 141U, 142U, 143U, 144U, 145U, + 146U, 147U, 148U, 149U, 150U, 151U, 152U, 153U, + 154U, 155U, 156U, 157U, 158U, 159U, 160U, 161U, + 162U, 163U, 164U, 165U, 166U, 167U, 168U, 169U, + 170U, 171U, 172U, 173U, 174U, 175U, 176U, 177U, + 178U, 179U, 180U, 181U, 182U, 183U, 184U, 185U, + 186U, 187U, 188U, 189U, 190U, 191U, 192U, 193U, + 194U, 195U, 196U, 197U, 198U, 199U, 200U, 201U, + 202U, 203U, 204U, 205U, 206U, 207U, 208U, 209U, + 210U, 211U, 212U, 213U, 214U, 215U, 216U, 217U, + 218U, 219U, 220U, 221U, 222U, 223U, 224U, 225U, + 226U, 227U, 228U, 229U, 230U, 231U, 232U, 233U, + 234U, 235U, 236U, 237U, 238U, 239U, 240U, 241U, + 242U, 243U, 244U, 245U, 246U, 247U, 248U, 249U, + 250U, 251U, 252U, 253U, 254U, 255U, 256U, 257U, + 258U, 259U, 260U, 261U, 262U, 263U, +}; + +#endif /* IEC104_SOURCE_RANKS_H */ diff --git a/App/protocol/iec60870/104/IEC104_AsduQueue.h b/App/protocol/iec60870/104/IEC104_AsduQueue.h index 249c56f7..875cb752 100644 --- a/App/protocol/iec60870/104/IEC104_AsduQueue.h +++ b/App/protocol/iec60870/104/IEC104_AsduQueue.h @@ -28,7 +28,7 @@ typedef struct { #define IEC104_ASDU_STRICT_HIGH_ENTRY_HEADER_LEN 19U /* 票号8、受理顺序8、长度2、等级1,逐字段memcpy。 */ #define IEC104_ASDU_SOE_SLOT_LEN 26U /* serial8、state/rank1、完整单对象ASDU17;逐字节存储,无ABI填充。 */ #define IEC104_ASDU_SOE_ASDU_LEN 17U -#define IEC104_ASDU_SOE_MAX_CAPACITY 256U +#define IEC104_ASDU_SOE_MAX_CAPACITY 128U /* SOE统计以单对象事件为单位;pending_count不含仍待应用决定的deferred_count。 */ typedef struct { diff --git a/App/protocol/iec60870/104/IEC104_Slave.h b/App/protocol/iec60870/104/IEC104_Slave.h index bede05d5..969365a6 100644 --- a/App/protocol/iec60870/104/IEC104_Slave.h +++ b/App/protocol/iec60870/104/IEC104_Slave.h @@ -656,7 +656,7 @@ IEC104_TcpSubmitResult_t IEC104_Slave_Enqueue_Event(IEC104_Slave_t *self, IEC608 * 输入参数:self/asdu——从站与标准104原文;priority——业务等级;deferred——是否先保留补报占位。 * 输出参数:ticket——可选身份输出,仅OK写入;deferred为true时不可为空。 * 返回值:OK已保存,WAIT未接手,ERROR输入非法,FATAL服务队列失效。 - * 说明:完整保存17字节原文;256条满后仅覆盖最旧SOE,普通缓存不能挤占;成功不表示ACK。 + * 说明:完整保存17字节原文;128条满后仅覆盖最旧SOE,普通缓存不能挤占;成功不表示ACK。 */ IEC104_TcpSubmitResult_t IEC104_Slave_Enqueue_Soe(IEC104_Slave_t *self, IEC60870_Asdu_t *asdu, IEC104_BusinessPriority_t priority, bool deferred, IEC104_SoeTicket_t *ticket); diff --git a/App/protocol/iec60870/104/IEC104_TcpServer.c b/App/protocol/iec60870/104/IEC104_TcpServer.c index 600ceeb7..d0af59ff 100644 --- a/App/protocol/iec60870/104/IEC104_TcpServer.c +++ b/App/protocol/iec60870/104/IEC104_TcpServer.c @@ -149,7 +149,7 @@ typedef struct { _Static_assert(IEC104_TCP_SERVER_CAPACITY > 0U, "Server pool must not be empty"); _Static_assert(IEC104_TCP_SOE_CAPACITY == IEC104_ASDU_SOE_MAX_CAPACITY, - "SOE storage must retain 256 events"); + "SOE storage must retain 128 events"); _Static_assert(IEC104_TCP_ACK_WATCH_CAPACITY > 0U, "ACK watch pool must not be empty"); _Static_assert(sizeof(((IEC104_TcpPeerInfo_t *)0)->address) == sizeof(((IEC104_NetPeer_t *)0)->address), "Public peer address storage must match the network endpoint"); diff --git a/App/protocol/iec60870/104/IEC104_TcpServer.h b/App/protocol/iec60870/104/IEC104_TcpServer.h index e46ccacc..51c162a7 100644 --- a/App/protocol/iec60870/104/IEC104_TcpServer.h +++ b/App/protocol/iec60870/104/IEC104_TcpServer.h @@ -172,7 +172,7 @@ extern IEC104_TcpSubmitResult_t IEC104_TcpServer_Enqueue_Event( IEC104_TcpServer_t *server, const uint8_t *asdu, uint16_t asdu_length); /** - * 功能:将单对象Type30/31、COT3原文保存到独立256条SOE区。 + * 功能:将单对象Type30/31、COT3原文保存到独立128条SOE区。 * 输入参数:server——服务;asdu/asdu_length——标准104原文,长度17;priority——业务等级;deferred——暂缓补报。 * 输出参数:ticket——可为NULL,仅OK写入服务期身份;deferred为true时必填。 * 返回值:OK已保存;WAIT未接手;ERROR参数或阶段非法;FATAL队列失效。 diff --git a/App/protocol/iec60870/104/IEC104_TcpServer_Config.h b/App/protocol/iec60870/104/IEC104_TcpServer_Config.h index 6370c527..7f0313b5 100644 --- a/App/protocol/iec60870/104/IEC104_TcpServer_Config.h +++ b/App/protocol/iec60870/104/IEC104_TcpServer_Config.h @@ -26,7 +26,7 @@ #define IEC104_TCP_NORMAL_CAPACITY 4096U /* 字节数:包含NORMAL条目头和原文;空间不足可覆盖最旧原文。 */ #endif /* 独立SOE区按事件计数;单对象Type30/31每条固定26字节,另按发送记录槽数预留退休身份。 */ -#define IEC104_TCP_SOE_CAPACITY 256U +#define IEC104_TCP_SOE_CAPACITY 128U #ifndef IEC104_TCP_CONTROL_CAPACITY #define IEC104_TCP_CONTROL_CAPACITY 8U /* 槽数:待发及正在发送的S/U帧,不占用业务I帧记录槽。 */ #endif diff --git a/App/protocol/iec60870/104/business/IEC104_Command.c b/App/protocol/iec60870/104/business/IEC104_Command.c index 21e67636..8328f574 100644 --- a/App/protocol/iec60870/104/business/IEC104_Command.c +++ b/App/protocol/iec60870/104/business/IEC104_Command.c @@ -222,6 +222,9 @@ typedef struct { struct IEC104_Command { IEC104_Slave_t *slave; /* 借用的所属服务,寿命必须覆盖本实例。 */ + /* [vendor 兼容补丁] 实例站点CA:首次受理请求时绑定,表不再逐点存CA。 */ + uint16_t station_ca; + bool ca_bound; /* station_ca是否已绑定;绑定后不再改变。 */ IEC104_SlaveEventIdentity_t session; /* 已按FIFO消费的连接/启停通知所确定的会话身份。 */ IEC104_CommandConfig_t config; /* Create时按值复制;其中points数组借用至Destroy,期间不可变。 */ IEC104_CommandStatus_t status; /* 累计计数及模块活动状态;调度字段由Get_Status即时计算。 */ @@ -260,6 +263,8 @@ static bool Owned(const IEC104_Command_t *self) * 输出参数:无。 * 返回值:(config->points == NULL) != (config->point_count == 0U) || config->point_count > SIZE_MAX / sizeof(*config->points)时返回false;其余分支返回false、true。 * 说明:全局禁用的类型可以保留在共享点表中;未知类型及51/64的选择模式不能入表。 + * [vendor 兼容补丁] 点表不再逐点存CA,故此处只校验IOA唯一/有序; + * 请求CA与本实例站点的匹配改由Find_Point在受理时判定。 */ static bool Valid_Points(const IEC104_CommandConfig_t *config) { @@ -268,40 +273,40 @@ static bool Valid_Points(const IEC104_CommandConfig_t *config) config->point_count > SIZE_MAX / sizeof(*config->points)) { return false; } for (i = 0U; i < config->point_count; ++i) { const IEC104_CommandPoint_t *point = &config->points[i]; - if (point->common_address == 0U || point->common_address == UINT16_MAX || - point->ioa == 0U || point->ioa > UINT32_C(0xffffff) || + /* [vendor 兼容补丁] 点表不再逐点存CA,CA合法性由实例站点与Slave注册表保证。 */ + if (point->ioa == 0U || point->ioa > UINT32_C(0xffffff) || point->type_mask == 0U || (point->type_mask & (uint16_t)~COMMAND_SUPPORTED_MASK) != 0U || (point->mode != IEC104_COMMAND_MODE_DIRECT && point->mode != IEC104_COMMAND_MODE_SELECT_EXECUTE) || (point->mode == IEC104_COMMAND_MODE_SELECT_EXECUTE && (point->type_mask & COMMAND_DIRECT_ONLY_MASK) != 0U)) { return false; } if (i != 0U) { const IEC104_CommandPoint_t *previous = &config->points[i - 1U]; - if (previous->common_address > point->common_address || - (previous->common_address == point->common_address && previous->ioa >= point->ioa)) { return false; } + if (previous->ioa >= point->ioa) { return false; } } } return true; } /** - * 功能:点表按CA/IOA排序,借用期间不可修改。 - * 输入参数:self——本模块实例。 - * ca——ASDU公共地址。 + * 功能:点表按IOA排序,借用期间不可修改。 + * 输入参数:self——本模块实例(提供表起点与长度)。 + * ca——ASDU公共地址;[vendor 兼容补丁] 仅做站点归属校验,不参与点表比较。 * ioa——信息体地址。 * 输出参数:无。 - * 返回值:二分查找不分配存储,空表自然返回NULL。 + * 返回值:二分查找不分配存储,空表或CA与本实例站点不符时自然返回NULL。 * 说明:二分查找不分配存储,空表自然返回NULL。 + * 表内不再逐点存CA,CA匹配由调用方的站点注册表判定;本函数在此保留CA参数 + * 只为维持原有拒绝语义(非本实例CA的请求一律当作未知IOA处理)。 */ static const IEC104_CommandPoint_t *Find_Point(const IEC104_Command_t *self, uint16_t ca, uint32_t ioa) { size_t first = 0U, last = self->config.point_count; + if (ca != self->station_ca) { return NULL; } while (first < last) { size_t middle = first + (last - first) / 2U; const IEC104_CommandPoint_t *point = &self->config.points[middle]; - if (point->common_address == ca && point->ioa == ioa) { return point; } - if (point->common_address < ca || (point->common_address == ca && point->ioa < ioa)) { - first = middle + 1U; - } else { last = middle; } + if (point->ioa == ioa) { return point; } + if (point->ioa < ioa) { first = middle + 1U; } else { last = middle; } } return NULL; } @@ -1242,6 +1247,10 @@ static IEC104_CommandEventResult_t Request(IEC104_Command_t *self, const IEC104_ } ioa = Read_IOA(data); station = IEC104_Slave_Get_Station(self->slave, info.common_address); + /* [vendor 兼容补丁] 表按IOA排序、不逐点存CA:首次受理时把请求CA绑定为实例CA。 + * 站点已在编译期注册且CS104不允许运行期增删,故绑定结果与旧实现的逐点CA一致; + * 之后任何与该CA不符的请求都在Find_Point处按未知IOA处理,保持原拒绝路径不变。 */ + if (!self->ca_bound && station != NULL) { self->station_ca = info.common_address; self->ca_bound = true; } is_select = Is_Select(layout, data); if (info.cause_of_transmission != IEC60870_ASDU_COT_ACTIVATION && info.cause_of_transmission != IEC60870_ASDU_COT_DEACTIVATION) { @@ -1442,7 +1451,7 @@ void IEC104_Command_Config_Default(IEC104_CommandConfig_t *config) * 输入参数:slave为有效服务句柄,寿命覆盖本实例;config按值复制,但其中点表借用至Destroy。 * 输出参数:成功时初始化空事务、空回复池和零统计,不建立网络监听,也不调用应用代码。 * 返回值:成功为池内不透明句柄;点表/类型位/期限配置非法、重复绑定、池满或实例号耗尽返回NULL。 - * 说明:约束:必须早于消费Slave通知创建;点表有序、唯一且实例存活期间不可变, + * 说明:约束:必须早于消费Slave通知创建;点表按IOA唯一且有序、实例存活期间不可变, * 当前允许45..51及58..64;51/64只允许直接执行,时区为-1439..1439。 */ IEC104_Command_t *IEC104_Command_Create(IEC104_Slave_t *slave, const IEC104_CommandConfig_t *config) diff --git a/App/protocol/iec60870/104/business/IEC104_Command.h b/App/protocol/iec60870/104/business/IEC104_Command.h index 710d68f9..fed89430 100644 --- a/App/protocol/iec60870/104/business/IEC104_Command.h +++ b/App/protocol/iec60870/104/business/IEC104_Command.h @@ -55,11 +55,15 @@ typedef enum { IEC104_COMMAND_MODE_SELECT_EXECUTE /* 须先选择,执行必须匹配仍有效的本事务选择。 */ } IEC104_CommandMode_t; -/* 同一CA/IOA仅一项;按common_address、ioa严格升序排列,Create校验、受理时二分查找。 +/* 同一IOA仅一项;按ioa严格升序排列,Create校验、受理时二分查找。 * 表由应用拥有,从Create到Destroy须保持有效且只读;可放在静态const存储中。 - * 库不复制点表、不持有设备指针。动态闭锁、权限和数值限值仍由应用在Accept前判断。 */ + * 库不复制点表、不持有设备指针。动态闭锁、权限和数值限值仍由应用在Accept前判断。 + * + * 公共地址不逐点存储:实例的站点CA即表的CA(自Create起恒定)。 + * 因此一张点位相同的表可被不同CA的实例共用,不必按CA复制。 + * [vendor 兼容补丁] ARM Compiler 5 下 uint16_t 为2字节对齐, + * 去掉 common_address 后本结构由12字节降到8字节。 */ typedef struct { - uint16_t common_address; /* 1..65534;允许先配置,受理时该CA仍必须已注册。 */ uint32_t ioa; /* 1..0xFFFFFF,控制点地址。 */ uint16_t type_mask; /* 非零,限14种已知类型;实际可用类型与全局type_mask取交集。 */ IEC104_CommandMode_t mode; /* 此点所有允许类型共用同一种执行方式。 */ @@ -92,7 +96,7 @@ typedef struct { uint32_t time_tag_max_delay_ms; /* 默认10000;0只关闭时差检查,仍拒绝IV=1/UTC换算失败。 */ int16_t master_utc_offset_minutes; /* 主站标准时区,默认480,范围-1439..1439;SU另由公共层处理。 */ bool negative_on_expired; /* TEST=0默认true否定COT49,受理/动作前均适用;false静默。TEST始终否定。 */ - const IEC104_CommandPoint_t *points; /* 按CA/IOA排序的只读点表,默认NULL;模式由各点决定。 */ + const IEC104_CommandPoint_t *points; /* 按IOA排序的只读点表,默认NULL;模式由各点决定。 */ size_t point_count; /* 点数,默认0;须与points同时为空或同时非空。 */ } IEC104_CommandConfig_t; diff --git a/App/protocol/iec60870/104/business/IEC104_Spontaneous.h b/App/protocol/iec60870/104/business/IEC104_Spontaneous.h index 7cfac7f2..1f9744a1 100644 --- a/App/protocol/iec60870/104/business/IEC104_Spontaneous.h +++ b/App/protocol/iec60870/104/business/IEC104_Spontaneous.h @@ -215,7 +215,7 @@ void IEC104_Spontaneous_Clear_Time_Base(IEC104_Spontaneous_t *self); * 原后缀,保留值、品质和采集时刻;双报的未完成块可能已交接PLAIN,重试允许该副本重复。 * Type207冻结事件使用TIME_UTC或TIME_MONOTONIC;后者按本次UTC基准换算,AT_PUBLISH重新取时。 * 有效句柄的count=0直接成功,允许changes=NULL且不要求已Init;QUEUE/SUBMIT应恢复服务。 - * 显式PLAIN或双报仍用通用缓存,不享有独立256条SOE保留额度。成功表示接手,仍可被新变化覆盖。 + * 显式PLAIN或双报仍用通用缓存,不享有独立128条SOE保留额度。成功表示接手,仍可被新变化覆盖。 */ IEC104_SpontaneousPublishResult_t IEC104_Spontaneous_Publish( IEC104_Spontaneous_t *self, const IEC104_SpontaneousChange_t *changes, diff --git a/App/protocol/iec60870/IMPORT.md b/App/protocol/iec60870/IMPORT.md index e5d6ede1..4ae7d4bf 100644 --- a/App/protocol/iec60870/IMPORT.md +++ b/App/protocol/iec60870/IMPORT.md @@ -11,8 +11,8 @@ recorded in the directory manifests before local compatibility edits. | Check | Status | | --- | --- | -| Original byte provenance | `UPSTREAM.sha256`; independent final 84-file check passed, six controlled source differences | -| C99 assertions | 43 original invocations unchanged; independent AC5 true passes / false fails, invalid capacities including SOE128 rejected | +| Original byte provenance | `UPSTREAM.sha256`; independent final 84-file check passed, seventeen locally differing files: twelve reviewed patches and five trailing-blank-line-only. The command-table patch spans two files in one directory (`IEC104_Command.h` and `.c`) and both are counted. The SOE-128 change touches `IEC104_TcpServer_Config.h` and `IEC104_AsduQueue.h` (capacity) plus `IEC104_TcpServer.c` (assert message text), with three comment-only corrections in `IEC104_Slave.h`, `IEC104_TcpServer.h`, `IEC104_Spontaneous.h` (stale "256" SOE wording fixed to 128, quantifiers only, semantics untouched; Lead decision 2026-11-18). | +| C99 assertions | 43 original invocations remain; every assertion condition unchanged (one message text tracks the SOE capacity macro); independent AC5 true passes / false fails, invalid capacities including SOE128 rejected | | Final compiler diagnostics | Independent AC5 default/compact: 62 translation-unit compilations, RC0 and zero diagnostics; simulator and runtime tests tracked separately | | Static memory / runtime integration | Separate build-verifier and integration task evidence; no board runtime claim | | License | No license grant confirmed; redistribution not authorized by this import | @@ -30,7 +30,10 @@ Local edits use the Edit tool only. standalone Net header. In pre-C11 C, each existing assertion expands to a line-unique typedef with array bound `(condition) ? 1 : -1`; false assertions are compile errors. C11 targets retain native assertions. All 43 assertion - invocations and their conditions/messages remain unchanged, including SOE=256. + invocations remain, and every assertion CONDITION is unchanged. The only + message text that differs is the SOE guard's event count, which tracks the + capacity macro this product sets to 128 (see below); on C99 the message is + discarded by the shim, so no assertion semantics move with it. - `104/IEC104_TcpServer.c`: two explicit `IEC104_TcpEventType_t` casts when expanding the byte-sized ring header into event validation helpers; no condition, capacity, storage layout or runtime behavior is changed. @@ -38,16 +41,68 @@ Local edits use the Edit tool only. convert nonnegative enum range checks to unsigned upper-bound comparisons. Invalid negative values still convert above the valid range and are rejected; AC5 no longer diagnoses pointless unsigned comparisons against zero. -- `104/business/IEC104_Command.h`: mask each TYPE_BIT shift count with 15. +- `104/business/IEC104_Command.h` + `104/business/IEC104_Command.c`: mask each + TYPE_BIT shift count with 15, and remove the per-point `common_address`. Selected valid branches already use shifts 0..13; range guards still return zero for unsupported types. This avoids MSVC diagnostics about unsigned underflow in unselected conditional branches, not a proven executed runtime UB. + The point table now sorts by IOA only; the instance binds its station CA on the + first accepted request and `Find_Point` rejects any other CA before searching, + so a CA mismatch still takes the unchanged unknown-IOA path. Point entry size + drops from 12 to 8 bytes on ARM Compiler 5, letting the application hold the + table in const Flash instead of static RAM. No capacity, SOE, ordering or + acceptance semantics change; see `ci-artifacts/iec104-mcu-skeleton/core-trim/` + for the element-wise and lookup equivalence probes. - Added `common/IEC60870_FaultEvent.c` as an exact-copy link dependency of `IEC104_Spontaneous_Publish_Fault_Event`, with Lead authorization. - `UPSTREAM.sha256`: 84 original byte hashes (29 implementations, 54 directory headers and the declarative profile header). Paths are relative to this directory and to `IEC60870-Slave/`; hashes describe upstream bytes, not the - six locally patched files. The compatibility header is new and not upstream. + twelve locally differing files. The compatibility header is new and not upstream. +- Trailing blank lines: five files (`common/IEC60870_Codec.c`, + `common/IEC60870_InformationObjects.c`, `common/IEC60870_InformationObjects.h`, + `common/IEC60870_InformationObjects_Internal.h`, + `examples/iec104_dtu_profile.h`) differ from upstream by exactly one + end-of-file blank line, removed by the repository's `end-of-file-fixer` + pre-commit hook (it does not exempt this tree). Content normalized for that + single line is byte-identical to upstream, and `verify_vendor.py` asserts as + much: its `BLANK` class may only list such files, and a semantic edit carried + into one of them fails the check instead of hiding behind the class. +- SOE capacity: this product sets `IEC104_TCP_SOE_CAPACITY` and + `IEC104_ASDU_SOE_MAX_CAPACITY` to `128U` (upstream `256U`) to fit the RAM + budget, and the guard message text follows the new count. IEC 60870-5-101/104 + does not specify SOE depth; the only numeric lower bound in play is the + Swedish Svk TR02-04-04 §7.4.1 guidance of 100 entries, so 128 stays compliant. + The assertion CONDITION (`SOE_CAPACITY == ASDU_SOE_MAX_CAPACITY`) is untouched, + so the invariant it guards still holds. + +## Capacity override surface (skeleton profile) + +Eleven per-module capacity macros are already wrapped in `#ifndef`, so a build may +override them with `-D` **without editing any source file**. This is what keeps the +MCU skeleton profile small while the simulator keeps every business module enabled. +`verify_vendor.py` compiles both the default and compact configurations and would +catch an undefined-macro regression, but note that no `-D` is baked into any source. + +| Macro | Default | File | +| --- | --- | --- | +| `IEC104_INTERROGATION_TASK_CAPACITY` | `4U` | `104/business/IEC104_Interrogation.c` | +| `IEC104_INTERROGATION_EVENT_CAPACITY` | `4U` | `104/business/IEC104_Interrogation.c` | +| `IEC104_SYSTEM_COMMAND_TASK_CAPACITY` | `4U` | `104/business/IEC104_SystemCommand.c` | +| `IEC104_SYSTEM_COMMAND_RESET_CAPACITY` | `4U` | `104/business/IEC104_SystemCommand.c` | +| `IEC104_PERIODIC_SCAN_GROUP_CAPACITY` | `4U` | `104/business/IEC104_PeriodicScan.c` | +| `IEC104_PARAMETER_TASK_CAPACITY` | `4U` | `104/business/IEC104_Parameter.c` | +| `IEC104_REMOTE_PARAMETER_TASK_CAPACITY` | `2U` | `104/business/IEC104_RemoteParameter.c` | +| `IEC104_CLOCK_SYNCHRONIZATION_TASK_CAPACITY` | `4U` | `104/business/IEC104_ClockSynchronization.c` | +| `IEC104_READ_TASK_CAPACITY` | `4U` | `104/business/IEC104_Read.c` | +| `IEC104_COMMAND_REPLY_CAPACITY` | `4U` | `104/business/IEC104_Command.c` | +| `IEC104_SPONTANEOUS_CAPACITY` | `IEC104_TCP_SERVER_CAPACITY` | `104/business/IEC104_Spontaneous.c` | + +`IEC104_SPONTANEOUS_CAPACITY` is overrideable but yields no RAM saving (its pool +element is callbacks/state, not a capacity-sized array), so the skeleton profile +leaves it at its default. The 92% gate is unaffected: these macros size single +instance work queues inside a business module, not the TCP server pool, SOE=128, +k/w windows or concurrency semantics. - Independent hash/diff and AC5 true/false assertion verification is performed by build-verifier; product integration and simulator build have separate owners. diff --git a/App/sync/time_sntp.c b/App/sync/time_sntp.c index 93593cb8..ab480a86 100644 --- a/App/sync/time_sntp.c +++ b/App/sync/time_sntp.c @@ -76,7 +76,17 @@ static struct { int32_t last_off_ms; /* 最近一次钟差(int64 截断,诊断用) */ SntpTimestamp_t t1; /* 本轮请求时间(serializer 要求跨收发保存) */ uint8_t pkt[SNTP_PACKET_BASE_SIZE]; /* 请求报文(48B,静态省栈) */ -} s_ctx; +} s_ctx = { + /* fd 必须显式初始化成 -1:net 层的 fd 0 是**合法**描述符,零初始化的 0 + * 会被 s_socket_close() 的 `fd >= 0` 判据当成"已打开的 socket", + * 于是在 SNTP 从未开过 socket 时对 fd 0 发 net_close(0),关掉别的服务 + * (实测 2026-11-18 台架:网卡起来第一轮代次变化即把 ftpTask 刚 listen + * 的槽 0 关掉,随后 104 的 net_socket() 又复用 fd 0,两个监听器抢同一 + * 芯片 Socket,表现为 104 连接立刻收到 FTP 的 220 banner)。 + * 教训:本项目 net fd 是"槽位下标",0 完全合法,任何"用 0 表示未打开" + * 的写法都是错的。 */ + .fd = -1, +}; static uint32_t s_rng; /* xorshift32:散布/防欺骗随机数(非密钥用途) */ static uint8_t s_rng_seeded; diff --git a/App/task/default_task.c b/App/task/default_task.c index 6ef1caba..6eaf5533 100644 --- a/App/task/default_task.c +++ b/App/task/default_task.c @@ -82,7 +82,7 @@ * = 48KB)——低于此值说明堆余量 <8%,新增任务/缓冲随时可能分配失败(隐性风险)。 * 阈值取 3,072 B 留出运行间 ~600B 波动余量,避免把正常波动误报为故障。 * 2026-10-12(B5):堆扩至 56KB(.ioc configTOTAL_HEAP_SIZE=57344,CCM 腾给 - * protectTask/iec104Task 栈),阈值**不随堆缩放**——它是绝对字节安全线。 */ + * protectTask 等任务栈),阈值**不随堆缩放**——它是绝对字节安全线。 */ #define HEAP_LOW_WATER_B 3072u /* 存储自愈策略(2026-09-21 审计 P0 修复):启动期存储挂载失败后, * 主循环按 2s 周期重跑完整 bring-up 的次数上限;耗尽则维持无存储降级 @@ -112,7 +112,6 @@ static const stack_probe_task_t s_stack_probe[] = { { "ui", &uiTaskHandle, &uiTask_attributes }, { "timesync", &timeSyncTaskHandle, &timeSyncTask_attributes }, { "adc", &adcTaskHandle, &adcTask_attributes }, - { "iec104", &iec104TaskHandle, &iec104Task_attributes }, { "protect", &protectTaskHandle, &protectTask_attributes }, }; @@ -323,7 +322,8 @@ void default_task_func(void *argument) { task_wd_seg(TASK_WD_SEG_CFGSAVE); net_cfg_save_run(); /* 保护定值落盘(B7):内部消费脏标志,无改动 = 空操作; - * 写失败脏回置 → iec104Task 下轮 poll 再投递事件 = 天然重试。 + * 写失败脏回置 → netTask 主循环(1 ms)里 iec104_serv_net_tick() 下轮 + * 按 100 ms 脏节拍再投递事件 = 天然重试。 * task-10「操作记录」写入点之一:⚠ 不能按 prot_set_store_save() 的返回值 * 记——它对"无待写"同样返 0,照返回值记就是每 50 ms 刷一条**没发生过**的 * 操作(正是"不许用静态演示数据充数"的反面)。先 peek 脏位(非消费, @@ -1001,6 +1001,12 @@ static void default_task_net_cfg_save_notify(void) { * 写日志点放在本函数内而非 ioboard_di.c:纯逻辑层不碰文件系统。 * 且只在 !TEST_SUITE_CH395F && !TEST_SUITE_GDRAM && !TEST_SUITE_STORAGE 时发布 —— * 那三个套件构建下卷由 testTask 独占,defaultTask 侧只读不算不写盘。 + * + * 函数功能:开入(DI)去抖与发布一拍 + * 入口参数:无 + * 返 回 值:0 - 本次读成功且已发布;非 0 - 读失败(沿用上一有效值,valid=0) + * 函数说明:每 50 ms 由 default_task_func() 调用一次;失败语义见上文【三】, + * 不把读失败当全 0 上报。 */ static uint8_t default_task_di_poll(void) { uint8_t mask = 0u; diff --git a/App/task/iec104_serv.c b/App/task/iec104_serv.c index fa42f47c..9f766acc 100644 --- a/App/task/iec104_serv.c +++ b/App/task/iec104_serv.c @@ -1,272 +1,350 @@ /* - * 模块名称:IEC 60870-5-104 被控站服务(板端胶水任务) - * 模块功能:监听端口来自 [comm] 段(工厂默认 2404)的 TCP server + 单连接 - * socket 收发 + 把字节流喂给 iec104_link 纯逻辑层;对时经 - * sys_clock_set_unix 落墙钟;数据源走 iec104_pts 默认源 - * (phasor / prot_elm / prot_set)。协议语义全部在 App/protocol/iec104, - * 本文件只做 I/O 编排(分层约束)。 - * 线程约定:iec104Task 独占(NET_READY 屏障后循环,100ms 节拍 + 看门狗心跳)。 - * 创建日期:2026-10-12(B4) - * 修改记录: - * 2026-10-26 DTU 项目组 道G task-8:公共地址与监听端口取值来源改 - * [comm] 段 getter(iec104_comm.h,改后重启生效; - * 端口另在下次重 bind 自然生效)。只改取值来源, - * 链路编排零改动。 + * 模块名称:IEC 60870-5-104 被控站服务(netTask 单属主驱动) + * 模块功能:在 netTask 的 1 ms 主循环里驱动 threadless 的 iec104_core: + * 代次自愈 -> iec104_core_start/poll/stop -> 四字段统计单调化。 + * 协议解析、socket I/O、点表全部在 App/protocol/iec104/ 与 vendor + * App/protocol/iec60870/ 内,本文件只做属主编排与对外只读契约。 + * 线程约定:**所有 core 调用只在 iec104_serv_net_tick() 内**(netTask 上下文)。 + * iec104_core 是单属主、零等待对象,绝不跨任务调用;本文件不含 + * 任何 osDelay / 阻塞等待,避免拖垮 netTask 的 1 ms 网络循环。 + * 创建日期:2026-10-12(B4,原 iec104Task 胶水) + * 改造日期:2026-11-17(task-18 板端网络割接:退役独立 iec104Task) */ #include "iec104_serv.h" #define DBG_LINE_BUF_MAX 128U /* 深链模块日志缓冲收紧(time_sync 先例) */ #define DBG_TAG "[I104]" -#include "iec104_comm.h" /* [comm] 段 getter:ca / 监听端口(道G task-8) */ -#include "iec104_link.h" -#include "iec104_pts.h" -#include "net_socket.h" -#include "prot_set.h" /* 定值脏标志 peek(B7 落盘通知) */ -#include "run_par.h" /* 运行参数脏 peek(运行参数段落盘通知,同款语义) */ -#include "sys_clock.h" -#include "sys_log.h" /* task-19:对时成功落一条操作记录(SYSLOG_OPER) */ +#include "iec104_comm.h" /* [comm] 段 getter:ca / 监听端口(改后重启/下次重 bind 生效) */ +#include "iec104_core.h" /* threadless 104 核心:start/poll/stop/get_status */ +#include "iec104_source.h" /* 数据源回调表:bind 入口(板端真实数据源接线) */ +#include "iec104_net_mcu.h" /* 后端唯一导出:rx_bytes(不在本文件重复计数) */ +#include "meas.h" /* 遥测快照:meas_get() 双区无锁读(唯一许可的板端遥测取数面) */ +#include "adc_cal.h" /* 标定有效性:adc_cal_flags() 未标定闭锁判据 */ +#include "ioboard_di.h" /* 开入快照读口(TODO 段预留,当前 s_signal 恒 false) */ +#include "net_socket.h" /* net_get_generation():网络代次自愈 */ +#include "prot_set.h" /* 定值脏标志 peek(B7 落盘通知) */ +#include "run_par.h" /* 运行参数脏 peek(运行参数段落盘通知) */ #include "sys_events.h" #include "task_watchdog.h" #include "dbg_log.h" #include "cmsis_os2.h" -#include +/* 统计饱和值:到顶停在 0xFFFFFFF0,不回绕(回绕成个位数会被读成"刚上电")。 */ +#define I104_STAT_SAT 0xFFFFFFF0u +/* 启动失败重试节流(ms):避免 core start 持续失败时每 1 ms 空转重建。 */ +#define I104_START_RETRY_MS 100u +/* 100 ms 业务节拍:脏标志投递按旧 iec104Task 的 100 ms 周期导出。 */ +#define I104_DIRTY_TICK_MS 100u -/* 服务周期:COV 延迟 ≤100ms(远小于 SOE 5000ms 验收线);心跳间隔同值 */ -#define IEC104_POLL_MS 100u -/* 接收搬运缓冲(静态,不入栈;link 层内部另有 512B 重组缓冲) */ -#define IEC104_RX_SZ 128u -/* 兜底节拍:门控判"无数据"时每 32 轮无条件收一次(ui_net_sink RM 先例, - * 防 RECV_OK 事件未收到把数据永久藏住);须为 2 的幂 */ -#define IEC104_LIVENESS_DIV 32u -/* 连续发送失败阈值:同 ui_net_sink 先例(短写=对端收坏帧) */ -#define IEC104_SEND_FAIL_MAX 3u +/* ---------------- 属主状态(仅 netTask 的 net_tick 写) ---------------- */ +static uint32_t s_gen; /* 网络代次基线(重建自愈) */ +static uint8_t s_started; /* core 是否已成功 start */ +static uint32_t s_retry_tick; /* 上次启动尝试的 tick(节流基准) */ +static uint32_t s_dirty_next; /* 下次脏标志投递的 tick 期限(不漏窗) */ +static uint8_t s_link_run; /* core.status.active 镜像(供任意上下文只读) */ +static uint8_t s_last_active; /* 上一轮 active,仅用于 0->1 跃迁日志(自愈可观测) */ -/* ---------------- 服务状态(iec104Task 独占) ---------------- */ -static iec104_link_t s_link; -static int s_listen = -1; -static int s_client = -1; /* 单连接模型:MCU 上即 s_listen */ -static uint32_t s_gen; /* 网络代次(重建自愈,ui_net_sink 先例) */ -static uint8_t s_rx[IEC104_RX_SZ]; -static uint8_t s_liveness_ctr; -static uint8_t s_send_fail_run; -static uint8_t s_conn_dead; /* 发送连败 → 本轮 link 调用返回后拆链 */ +/* 对外四字段:跨 core start 单调发布;写者 netTask,读者 uiTask/feed。 */ +static iec104_serv_stats_t s_stats; -/* ---------------- 只读观测计数(道G task-12;上电以来,跨重连**不清零**)----------- - * 与上面三枚的分工要说清:s_liveness_ctr / s_send_fail_run / s_conn_dead 是**控制量** - * ——它们为"要不要拆链"服务,会被复位、也是 8 位,拿它们当统计数字必错(拆一次链 - * 就把连败清零)。下面四枚只做一件事:被 iec104_serv_get_stats() 读出去显示。 - * 为什么留在本文件而不是并进 App/util/boot_stats:104 的账本归 104(分层), - * boot_stats 只管开机账;两边各一张表比一张混表好查。 - * 为什么**不放进 iec104_link_t**:实例是 serv.c:48 的文件级 static,feed 拿不到指针; - * 更要紧的是 link_open/link_close 的语义会把"上电以来"洗成"本次连接"。 - * 写者 = iec104Task(本文件),读者 = uiTask/feed;u32 单字读写在 Cortex-M4 上原子, - * 跨字段不保证同一瞬间——四个数之间没有"合起来才成立"的判据,混窗对显示无害。 - * 到顶**饱和**不回绕:停在 42 亿一眼能看出到头,回绕成个位数会被读成"刚上电"。 */ -static uint32_t s_st_conn_up; /* 主站接入次数(accept 成功且已 open link) */ -static uint32_t s_st_apdu_tx; /* 成功发出的 APDU 帧数(短写不计,那算 tx_fail) */ -static uint32_t s_st_tx_fail; /* 发送短写/失败次数(与连败复位无关,只累计) */ -static uint32_t s_st_rx_bytes; /* 收到的字节数(帧数在 link 层重组,serv 只看得见字节) */ +/* 单调化基线:core/后端计数器在每次 start 归零,这里记住上一代末值与累计搬运量。 */ +static uint32_t s_last_conn, s_carry_conn; +static uint32_t s_last_apdu, s_carry_apdu; +static uint32_t s_last_txfail, s_carry_txfail; +static uint32_t s_last_rx, s_carry_rx; -/* - * 函数功能:单枚观测计数 +1,到顶饱和(四枚同式,收成一处,别在四个调用点各写一遍) - * 入口参数:p - 计数变量地址 uint32_t * - * 返 回 值:无 void - * 限定条件:iec104Task 上下文(唯一写者);NULL 时无害返回 - * 函数说明:**只加不清**——观测计数一旦有清零路径,"上电以来"就退化成"上次谁清零 - * 以来"。p 为 NULL 直接返回(与三个对外 getter 的 NULL 契约一致)。 - */ -static void s_cnt_add(uint32_t *p) +/* core 启动配置静态存储:bind_address 指向 ROM 字面量;端口/CA 从 [comm] 现取。 */ +static iec104_core_config_t s_core_cfg = { "0.0.0.0", + IEC104_COMM_DEF_PORT, + IEC104_COMM_DEF_CA }; + +/* ---------------- 板端数据源绑定(netTask 单属主,回调在 core poll 内串行调用) ---------------- */ + +/* 104 点表 source_addr(XML 源地址)→ 板端遥测语义通道。 + * 只列**真实存在**的物理量;PT2 全部点 / 电池 / 湿度 / 功率 / 局放等无对应通道, + * 不在表内 → 回调返回 false,source 层置 0 + IV(不拿 PT1 冒充 PT2)。 + * 电流说明:本仓只有一组电流通道(ADC_SEM_IA/IB/IC 即 TPAFE/STM32 唯一一路, + * 见 adc_input.c 通道表与 ADC通道映射说明.md §1)。点表的 "SW00 measurement + * Ia/Ib/Ic"(0x961F/9620/9621) 与 "SW00 protection Ia/Ib/Ic"(0x9622/23/24) + * 在现场 XML 里是两组 CT,本仓硬件只有一组——该组已按 protection 语义占用, + * 故 measurement 三点不接(同一物理量不能以两个语义同时上送)。 + * 0xFF = 频率点特殊处理(取 meas_snap_t.freq_hz,不是 yc[] 下标)。 */ +#define I104_SRC_FREQ 0xFFU +static const struct { + uint16_t source_addr; + uint8_t sem; /* ADC_SEM_xxx;I104_SRC_FREQ = snap.freq_hz */ +} s_meas_map[] = { + { 0x9605U, ADC_SEM_UA }, /* PT1 Ua */ + { 0x9606U, ADC_SEM_UB }, /* PT1 Ub */ + { 0x9607U, ADC_SEM_UC }, /* PT1 Uc */ + { 0x960BU, ADC_SEM_UN }, /* PT1 零序电压(台架无接线,cal flags 无 VALID → 恒 IV) */ + { 0x9622U, ADC_SEM_IA }, /* SW00 保护 Ia */ + { 0x9623U, ADC_SEM_IB }, /* SW00 保护 Ib */ + { 0x9624U, ADC_SEM_IC }, /* SW00 保护 Ic */ + { 0x9625U, ADC_SEM_IN }, /* SW00 零序电流 */ + { 0x960DU, I104_SRC_FREQ }, /* PT1 频率 */ + { 0x9617U, ADC_SEM_TEMP } /* 环境温度(NT 非交流量,meas.qds 已置) */ +}; + +/* 函数功能:104 遥测源回调(按 source_addr 查真实存在的板端物理量)。 + * 入口参数:ctx - 未用(绑定的 context 恒 NULL) + * source_addr - 104 点表 XML 源地址 + * v - 输出工程量;q - 输出 104 QDS 品质字节 + * 返回值:true = 取到值(品质另有 IV/NT 位);false = 无源,由 source 层置 0+IV + * 限定条件:仅 netTask(core poll 串行调用);不阻塞、不碰硬件 + * 函数说明:meas 双区快照是唯一许可的板端遥测取数面——直接调 + * tpafe5160_snapshot() 会抢 adcTask 的 consumer_seq,破坏其取数节奏。 + * 品质 = meas.qds 低字节(与 IEC104_QDS_* 同值)AND adc_cal_flags() 的 + * VALID:未标定路一律补 IV,落实"未标定闭锁"口径(UN 路台架永远 IV)。 + * 快照用栈上 72 B 缓冲,静态 RAM 0 B;GI 一轮 30 点 × 72 B 拷贝 + * 相对 200 ms 发布间隔可忽略,无需跨调用缓存(栈变量也缓存不住)。 */ +static bool s_measure(void *ctx, uint16_t source_addr, float *value, uint8_t *quality) { - if (p == 0) { - return; - } - if (*p < 0xFFFFFFF0u) { - *p = *p + 1u; - } -} - -/* 前向声明(cfg 初始化引用) */ -static void s_send_apdu(void *ctx, const uint8_t *apdu, uint16_t len); -static int s_clock_sync(void *ctx, uint64_t epoch_ms); -static uint64_t s_epoch_ms(void *ctx); - -/* 链路 cfg:ca 占位工厂默认,任务启动经 s_apply_comm_ca() 从 [comm] 段取真值 - * (道G task-8;点表口径默认 1);非 const 即此一处写、其余只读 */ -static iec104_link_cfg_t s_cfg = { IEC104_COMM_DEF_CA, - s_send_apdu, s_clock_sync, s_epoch_ms }; - -/* - * 函数功能:link 层发送回调——经 net_send 串行 RPC 发出一个 APDU - * 入口参数:ctx 未用;apdu/len = 完整 APCI 帧 - * 返回值:无 - * 限定条件:s_client >= 0(在 link 调用栈内执行,即本任务上下文) - * 函数说明:短写/失败累计(ui_net_sink 先例);连续 3 次 → 置 s_conn_dead, - * 由 s_service_link 在 link 调用返回后统一拆链(严禁在回调里拆) - */ -static void s_send_apdu(void *ctx, const uint8_t *apdu, uint16_t len) { - int ret; + meas_snap_t snap; + uint32_t i; + uint8_t sem; (void)ctx; - if (s_client < 0) { + if (value == NULL || quality == NULL) { return false; } + for (i = 0U; i < sizeof(s_meas_map) / sizeof(s_meas_map[0]); ++i) { + if (s_meas_map[i].source_addr == source_addr) { break; } + } + if (i >= sizeof(s_meas_map) / sizeof(s_meas_map[0])) { return false; } + if (meas_get(&snap) != 0) { return false; } /* 未发布过 = 无源 */ + + sem = s_meas_map[i].sem; + if (sem == I104_SRC_FREQ) { + if (snap.freq_valid == 0U) { return false; } + *value = snap.freq_hz; + *quality = 0U; + return true; + } + if (sem >= ADC_SEM_COUNT) { return false; } + *value = snap.yc[sem]; + *quality = (uint8_t)(snap.qds[sem] & 0xFFU); + /* 未标定的通道不可信:0x80 与 IEC104_QDS_IV 同值(meas.h 明示 + * 低字节与线上 104 QDS 同值,故本层不反向 include 协议头)。 + * UN 路台架永久无标定,该位始终置上。 */ + if ((adc_cal_flags((adc_semantic_t)sem) & ADC_CAL_F_VALID) == 0U) { + *quality |= 0x80U; /* IEC104_QDS_IV */ + } + return true; +} + +/* 函数功能:104 遥信源回调(当前板端 8 路开入无业务语义映射,恒无源)。 + * 入口参数:ctx / source_addr / v / q(同 s_measure) + * 返回值:恒 false + * 限定条件:无 + * 函数说明:docs/硬件平台/开入开出实施说明.md:28 明确"104 遥信点表未接开入、 + * 继电器动作语义未定义"。板端 8 路开入是 bit0=A..bit7=H 的无语义电平, + * 点表 59 个遥信 source_addr 是 0x9146/... 具体业务点。硬接 = 编造。 + * 将来 Lead/用户给出对照表后,只在本函数查一张 static const 映射表 + * (读 ioboard_di_snap_lookup() + ioboard_di_snap_read()),函数签名与 + * bind 流程均不用改;详见 ci-artifacts/iec104-cutover/source-bind-plan.md §3.3。 */ +static bool s_signal(void *ctx, uint16_t source_addr, uint8_t *value, uint8_t *quality) +{ + (void)ctx; (void)source_addr; (void)value; (void)quality; + return false; +} + +/* 函数功能:绑定板端数据源到 104 source(每次 core_start 成功后调用)。 + * 入口参数:无 + * 返回值:无 + * 限定条件:仅 netTask,在 iec104_core_start() 成功分支、首次 poll 之前 + * 函数说明:**为什么不能在系统初始化时绑一次就完事**—— + * iec104_source_init() 的首条语句就是 memset(&bindings, 0, ...),而它唯一的 + * 产品侧调用点在 iec104_core.c:573 initialize_core(),由 iec104_core_start() + * 每次 start 触发(网络代次变化 / poll 服务级失败都会 stop→start)。 + * 若只在开机时绑一次,第一次重连后 bindings 被清零且再无人重绑, + * 主站又退回"0 + IV"且无任何日志——这是下一个接手人最容易踩的坑。 + * parameter_read/parameter_apply 两个都保持 NULL:source.h 要求成对注册, + * 而 NOSTORE 档明确禁止写,只注册 read 会破坏配对语义、掩盖参数整定不可用。 */ +static void s_bind_mcu_source(void) +{ + static const iec104_source_bindings_t bindings = { + NULL, s_measure, s_signal, NULL, NULL + }; + iec104_source_bind(&bindings); +} + +/* + * 函数功能:把"每次 start 归零"的源计数折算成上电以来单调不回退的对外值。 + * 入口参数:now = 本轮源计数;last = 上一轮源计数;carry = 已封存的历代总和 + * 返回值:对外发布值(饱和 I104_STAT_SAT) + * 限定条件:仅 net_tick 内调用(单写者) + * 函数说明:now < last 唯一原因是 core/后端重启把源计数清零;此时先把上一代 + * 末值进 carry,再从 0 起算。三个状态都是 u32,Cortex-M4 单字原子, + * 读者(get_stats)只读 s_stats 不读这些基线,无撕裂风险。 + */ +static uint32_t s_monotonic(uint32_t now, uint32_t *last, uint32_t *carry) +{ + if (now < *last) { + if (*carry > (I104_STAT_SAT - *last)) { + *carry = I104_STAT_SAT; + } else { + *carry += *last; + } + } + *last = now; + if (*carry > (I104_STAT_SAT - now)) { + return I104_STAT_SAT; + } + return *carry + now; +} + +/* + * 函数功能:强制重建 104 core(网络代次变化 / core poll 服务级失败时调用)。 + * 入口参数:now = 当前 tick(用于启动节流基准) + * 返回值:无 + * 限定条件:netTask 上下文;NET_READY 已置位 + * 函数说明:代次一变即代表 net_init 已复位芯片并清空 net 层控制块,旧 fd 在 + * 芯片与 net 层都不存在;后端匮乏次句柄一律 find 失败、Close 幂等返回, + * 因此**绝不把"Close(旧 listener) 成功"当作 start 的前置条件**——否则 + * stop 静默失败 -> owns_resources 仍 1 -> start 被拒 -> 104 永久起不来。 + * 这里按"core 已停止"处理:无条件调一次 stop 兜底清理(幂等),再 start。 + * start 失败不在此死等,交下一轮按 I104_START_RETRY_MS 节流重试。 + */ +static void s_restart_core(uint32_t now) +{ + (void)iec104_core_stop(); + s_started = 0U; + s_retry_tick = now; /* 允许本轮末尾立即尝试一次 start */ +} + +/* + * 函数功能:尝试启动(或重启)core;成功置 s_started。 + * 入口参数:now = 当前 tick + * 返回值:无 + * 限定条件:netTask 上下文;NET_READY 已置位 + */ +static void s_try_start(uint32_t now) +{ + if ((now - s_retry_tick) < I104_START_RETRY_MS) { + return; /* 节流窗口内不重复尝试 */ + } + s_retry_tick = now; + /* 这是 core owns_resources=1 的唯一重试点:上一实例 stop 失败残留时, + * 靠这里的兜底 stop 再试一次(core 契约要求失败后必须重试 stop)。 + * I104_START_RETRY_MS 同时就是 stop 重试周期——改这个宏等于改 stop 重试 + * 策略,不只是改 start 节奏。core stop 在 slave==NULL 时直接返回 0。 + * stop 不 memset(status):重试期间 status 保持最后一次真值,不会出现 + * "看起来像活着"的假零值,因此本窗口无第二个混淆源。 */ + (void)iec104_core_stop(); + s_core_cfg.port = iec104_comm_port(); + s_core_cfg.common_address = iec104_comm_ca(); + if (iec104_core_start(&s_core_cfg) == 0) { + s_started = 1U; + /* 数据源必须**每次 start 成功后**重绑:iec104_source_init() 在每次 + * core_start 里把 bindings 清零(见 s_bind_mcu_source 注释)。 + * 必须在首次 poll 之前,且只在成功分支——失败时 core 不持有资源。 */ + s_bind_mcu_source(); + DBG_INFO("i104: listening on %u", (unsigned)s_core_cfg.port); + } else { + DBG_ERROR("i104: start fail port=%u, retry", (unsigned)s_core_cfg.port); + } +} + +/* + * 函数功能:netTask 内唯一的 104 推进入口(每轮一次,零阻塞)。 + * 入口参数:无 + * 返回值:无 + * 限定条件:**netTask 上下文**;由 App/task/net_task.c 主循环在 + * net_process_messages() 之后、osDelay(1) 之前调用。 + * 函数说明:一轮顺序 = 喂狗 -> NET_READY 查询 -> 代次自愈 -> start -> + * core_poll(Prepare(0)->Wait->Process->NextEvent + 有界业务) -> + * 四字段单调化 -> 100 ms 脏标志投递。全程不 osDelay、不取信号量、 + * 不读 socket 阻塞面;NET_READY 用 osFlagsNoClear 查询位、不消费。 + */ +void iec104_serv_net_tick(void) +{ + iec104_core_status_t st; + uint32_t rx = 0U; + uint32_t now; + + /* 喂狗点从退役的 iec104Task 移到这里:掩码仍含 IEC104 位,只是置位者换任务。 + * 100 ms 抽样 / 800 ms 缺席停喂口径不变,netTask 1 ms 循环天然满足。 + * 必须放在所有 early-return 之前:否则 NET_READY 未置位/代次重建等任一 + * 分支提前返回都会让看门狗判 104 死、周期复位。这一位置是硬约束。 */ + task_wd_beat(TASK_WD_IEC104); + + if (sys_evtHandle != NULL) { + if ((osEventFlagsWait(sys_evtHandle, SYS_EVT_NET_READY, + osFlagsWaitAny | osFlagsNoClear, 0U) & osFlagsError) != 0U) { + return; /* 网络未就绪:本轮不动 core,也不喂统计 */ + } + } + + now = osKernelGetTickCount(); + if (net_get_generation() != s_gen) { + uint32_t old_gen = s_gen; + s_gen = net_get_generation(); + /* 代次重建自愈时序(可观测日志:old_gen -> new_gen -> start ok/fail): + * net_stack_bring_up 先 net_init(芯片复位+清控制块) 后 net_generation_inc; + * X = 代次变化的这一轮内完成强制 stop -> 重新 start,期间不依赖旧句柄 + * Close 成功(见 s_restart_core 注释),监听由 net 层 auto_relisten 自理。 */ + s_restart_core(now); + DBG_INFO("i104: net gen %u -> %u, restart", (unsigned)old_gen, (unsigned)s_gen); + } + + if (s_started == 0U) { + s_try_start(now); + if (s_started == 0U) { + return; /* 启动未成功:本轮无 poll、无统计刷新 */ + } + } + + /* 一轮一次零等待推进。core 内部 Prepare(0)->Wait(纯查询)->Process-> + * NextEvent + drain_events(16) + 有界业务;最多一次,防止 1 ms 循环里 + * 反跑多轮挤占 FTP/UI 的网络时隙。 */ + if (iec104_core_poll() != 0) { + /* 服务/装配级失败(非 TCP 断链):core 契约要求 stop 后重建。 */ + s_restart_core(now); + DBG_ERROR("i104: poll fail, restart"); return; } - ret = net_send(s_client, apdu, (int)len, 0); - if (ret == (int)len) { - s_send_fail_run = 0u; - s_cnt_add(&s_st_apdu_tx); /* 只数真发出去的(道G task-12 观测计数) */ - return; - } - s_cnt_add(&s_st_tx_fail); /* 短写/失败也进观测账,与下面的连败判定各管各的 */ - if (s_send_fail_run < 255u) { - s_send_fail_run++; - } - DBG_ERROR("i104 send short: ret=%d/%u run=%u", ret, (unsigned)len, - (unsigned)s_send_fail_run); - if (s_send_fail_run >= IEC104_SEND_FAIL_MAX) { - s_conn_dead = 1u; - } -} -/* - * 函数功能:link 层对时回调——epoch 毫秒落系统墙钟(含 SD2506 RTC 写回), - * 成功时顺带落一条操作记录(道F task-19:「时钟设置」是四处操作记录 - * 写入点之一,另外三处见 App/log/README.md 的五类记录对照表) - * 入口参数:ctx 未用;epoch_ms = C_CS 解析出的 UTC 时刻 - * 返回值:0 成功 / -1 失败(link 层回 actcon+PN) - * 函数说明:uint32 秒域上限 2106-02-07,越界显式拒绝(CP56 域到 2127)。 - * **只在真正改成功之后才投记录**:越界拒绝与 sys_clock_set_unix 失败两条腿 - * 一条都不投——操作记录是审计面,写进去一条没发生过的"对时"比少一条更坏 - * (TC-I104SRV-050b / 051 分别钉这两条腿)。 - * 投递用 syslog_post_quiet():iec104Task 是深链任务(本文件顶部已把 - * DBG_LINE_BUF_MAX 收到 128 就是同一件事的证据),不许在它的调用链上 - * 内联日志行缓冲;两个投递口的收/丢判据一致,差别只在留痕位置 - * (口径与理由见 App/log/README.md「两个投递口」)。 - * 文案是 ROM 常量、17 字节 < SYSLOG_DESC_MAX(28):iec104Task 里不 snprintf。 - */ -static int s_clock_sync(void *ctx, uint64_t epoch_ms) { - uint64_t secs = epoch_ms / 1000ULL; - int rc; + iec104_core_get_status(&st); + iec104_net_mcu_stats(&rx); - (void)ctx; - if (secs > 0xFFFFFFFFULL) { - return -1; + s_link_run = st.active; /* connected && status_valid && data_transfer_started */ + /* 代次重建后的可观测收尾:old_gen -> new_gen -> start ok(上一行)-> active 1。 + * 主站重连后应看到这一行;若只看到 gen 迁移而无本行,说明 core 起来了但 + * STARTDT 未握手,属主站侧问题,不是本端监听重建失败。 */ + if ((s_link_run != 0U) && (s_last_active == 0U)) { + DBG_INFO("i104: link active after gen %u", (unsigned)s_gen); } - rc = sys_clock_set_unix((uint32_t)secs); - if (rc == 0) { - syslog_post_quiet(SYSLOG_OPER, "clock set by 104"); - } - return rc; -} + s_last_active = s_link_run; + s_stats.conn_up = s_monotonic(st.connections, &s_last_conn, &s_carry_conn); + s_stats.apdu_tx = s_monotonic(st.written_i_frames, &s_last_apdu, &s_carry_apdu); + s_stats.tx_fail = s_monotonic(st.frame_failures, &s_last_txfail, &s_carry_txfail); + /* rx 随每次 core start(IEC104_Net_Init 内 s_rx_bytes=0U)归零, + * 故服务层单调化在重连后生效,与其它三个 core 计数同形态。 */ + s_stats.rx_bytes = s_monotonic(rx, &s_last_rx, &s_carry_rx); -/* - * 函数功能:link 层时标源——当前墙钟 epoch 毫秒(B9:M_SP_TB_1 自发用) - * 入口参数:ctx 未用 - * 返回值:epoch 毫秒;墙钟未建(UINT32_MAX)→ UINT64_MAX(link 置 CP56 IV) - * 函数说明:sys_clock 秒域时基 → ms 字段恒 0(不造假亚秒,B9 口径); - * 纯 RAM 推算,无 I/O、无副作用。 - */ -static uint64_t s_epoch_ms(void *ctx) { - uint32_t s = sys_clock_get(); - - (void)ctx; - if (s == UINT32_MAX) { - return UINT64_MAX; - } - return (uint64_t)s * 1000ULL; -} - -/* - * 函数功能:把 [comm] 段公共地址取进链路 cfg(道G task-8 取值来源改造) - * 返回值:无 - * 限定条件:iec104_link_init 之前调用(任务启动一次)——ca 生效语义 = - * 改后重启;端口不同:s_bind_listen 每次现取 iec104_comm_port(), - * 下次重 bind(拆链重建/网络代次重建)即生效,不必整机重启 - */ -static void s_apply_comm_ca(void) { - s_cfg.ca = iec104_comm_ca(); -} - -/* - * 函数功能:创建并监听 [comm] port(socket+bind+listen,抄 ui_net_sink bind_listen) - * 返回值:0 成功(s_listen 写回)/ -1 失败 - * 限定条件:net 子系统可用(NET_READY 屏障后) - */ -static int s_bind_listen(void) { - int ls; - struct net_sockaddr_in addr; - - ls = net_socket(NET_AF_INET, NET_SOCK_STREAM); - if (ls < 0) { - return -1; - } - (void)memset(&addr, 0, sizeof(addr)); - addr.sin_family = NET_AF_INET; - addr.sin_port = net_htons(iec104_comm_port()); - addr.sin_addr.s_addr = NET_INADDR_ANY; - if (net_bind(ls, (struct net_sockaddr *)&addr, (int)sizeof(addr)) < 0) { - net_close(ls); - return -1; - } - if (net_listen(ls) < 0) { - net_close(ls); - return -1; - } - s_listen = ls; - return 0; -} - -/* - * 函数功能:主动断开当前 104 连接并重建监听(协议故障/t1 超时/发送连败) - * 入口参数:why = 日志原因串(ASCII) - * 返回值:无 - * 函数说明:与 EOF 路径不同——协议违例时主站不会自行断开,必须本端 close - * 促其重连;单连接模型下 client 即 listen,close 后统一重建 - * (time_sync 会话收尾先例,非芯片侧 auto_relisten 风暴路径) - */ -static void s_drop_conn(const char *why) { - DBG_ERROR("i104 drop: %s", why); - if (s_client >= 0) { - net_close(s_client); - } - s_client = -1; - s_listen = -1; - iec104_link_close(&s_link); - s_send_fail_run = 0u; - s_conn_dead = 0u; - s_liveness_ctr = 0u; - if (s_bind_listen() < 0) { - s_listen = -1; /* 主循环下轮重试 */ - } -} - -/* - * 函数功能:link 层节拍服务 + 故障检测(poll 后查 IDLE 跳变/发送连败) - * 入口参数:now = 注入时基(tick ms) - * 返回值:无 - */ -static void s_service_link(uint32_t now) { - iec104_link_poll(&s_link, now); - if (s_conn_dead != 0u) { - s_drop_conn("send fail"); - return; - } - if (iec104_link_state(&s_link) == IEC104_ST_IDLE) { - s_drop_conn("protocol fault"); + /* 100 ms 导出的脏标志投递(旧 iec104Task 的 100 ms 周期语义):peek 非消费, + * 写盘失败时脏标志仍在、下一轮再投 = 天然重试;本任务不碰文件系统 + * (配置引擎属主 = defaultTask,模块约定)。用期限递推而非 now%100==0, + * netTask 偶发延迟一轮也不会错过整个 100 ms 窗口。 */ + if ((int32_t)(now - s_dirty_next) >= 0) { + s_dirty_next = now + I104_DIRTY_TICK_MS; + if ((prot_set_dirty_peek() != 0U) && (sys_evtHandle != NULL)) { + (void)osEventFlagsSet(sys_evtHandle, SYS_EVT_PROT_SET_SAVE); + } + if ((run_par_dirty_peek() != 0U) && (sys_evtHandle != NULL)) { + (void)osEventFlagsSet(sys_evtHandle, SYS_EVT_RUN_PAR_SAVE); + } } } /* * 函数功能:读 104 观测计数(契约见 iec104_serv.h 的 iec104_serv_get_stats) - * 入口参数:p_out - 输出缓冲;NULL 时无害返回 iec104_serv_stats_t * - * 返 回 值:无 void + * 入口参数:p_out - 输出缓冲;NULL 时无害返回 + * 返回值:无 * 限定条件:任意上下文;不取锁、不读时刻、不碰 socket、不阻塞 - * 函数说明:先读进局部再整体赋出——四枚都读完后才发布,读者拿到的是"同一轮读取"的 - * 四元组(中途若有新计数产生,那一枚可能偏新一格,但不会读到半改写的字)。 - * 本函数**不清零、不复位任何计数**:统计口一旦能清零,"上电以来"就退化成 - * "上次谁读过以来",那条账再没人敢信。 + * 函数说明:先读进局部再整体赋出——读者拿到的是同一轮读取的四元组。本函数 + * 不清零、不复位任何计数;四字段口径见 .h 注释。 */ void iec104_serv_get_stats(iec104_serv_stats_t *p_out) { @@ -275,182 +353,18 @@ void iec104_serv_get_stats(iec104_serv_stats_t *p_out) if (p_out == NULL) { return; } - s.conn_up = s_st_conn_up; - s.apdu_tx = s_st_apdu_tx; - s.tx_fail = s_st_tx_fail; - s.rx_bytes = s_st_rx_bytes; + s = s_stats; *p_out = s; } /* - * 函数功能:读 104 链路是否处于 RUN 态(契约见 iec104_serv.h 的 iec104_serv_link_run) - * 入口参数:无 - * 返 回 值:1 = RUN;0 = 其它 uint8_t - * 限定条件:任意上下文;单枚举字读,原子 - * 函数说明:直接透传 iec104_link_state(),不另存镜像量——镜像量一旦和状态机 - * 分家(比如 open/close 路径漏更),屏灯就成第二本假账。link_state - * 本身只读实例里的 state 字段(App/protocol/iec104/iec104_link.c), - * 无副作用,跨任务读安全。 + * 函数功能:读 104 链路是否处于 RUN 态(契约见 iec104_serv.h) + * 返回值:1 = core.status.active(STARTDT 数据传输已启动);0 = 其它 + * 限定条件:任意上下文;单字节镜像,原子读 + * 函数说明:s_link_run 由 net_tick 从 core.status.active 镜像,等价于旧 + * link_state==RUN;屏板通信灯 ID 3 消费。 */ uint8_t iec104_serv_link_run(void) { - return (iec104_link_state(&s_link) == IEC104_ST_RUN) ? 1U : 0U; -} - -/* - * 函数功能:单次服务循环(代次自愈 → accept → 门控收 → 喂 link → 节拍) - * 返回值:无 - * 限定条件:NET_READY 已置位;s_cfg/s_link 已 init - * 函数说明:门控(net_listener_armed/net_can_read 纯 RAM 读)+ 兜底节拍照 - * ui_net_sink 先例;EOF 时 client==listen 严禁 close(net 层 - * 已 auto_relisten,close 会连监听一起毁) - */ -static void s_serv_poll(void) { - uint32_t now = osKernelGetTickCount(); - int n; - - /* 网络重建(代次变化):旧监听/客户端随芯片复位失效 → 重建 */ - if (net_get_generation() != s_gen) { - if ((s_client >= 0) && (s_client != s_listen)) { - net_close(s_client); - } - if (s_listen >= 0) { - net_close(s_listen); - s_listen = -1; - } - s_client = -1; - iec104_link_close(&s_link); - s_send_fail_run = 0u; - s_conn_dead = 0u; - s_liveness_ctr = 0u; - s_gen = net_get_generation(); - (void)s_bind_listen(); - return; - } - - if (s_listen < 0) { - (void)s_bind_listen(); /* 启动失败/被毁:重试 */ - return; - } - - if (s_client < 0) { - int c; - - /* accept 门控迁移(docs/网络/网络自愈架构设计.md §4.2):门控从 net_can_accept(只认 ESTABLISHED,已退役) - * 迁 net_listener_armed——旧门控把 LISTENING 窗口全挡掉,:2404 的丢 - * CONNECT 探针(net_accept_locked 内)因此从不运行(与已修的 :7003 - * 同型);armed=ESTABLISHED 待 accept / LISTENING / - * CLOSED+auto_relisten+残留(ESTABLISHED 放行由台架实证补齐: - * 漏它则本任务 200ms 周期抢不过对账② ~400ms 去抖、整场饿死) */ - if (net_listener_armed(s_listen) == 0) { - if (net_get_sock(s_listen) == NULL) { - s_listen = -1; /* 控制块消失:交回上方重建 */ - } - return; - } - c = net_accept(s_listen, NULL, NULL); - if (c >= 0) { - s_client = c; - s_send_fail_run = 0u; - s_conn_dead = 0u; - s_liveness_ctr = 0u; - iec104_link_open(&s_link, now); - s_cnt_add(&s_st_conn_up); /* 主站接入次数(上电以来;道G task-12) */ - DBG_INFO("i104: accepted fd=%d", c); - } - return; - } - - /* 门控 + 兜底:无数据多数轮直接走 link 节拍;每 32 轮无条件收一次 */ - if (net_can_read(s_client) == 0) { - if (((++s_liveness_ctr) & (IEC104_LIVENESS_DIV - 1u)) != 0u) { - s_service_link(now); - return; - } - } else { - s_liveness_ctr = 0u; - } - - /* DONTWAIT 已转正为具名 API net_recv_nb——本任务在 IWDG - * required_mask 内且有 100ms 周期职责(喂狗/链路节拍/上送),禁止无限 - * 阻塞 recv(文档契约见 net_socket.h net_recv 注释),非阻塞轮询是义务 */ - n = net_recv_nb(s_client, s_rx, (int)sizeof(s_rx)); - if (n > 0) { - /* 收字节观测计数(道G task-12):这里数的是 recv 段返回的**字节数**,不是 - * APDU 帧数——帧边界在 link 层重组,serv 这一层看不见;页面文案别写"接收帧数"。 - * 加法也做饱和:n 最大 128,先留出余量再比,避免"加完才判"溢出成小数字。 */ - if (s_st_rx_bytes < (0xFFFFFFF0u - (uint32_t)n)) { - s_st_rx_bytes = s_st_rx_bytes + (uint32_t)n; - } else { - s_st_rx_bytes = 0xFFFFFFF0u; - } - iec104_link_on_rx(&s_link, s_rx, (uint16_t)n, now); - } else if (n == 0) { - /* 对端关闭:net 层已 auto_relisten;client==listen 时严禁 close */ - if (s_client != s_listen) { - net_close(s_client); /* 模拟器多连接后端:数据通道独立 */ - } - s_client = -1; - s_liveness_ctr = 0u; - iec104_link_close(&s_link); - if ((net_get_sock(s_listen) == NULL) && (s_bind_listen() < 0)) { - s_listen = -1; - } - return; - } else if (net_get_errno() != NET_ERR_WOULDBLOCK) { - s_drop_conn("recv err"); - return; - } - - s_service_link(now); -} - -/* - * 函数功能:iec104Task 任务体(freertos.c USER CODE 区创建) - * 入口参数:argument 未用 - * 返回值:无(不返回) - * 函数说明:NET_READY 屏障(100ms 分片 + 每片喂心跳,timeSyncTask 先例)→ - * 点表/链路 init + 建监听 → 100ms 服务循环(每轮喂看门狗) - */ -void iec104_serv_task(void *argument) { - (void)argument; - - if (sys_evtHandle != NULL) { - for (;;) { - uint32_t r = osEventFlagsWait(sys_evtHandle, SYS_EVT_NET_READY, - osFlagsWaitAny | osFlagsNoClear, 100u); - if ((r & osFlagsError) == 0u) { - break; /* 就绪位是状态位(NoClear),不消费 */ - } - task_wd_beat(TASK_WD_IEC104); - } - } - - iec104_pts_init(); - s_apply_comm_ca(); - iec104_link_init(&s_link, &s_cfg, NULL); - s_gen = net_get_generation(); - if (s_bind_listen() < 0) { - DBG_ERROR("i104: bind port %u FAIL, retry in loop", - (unsigned)iec104_comm_port()); - } else { - DBG_INFO("i104: listening on %u", (unsigned)iec104_comm_port()); - } - - for (;;) { - task_wd_beat(TASK_WD_IEC104); - s_serv_poll(); - /* 定值改动(C_SE 执行段 / YK12)→ 通知属主任务落盘 /prot_set.bin(B7)。 - * peek 非消费:写盘失败时脏标志仍在,下一轮再投递 = 天然重试; - * 本任务不碰文件系统(配置引擎属主 = defaultTask,模块约定) */ - if ((prot_set_dirty_peek() != 0u) && (sys_evtHandle != NULL)) { - (void)osEventFlagsSet(sys_evtHandle, SYS_EVT_PROT_SET_SAVE); - } - /* 运行参数整定(C_SE 0x8020~0x8058 段)→ 通知属主落盘 config.ini - * (运行参数段;peek 非消费 = 写盘失败天然重试,与上块 B7 语义完全同款) */ - if ((run_par_dirty_peek() != 0u) && (sys_evtHandle != NULL)) { - (void)osEventFlagsSet(sys_evtHandle, SYS_EVT_RUN_PAR_SAVE); - } - osDelay(IEC104_POLL_MS); - } + return s_link_run; } diff --git a/App/task/iec104_serv.h b/App/task/iec104_serv.h index c0200355..ee7cc149 100644 --- a/App/task/iec104_serv.h +++ b/App/task/iec104_serv.h @@ -1,7 +1,9 @@ /* * 模块名称:IEC 60870-5-104 被控站服务(对外接口) - * 模块功能:声明 iec104Task 任务体与监听端口;协议实现在 App/protocol/iec104/, - * 本接口仅供 Src/freertos.c 创建任务使用。 + * 模块功能:声明 IEC104 服务的 netTask 驱动入口与对外只读契约;协议实现在 + * App/protocol/iec104/ 与 App/protocol/iec60870/,由 netTask 单属主 + * 在 1 ms 循环内调用 iec104_serv_net_tick() 驱动 threadless 核心; + * iec104Task 已退役,其任务体声明/创建点已全部删除。 * 创建日期:2026-10-12(B4) */ #ifndef IEC104_SERV_H @@ -14,21 +16,27 @@ * 工厂默认 IEC104_COMM_DEF_PORT = 2404 = DL/T 634.5104 标准端口)。 */ /* - * 函数功能:iec104Task 任务体(在 Src/freertos.c USER CODE 区 osThreadNew 创建) - * 入口参数:argument - 未用 - * 返回值:无(任务不返回) + * 函数功能:netTask 内唯一的 104 推进入口(每轮一次,零阻塞) + * 入口参数:无 + * 返回值:无 + * 限定条件:**仅 netTask 上下文调用**(在 net_task.c 主循环 net_process_messages() + * 之后、osDelay(1) 之前);内部含 task_wd_beat(TASK_WD_IEC104)。 + * 函数说明:驱动 threadless iec104_core 的 start/poll/stop,不做任何阻塞等待。 */ -void iec104_serv_task(void *argument); +void iec104_serv_net_tick(void); /* * 104 只读观测计数(道G task-12):四个数都是**上电以来**、跨重连不清零,语义各自 * 独立、不得互相换算: - * conn_up = 主站接入次数(accept 成功并建立协议层链路) - * apdu_tx = 成功发出的 APDU 帧数(短写算 tx_fail,不算这里) - * tx_fail = 发送短写/失败次数(含拆链前那几次连败) - * rx_bytes = 收到的**字节**数(不是帧数:帧边界在 link 层重组,serv 看不见) - * ⚠ 与 App/task/iec104_serv.c 里 s_liveness_ctr / s_send_fail_run / s_conn_dead 三枚 - * **控制量**无关:那三枚会被复位、只有 8 位,为"要不要拆链"服务,拿来当统计必错。 + * conn_up = 主站接入次数(core 统计的 TCP 接入事件次数) + * apdu_tx = I 帧写帧数(**只含 I 帧,不含 S/U 帧**;在 ACK 与收尾记录交付时 + * 观察,可能滞后于实际写入) + * tx_fail = 以发送类故障结束的会话次数(不是字节失败数/短写次数) + * rx_bytes = 收到的**字节**数(不是帧数:帧边界在传输层重组,本层看不见) + * 四个字段**跨重连单调、不归零**(core 下次 start 会清零其源计数,服务层做 + * 跨 start 搬运累计,对外永不倒退)。 + * ⚠ 与旧的 iec104Task 控制量(活性分频 / 发送连败 / 拆链标记)无关:那些会被 + * 复位、只有 8 位,为"要不要拆链"服务,拿来当统计必错。 * 到顶饱和在 0xFFFFFFF0,不回绕(回绕成个位数会被读成"刚上电")。 * 页面这一栏要写「本次开机以来」,与运行时长同一类,别让人读成终身值。 */ @@ -46,19 +54,22 @@ typedef struct { * 限定条件:**任意上下文可读**——不取锁、不读时刻、不碰 socket、不阻塞(照 * adc_cal_get_stats() / boot_stats_get() 的形态:观测口一旦去抢总线或等锁, * 观测就成了故障的一部分) - * 函数说明:写者 = iec104Task,读者 = uiTask/喂数据侧;u32 单字读写原子,跨字段 - * **不保证同一瞬间**——四枚之间没有"合起来才成立"的判据,混窗对显示无害。 + * 函数说明:写者 = netTask(iec104_serv_net_tick),读者 = uiTask/喂数据侧; + * u32 单字读写原子,跨字段**不保证同一瞬间**——四枚之间没有"合起来 + * 才成立"的判据,混窗对显示无害。 * 本函数无任何清零能力(能清零的统计口不是统计口)。 */ void iec104_serv_get_stats(iec104_serv_stats_t *p_out); /* - * 函数功能:读 104 链路是否处于 RUN 态(STARTDT 已确认 = 主站在线在轮询) - * 返 回 值:1 = RUN;0 = 其它(IDLE/OPEN/STOPPED 或未创建任务) uint8_t - * 限定条件:**任意上下文可读**——单枚举字读,不取锁、不碰 socket、不阻塞 + * 函数功能:读 104 链路是否处于 RUN 态(STARTDT 数据传输已启动) + * 返 回 值:1 = core.status.active(connected && status_valid && data_transfer_started); + * 0 = 其它(未连接/未启动/未就绪) + * 限定条件:**任意上下文可读**——单字节镜像读,不取锁、不碰 socket、不阻塞 * (与 iec104_serv_get_stats 同一形态与同一读者群)。 - * 函数说明:写者 = iec104Task(link 状态机推进),读者按需采样;单字读写在 - * Cortex-M4 上原子,最多读到"晚一拍"的状态,无撕裂风险。 + * 函数说明:写者 = netTask(iec104_serv_net_tick 从 core.status.active 镜像), + * 读者按需采样;单字节读写在 Cortex-M4 上原子,最多读到"晚一拍"的 + * 状态,无撕裂风险。 * 消费点 = 屏板状态灯 ID 3(App/algo/sb_led_map.h 的通信灯)。 * ⚠ 别拿它换算 conn_up:RUN 是电平,conn_up 是累计边沿,语义不可互换 * (同文件统计注释里的"不得互相换算"纪律)。 diff --git a/App/task/net_task.c b/App/task/net_task.c index 406d5728..e30b705e 100644 --- a/App/task/net_task.c +++ b/App/task/net_task.c @@ -34,6 +34,7 @@ #include "net_select.h" #include "net_cfg.h" #include "ch395f.h" +#include "iec104_serv.h" /* task-18:104 由本任务单属主驱动(threadless core) */ #include "sys_events.h" #include "sys_log.h" #include "test_config.h" /* 测试模式宏(ENABLE_HW_LAYER_TESTS);产品构建全未定义,无作用 */ @@ -61,6 +62,30 @@ static void net_reconfig_request_cb(void) { } } +/* bring-up 期统一心跳:NET 位 + 104 引擎位(bit7)一起喂。 + * 【定位】s_wd_beat_bringup() 是"104 引擎未 start 期"的占位心跳:104 引擎 + * 位原属独立 iec104Task,退役后喂狗者改为 netTask 的 iec104_serv_net_tick(), + * 而该 tick 只在 NET_READY 之后的主循环里跑;本 helper 只覆盖它开跑之前的 + * bring-up 窗口(PHY 轮询最多 3s / 存储屏障 10s / 组网失败或 RECONFIG 30s + * 重试——RECONFIG 在主循环里也调 net_stack_bring_up(),故埋点必须在 + * net_stack_bring_up() 内部)。若该窗口只喂 NET,bit7 连续缺席 8 窗即判 stall + * → 停喂 → IWDG 复位环(2026-11-18 台架:bring-up 1.96s 侥幸未复位, + * 实测 mask 0x177 / req 0x1F7,缺的正是 bit7)。 + * 【start 后交还】引擎一旦 start 成功,bit7 归 iec104_serv_net_tick() 独喂; + * 主循环 :254 处只喂 TASK_WD_NET,紧接着的 tick 独喂 bit7,这样"引擎真死" + * (tick 不跑)才能被 IWDG 在 800ms 内观测到。切勿把本 helper 抄进主循环, + * 否则等于给死掉的 104 引擎冒名喂狗,IWDG 将永远看不见它停摆。 + * + * 函数功能:bring-up 窗口内的统一看门狗心跳(NET 位 + 104 引擎位) + * 入口参数:无 + * 返 回 值:无 + * 函数说明:只在 net_stack_bring_up() 内部调用,覆盖"104 引擎尚未 start"的窗口。 */ +static void s_wd_beat_bringup(void) +{ + task_wd_beat(TASK_WD_NET); + task_wd_beat(TASK_WD_IEC104); +} + /* * 函数功能:CH395F 协议栈一次性初始化(两种构建模式共用) * 入口参数:无 @@ -127,8 +152,9 @@ int net_stack_bring_up(void) { } /* 心跳埋点:本循环单次最长约 1.1s(含 PHY 仍未就绪的 60 次迭代里 * 每次 50ms 延时叠加),远超看门狗 100ms 抽样窗——必须在延时段补心跳, - * 否则 PHY 未插网线时本任务会被误判为卡死(见设计说明 §4.4 长耗时白名单) */ - task_wd_beat(TASK_WD_NET); + * 否则 PHY 未插网线时本任务会被误判为卡死(见设计说明 §4.4 长耗时白名单) + * bring-up 期双位一起喂(bit7 的独喂者 tick 尚未开跑,见 helper 注释)。 */ + s_wd_beat_bringup(); osDelay(50); } DBG_INFO("PHY: %s", @@ -174,8 +200,8 @@ void net_task_func(void const *arg) { DBG_INFO("netTask parked: HW-layer test mode, CH395F owned by testTask"); for (;;) { /* 该模式下本任务已被 task_wd_required_mask() 剔除,喂心跳无副作用; - * 保留埋点以免掩码配置变更时意外误杀 */ - task_wd_beat(TASK_WD_NET); + * 保留埋点以免掩码配置变更时意外误杀(双位同喂,见 helper 注释) */ + s_wd_beat_bringup(); osDelay(1000); } #endif @@ -196,7 +222,7 @@ void net_task_func(void const *arg) { if ((r & osFlagsError) == 0u) { break; /* 存储就绪 */ } - task_wd_beat(TASK_WD_NET); /* 看门狗:分片喂心跳(屏障等待态) */ + s_wd_beat_bringup(); /* 看门狗:分片喂心跳(屏障等待态,双位) */ if ((--rounds_left) == 0u) { break; /* 10s 超时:工厂默认组网,不阻塞网络启动 */ } @@ -214,7 +240,7 @@ void net_task_func(void const *arg) { (void)syslog_post(SYSLOG_SELFTEST, "net init fail"); for (uint32_t i = 0U; i < 30U; i++) { osDelay(1000U); - task_wd_beat(TASK_WD_NET); + s_wd_beat_bringup(); /* 30s 重试期同样要喂 bit7(104 tick 还没跑) */ } } @@ -268,6 +294,11 @@ void net_task_func(void const *arg) { net_poll(); task_prof_exit(TASK_PROF_NET_POLL); net_process_messages(); + /* task-18:IEC104 机架在此驱动——netTask 是 CH395F 与 104 核心的唯一属主。 + * 位置固定在 net_process_messages() 后,socket 回执/监听自愈先于 104 推进; + * iec104_serv_net_tick() 内部零阻塞(查询式 NET_READY、无 osDelay), + * 不拖慢本任务 1 ms 网络循环。 */ + iec104_serv_net_tick(); osDelay(1); } } diff --git a/App/task/task_handles.h b/App/task/task_handles.h index f73609ad..d029e36d 100644 --- a/App/task/task_handles.h +++ b/App/task/task_handles.h @@ -35,7 +35,6 @@ extern osThreadId_t testTaskHandle; extern osThreadId_t uiTaskHandle; extern osThreadId_t timeSyncTaskHandle; extern osThreadId_t adcTaskHandle; -extern osThreadId_t iec104TaskHandle; extern osThreadId_t protectTaskHandle; extern const osThreadAttr_t defaultTask_attributes; @@ -45,7 +44,6 @@ extern const osThreadAttr_t testTask_attributes; extern const osThreadAttr_t uiTask_attributes; extern const osThreadAttr_t timeSyncTask_attributes; extern const osThreadAttr_t adcTask_attributes; -extern const osThreadAttr_t iec104Task_attributes; extern const osThreadAttr_t protectTask_attributes; #ifdef __cplusplus diff --git a/App/util/task_watchdog.c b/App/util/task_watchdog.c index e9236da2..c1ba1d3e 100644 --- a/App/util/task_watchdog.c +++ b/App/util/task_watchdog.c @@ -218,7 +218,7 @@ static uint32_t wd_required_mask(void) { | (1u << (uint32_t)TASK_WD_UI) | (1u << (uint32_t)TASK_WD_TIMESYNC) | (1u << (uint32_t)TASK_WD_ADC) /* adcTask 不依赖任何屏障,任何构建都置位 */ - | (1u << (uint32_t)TASK_WD_IEC104) /* iec104Task 同 adcTask:任何构建都创建 */ + | (1u << (uint32_t)TASK_WD_IEC104) /* 喂狗者 = netTask 的 iec104_serv_net_tick()(退役独立任务后位保留,覆盖 netTask 内的 104 引擎) */ | (1u << (uint32_t)TASK_WD_PROTECT);/* protectTask 同:判据节拍必须心跳 */ #if defined(ENABLE_HW_LAYER_TESTS) diff --git a/App/util/task_watchdog.h b/App/util/task_watchdog.h index 78820e0b..dda48afd 100644 --- a/App/util/task_watchdog.h +++ b/App/util/task_watchdog.h @@ -31,7 +31,7 @@ typedef enum { TASK_WD_UI = 4, TASK_WD_TIMESYNC = 5, TASK_WD_ADC = 6, /* adcTask:1ms 采样节拍消费者(B1,2026-10-10) */ - TASK_WD_IEC104 = 7, /* iec104Task:104 上行服务(B4,2026-10-12) */ + TASK_WD_IEC104 = 7, /* 104 上行引擎心跳位:喂狗者 = netTask(iec104_serv_net_tick),2026-11-17 起无独立任务 */ TASK_WD_PROTECT = 8, /* protectTask:保护判据节拍(B5,2026-10-12) */ TASK_WD_ID_MAX } task_wd_id_t; diff --git a/Drivers/BSP/NET/net_socket.c b/Drivers/BSP/NET/net_socket.c index cb765206..e46ad111 100644 --- a/Drivers/BSP/NET/net_socket.c +++ b/Drivers/BSP/NET/net_socket.c @@ -281,8 +281,11 @@ static void parse_ip_string(const char *str, uint8_t *ip_arr); static int net_recv_locked(net_sock_t *p_sock, void *buf, int len, int flags, uint32_t timeout_ms, TaskHandle_t caller); static int net_close_locked(net_sock_t *p_sock); -static int net_drop_conn_locked(net_sock_t *p_sock); -static int net_accept_locked(int sockfd, struct net_sockaddr *addr, int *addrlen); +/* task-18 割接:IEC104 Net 后端(netTask 单 owner)需要 owner 出口。 + * 仅把 static 去掉,函数体一字未改;公开版 net_accept/net_drop_conn 是 + * 队列+osWaitForever 自等死锁路径,netTask 内绝不可调用。 */ +int net_drop_conn_locked(net_sock_t *p_sock); +int net_accept_locked(int sockfd, struct net_sockaddr *addr, int *addrlen); static int net_connect_locked(int sockfd, const struct net_sockaddr *addr, int addrlen); /* UDP 收包共用实现(net_recvfrom / net_recvfrom_to 两个入口一条路) */ static int net_recvfrom_impl(int sockfd, void *buf, int len, int flags, @@ -1361,10 +1364,9 @@ int net_listen(int sockfd) { * 3. CLOSED + 芯片 RX 缓冲有残留数据:接受"已关但可读"连接排空 * (FUN_PARA §5.52 ② 保留现场契约,TRAP-NET-20 三次定案) */ -static int net_accept_locked(int sockfd, struct net_sockaddr *addr, int *addrlen) { +int net_accept_locked(int sockfd, struct net_sockaddr *addr, int *addrlen) { /* 监听 Socket 控制块 */ net_sock_t *p_listen_sock; - /* 取控制块(sockfd 已在上层校验范围) */ p_listen_sock = &s_net_socks[sockfd]; /* 控制块未在用 → INVAL */ @@ -2169,7 +2171,7 @@ static int net_close_locked(net_sock_t *p_sock) { * 是否重连由调用方决定 * 4. 挂起 recv 先结束(settle_close:排空尝试或取消,必通知) */ -static int net_drop_conn_locked(net_sock_t *p_sock) { +int net_drop_conn_locked(net_sock_t *p_sock) { /* S12 试点②(状态机不变量,规格 §2.1):函数头「限定条件:p_sock 在用且为 * TCP 流」+ 分派处的"非 ESTABLISHED/CONNECTING 视为幂等成功"这两条契约, * 在本函数体内**没有任何机器表达**,而函数体是无条件的:置 CLOSED、清 @@ -3513,3 +3515,103 @@ int net_getpeername(int sockfd, struct net_sockaddr *addr, int *addrlen) { /* 成功(0) */ return 0; } + +/* ===== task-18:IEC104 Net 后端的 owner-only 小接口 ===== + * 三条共用纪律: + * 1. 只能在 netTask(或硬件层 testTask)上下文调用——非 owner 直接拒绝; + * 2. 不投消息队列、不等待通知、不借用调用方 buffer; + * 3. 不修改任何既有 net_* 路径的语义,下面全是新函数。 */ + +/* + * 函数功能:读取当前 TCP 会话芯片 RX 缓冲中的待收字节数(IEC104_Net_Pending_Input 数据源) + * 入口参数:sockfd - 会话 fd + * 返回值:>=0 待收字节数;-1 表示无效/非 owner/非活动会话 + * 限定条件:netTask 上下文 + * 函数说明:ch395f_get_recv_len 是一次 SPI 事务,只能由 netTask 发起;协议层不得 include + * ch395f.h。同一 session cutoff:仅 ESTABLISHED 活动会话给出快照;CLOSED 后 + * 即使芯片仍有残留数据也报 -1,避免旧会话快照被新连接消费。 + */ +int net_pending_bytes(int sockfd) +{ + net_sock_t *p_sock; + int len; + if (net_ctx_is_owner_task() == 0U) { + return NET_ERR_RETURN_1(NET_ERR_INVAL); + } + p_sock = net_get_sock(sockfd); + if (p_sock == NULL || p_sock->type != NET_SOCK_STREAM || + (p_sock->state != NET_SOCK_STATE_ESTABLISHED && + p_sock->state != NET_SOCK_STATE_CONNECTING)) { + return NET_ERR_RETURN_1(NET_ERR_BADF); + } + len = (int)ch395f_get_recv_len((uint8_t)sockfd); + /* 0xFFFF 是 CH395F 查询失败/超范围哨兵,不是有效字节数 */ + if (len >= 0xFFFF) { + return NET_ERR_RETURN_1(NET_ERR_BUSY); + } + return len; +} + +/* + * 函数功能:非阻塞、不借用 buffer 的单块发送(IEC104_Net_Send 数据源) + * 入口参数:p_sock - 会话控制块;buf/len - 待发数据;sent - 输出实际写入字节数 + * 返回值:0 = 已发起(*sent 为本次写入量,可为 0 或短写);负 errno = 失败 + * 限定条件:netTask 上下文 + * 函数说明:1. 本函数把 len 截到 NET_SEND_CHUNK_MAX(1KB FIFO 上限),保证 + * net_send_locked 要么块写完即返回、要么在写块之前因缓冲忙返回 BUSY, + * 绝不会在"已写部分字节"之后登记挂起而丢失进度——这正是不能借用 + * caller buffer 的原因; + * 2. net_send_locked 的 caller 传 NULL,挂起登记守卫直接拒绝; + * 3. BUSY / WOULDBLOCK 统一映射成 NET_ERR_WOULDBLOCK,其余按 net 层 errno 原样上报。 + */ +int net_send_try(net_sock_t *p_sock, const void *buf, int len, int *sent) +{ + int rc, err; + if (sent != NULL) { + *sent = 0; + } + if (net_ctx_is_owner_task() == 0U || p_sock == NULL || buf == NULL || + len <= 0 || sent == NULL) { + return NET_ERR_RETURN_1(NET_ERR_INVAL); + } + if (len > NET_SEND_CHUNK_MAX) { + len = NET_SEND_CHUNK_MAX; + } + rc = net_send_locked(p_sock, buf, len, NULL); + if (rc >= 0) { + *sent = rc; + return 0; + } + err = net_get_errno(); + if (err == NET_ERR_BUSY || err == NET_ERR_WOULDBLOCK) { + return NET_ERR_RETURN_1(NET_ERR_WOULDBLOCK); + } + return NET_ERR_RETURN_1((err < 0) ? err : NET_ERR); +} + +/* + * 函数功能:32 位 tick → 64 位单调毫秒(now_ms 由 netTask 每轮驱动) + * 返回值:64 位单调毫秒 + * 限定条件:**只能在 netTask 上下文调用** + * 函数说明:内部维护 static prev_lo + hi;cur < prev_lo 即回绕,hi 加 0x100000000。 + * 不漏回绕由 netTask 1 ms 主循环与 IWDG 复位共同保证,本函数不承诺在 + * 被永久搁置的上下文里不漏回绕;若两次调用间隔真超过 49.7 天,那是 + * netTask 停摆,IWDG 早已复位——此时进程已重新开始,计时基线本就归零。 + * 读取只在单 owner 内发生,prev_lo/hi 不需要原子快照;高低位由同一次 + * 计算得出,不会撕裂。 + */ +uint64_t net_mono_now_ms(void) +{ + static uint32_t s_prev_lo; + static uint32_t s_hi; + uint32_t cur; + if (net_ctx_is_owner_task() == 0U) { + return 0U; + } + cur = HAL_GetTick(); + if (cur < s_prev_lo) { + ++s_hi; + } + s_prev_lo = cur; + return (((uint64_t)s_hi) << 32) | (uint64_t)cur; +} diff --git a/Drivers/BSP/NET/net_socket.h b/Drivers/BSP/NET/net_socket.h index 647ad705..e7298fc1 100644 --- a/Drivers/BSP/NET/net_socket.h +++ b/Drivers/BSP/NET/net_socket.h @@ -764,6 +764,60 @@ int net_listen_locked(int sockfd); */ uint8_t net_ctx_is_owner_task(void); +/* task-18 割接:以下五个入口专供 netTask 内 IEC104 Net 后端使用。 + * 它们只去 static 或做 ≤10 行包装,不经过 netMsgQueue,绝不等待。 */ + +/* + * 函数功能:丢弃一条 TCP 会话并释放其 Socket(owner-only,绝不关监听 fd) + * 入口参数:p_sock - 会话控制块 + * 返回值:0 成功;-1 失败(参数或状态不合法) + * 限定条件:必须在 netTask 上下文中调用;IEC104_Net Close(客户端句柄) 映射到本函数 + * 函数说明:与公开的 net_drop_conn() 不同,本函数不去投递 netMsgQueue——在 + * netTask 自身里投递并等待回执等于自等死锁,所以公开版只能在 + * 其它任务上下文使用。 + */ +int net_drop_conn_locked(net_sock_t *p_sock); + +/* + * 函数功能:在监听 fd 上执行一次非阻塞 accept(owner-only) + * 入口参数:sockfd - 监听 Socket 描述符 + * addr - 输出对端地址(可空) + * addrlen - 地址长度进出参(可空) + * 返回值:>=0 新会话描述符;NET_ERR_WOULDBLOCK = 当前无待接入会话; + * 其它负 errno = 失败 + * 限定条件:必须在 netTask 上下文中调用 + * 函数说明:MCU 单连接模型下芯片返回的会话 fd 可能与本监听 fd 同值, + * 故调用方**不得**把返回值直接当"独立客户端 fd"去 net_close_sock; + * 关闭会话一律走 net_drop_conn_locked。 + */ +int net_accept_locked(int sockfd, struct net_sockaddr *addr, int *addrlen); + +/* + * 函数功能:读取 TCP 会话芯片 RX 待收字节数(owner-only) + * 返回值:>=0 字节数;-1 = 非 owner / 无效 fd / 非活动会话 / 查询失败 + * 限定条件:netTask 上下文;IEC104_Net_Pending_Input 的唯一数据来源 + */ +int net_pending_bytes(int sockfd); + +/* + * 函数功能:非阻塞单块发送,不借用调用方 buffer(owner-only) + * 入口参数:p_sock - 会话;buf/len - 数据;sent - 输出已写入字节数(必填) + * 返回值:0 = 已发起(*sent 可为短写);NET_ERR_WOULDBLOCK / 其它负 errno = 失败 + * 限定条件:netTask 上下文;len 内部截到 NET_SEND_CHUNK_MAX 保证无跨调用借用 + */ +int net_send_try(net_sock_t *p_sock, const void *buf, int len, int *sent); + +/* + * 函数功能:32 位 tick 扩展的 64 位单调毫秒(owner-only) + * 返回值:单调递增的 64 位毫秒计数(跨 32 位 tick 回绕不回退) + * 限定条件:**只能在 netTask 上下文调用**;由 netTask 每轮驱动, + * 不漏回绕由 1 ms 主循环与 IWDG 复位共同保证。 + * 函数说明:IEC104_Net Now_Ms 的唯一数据来源。库的超时判定依赖 64 位 + * 单调量,直接把 32 位 tick 强转成 64 位会在约 49.7 天回绕处 + * 让所有定时器一次性过期,故在此做高位进位扩展。 + */ +uint64_t net_mono_now_ms(void); + /* * 函数功能:发送数据(内部锁定版本,TCP 与 UDP 共用同一份分块实现) * 入口参数:p_sock - Socket 控制块指针 diff --git a/IEC60870-Slave/test/iec104_strict_priority_transport_test.c b/IEC60870-Slave/test/iec104_strict_priority_transport_test.c index 7d4073a2..f60fbc33 100644 --- a/IEC60870-Slave/test/iec104_strict_priority_transport_test.c +++ b/IEC60870-Slave/test/iec104_strict_priority_transport_test.c @@ -4,6 +4,9 @@ #include "iec104_test_config.h" #include "iec104_tcp_fixture.h" +#define SOE_CAP IEC104_ASDU_SOE_MAX_CAPACITY +#define SOE_OVER (IEC104_ASDU_SOE_MAX_CAPACITY + 1U) + static unsigned strict_groups; /** @@ -463,24 +466,24 @@ static void soe_flush_all(void) */ static void soe_capacity_isolation(void) { - unsigned strict, id, ids[256]; + unsigned strict, id, ids[SOE_CAP]; for (strict = 0U; strict < 2U; ++strict) { IEC104_TcpServerStatus_t status; soe_begin(strict); - for (id = 1U; id <= 256U; ++id) { soe_enqueue(id, 1U, false, NULL); } + for (id = 1U; id <= SOE_CAP; ++id) { soe_enqueue(id, 1U, false, NULL); } CHECK(IEC104_TcpServer_Get_Status(sut, &status, NULL) == IEC104_TCP_OK); - CHECK(status.soe_queue.capacity == 256U && status.soe_queue.stored_count == 256U); + CHECK(status.soe_queue.capacity == SOE_CAP && status.soe_queue.stored_count == SOE_CAP); CHECK(status.soe_queue.dropped_pending_count == 0U); for (id = 1U; id <= 64U; ++id) { event(8U, (uint8_t)id, 120U); } CHECK(IEC104_TcpServer_Get_Status(sut, &status, NULL) == IEC104_TCP_OK); - CHECK(status.soe_queue.stored_count == 256U && status.soe_queue.dropped_pending_count == 0U); - soe_enqueue(257U, 1U, false, NULL); + CHECK(status.soe_queue.stored_count == SOE_CAP && status.soe_queue.dropped_pending_count == 0U); + soe_enqueue(SOE_OVER, 1U, false, NULL); CHECK(IEC104_TcpServer_Get_Status(sut, &status, NULL) == IEC104_TCP_OK); - CHECK(status.soe_queue.stored_count == 256U && status.soe_queue.dropped_pending_count == 1U); + CHECK(status.soe_queue.stored_count == SOE_CAP && status.soe_queue.dropped_pending_count == 1U); CHECK(IEC104_TcpServer_Release_Startup(sut, sut->generation, sut->activation_id) == IEC104_TCP_SUBMIT_OK); soe_flush_all(); - CHECK(output_soe_ids(ids, 256U) == 256U); - for (id = 0U; id < 256U; ++id) { CHECK(ids[id] == id + 2U); } + CHECK(output_soe_ids(ids, SOE_CAP) == SOE_CAP); + for (id = 0U; id < SOE_CAP; ++id) { CHECK(ids[id] == id + 2U); } CHECK(IEC104_TcpServer_Get_Status(sut, &status, NULL) == IEC104_TCP_OK); CHECK(status.soe_queue.stored_count == 0U && status.soe_queue.retired_count == 0U); end(); @@ -497,29 +500,29 @@ static void soe_capacity_isolation(void) */ static void soe_overwritten_ack_identity(void) { - unsigned strict, id, ids[257]; + unsigned strict, id, ids[SOE_OVER]; for (strict = 0U; strict < 2U; ++strict) { IEC104_TcpServerStatus_t status; soe_begin(strict); soe_enqueue(1U, 1U, false, NULL); CHECK(IEC104_TcpServer_Release_Startup(sut, sut->generation, sut->activation_id) == IEC104_TCP_SUBMIT_OK); - emit(1U); CHECK(output_soe_ids(ids, 257U) == 1U && ids[0] == 1U); + emit(1U); CHECK(output_soe_ids(ids, SOE_OVER) == 1U && ids[0] == 1U); CHECK(IEC104_AsduQueue_Set_Startup_Pending(&sut->queue, sut->generation, 1U) == IEC104_ASDU_QUEUE_OK); - for (id = 2U; id <= 257U; ++id) { soe_enqueue(id, 1U, false, NULL); } + for (id = 2U; id <= SOE_OVER; ++id) { soe_enqueue(id, 1U, false, NULL); } CHECK(IEC104_TcpServer_Get_Status(sut, &status, NULL) == IEC104_TCP_OK); - CHECK(status.soe_queue.stored_count == 256U && status.soe_queue.retired_count == 1U); + CHECK(status.soe_queue.stored_count == SOE_CAP && status.soe_queue.retired_count == 1U); CHECK(status.soe_queue.overwritten_unacked_count == 1U); push_ack(1U); emit(2U); CHECK(IEC104_TcpServer_Get_Status(sut, &status, NULL) == IEC104_TCP_OK); - CHECK(status.soe_queue.stored_count == 256U && status.soe_queue.retired_count == 0U); + CHECK(status.soe_queue.stored_count == SOE_CAP && status.soe_queue.retired_count == 0U); CHECK(IEC104_TcpServer_Release_Startup(sut, sut->generation, sut->activation_id) == IEC104_TCP_SUBMIT_OK); - emit(1U); CHECK(output_soe_ids(ids, 257U) >= 2U && ids[1] == 2U); + emit(1U); CHECK(output_soe_ids(ids, SOE_OVER) >= 2U && ids[1] == 2U); CHECK(IEC104_AsduQueue_Set_Startup_Pending(&sut->queue, sut->generation, 1U) == IEC104_ASDU_QUEUE_OK); push_ack(2U); emit(2U); CHECK(IEC104_TcpServer_Get_Status(sut, &status, NULL) == IEC104_TCP_OK); - CHECK(status.soe_queue.stored_count == 255U && status.soe_queue.retired_count == 0U); + CHECK(status.soe_queue.stored_count == (SOE_CAP - 1U) && status.soe_queue.retired_count == 0U); CHECK(IEC104_TcpServer_Release_Startup(sut, sut->generation, sut->activation_id) == IEC104_TCP_SUBMIT_OK); - soe_flush_all(); CHECK(output_soe_ids(ids, 257U) == 257U); - for (id = 0U; id < 257U; ++id) { CHECK(ids[id] == id + 1U); } + soe_flush_all(); CHECK(output_soe_ids(ids, SOE_OVER) == SOE_OVER); + for (id = 0U; id < SOE_OVER; ++id) { CHECK(ids[id] == id + 1U); } end(); } ++strict_groups; diff --git a/MDK-ARM/STM32F407-Demo.uvprojx b/MDK-ARM/STM32F407-Demo.uvprojx index 378294f1..63c769b6 100644 --- a/MDK-ARM/STM32F407-Demo.uvprojx +++ b/MDK-ARM/STM32F407-Demo.uvprojx @@ -335,9 +335,9 @@ 0 --diag_suppress=1,68,111,188,191,546,1293 - USE_HAL_DRIVER,STM32F407xx,NDEBUG + USE_HAL_DRIVER,STM32F407xx,NDEBUG,IEC104_TCP_RX_CAPACITY=256,IEC104_TCP_HIGH_CAPACITY=288,IEC104_TCP_NORMAL_CAPACITY=272,IEC104_TCP_RECORD_CAPACITY=4,IEC104_TCP_EVENT_CAPACITY=11,IEC104_INTERROGATION_TASK_CAPACITY=1,IEC104_INTERROGATION_EVENT_CAPACITY=2,IEC104_SYSTEM_COMMAND_TASK_CAPACITY=1,IEC104_SYSTEM_COMMAND_RESET_CAPACITY=1,IEC104_PERIODIC_SCAN_GROUP_CAPACITY=1,IEC104_PARAMETER_TASK_CAPACITY=1,IEC104_REMOTE_PARAMETER_TASK_CAPACITY=1,IEC104_CLOCK_SYNCHRONIZATION_TASK_CAPACITY=1,IEC104_READ_TASK_CAPACITY=1,IEC104_COMMAND_REPLY_CAPACITY=1 - ../Inc;../Drivers/STM32F4xx_HAL_Driver/Inc;../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F4xx/Include;../Drivers/CMSIS/Include;../Drivers/BSP;../Drivers/BSP/CH395F;../Drivers/BSP/GD5F2GQ5UE;../Drivers/BSP/TPAFE5160;../Drivers/BSP/SD2506;../Drivers/BSP/RS485;../Drivers/BSP/ScreenLink;../Drivers/BSP/NET;../Drivers/BSP/NET/lftpd;../Drivers/BSP/NETCFG;../Drivers/BSP/IOBOARD;../App;../App/app;../App/algo;../App/cfg;../App/fs;../App/log;../App/sync;../App/task;../App/protocol/iec104;../App/util;../Middlewares/Third_Party/FreeRTOS/Source/include;../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2;../Middlewares/Third_Party/FreeRTOS/Source/portable/RVDS/ARM_CM4F;../Lib/dhara;../Lib/FatFs;../test/board;../Lib/lvgl;../Drivers/BSP/UI;../Lib;../Lib/coreSNTP/include + ../Inc;../Drivers/STM32F4xx_HAL_Driver/Inc;../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F4xx/Include;../Drivers/CMSIS/Include;../Drivers/BSP;../Drivers/BSP/CH395F;../Drivers/BSP/GD5F2GQ5UE;../Drivers/BSP/TPAFE5160;../Drivers/BSP/SD2506;../Drivers/BSP/RS485;../Drivers/BSP/ScreenLink;../Drivers/BSP/NET;../Drivers/BSP/NET/lftpd;../Drivers/BSP/NETCFG;../Drivers/BSP/IOBOARD;../App;../App/app;../App/algo;../App/cfg;../App/fs;../App/log;../App/sync;../App/task;../App/protocol/iec104;../App/protocol/iec60870/common;../App/protocol/iec60870/104;../App/protocol/iec60870/104/business;../App/protocol/iec60870/examples;../App/util;../Middlewares/Third_Party/FreeRTOS/Source/include;../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2;../Middlewares/Third_Party/FreeRTOS/Source/portable/RVDS/ARM_CM4F;../Lib/dhara;../Lib/FatFs;../test/board;../Lib/lvgl;../Drivers/BSP/UI;../Lib;../Lib/coreSNTP/include @@ -992,26 +992,171 @@ 1 ..\App\task\protect_task.c - - iec104_asdu.c - 1 - ..\App\protocol\iec104\iec104_asdu.c - - - iec104_pts.c - 1 - ..\App\protocol\iec104\iec104_pts.c - - - iec104_link.c - 1 - ..\App\protocol\iec104\iec104_link.c - iec104_comm.c 1 ..\App\protocol\iec104\iec104_comm.c + + iec104_core.c + 1 + ..\App\protocol\iec104\iec104_core.c + + + iec104_source.c + 1 + ..\App\protocol\iec104\iec104_source.c + + + iec104_dtu_table.c + 1 + ..\App\protocol\iec104\iec104_dtu_table.c + + + iec104_net_mcu.c + 1 + ..\App\protocol\iec104\iec104_net_mcu.c + + + IEC104_AsduQueue.c + 1 + ..\App\protocol\iec60870\104\IEC104_AsduQueue.c + + + IEC104_Codec.c + 1 + ..\App\protocol\iec60870\104\IEC104_Codec.c + + + IEC104_Connection.c + 1 + ..\App\protocol\iec60870\104\IEC104_Connection.c + + + IEC104_Link.c + 1 + ..\App\protocol\iec60870\104\IEC104_Link.c + + + IEC104_Link_Slave_StartStop.c + 1 + ..\App\protocol\iec60870\104\IEC104_Link_Slave_StartStop.c + + + IEC104_Receiver.c + 1 + ..\App\protocol\iec60870\104\IEC104_Receiver.c + + + IEC104_SendBuffer.c + 1 + ..\App\protocol\iec60870\104\IEC104_SendBuffer.c + + + IEC104_SendManager.c + 1 + ..\App\protocol\iec60870\104\IEC104_SendManager.c + + + IEC104_Slave.c + 1 + ..\App\protocol\iec60870\104\IEC104_Slave.c + + + IEC104_TcpServer.c + 1 + ..\App\protocol\iec60870\104\IEC104_TcpServer.c + + + IEC104_ClockSynchronization.c + 1 + ..\App\protocol\iec60870\104\business\IEC104_ClockSynchronization.c + + + IEC104_Command.c + 1 + ..\App\protocol\iec60870\104\business\IEC104_Command.c + + + IEC104_CounterInterrogation.c + 1 + ..\App\protocol\iec60870\104\business\IEC104_CounterInterrogation.c + + + IEC104_GeneralInterrogation.c + 1 + ..\App\protocol\iec60870\104\business\IEC104_GeneralInterrogation.c + + + IEC104_Interrogation.c + 1 + ..\App\protocol\iec60870\104\business\IEC104_Interrogation.c + + + IEC104_Parameter.c + 1 + ..\App\protocol\iec60870\104\business\IEC104_Parameter.c + + + IEC104_PeriodicScan.c + 1 + ..\App\protocol\iec60870\104\business\IEC104_PeriodicScan.c + + + IEC104_Read.c + 1 + ..\App\protocol\iec60870\104\business\IEC104_Read.c + + + IEC104_RemoteParameter.c + 1 + ..\App\protocol\iec60870\104\business\IEC104_RemoteParameter.c + + + IEC104_Spontaneous.c + 1 + ..\App\protocol\iec60870\104\business\IEC104_Spontaneous.c + + + IEC104_Startup.c + 1 + ..\App\protocol\iec60870\104\business\IEC104_Startup.c + + + IEC104_SystemCommand.c + 1 + ..\App\protocol\iec60870\104\business\IEC104_SystemCommand.c + + + IEC60870_Asdu.c + 1 + ..\App\protocol\iec60870\common\IEC60870_Asdu.c + + + IEC60870_Codec.c + 1 + ..\App\protocol\iec60870\common\IEC60870_Codec.c + + + IEC60870_FaultEvent.c + 1 + ..\App\protocol\iec60870\common\IEC60870_FaultEvent.c + + + IEC60870_InformationObjects.c + 1 + ..\App\protocol\iec60870\common\IEC60870_InformationObjects.c + + + IEC60870_Slave.c + 1 + ..\App\protocol\iec60870\common\IEC60870_Slave.c + + + IEC60870_Time.c + 1 + ..\App\protocol\iec60870\common\IEC60870_Time.c + adc_input.c 1 diff --git a/README.md b/README.md index 93f3b53e..89d857f1 100644 --- a/README.md +++ b/README.md @@ -78,13 +78,12 @@ main.c | 任务 | 栈大小 | 优先级 | 职责 | |------|--------|--------|------| | defaultTask | 1280 words | Normal | FTL + FatFS 挂载、配置引擎属主、syslog 唯一写者 | -| netTask | 960 words | Normal | 网络初始化 + CH395F 轮询(消费 NET_RECONFIG 按代次重建监听) | +| netTask | 1408 words | Normal | 网络初始化 + CH395F 轮询(消费 NET_RECONFIG 按代次重建监听) | | ftpTask | 1024 words | Normal | FTP 服务(等待网络+存储就绪) | | testTask | 2048 words | BelowNormal | 硬件测试入口 | | uiTask | 4096 words | BelowNormal | LVGL UI 界面 | -| timeSyncTask | 640 words | Normal | 墙钟时间同步 | +| timeSyncTask | 736 words | Normal | 墙钟时间同步 | | adcTask | 640 words | AboveNormal | TPAFE5160 采样(TIM3 1kHz 事件驱动 + 原子快照 + STM32 ADC DMA,纯消费者) | -| iec104Task | 640 words | Normal | IEC 60870-5-104 上行(工厂默认 :2404 监听,遥信/遥测/定值区) | | protectTask | 512 words | Normal | 保护判据 20ms 节拍(保护判据元件 + 采样故障闭锁) | diff --git a/STM32F407-Demo.ioc b/STM32F407-Demo.ioc index 891e9512..aeba3fc9 100644 --- a/STM32F407-Demo.ioc +++ b/STM32F407-Demo.ioc @@ -119,7 +119,7 @@ FREERTOS.Events01=sys_evt,Dynamic,NULL FREERTOS.FootprintOK=true FREERTOS.IPParameters=Tasks01,configENABLE_FPU,FootprintOK,configTOTAL_HEAP_SIZE,Queues01,Events01,configCHECK_FOR_STACK_OVERFLOW,configUSE_MALLOC_FAILED_HOOK FREERTOS.Queues01=netMsgQueue,8,net_msg_t,0,Dynamic,NULL,NULL -FREERTOS.Tasks01=defaultTask,24,1280,StartDefaultTask,Default,NULL,Dynamic,NULL,NULL;netTask,24,960,StartNetTask,Default,NULL,Dynamic,NULL,NULL;ftpTask,24,1024,StartFtpTask,As weak,NULL,Dynamic,NULL,NULL;testTask,16,2048,start_test_task,As weak,NULL,Dynamic,NULL,NULL;uiTask,16,4096,StartUiTask,Default,NULL,Dynamic,NULL,NULL +FREERTOS.Tasks01=defaultTask,24,1280,StartDefaultTask,Default,NULL,Dynamic,NULL,NULL;netTask,24,1408,StartNetTask,Default,NULL,Dynamic,NULL,NULL;ftpTask,24,1024,StartFtpTask,As weak,NULL,Dynamic,NULL,NULL;testTask,16,2048,start_test_task,As weak,NULL,Dynamic,NULL,NULL;uiTask,16,4096,StartUiTask,Default,NULL,Dynamic,NULL,NULL FREERTOS.configCHECK_FOR_STACK_OVERFLOW=2 FREERTOS.configENABLE_FPU=1 FREERTOS.configTOTAL_HEAP_SIZE=57344 diff --git a/Src/freertos.c b/Src/freertos.c index 3964ae03..2f12c34d 100644 --- a/Src/freertos.c +++ b/Src/freertos.c @@ -39,7 +39,6 @@ #include "sys_events.h" #include "default_task.h" #include "adc_task.h" /* B1(2026-10-10):ADC 采集消费者(手写任务,见 Variables 区) */ -#include "iec104_serv.h" /* B4(2026-10-12):IEC 104 上行服务(手写任务,见 Variables 区) */ #include "protect_task.h" /* B5(2026-10-12):保护判据节拍任务(手写任务,同上) */ /* USER CODE END Includes */ @@ -108,22 +107,29 @@ static int hook_ptr_ok(const void *p) * cfg 写 → f_rename → sync_fs → dhara GC → 控制台回显尾),1024 words 时余 * 1080 B < 30% 线(4096×30% = 1228 B)→ 抬至 **1280 words**(5120 B),余 * 2104 B / 41%;堆开销 +1024 B。栈值事实源仍是 `.ioc` 的 `FREERTOS.Tasks01`。 - * netTask 960 words:静态最坏链 1944 B(2026-10-12 监听生命周期模块化后复测,链尾经 - * net_listener_pump→net_relisten_locked→SPI 故障→日志尾;2026-10-10 整改后曾为 - * 1872 B,整改前 2664 B);3840 B 配置余量 1896 B - * (49%),过 stack_report 规则。运行时水位仅 ~0.9 KB(错误尾未 - * 触发,不可作依据)。曾试 net_drain_chip_rx scratch 静态化,实测仅省 16 B 栈 + * netTask 1408 words:静态最坏链 **3784 B**(2026-11-18 104 割接后实测,链尾为 + * net_task_func→iec104_serv_net_tick→s_try_start→iec104_core_start→ + * iec104_core_stop→drain_events→dispatch→vendor 命令拒绝→Drop_Client→ + * IEC104_Net_Close→net_close_sock→SPI 故障→控制台回显尾)。 + * 抬栈依据:原 960 words(3840 B)时余量仅 56 B / 1%,FAIL。把 104 装配层 + * 栈压到 0 也不够——net_task_func 216 B + dispatch 以下不归本层管的链尾 + * 2776 B = 2992 B 已超 960 words 允许的最坏深 2688 B(3840−1152)⇒ 必须抬栈。 + * 1408 words(5632 B)余量 1848 B / 32.8%,过 stack_report 规则。 + * 堆代价 +1792 B(configTOTAL_HEAP_SIZE 57344 B,见 Inc/FreeRTOSConfig.h; + * 任务栈自堆分配,且堆在 CCM ⇒ 不占 RW_IRAM1、不影响 92% SRAM 门禁)。 + * 曾试 net_drain_chip_rx scratch 静态化,实测仅省 16 B 栈 * (ARMCC 已叠放不重叠局部量)反增 256 B BSS,已回退——见 net_socket.c 注释。 * testTask 2048 words:存储套件 deep call chain + 局部缓冲,原 1024(4 KB)实测溢出 * (2026-09-20)。仅启用测试套件时创建。 - * timeSyncTask 640 words:本区下方手工定义(不在 `.ioc` 的 Tasks01 里 → 重生成会丢, - * 靠审计 WARN 提示),建监听 → net_bind → CH395F → 日志尾。2026-10-10 整改后 - * 静态最坏链 1024 B(整改前 1736 B)、实测峰值 616 B;⚠ 余量 1024 B **正好** - * 等于 ISR 底线 → 本任务链上再加任何调用(或新日志行)都必须先抬栈。 - * 栈余量收口(2026-10-12):链已加深到 **1264 B**(同一控制台回显尾:`dbg_console_drain` - * → `MX_USART1_UART_Init` → `Error_Handler` → 回显 Cycle),512 words 时余 - * 784 B < 1024 B ISR 底线 → 抬至 **640 words**(2.5 KB),余 1296 B / 50%; - * 堆开销 +512 B。 + * timeSyncTask 736 words:本区下方手工定义(不在 `.ioc` 的 Tasks01 里 → 重生成会丢, + * 靠审计 WARN 提示),建监听 → net_bind → CH395F → 日志尾。 + * 静态最坏链 **1904 B**(2026-11-18 复测,链尾同一控制台回显尾:`dbg_console_drain` + * → `MX_USART1_UART_Init` → `Error_Handler` → 回显 Cycle)。640 words(2560 B)时 + * 余量 656 B / 25% → FAIL(缺 368 B 才到 1024 B ISR 底线)。抬至 **736 words** + * (2944 B),余量 1040 B / 35.3% → PASS。 + * ⚠ 余量只比 1024 B 底线多 **16 B**:本任务链上再加任何调用(或新日志行)都必须 + * 先重跑 `scripts/stack_report.py` 并再次抬栈,不能默认"刚抬过还有余"。 + * 堆开销 +384 B。 * adcTask 640 words:本区下方手工定义(同上,不在 `.ioc` 里)。B1(2026-10-10) * ADC 采集消费者;全周傅氏相量(2026-10-11)+ 采样有效性校验(同日)后链上为 * adc_input_poll + sample_ring/phasor + adc_health_report(DBG_ERROR + @@ -131,10 +137,6 @@ static int hook_ptr_ok(const void *p) * ISR 底线 → 抬至 640 words(2.5 KB,堆余量 min_ever 7152→≈6640 B,可承受)。 * 2026-10-12 复测链 1320 B(保护判据接线后),余 1240 B / 48% 仍 PASS。 * 栈值以 `scripts/stack_report.py` 实测最坏链为准,改动前后各跑一次。 - * iec104Task 640 words:B4(2026-10-12)104 上行服务(默认 2404 监听 + link 状态 - * 机)。link/pts 缓冲全静态;stack_report 实测静态最坏链 1456 B(拆链 - * 重建监听 → net_bind → SPI 故障 → 日志尾,日志主导)。512 words 时余 - * 592 B < 1024 B ISR 底线 → 抬至 640(2.5 KB)。 * protectTask 512 words:B5(2026-10-12)保护判据节拍(prot_elm_run 消费者 * + 自检失败闭锁 采样闭锁)。stack_report 实测静态最坏链 872 B(float 判据 + * phasor 快照 + 日志尾),余 1176 B / 57% ≥ ISR 底线 → 512 保持。 @@ -143,7 +145,7 @@ static int hook_ptr_ok(const void *p) osThreadId_t timeSyncTaskHandle; const osThreadAttr_t timeSyncTask_attributes = { .name = "timeSyncTask", - .stack_size = 640 * 4, + .stack_size = 736 * 4, .priority = (osPriority_t) osPriorityNormal, }; /* B1:ADC 采集消费者(TIM3 1 kHz 采样节拍 + 原子快照 + 帧统计)。 @@ -159,17 +161,6 @@ const osThreadAttr_t adcTask_attributes = { .stack_size = 640 * 4, .priority = (osPriority_t) osPriorityAboveNormal, }; -/* B4(2026-10-12):IEC 60870-5-104 被控站服务(默认 2404 监听 + 链路状态机消费)。 - * 手写于此而非 .ioc(同 timeSyncTask/adcTask:不在 Tasks01 里 → 重生成会丢, - * 靠审计 WARN 提示)。640 words:stack_report 实测静态最坏链 1456 B(拆链→ - * 重建监听→net_bind→SPI 故障→日志尾,日志主导);512 words 时余 592 B - * < 1024 B ISR 底线 → 抬至 640(2.5 KB,CCM 堆 min_ever 再降 512 B,可承受)。 */ -osThreadId_t iec104TaskHandle; -const osThreadAttr_t iec104Task_attributes = { - .name = "iec104Task", - .stack_size = 640 * 4, - .priority = (osPriority_t) osPriorityNormal, -}; /* B5(2026-10-12):保护判据节拍(prot_elm_run 消费者 + 自检失败闭锁 采样闭锁)。 * 手写于此而非 .ioc(同上)。512 words:stack_report 实测静态最坏链 872 B * (float 判据 + phasor 快照 + 日志尾),余 1176 B / 57% ≥ ISR 底线 → 保持。 @@ -194,7 +185,7 @@ const osThreadAttr_t defaultTask_attributes = { osThreadId_t netTaskHandle; const osThreadAttr_t netTask_attributes = { .name = "netTask", - .stack_size = 960 * 4, + .stack_size = 1408 * 4, .priority = (osPriority_t) osPriorityNormal, }; /* Definitions for ftpTask */ @@ -385,10 +376,9 @@ void MX_FREERTOS_Init(void) { * (内核启动前)完成;本任务只做运行期采样。 */ adcTaskHandle = osThreadNew(adc_task_func, NULL, &adcTask_attributes); - /* B4(2026-10-12):IEC 60870-5-104 上行服务任务。任务体内先等 NET_READY - * 屏障(100ms 分片 + 每片喂心跳,timeSyncTask 先例),再建默认端口 2404 监听并 - * 100ms 循环服务;纳入 IWDG required_mask(TASK_WD_IEC104,任何构建都创建)。 */ - iec104TaskHandle = osThreadNew(iec104_serv_task, NULL, &iec104Task_attributes); + /* B4(2026-10-12):IEC 60870-5-104 上行服务已于 task-18 退役独立任务; + * 现由 netTask 单属主在 1 ms 循环内驱动 threadless 的 iec104_core + * (App/task/net_task.c 调 iec104_serv_net_tick),不再创建 iec104Task。 */ protectTaskHandle = osThreadNew(protect_task, NULL, &protectTask_attributes); /* 2026-10-04:产品构建(未选任何 TEST_SUITE_*)不需要 testTask。 diff --git a/_all_hook.txt b/_all_hook.txt new file mode 100644 index 00000000..7ad1f94d --- /dev/null +++ b/_all_hook.txt @@ -0,0 +1,512 @@ +App/algo/adc_cal.c +App/algo/adc_cal.h +App/algo/adc_health.c +App/algo/adc_health.h +App/algo/adc_input.c +App/algo/adc_input.h +App/algo/freq.c +App/algo/freq.h +App/algo/meas.c +App/algo/meas.h +App/algo/phasor.c +App/algo/phasor.h +App/algo/prot_elm.c +App/algo/prot_elm.h +App/algo/prot_set.c +App/algo/prot_set.h +App/algo/run_par.c +App/algo/run_par.h +App/algo/sample_ring.c +App/algo/sample_ring.h +App/algo/sb_led_map.c +App/algo/sb_led_map.h +App/algo/wave_ring.c +App/algo/wave_ring.h +App/algo/wave_store.c +App/algo/wave_store.h +App/app/app_cfg.h +App/app/app_main.c +App/app/app_main.h +App/app/sys_events.h +App/app/ui_data_feed.c +App/app/ui_data_feed.h +App/cfg/cfg_file.c +App/cfg/cfg_file.h +App/cfg/cfg_file_store.h +App/cfg/cfg_file_store_mcu.c +App/cfg/prot_set_store.c +App/cfg/prot_set_store.h +App/fs/vol_idle_sync.c +App/fs/vol_idle_sync.h +App/fs/vol_lock.c +App/fs/vol_lock.h +App/log/console_log.c +App/log/console_log.h +App/log/soe_rec.c +App/log/soe_rec.h +App/log/soe_store.c +App/log/soe_store.h +App/log/sys_log.h +App/log/sys_log_mcu.c +App/protocol/iec104/iec104_asdu.h +App/protocol/iec104/iec104_comm.c +App/protocol/iec104/iec104_comm.h +App/protocol/iec104/iec104_core.c +App/protocol/iec104/iec104_core.h +App/protocol/iec104/iec104_dtu_table.c +App/protocol/iec104/iec104_dtu_table.h +App/protocol/iec104/iec104_net_mcu.c +App/protocol/iec104/iec104_net_mcu.h +App/protocol/iec104/iec104_source.c +App/protocol/iec104/iec104_source.h +App/protocol/iec104/iec104_source_ranks.h +App/protocol/iec60870/104/IEC104.h +App/protocol/iec60870/104/IEC104_AsduQueue.c +App/protocol/iec60870/104/IEC104_AsduQueue.h +App/protocol/iec60870/104/IEC104_Codec.c +App/protocol/iec60870/104/IEC104_Codec.h +App/protocol/iec60870/104/IEC104_Config_Internal.h +App/protocol/iec60870/104/IEC104_Connection.c +App/protocol/iec60870/104/IEC104_Connection.h +App/protocol/iec60870/104/IEC104_Link.c +App/protocol/iec60870/104/IEC104_Link.h +App/protocol/iec60870/104/IEC104_Link_Common.h +App/protocol/iec60870/104/IEC104_Link_Internal.h +App/protocol/iec60870/104/IEC104_Link_Master_StartStop.h +App/protocol/iec60870/104/IEC104_Link_Slave_StartStop.c +App/protocol/iec60870/104/IEC104_Link_Slave_StartStop.h +App/protocol/iec60870/104/IEC104_Log.h +App/protocol/iec60870/104/IEC104_Net.h +App/protocol/iec60870/104/IEC104_Net_Windows.c +App/protocol/iec60870/104/IEC104_Receiver.c +App/protocol/iec60870/104/IEC104_Receiver.h +App/protocol/iec60870/104/IEC104_SendBuffer.c +App/protocol/iec60870/104/IEC104_SendBuffer.h +App/protocol/iec60870/104/IEC104_SendManager.c +App/protocol/iec60870/104/IEC104_SendManager.h +App/protocol/iec60870/104/IEC104_Slave.c +App/protocol/iec60870/104/IEC104_Slave.h +App/protocol/iec60870/104/IEC104_TcpServer.c +App/protocol/iec60870/104/IEC104_TcpServer.h +App/protocol/iec60870/104/IEC104_TcpServer_Config.h +App/protocol/iec60870/104/IEC104_TcpTypes.h +App/protocol/iec60870/104/IEC104_Types.h +App/protocol/iec60870/104/business/IEC104_BusinessConfig_Internal.h +App/protocol/iec60870/104/business/IEC104_ClockSynchronization.c +App/protocol/iec60870/104/business/IEC104_ClockSynchronization.h +App/protocol/iec60870/104/business/IEC104_Command.c +App/protocol/iec60870/104/business/IEC104_Command.h +App/protocol/iec60870/104/business/IEC104_CounterInterrogation.c +App/protocol/iec60870/104/business/IEC104_CounterInterrogation.h +App/protocol/iec60870/104/business/IEC104_FileService.h +App/protocol/iec60870/104/business/IEC104_GeneralInterrogation.c +App/protocol/iec60870/104/business/IEC104_GeneralInterrogation.h +App/protocol/iec60870/104/business/IEC104_Interrogation.c +App/protocol/iec60870/104/business/IEC104_Interrogation.h +App/protocol/iec60870/104/business/IEC104_Interrogation_Internal.h +App/protocol/iec60870/104/business/IEC104_Parameter.c +App/protocol/iec60870/104/business/IEC104_Parameter.h +App/protocol/iec60870/104/business/IEC104_PeriodicScan.c +App/protocol/iec60870/104/business/IEC104_PeriodicScan.h +App/protocol/iec60870/104/business/IEC104_Read.c +App/protocol/iec60870/104/business/IEC104_Read.h +App/protocol/iec60870/104/business/IEC104_RemoteParameter.c +App/protocol/iec60870/104/business/IEC104_RemoteParameter.h +App/protocol/iec60870/104/business/IEC104_SoftwareUpgrade.h +App/protocol/iec60870/104/business/IEC104_Spontaneous.c +App/protocol/iec60870/104/business/IEC104_Spontaneous.h +App/protocol/iec60870/104/business/IEC104_Startup.c +App/protocol/iec60870/104/business/IEC104_Startup.h +App/protocol/iec60870/104/business/IEC104_SystemCommand.c +App/protocol/iec60870/104/business/IEC104_SystemCommand.h +App/protocol/iec60870/common/IEC60870_Asdu.c +App/protocol/iec60870/common/IEC60870_Asdu.h +App/protocol/iec60870/common/IEC60870_Clock.h +App/protocol/iec60870/common/IEC60870_Codec.c +App/protocol/iec60870/common/IEC60870_Codec.h +App/protocol/iec60870/common/IEC60870_Comtrade.h +App/protocol/iec60870/common/IEC60870_EnergyFreeze.h +App/protocol/iec60870/common/IEC60870_EnergyFreezeFile.h +App/protocol/iec60870/common/IEC60870_FaultEvent.c +App/protocol/iec60870/common/IEC60870_FaultEvent.h +App/protocol/iec60870/common/IEC60870_FaultRecorder.h +App/protocol/iec60870/common/IEC60870_FirmwareUpdate.h +App/protocol/iec60870/common/IEC60870_History.h +App/protocol/iec60870/common/IEC60870_HistoryFile.h +App/protocol/iec60870/common/IEC60870_InformationObjects.c +App/protocol/iec60870/common/IEC60870_InformationObjects.h +App/protocol/iec60870/common/IEC60870_InformationObjects_Internal.h +App/protocol/iec60870/common/IEC60870_Slave.c +App/protocol/iec60870/common/IEC60870_Slave.h +App/protocol/iec60870/common/IEC60870_StaticAssert.h +App/protocol/iec60870/common/IEC60870_Time.c +App/protocol/iec60870/common/IEC60870_Time.h +App/protocol/iec60870/common/IEC60870_Types.h +App/protocol/iec60870/common/IEC60870_UserLog.h +App/protocol/iec60870/common/IEC60870_UserLogFile.h +App/protocol/iec60870/examples/iec104_dtu_profile.h +App/sync/time_sntp.c +App/sync/time_sntp.h +App/sync/time_sync.c +App/sync/time_sync.h +App/task/adc_task.c +App/task/adc_task.h +App/task/default_task.c +App/task/default_task.h +App/task/iec104_serv.c +App/task/iec104_serv.h +App/task/net_task.c +App/task/net_task.h +App/task/protect_task.c +App/task/protect_task.h +App/task/rs485_task.c +App/task/rs485_task.h +App/task/task_handles.h +App/task/ui_task.c +App/task/ui_task.h +App/util/boot_stats.c +App/util/boot_stats.h +App/util/ioboard_di.c +App/util/ioboard_di.h +App/util/sha256.c +App/util/sha256.h +App/util/sys_clock.c +App/util/sys_clock.h +App/util/task_prof.c +App/util/task_prof.h +App/util/task_watchdog.c +App/util/task_watchdog.h +Drivers/BSP/CH395F/ch395f.c +Drivers/BSP/CH395F/ch395f.h +Drivers/BSP/GD5F2GQ5UE/gd5f2gq5ue.c +Drivers/BSP/GD5F2GQ5UE/gd5f2gq5ue.h +Drivers/BSP/IOBOARD/ioboard.c +Drivers/BSP/IOBOARD/ioboard.h +Drivers/BSP/IOBOARD/ioboard_bits.c +Drivers/BSP/IOBOARD/ioboard_bits.h +Drivers/BSP/NET/net_config.h +Drivers/BSP/NET/net_events.c +Drivers/BSP/NET/net_events.h +Drivers/BSP/NET/net_listener.c +Drivers/BSP/NET/net_listener.h +Drivers/BSP/NET/net_pending.c +Drivers/BSP/NET/net_pending.h +Drivers/BSP/NET/net_select.c +Drivers/BSP/NET/net_select.h +Drivers/BSP/NET/net_socket.c +Drivers/BSP/NET/net_socket.h +Drivers/BSP/NET/net_types.h +Drivers/BSP/NET/net_udp.c +Drivers/BSP/NET/net_udp.h +Drivers/BSP/NETCFG/ftp_cfg.c +Drivers/BSP/NETCFG/ftp_cfg.h +Drivers/BSP/NETCFG/net_cfg.c +Drivers/BSP/NETCFG/net_cfg.h +Drivers/BSP/NETCFG/sntp_cfg.c +Drivers/BSP/NETCFG/sntp_cfg.h +Drivers/BSP/RS485/rs485.c +Drivers/BSP/RS485/rs485.h +Drivers/BSP/SD2506/sd2506.c +Drivers/BSP/SD2506/sd2506.h +Drivers/BSP/ScreenLink/sb_link.c +Drivers/BSP/ScreenLink/sb_link.h +Drivers/BSP/ScreenLink/sb_proto.c +Drivers/BSP/ScreenLink/sb_proto.h +Drivers/BSP/TPAFE5160/tpafe5160.c +Drivers/BSP/TPAFE5160/tpafe5160.h +Drivers/BSP/UI/ui_content_page.c +Drivers/BSP/UI/ui_content_page.h +Drivers/BSP/UI/ui_data.c +Drivers/BSP/UI/ui_data.h +Drivers/BSP/UI/ui_deco.c +Drivers/BSP/UI/ui_deco.h +Drivers/BSP/UI/ui_font_cn_12.c +Drivers/BSP/UI/ui_menu.c +Drivers/BSP/UI/ui_menu.h +Drivers/BSP/UI/ui_menu_tab.c +Drivers/BSP/UI/ui_menu_tab.h +Drivers/BSP/UI/ui_menu_view.c +Drivers/BSP/UI/ui_menu_view.h +Drivers/BSP/UI/ui_net_sink.c +Drivers/BSP/UI/ui_net_sink.h +Drivers/BSP/UI/ui_net_sink_backend.h +Drivers/BSP/UI/ui_net_sink_backend_mcu.c +Drivers/BSP/UI/ui_page_ac.c +Drivers/BSP/UI/ui_page_ac.h +Drivers/BSP/UI/ui_page_accident.c +Drivers/BSP/UI/ui_page_accident.h +Drivers/BSP/UI/ui_page_action.c +Drivers/BSP/UI/ui_page_action.h +Drivers/BSP/UI/ui_page_alarm.c +Drivers/BSP/UI/ui_page_alarm.h +Drivers/BSP/UI/ui_page_calib.c +Drivers/BSP/UI/ui_page_calib.h +Drivers/BSP/UI/ui_page_clear.c +Drivers/BSP/UI/ui_page_clear.h +Drivers/BSP/UI/ui_page_clock.c +Drivers/BSP/UI/ui_page_clock.h +Drivers/BSP/UI/ui_page_comm.c +Drivers/BSP/UI/ui_page_comm.h +Drivers/BSP/UI/ui_page_dc.c +Drivers/BSP/UI/ui_page_dc.h +Drivers/BSP/UI/ui_page_deadband.c +Drivers/BSP/UI/ui_page_deadband.h +Drivers/BSP/UI/ui_page_device_info.c +Drivers/BSP/UI/ui_page_device_info.h +Drivers/BSP/UI/ui_page_net_cfg.c +Drivers/BSP/UI/ui_page_net_cfg.h +Drivers/BSP/UI/ui_page_oper.c +Drivers/BSP/UI/ui_page_oper.h +Drivers/BSP/UI/ui_page_password.c +Drivers/BSP/UI/ui_page_password.h +Drivers/BSP/UI/ui_page_registry.c +Drivers/BSP/UI/ui_page_registry.h +Drivers/BSP/UI/ui_page_reset.c +Drivers/BSP/UI/ui_page_reset.h +Drivers/BSP/UI/ui_page_runlog.c +Drivers/BSP/UI/ui_page_runlog.h +Drivers/BSP/UI/ui_page_runreport.c +Drivers/BSP/UI/ui_page_runreport.h +Drivers/BSP/UI/ui_page_selftest.c +Drivers/BSP/UI/ui_page_selftest.h +Drivers/BSP/UI/ui_page_sntp.c +Drivers/BSP/UI/ui_page_sntp.h +Drivers/BSP/UI/ui_page_soe.c +Drivers/BSP/UI/ui_page_soe.h +Drivers/BSP/UI/ui_page_start.c +Drivers/BSP/UI/ui_page_start.h +Drivers/BSP/UI/ui_page_view_param.c +Drivers/BSP/UI/ui_page_view_param.h +Drivers/BSP/UI/ui_page_view_plate.c +Drivers/BSP/UI/ui_page_view_plate.h +Drivers/BSP/UI/ui_page_view_set.c +Drivers/BSP/UI/ui_page_view_set.h +Drivers/BSP/UI/ui_page_view_word.c +Drivers/BSP/UI/ui_page_view_word.h +Drivers/BSP/UI/ui_page_wave_manual.c +Drivers/BSP/UI/ui_page_wave_manual.h +Drivers/BSP/UI/ui_page_wave_play.c +Drivers/BSP/UI/ui_page_wave_play.h +Drivers/BSP/UI/ui_page_yk.c +Drivers/BSP/UI/ui_page_yk.h +Drivers/BSP/UI/ui_page_yx.c +Drivers/BSP/UI/ui_page_yx.h +Drivers/BSP/UI/ui_port.c +Drivers/BSP/UI/ui_port.h +Drivers/BSP/UI/ui_pwd_def.h +Drivers/BSP/UI/ui_standby.c +Drivers/BSP/UI/ui_standby.h +Drivers/BSP/UI/ui_style.c +Drivers/BSP/UI/ui_style.h +Drivers/BSP/UI/ui_tokens.h +Drivers/BSP/UI/ui_w_editor.c +Drivers/BSP/UI/ui_w_editor.h +Drivers/BSP/UI/ui_w_records.c +Drivers/BSP/UI/ui_w_records.h +Drivers/BSP/UI/ui_w_setlist.c +Drivers/BSP/UI/ui_w_setlist.h +Drivers/BSP/UI/ui_w_setview.c +Drivers/BSP/UI/ui_w_setview.h +Drivers/BSP/UI/ui_w_soe.c +Drivers/BSP/UI/ui_w_soe.h +Drivers/BSP/UI/ui_w_ytview.c +Drivers/BSP/UI/ui_w_ytview.h +Drivers/BSP/app_assert.h +Drivers/BSP/bsp_err.h +Drivers/BSP/dbg_cfg.h +Drivers/BSP/dbg_log.h +IEC60870-Slave/104/IEC104.c +IEC60870-Slave/104/IEC104.h +IEC60870-Slave/104/IEC104_AsduQueue.c +IEC60870-Slave/104/IEC104_AsduQueue.h +IEC60870-Slave/104/IEC104_Codec.c +IEC60870-Slave/104/IEC104_Codec.h +IEC60870-Slave/104/IEC104_Config_Internal.h +IEC60870-Slave/104/IEC104_Connection.c +IEC60870-Slave/104/IEC104_Connection.h +IEC60870-Slave/104/IEC104_Link.c +IEC60870-Slave/104/IEC104_Link.h +IEC60870-Slave/104/IEC104_Link_Common.h +IEC60870-Slave/104/IEC104_Link_Internal.h +IEC60870-Slave/104/IEC104_Link_Master_StartStop.c +IEC60870-Slave/104/IEC104_Link_Master_StartStop.h +IEC60870-Slave/104/IEC104_Link_Slave_StartStop.c +IEC60870-Slave/104/IEC104_Link_Slave_StartStop.h +IEC60870-Slave/104/IEC104_Log.c +IEC60870-Slave/104/IEC104_Log.h +IEC60870-Slave/104/IEC104_Net.h +IEC60870-Slave/104/IEC104_Net_Windows.c +IEC60870-Slave/104/IEC104_Receiver.c +IEC60870-Slave/104/IEC104_Receiver.h +IEC60870-Slave/104/IEC104_SendBuffer.c +IEC60870-Slave/104/IEC104_SendBuffer.h +IEC60870-Slave/104/IEC104_SendManager.c +IEC60870-Slave/104/IEC104_SendManager.h +IEC60870-Slave/104/IEC104_Slave.c +IEC60870-Slave/104/IEC104_Slave.h +IEC60870-Slave/104/IEC104_TcpServer.c +IEC60870-Slave/104/IEC104_TcpServer.h +IEC60870-Slave/104/IEC104_TcpServer_Config.h +IEC60870-Slave/104/IEC104_TcpTypes.h +IEC60870-Slave/104/IEC104_Types.h +IEC60870-Slave/104/business/IEC104_BusinessConfig_Internal.h +IEC60870-Slave/104/business/IEC104_ClockSynchronization.c +IEC60870-Slave/104/business/IEC104_ClockSynchronization.h +IEC60870-Slave/104/business/IEC104_Command.c +IEC60870-Slave/104/business/IEC104_Command.h +IEC60870-Slave/104/business/IEC104_CounterInterrogation.c +IEC60870-Slave/104/business/IEC104_CounterInterrogation.h +IEC60870-Slave/104/business/IEC104_FileService.c +IEC60870-Slave/104/business/IEC104_FileService.h +IEC60870-Slave/104/business/IEC104_GeneralInterrogation.c +IEC60870-Slave/104/business/IEC104_GeneralInterrogation.h +IEC60870-Slave/104/business/IEC104_Interrogation.c +IEC60870-Slave/104/business/IEC104_Interrogation.h +IEC60870-Slave/104/business/IEC104_Interrogation_Internal.h +IEC60870-Slave/104/business/IEC104_Parameter.c +IEC60870-Slave/104/business/IEC104_Parameter.h +IEC60870-Slave/104/business/IEC104_PeriodicScan.c +IEC60870-Slave/104/business/IEC104_PeriodicScan.h +IEC60870-Slave/104/business/IEC104_Read.c +IEC60870-Slave/104/business/IEC104_Read.h +IEC60870-Slave/104/business/IEC104_RemoteParameter.c +IEC60870-Slave/104/business/IEC104_RemoteParameter.h +IEC60870-Slave/104/business/IEC104_SoftwareUpgrade.c +IEC60870-Slave/104/business/IEC104_SoftwareUpgrade.h +IEC60870-Slave/104/business/IEC104_Spontaneous.c +IEC60870-Slave/104/business/IEC104_Spontaneous.h +IEC60870-Slave/104/business/IEC104_Startup.c +IEC60870-Slave/104/business/IEC104_Startup.h +IEC60870-Slave/104/business/IEC104_SystemCommand.c +IEC60870-Slave/104/business/IEC104_SystemCommand.h +IEC60870-Slave/common/IEC60870_Asdu.c +IEC60870-Slave/common/IEC60870_Asdu.h +IEC60870-Slave/common/IEC60870_Clock.c +IEC60870-Slave/common/IEC60870_Clock.h +IEC60870-Slave/common/IEC60870_Codec.c +IEC60870-Slave/common/IEC60870_Codec.h +IEC60870-Slave/common/IEC60870_Comtrade.c +IEC60870-Slave/common/IEC60870_Comtrade.h +IEC60870-Slave/common/IEC60870_EnergyFreeze.c +IEC60870-Slave/common/IEC60870_EnergyFreeze.h +IEC60870-Slave/common/IEC60870_EnergyFreezeFile.c +IEC60870-Slave/common/IEC60870_EnergyFreezeFile.h +IEC60870-Slave/common/IEC60870_FaultEvent.c +IEC60870-Slave/common/IEC60870_FaultEvent.h +IEC60870-Slave/common/IEC60870_FaultRecorder.c +IEC60870-Slave/common/IEC60870_FaultRecorder.h +IEC60870-Slave/common/IEC60870_FirmwareUpdate.c +IEC60870-Slave/common/IEC60870_FirmwareUpdate.h +IEC60870-Slave/common/IEC60870_History.c +IEC60870-Slave/common/IEC60870_History.h +IEC60870-Slave/common/IEC60870_HistoryFile.c +IEC60870-Slave/common/IEC60870_HistoryFile.h +IEC60870-Slave/common/IEC60870_InformationObjects.c +IEC60870-Slave/common/IEC60870_InformationObjects.h +IEC60870-Slave/common/IEC60870_InformationObjects_Internal.h +IEC60870-Slave/common/IEC60870_Slave.c +IEC60870-Slave/common/IEC60870_Slave.h +IEC60870-Slave/common/IEC60870_Time.c +IEC60870-Slave/common/IEC60870_Time.h +IEC60870-Slave/common/IEC60870_Types.h +IEC60870-Slave/common/IEC60870_UserLog.c +IEC60870-Slave/common/IEC60870_UserLog.h +IEC60870-Slave/common/IEC60870_UserLogFile.c +IEC60870-Slave/common/IEC60870_UserLogFile.h +IEC60870-Slave/examples/iec104_dtu_example.c +IEC60870-Slave/examples/iec104_dtu_measurement.c +IEC60870-Slave/examples/iec104_dtu_measurement.h +IEC60870-Slave/examples/iec104_dtu_profile.h +IEC60870-Slave/examples/iec104_dtu_protection.c +IEC60870-Slave/examples/iec104_dtu_protection.h +IEC60870-Slave/examples/iec104_dtu_settings.c +IEC60870-Slave/examples/iec104_dtu_settings.h +IEC60870-Slave/examples/iec104_example_config.c +IEC60870-Slave/examples/iec104_example_config.h +IEC60870-Slave/examples/iec104_example_energy_freeze.c +IEC60870-Slave/examples/iec104_example_energy_freeze.h +IEC60870-Slave/examples/iec104_example_energy_meter.c +IEC60870-Slave/examples/iec104_example_energy_meter.h +IEC60870-Slave/examples/iec104_example_history.c +IEC60870-Slave/examples/iec104_example_history.h +IEC60870-Slave/examples/iec104_example_points.h +IEC60870-Slave/examples/iec104_example_recording.c +IEC60870-Slave/examples/iec104_example_recording.h +IEC60870-Slave/examples/iec104_example_upgrade.c +IEC60870-Slave/examples/iec104_example_upgrade.h +IEC60870-Slave/examples/iec104_example_user_log.c +IEC60870-Slave/examples/iec104_example_user_log.h +IEC60870-Slave/examples/iec104_parameter_multi_master.c +IEC60870-Slave/examples/iec104_slave_example.c +IEC60870-Slave/test/iec104_ack_tracking_test.c +IEC60870-Slave/test/iec104_asdu_transport_test.c +IEC60870-Slave/test/iec104_command_test.c +IEC60870-Slave/test/iec104_dtu_energy_settings_test.c +IEC60870-Slave/test/iec104_dtu_measurement_test.c +IEC60870-Slave/test/iec104_dtu_protection_test.c +IEC60870-Slave/test/iec104_dtu_settings_model_test.c +IEC60870-Slave/test/iec104_dtu_storage_test.c +IEC60870-Slave/test/iec104_dtu_trigger_recording_test.c +IEC60870-Slave/test/iec104_energy_freeze_transitions_test.c +IEC60870-Slave/test/iec104_example_energy_freeze_test.c +IEC60870-Slave/test/iec104_example_energy_meter_test.c +IEC60870-Slave/test/iec104_example_history_test.c +IEC60870-Slave/test/iec104_example_recording_test.c +IEC60870-Slave/test/iec104_example_upgrade_test.c +IEC60870-Slave/test/iec104_example_user_log_test.c +IEC60870-Slave/test/iec104_fault_event_test.c +IEC60870-Slave/test/iec104_file_service_internal_test.c +IEC60870-Slave/test/iec104_file_service_test.c +IEC60870-Slave/test/iec104_idle_transport_test.c +IEC60870-Slave/test/iec104_interrogation_rules_test.c +IEC60870-Slave/test/iec104_net_pending_input_test.c +IEC60870-Slave/test/iec104_parameter_edge_test.c +IEC60870-Slave/test/iec104_parameter_test.c +IEC60870-Slave/test/iec104_periodic_scan_test.c +IEC60870-Slave/test/iec104_read_test.c +IEC60870-Slave/test/iec104_remote_parameter_internal_test.c +IEC60870-Slave/test/iec104_remote_parameter_test.c +IEC60870-Slave/test/iec104_response_queue_test.c +IEC60870-Slave/test/iec104_response_transport_test.c +IEC60870-Slave/test/iec104_slave_example_test.c +IEC60870-Slave/test/iec104_slave_test.c +IEC60870-Slave/test/iec104_software_upgrade_internal_test.c +IEC60870-Slave/test/iec104_software_upgrade_test.c +IEC60870-Slave/test/iec104_spontaneous_test.c +IEC60870-Slave/test/iec104_strict_priority_queue_test.c +IEC60870-Slave/test/iec104_strict_priority_transport_test.c +IEC60870-Slave/test/iec104_system_command_test.c +IEC60870-Slave/test/iec104_tcp_event_ring_test.c +IEC60870-Slave/test/iec104_tcp_fixture.h +IEC60870-Slave/test/iec104_tcp_scheduler_test.c +IEC60870-Slave/test/iec104_test_config.h +IEC60870-Slave/test/iec60870_asdu_extended_test.c +IEC60870-Slave/test/iec60870_asdu_fixture.h +IEC60870-Slave/test/iec60870_asdu_test.c +IEC60870-Slave/test/iec60870_comtrade_test.c +IEC60870-Slave/test/iec60870_energy_freeze_file_test.c +IEC60870-Slave/test/iec60870_energy_freeze_test.c +IEC60870-Slave/test/iec60870_fault_event_test.c +IEC60870-Slave/test/iec60870_fault_recorder_test.c +IEC60870-Slave/test/iec60870_firmware_update_test.c +IEC60870-Slave/test/iec60870_history_file_test.c +IEC60870-Slave/test/iec60870_history_test.c +IEC60870-Slave/test/iec60870_user_log_file_test.c +IEC60870-Slave/test/iec60870_user_log_test.c +IEC60870-Slave/test/parameter_interop_slave.c +IEC60870-Slave/test/parameter_lib60870_client.c +IEC60870-Slave/test/periodic_scan_interop_server.c +IEC60870-Slave/test/periodic_scan_lib60870_client.c +IEC60870-Slave/test/periodic_scan_soak_example.c +simulator/dbg_log.h +simulator/lv_conf.h +simulator/main.c +simulator/sim/cfg_file_store_sim.c +simulator/sim/iec104_sim.c +simulator/sim/iec104_sim.h +simulator/sim/net_socket_sim.c +simulator/sim/sim_latency_stub.c +simulator/sim/sim_port.c +simulator/sim/sim_port.h +simulator/sim/sim_syslog.c +simulator/sim/ui_net_sink_backend_sim.c diff --git a/_scope.txt b/_scope.txt new file mode 100644 index 00000000..7ad1f94d --- /dev/null +++ b/_scope.txt @@ -0,0 +1,512 @@ +App/algo/adc_cal.c +App/algo/adc_cal.h +App/algo/adc_health.c +App/algo/adc_health.h +App/algo/adc_input.c +App/algo/adc_input.h +App/algo/freq.c +App/algo/freq.h +App/algo/meas.c +App/algo/meas.h +App/algo/phasor.c +App/algo/phasor.h +App/algo/prot_elm.c +App/algo/prot_elm.h +App/algo/prot_set.c +App/algo/prot_set.h +App/algo/run_par.c +App/algo/run_par.h +App/algo/sample_ring.c +App/algo/sample_ring.h +App/algo/sb_led_map.c +App/algo/sb_led_map.h +App/algo/wave_ring.c +App/algo/wave_ring.h +App/algo/wave_store.c +App/algo/wave_store.h +App/app/app_cfg.h +App/app/app_main.c +App/app/app_main.h +App/app/sys_events.h +App/app/ui_data_feed.c +App/app/ui_data_feed.h +App/cfg/cfg_file.c +App/cfg/cfg_file.h +App/cfg/cfg_file_store.h +App/cfg/cfg_file_store_mcu.c +App/cfg/prot_set_store.c +App/cfg/prot_set_store.h +App/fs/vol_idle_sync.c +App/fs/vol_idle_sync.h +App/fs/vol_lock.c +App/fs/vol_lock.h +App/log/console_log.c +App/log/console_log.h +App/log/soe_rec.c +App/log/soe_rec.h +App/log/soe_store.c +App/log/soe_store.h +App/log/sys_log.h +App/log/sys_log_mcu.c +App/protocol/iec104/iec104_asdu.h +App/protocol/iec104/iec104_comm.c +App/protocol/iec104/iec104_comm.h +App/protocol/iec104/iec104_core.c +App/protocol/iec104/iec104_core.h +App/protocol/iec104/iec104_dtu_table.c +App/protocol/iec104/iec104_dtu_table.h +App/protocol/iec104/iec104_net_mcu.c +App/protocol/iec104/iec104_net_mcu.h +App/protocol/iec104/iec104_source.c +App/protocol/iec104/iec104_source.h +App/protocol/iec104/iec104_source_ranks.h +App/protocol/iec60870/104/IEC104.h +App/protocol/iec60870/104/IEC104_AsduQueue.c +App/protocol/iec60870/104/IEC104_AsduQueue.h +App/protocol/iec60870/104/IEC104_Codec.c +App/protocol/iec60870/104/IEC104_Codec.h +App/protocol/iec60870/104/IEC104_Config_Internal.h +App/protocol/iec60870/104/IEC104_Connection.c +App/protocol/iec60870/104/IEC104_Connection.h +App/protocol/iec60870/104/IEC104_Link.c +App/protocol/iec60870/104/IEC104_Link.h +App/protocol/iec60870/104/IEC104_Link_Common.h +App/protocol/iec60870/104/IEC104_Link_Internal.h +App/protocol/iec60870/104/IEC104_Link_Master_StartStop.h +App/protocol/iec60870/104/IEC104_Link_Slave_StartStop.c +App/protocol/iec60870/104/IEC104_Link_Slave_StartStop.h +App/protocol/iec60870/104/IEC104_Log.h +App/protocol/iec60870/104/IEC104_Net.h +App/protocol/iec60870/104/IEC104_Net_Windows.c +App/protocol/iec60870/104/IEC104_Receiver.c +App/protocol/iec60870/104/IEC104_Receiver.h +App/protocol/iec60870/104/IEC104_SendBuffer.c +App/protocol/iec60870/104/IEC104_SendBuffer.h +App/protocol/iec60870/104/IEC104_SendManager.c +App/protocol/iec60870/104/IEC104_SendManager.h +App/protocol/iec60870/104/IEC104_Slave.c +App/protocol/iec60870/104/IEC104_Slave.h +App/protocol/iec60870/104/IEC104_TcpServer.c +App/protocol/iec60870/104/IEC104_TcpServer.h +App/protocol/iec60870/104/IEC104_TcpServer_Config.h +App/protocol/iec60870/104/IEC104_TcpTypes.h +App/protocol/iec60870/104/IEC104_Types.h +App/protocol/iec60870/104/business/IEC104_BusinessConfig_Internal.h +App/protocol/iec60870/104/business/IEC104_ClockSynchronization.c +App/protocol/iec60870/104/business/IEC104_ClockSynchronization.h +App/protocol/iec60870/104/business/IEC104_Command.c +App/protocol/iec60870/104/business/IEC104_Command.h +App/protocol/iec60870/104/business/IEC104_CounterInterrogation.c +App/protocol/iec60870/104/business/IEC104_CounterInterrogation.h +App/protocol/iec60870/104/business/IEC104_FileService.h +App/protocol/iec60870/104/business/IEC104_GeneralInterrogation.c +App/protocol/iec60870/104/business/IEC104_GeneralInterrogation.h +App/protocol/iec60870/104/business/IEC104_Interrogation.c +App/protocol/iec60870/104/business/IEC104_Interrogation.h +App/protocol/iec60870/104/business/IEC104_Interrogation_Internal.h +App/protocol/iec60870/104/business/IEC104_Parameter.c +App/protocol/iec60870/104/business/IEC104_Parameter.h +App/protocol/iec60870/104/business/IEC104_PeriodicScan.c +App/protocol/iec60870/104/business/IEC104_PeriodicScan.h +App/protocol/iec60870/104/business/IEC104_Read.c +App/protocol/iec60870/104/business/IEC104_Read.h +App/protocol/iec60870/104/business/IEC104_RemoteParameter.c +App/protocol/iec60870/104/business/IEC104_RemoteParameter.h +App/protocol/iec60870/104/business/IEC104_SoftwareUpgrade.h +App/protocol/iec60870/104/business/IEC104_Spontaneous.c +App/protocol/iec60870/104/business/IEC104_Spontaneous.h +App/protocol/iec60870/104/business/IEC104_Startup.c +App/protocol/iec60870/104/business/IEC104_Startup.h +App/protocol/iec60870/104/business/IEC104_SystemCommand.c +App/protocol/iec60870/104/business/IEC104_SystemCommand.h +App/protocol/iec60870/common/IEC60870_Asdu.c +App/protocol/iec60870/common/IEC60870_Asdu.h +App/protocol/iec60870/common/IEC60870_Clock.h +App/protocol/iec60870/common/IEC60870_Codec.c +App/protocol/iec60870/common/IEC60870_Codec.h +App/protocol/iec60870/common/IEC60870_Comtrade.h +App/protocol/iec60870/common/IEC60870_EnergyFreeze.h +App/protocol/iec60870/common/IEC60870_EnergyFreezeFile.h +App/protocol/iec60870/common/IEC60870_FaultEvent.c +App/protocol/iec60870/common/IEC60870_FaultEvent.h +App/protocol/iec60870/common/IEC60870_FaultRecorder.h +App/protocol/iec60870/common/IEC60870_FirmwareUpdate.h +App/protocol/iec60870/common/IEC60870_History.h +App/protocol/iec60870/common/IEC60870_HistoryFile.h +App/protocol/iec60870/common/IEC60870_InformationObjects.c +App/protocol/iec60870/common/IEC60870_InformationObjects.h +App/protocol/iec60870/common/IEC60870_InformationObjects_Internal.h +App/protocol/iec60870/common/IEC60870_Slave.c +App/protocol/iec60870/common/IEC60870_Slave.h +App/protocol/iec60870/common/IEC60870_StaticAssert.h +App/protocol/iec60870/common/IEC60870_Time.c +App/protocol/iec60870/common/IEC60870_Time.h +App/protocol/iec60870/common/IEC60870_Types.h +App/protocol/iec60870/common/IEC60870_UserLog.h +App/protocol/iec60870/common/IEC60870_UserLogFile.h +App/protocol/iec60870/examples/iec104_dtu_profile.h +App/sync/time_sntp.c +App/sync/time_sntp.h +App/sync/time_sync.c +App/sync/time_sync.h +App/task/adc_task.c +App/task/adc_task.h +App/task/default_task.c +App/task/default_task.h +App/task/iec104_serv.c +App/task/iec104_serv.h +App/task/net_task.c +App/task/net_task.h +App/task/protect_task.c +App/task/protect_task.h +App/task/rs485_task.c +App/task/rs485_task.h +App/task/task_handles.h +App/task/ui_task.c +App/task/ui_task.h +App/util/boot_stats.c +App/util/boot_stats.h +App/util/ioboard_di.c +App/util/ioboard_di.h +App/util/sha256.c +App/util/sha256.h +App/util/sys_clock.c +App/util/sys_clock.h +App/util/task_prof.c +App/util/task_prof.h +App/util/task_watchdog.c +App/util/task_watchdog.h +Drivers/BSP/CH395F/ch395f.c +Drivers/BSP/CH395F/ch395f.h +Drivers/BSP/GD5F2GQ5UE/gd5f2gq5ue.c +Drivers/BSP/GD5F2GQ5UE/gd5f2gq5ue.h +Drivers/BSP/IOBOARD/ioboard.c +Drivers/BSP/IOBOARD/ioboard.h +Drivers/BSP/IOBOARD/ioboard_bits.c +Drivers/BSP/IOBOARD/ioboard_bits.h +Drivers/BSP/NET/net_config.h +Drivers/BSP/NET/net_events.c +Drivers/BSP/NET/net_events.h +Drivers/BSP/NET/net_listener.c +Drivers/BSP/NET/net_listener.h +Drivers/BSP/NET/net_pending.c +Drivers/BSP/NET/net_pending.h +Drivers/BSP/NET/net_select.c +Drivers/BSP/NET/net_select.h +Drivers/BSP/NET/net_socket.c +Drivers/BSP/NET/net_socket.h +Drivers/BSP/NET/net_types.h +Drivers/BSP/NET/net_udp.c +Drivers/BSP/NET/net_udp.h +Drivers/BSP/NETCFG/ftp_cfg.c +Drivers/BSP/NETCFG/ftp_cfg.h +Drivers/BSP/NETCFG/net_cfg.c +Drivers/BSP/NETCFG/net_cfg.h +Drivers/BSP/NETCFG/sntp_cfg.c +Drivers/BSP/NETCFG/sntp_cfg.h +Drivers/BSP/RS485/rs485.c +Drivers/BSP/RS485/rs485.h +Drivers/BSP/SD2506/sd2506.c +Drivers/BSP/SD2506/sd2506.h +Drivers/BSP/ScreenLink/sb_link.c +Drivers/BSP/ScreenLink/sb_link.h +Drivers/BSP/ScreenLink/sb_proto.c +Drivers/BSP/ScreenLink/sb_proto.h +Drivers/BSP/TPAFE5160/tpafe5160.c +Drivers/BSP/TPAFE5160/tpafe5160.h +Drivers/BSP/UI/ui_content_page.c +Drivers/BSP/UI/ui_content_page.h +Drivers/BSP/UI/ui_data.c +Drivers/BSP/UI/ui_data.h +Drivers/BSP/UI/ui_deco.c +Drivers/BSP/UI/ui_deco.h +Drivers/BSP/UI/ui_font_cn_12.c +Drivers/BSP/UI/ui_menu.c +Drivers/BSP/UI/ui_menu.h +Drivers/BSP/UI/ui_menu_tab.c +Drivers/BSP/UI/ui_menu_tab.h +Drivers/BSP/UI/ui_menu_view.c +Drivers/BSP/UI/ui_menu_view.h +Drivers/BSP/UI/ui_net_sink.c +Drivers/BSP/UI/ui_net_sink.h +Drivers/BSP/UI/ui_net_sink_backend.h +Drivers/BSP/UI/ui_net_sink_backend_mcu.c +Drivers/BSP/UI/ui_page_ac.c +Drivers/BSP/UI/ui_page_ac.h +Drivers/BSP/UI/ui_page_accident.c +Drivers/BSP/UI/ui_page_accident.h +Drivers/BSP/UI/ui_page_action.c +Drivers/BSP/UI/ui_page_action.h +Drivers/BSP/UI/ui_page_alarm.c +Drivers/BSP/UI/ui_page_alarm.h +Drivers/BSP/UI/ui_page_calib.c +Drivers/BSP/UI/ui_page_calib.h +Drivers/BSP/UI/ui_page_clear.c +Drivers/BSP/UI/ui_page_clear.h +Drivers/BSP/UI/ui_page_clock.c +Drivers/BSP/UI/ui_page_clock.h +Drivers/BSP/UI/ui_page_comm.c +Drivers/BSP/UI/ui_page_comm.h +Drivers/BSP/UI/ui_page_dc.c +Drivers/BSP/UI/ui_page_dc.h +Drivers/BSP/UI/ui_page_deadband.c +Drivers/BSP/UI/ui_page_deadband.h +Drivers/BSP/UI/ui_page_device_info.c +Drivers/BSP/UI/ui_page_device_info.h +Drivers/BSP/UI/ui_page_net_cfg.c +Drivers/BSP/UI/ui_page_net_cfg.h +Drivers/BSP/UI/ui_page_oper.c +Drivers/BSP/UI/ui_page_oper.h +Drivers/BSP/UI/ui_page_password.c +Drivers/BSP/UI/ui_page_password.h +Drivers/BSP/UI/ui_page_registry.c +Drivers/BSP/UI/ui_page_registry.h +Drivers/BSP/UI/ui_page_reset.c +Drivers/BSP/UI/ui_page_reset.h +Drivers/BSP/UI/ui_page_runlog.c +Drivers/BSP/UI/ui_page_runlog.h +Drivers/BSP/UI/ui_page_runreport.c +Drivers/BSP/UI/ui_page_runreport.h +Drivers/BSP/UI/ui_page_selftest.c +Drivers/BSP/UI/ui_page_selftest.h +Drivers/BSP/UI/ui_page_sntp.c +Drivers/BSP/UI/ui_page_sntp.h +Drivers/BSP/UI/ui_page_soe.c +Drivers/BSP/UI/ui_page_soe.h +Drivers/BSP/UI/ui_page_start.c +Drivers/BSP/UI/ui_page_start.h +Drivers/BSP/UI/ui_page_view_param.c +Drivers/BSP/UI/ui_page_view_param.h +Drivers/BSP/UI/ui_page_view_plate.c +Drivers/BSP/UI/ui_page_view_plate.h +Drivers/BSP/UI/ui_page_view_set.c +Drivers/BSP/UI/ui_page_view_set.h +Drivers/BSP/UI/ui_page_view_word.c +Drivers/BSP/UI/ui_page_view_word.h +Drivers/BSP/UI/ui_page_wave_manual.c +Drivers/BSP/UI/ui_page_wave_manual.h +Drivers/BSP/UI/ui_page_wave_play.c +Drivers/BSP/UI/ui_page_wave_play.h +Drivers/BSP/UI/ui_page_yk.c +Drivers/BSP/UI/ui_page_yk.h +Drivers/BSP/UI/ui_page_yx.c +Drivers/BSP/UI/ui_page_yx.h +Drivers/BSP/UI/ui_port.c +Drivers/BSP/UI/ui_port.h +Drivers/BSP/UI/ui_pwd_def.h +Drivers/BSP/UI/ui_standby.c +Drivers/BSP/UI/ui_standby.h +Drivers/BSP/UI/ui_style.c +Drivers/BSP/UI/ui_style.h +Drivers/BSP/UI/ui_tokens.h +Drivers/BSP/UI/ui_w_editor.c +Drivers/BSP/UI/ui_w_editor.h +Drivers/BSP/UI/ui_w_records.c +Drivers/BSP/UI/ui_w_records.h +Drivers/BSP/UI/ui_w_setlist.c +Drivers/BSP/UI/ui_w_setlist.h +Drivers/BSP/UI/ui_w_setview.c +Drivers/BSP/UI/ui_w_setview.h +Drivers/BSP/UI/ui_w_soe.c +Drivers/BSP/UI/ui_w_soe.h +Drivers/BSP/UI/ui_w_ytview.c +Drivers/BSP/UI/ui_w_ytview.h +Drivers/BSP/app_assert.h +Drivers/BSP/bsp_err.h +Drivers/BSP/dbg_cfg.h +Drivers/BSP/dbg_log.h +IEC60870-Slave/104/IEC104.c +IEC60870-Slave/104/IEC104.h +IEC60870-Slave/104/IEC104_AsduQueue.c +IEC60870-Slave/104/IEC104_AsduQueue.h +IEC60870-Slave/104/IEC104_Codec.c +IEC60870-Slave/104/IEC104_Codec.h +IEC60870-Slave/104/IEC104_Config_Internal.h +IEC60870-Slave/104/IEC104_Connection.c +IEC60870-Slave/104/IEC104_Connection.h +IEC60870-Slave/104/IEC104_Link.c +IEC60870-Slave/104/IEC104_Link.h +IEC60870-Slave/104/IEC104_Link_Common.h +IEC60870-Slave/104/IEC104_Link_Internal.h +IEC60870-Slave/104/IEC104_Link_Master_StartStop.c +IEC60870-Slave/104/IEC104_Link_Master_StartStop.h +IEC60870-Slave/104/IEC104_Link_Slave_StartStop.c +IEC60870-Slave/104/IEC104_Link_Slave_StartStop.h +IEC60870-Slave/104/IEC104_Log.c +IEC60870-Slave/104/IEC104_Log.h +IEC60870-Slave/104/IEC104_Net.h +IEC60870-Slave/104/IEC104_Net_Windows.c +IEC60870-Slave/104/IEC104_Receiver.c +IEC60870-Slave/104/IEC104_Receiver.h +IEC60870-Slave/104/IEC104_SendBuffer.c +IEC60870-Slave/104/IEC104_SendBuffer.h +IEC60870-Slave/104/IEC104_SendManager.c +IEC60870-Slave/104/IEC104_SendManager.h +IEC60870-Slave/104/IEC104_Slave.c +IEC60870-Slave/104/IEC104_Slave.h +IEC60870-Slave/104/IEC104_TcpServer.c +IEC60870-Slave/104/IEC104_TcpServer.h +IEC60870-Slave/104/IEC104_TcpServer_Config.h +IEC60870-Slave/104/IEC104_TcpTypes.h +IEC60870-Slave/104/IEC104_Types.h +IEC60870-Slave/104/business/IEC104_BusinessConfig_Internal.h +IEC60870-Slave/104/business/IEC104_ClockSynchronization.c +IEC60870-Slave/104/business/IEC104_ClockSynchronization.h +IEC60870-Slave/104/business/IEC104_Command.c +IEC60870-Slave/104/business/IEC104_Command.h +IEC60870-Slave/104/business/IEC104_CounterInterrogation.c +IEC60870-Slave/104/business/IEC104_CounterInterrogation.h +IEC60870-Slave/104/business/IEC104_FileService.c +IEC60870-Slave/104/business/IEC104_FileService.h +IEC60870-Slave/104/business/IEC104_GeneralInterrogation.c +IEC60870-Slave/104/business/IEC104_GeneralInterrogation.h +IEC60870-Slave/104/business/IEC104_Interrogation.c +IEC60870-Slave/104/business/IEC104_Interrogation.h +IEC60870-Slave/104/business/IEC104_Interrogation_Internal.h +IEC60870-Slave/104/business/IEC104_Parameter.c +IEC60870-Slave/104/business/IEC104_Parameter.h +IEC60870-Slave/104/business/IEC104_PeriodicScan.c +IEC60870-Slave/104/business/IEC104_PeriodicScan.h +IEC60870-Slave/104/business/IEC104_Read.c +IEC60870-Slave/104/business/IEC104_Read.h +IEC60870-Slave/104/business/IEC104_RemoteParameter.c +IEC60870-Slave/104/business/IEC104_RemoteParameter.h +IEC60870-Slave/104/business/IEC104_SoftwareUpgrade.c +IEC60870-Slave/104/business/IEC104_SoftwareUpgrade.h +IEC60870-Slave/104/business/IEC104_Spontaneous.c +IEC60870-Slave/104/business/IEC104_Spontaneous.h +IEC60870-Slave/104/business/IEC104_Startup.c +IEC60870-Slave/104/business/IEC104_Startup.h +IEC60870-Slave/104/business/IEC104_SystemCommand.c +IEC60870-Slave/104/business/IEC104_SystemCommand.h +IEC60870-Slave/common/IEC60870_Asdu.c +IEC60870-Slave/common/IEC60870_Asdu.h +IEC60870-Slave/common/IEC60870_Clock.c +IEC60870-Slave/common/IEC60870_Clock.h +IEC60870-Slave/common/IEC60870_Codec.c +IEC60870-Slave/common/IEC60870_Codec.h +IEC60870-Slave/common/IEC60870_Comtrade.c +IEC60870-Slave/common/IEC60870_Comtrade.h +IEC60870-Slave/common/IEC60870_EnergyFreeze.c +IEC60870-Slave/common/IEC60870_EnergyFreeze.h +IEC60870-Slave/common/IEC60870_EnergyFreezeFile.c +IEC60870-Slave/common/IEC60870_EnergyFreezeFile.h +IEC60870-Slave/common/IEC60870_FaultEvent.c +IEC60870-Slave/common/IEC60870_FaultEvent.h +IEC60870-Slave/common/IEC60870_FaultRecorder.c +IEC60870-Slave/common/IEC60870_FaultRecorder.h +IEC60870-Slave/common/IEC60870_FirmwareUpdate.c +IEC60870-Slave/common/IEC60870_FirmwareUpdate.h +IEC60870-Slave/common/IEC60870_History.c +IEC60870-Slave/common/IEC60870_History.h +IEC60870-Slave/common/IEC60870_HistoryFile.c +IEC60870-Slave/common/IEC60870_HistoryFile.h +IEC60870-Slave/common/IEC60870_InformationObjects.c +IEC60870-Slave/common/IEC60870_InformationObjects.h +IEC60870-Slave/common/IEC60870_InformationObjects_Internal.h +IEC60870-Slave/common/IEC60870_Slave.c +IEC60870-Slave/common/IEC60870_Slave.h +IEC60870-Slave/common/IEC60870_Time.c +IEC60870-Slave/common/IEC60870_Time.h +IEC60870-Slave/common/IEC60870_Types.h +IEC60870-Slave/common/IEC60870_UserLog.c +IEC60870-Slave/common/IEC60870_UserLog.h +IEC60870-Slave/common/IEC60870_UserLogFile.c +IEC60870-Slave/common/IEC60870_UserLogFile.h +IEC60870-Slave/examples/iec104_dtu_example.c +IEC60870-Slave/examples/iec104_dtu_measurement.c +IEC60870-Slave/examples/iec104_dtu_measurement.h +IEC60870-Slave/examples/iec104_dtu_profile.h +IEC60870-Slave/examples/iec104_dtu_protection.c +IEC60870-Slave/examples/iec104_dtu_protection.h +IEC60870-Slave/examples/iec104_dtu_settings.c +IEC60870-Slave/examples/iec104_dtu_settings.h +IEC60870-Slave/examples/iec104_example_config.c +IEC60870-Slave/examples/iec104_example_config.h +IEC60870-Slave/examples/iec104_example_energy_freeze.c +IEC60870-Slave/examples/iec104_example_energy_freeze.h +IEC60870-Slave/examples/iec104_example_energy_meter.c +IEC60870-Slave/examples/iec104_example_energy_meter.h +IEC60870-Slave/examples/iec104_example_history.c +IEC60870-Slave/examples/iec104_example_history.h +IEC60870-Slave/examples/iec104_example_points.h +IEC60870-Slave/examples/iec104_example_recording.c +IEC60870-Slave/examples/iec104_example_recording.h +IEC60870-Slave/examples/iec104_example_upgrade.c +IEC60870-Slave/examples/iec104_example_upgrade.h +IEC60870-Slave/examples/iec104_example_user_log.c +IEC60870-Slave/examples/iec104_example_user_log.h +IEC60870-Slave/examples/iec104_parameter_multi_master.c +IEC60870-Slave/examples/iec104_slave_example.c +IEC60870-Slave/test/iec104_ack_tracking_test.c +IEC60870-Slave/test/iec104_asdu_transport_test.c +IEC60870-Slave/test/iec104_command_test.c +IEC60870-Slave/test/iec104_dtu_energy_settings_test.c +IEC60870-Slave/test/iec104_dtu_measurement_test.c +IEC60870-Slave/test/iec104_dtu_protection_test.c +IEC60870-Slave/test/iec104_dtu_settings_model_test.c +IEC60870-Slave/test/iec104_dtu_storage_test.c +IEC60870-Slave/test/iec104_dtu_trigger_recording_test.c +IEC60870-Slave/test/iec104_energy_freeze_transitions_test.c +IEC60870-Slave/test/iec104_example_energy_freeze_test.c +IEC60870-Slave/test/iec104_example_energy_meter_test.c +IEC60870-Slave/test/iec104_example_history_test.c +IEC60870-Slave/test/iec104_example_recording_test.c +IEC60870-Slave/test/iec104_example_upgrade_test.c +IEC60870-Slave/test/iec104_example_user_log_test.c +IEC60870-Slave/test/iec104_fault_event_test.c +IEC60870-Slave/test/iec104_file_service_internal_test.c +IEC60870-Slave/test/iec104_file_service_test.c +IEC60870-Slave/test/iec104_idle_transport_test.c +IEC60870-Slave/test/iec104_interrogation_rules_test.c +IEC60870-Slave/test/iec104_net_pending_input_test.c +IEC60870-Slave/test/iec104_parameter_edge_test.c +IEC60870-Slave/test/iec104_parameter_test.c +IEC60870-Slave/test/iec104_periodic_scan_test.c +IEC60870-Slave/test/iec104_read_test.c +IEC60870-Slave/test/iec104_remote_parameter_internal_test.c +IEC60870-Slave/test/iec104_remote_parameter_test.c +IEC60870-Slave/test/iec104_response_queue_test.c +IEC60870-Slave/test/iec104_response_transport_test.c +IEC60870-Slave/test/iec104_slave_example_test.c +IEC60870-Slave/test/iec104_slave_test.c +IEC60870-Slave/test/iec104_software_upgrade_internal_test.c +IEC60870-Slave/test/iec104_software_upgrade_test.c +IEC60870-Slave/test/iec104_spontaneous_test.c +IEC60870-Slave/test/iec104_strict_priority_queue_test.c +IEC60870-Slave/test/iec104_strict_priority_transport_test.c +IEC60870-Slave/test/iec104_system_command_test.c +IEC60870-Slave/test/iec104_tcp_event_ring_test.c +IEC60870-Slave/test/iec104_tcp_fixture.h +IEC60870-Slave/test/iec104_tcp_scheduler_test.c +IEC60870-Slave/test/iec104_test_config.h +IEC60870-Slave/test/iec60870_asdu_extended_test.c +IEC60870-Slave/test/iec60870_asdu_fixture.h +IEC60870-Slave/test/iec60870_asdu_test.c +IEC60870-Slave/test/iec60870_comtrade_test.c +IEC60870-Slave/test/iec60870_energy_freeze_file_test.c +IEC60870-Slave/test/iec60870_energy_freeze_test.c +IEC60870-Slave/test/iec60870_fault_event_test.c +IEC60870-Slave/test/iec60870_fault_recorder_test.c +IEC60870-Slave/test/iec60870_firmware_update_test.c +IEC60870-Slave/test/iec60870_history_file_test.c +IEC60870-Slave/test/iec60870_history_test.c +IEC60870-Slave/test/iec60870_user_log_file_test.c +IEC60870-Slave/test/iec60870_user_log_test.c +IEC60870-Slave/test/parameter_interop_slave.c +IEC60870-Slave/test/parameter_lib60870_client.c +IEC60870-Slave/test/periodic_scan_interop_server.c +IEC60870-Slave/test/periodic_scan_lib60870_client.c +IEC60870-Slave/test/periodic_scan_soak_example.c +simulator/dbg_log.h +simulator/lv_conf.h +simulator/main.c +simulator/sim/cfg_file_store_sim.c +simulator/sim/iec104_sim.c +simulator/sim/iec104_sim.h +simulator/sim/net_socket_sim.c +simulator/sim/sim_latency_stub.c +simulator/sim/sim_port.c +simulator/sim/sim_port.h +simulator/sim/sim_syslog.c +simulator/sim/ui_net_sink_backend_sim.c diff --git a/docs/CI/远程CI完整指南.md b/docs/CI/远程CI完整指南.md index a533426b..6c64436a 100644 --- a/docs/CI/远程CI完整指南.md +++ b/docs/CI/远程CI完整指南.md @@ -1059,7 +1059,7 @@ date +%s # 对比 last_online | Runners 页 runner 显示 **`offline`** | daemon 进程不在:`gitea-runner` v4 的 `daemon` **首次 Declare 失败就直接退出**(Gitea 重启/机器重启后无人拉起) | §2.4 用 `ci_runner_bootstrap.ps1` 装看门狗 + 计划任务;`-Status` 复查 | | `static-gates` 报 `no Python with a SYSTEM-visible pre-commit` | runner 是 SYSTEM:PATH 上的 python 无 pre-commit、用户级 site 不可见、`.venv` 未入库(§4.1 三重坑) | `ci_runner_bootstrap.ps1 -SetEnv` 写机器级 `DTU_PRECOMMIT_PYTHON`,或把 pre-commit 装进机器级解释器;**改完必须重启 runner** | | `static-gates` 报 `runner missing cppcheck` | 机器 PATH 无 Cppcheck 且无机器级 `DTU_CPPCHECK` | `-SetEnv`(会自动发现 `C:\Program Files\Cppcheck`)或装 `Cppcheck.Cppcheck` | -| **钩子条数对不上**(CI 的 `--all-files` 报告条数 = 定义数 − 1 − 3 manual:定义数 **51** → 报告 **47** 行,另由「手动阶段门禁」步跑 3 根(2026-10-29 起声明数 52 → 报告 48 行,公式不变);2026-10-12 **当时**实测 `master` 18 定义 / 17 报告,`v2-on-ui` 26 定义 / 25 报告——**增删钩子的分支必须重算这个差值**) | 两处都不进 `--all-files` 报告:`gitlint` 的 `stages: [commit-msg]` 写在**上游** `.pre-commit-hooks.yaml`(项目 `.pre-commit-config.yaml` 里 grep 不到,别据此断定"没限制");`cppcheck` / `test-cppcheck` / `test-coverage` 带 `stages: [manual]`,只由「手动阶段门禁」步逐根 `--hook-stage manual` 跑。都会表现为全绿——静默空转 | commit-msg 阶段已由 `scripts/ci_gitlint_range.ps1` 单独校验、manual 三根已由「手动阶段门禁」步兜住;**以后增删钩子必须核对"定义数 == 日志条数 + gitlint + manual 三根"** | +| **钩子条数对不上**(CI 的 `--all-files` 报告条数 = 定义数 − 1 − N manual:**当前**定义数 **52**、manual **4** → 报告 **47** 行,另由「手动阶段门禁」步跑其中 3 根,第 4 根 `iec104-tcp` 因需模拟器产物而**只在开发机本地跑**;2026-10-29 当天是定义数 52 / manual 3 → 报告 48 行;2026-10-12 **当时**实测 `master` 18 定义 / 17 报告,`v2-on-ui` 26 定义 / 25 报告——**增删钩子的分支必须重算这个差值**) | 两处都不进 `--all-files` 报告:`gitlint` 的 `stages: [commit-msg]` 写在**上游** `.pre-commit-hooks.yaml`(项目 `.pre-commit-config.yaml` 里 grep 不到,别据此断定"没限制");`cppcheck` / `test-cppcheck` / `test-coverage` / `iec104-tcp` 带 `stages: [manual]`,只由「手动阶段门禁」步逐根 `--hook-stage manual` 跑(`iec104-tcp` 不在 CI 步里,见该步注释)。都会表现为全绿——静默空转 | commit-msg 阶段已由 `scripts/ci_gitlint_range.ps1` 单独校验、manual 四根中 CI 能跑的三根已由「手动阶段门禁」步兜住;**以后增删钩子必须核对"定义数 == 日志条数 + gitlint + manual 根数"** | | gitlint 步骤 **Failed 但提交信息其实合规**(同一条命令在本地全绿),日志里是 `exit code: 254` + `Missing git configuration: please set user.name` | `actions/checkout` 把 HOME 临时指向每次任务的临时目录,而 SYSTEM 账号没有全局 git 身份 → gitlint **在读到任何规则之前**就因配置错误退出(**254 不是规则违规**)。旧脚本末尾那句 `::error::...rule: single-line Chinese title, < 100 chars` 是**写死的猜测文案**,把环境问题伪装成"提交信息不合格";且该步 `exit 1` 会让后面的 `--all-files` **整个不跑**——看着像"门禁拦住了",实际当时 26 个钩子一个都没执行 | `ci_gitlint_range.ps1` 先探测身份,缺失就用 `GIT_CONFIG_COUNT/KEY/VALUE` 注入一次性身份(**不写任何文件**,开发者机器不受影响),并把 254 与真实违规分开报(**2 = 门禁没跑起来**,1 = 信息确实违规)。实测同一命令:空 HOME 下改前 254、改后 `0 failed`(2026-10-12 task 31 首次暴露) | | push 后 Actions 页**空白/无任务** | ① 服务端开关未开 ② workflow 没 push 到远程 ③ 只改了 `docs/**`(被 `paths-ignore` 滤掉) ④ **新建分支的首次 push**(实测 2026-10-12:创建 `v2-on-ui-ci` 那次 push 没产生 run——runner 在线空闲、job 日志零新增;紧接着一次普通 push 立刻出 task。原因:`before` 是全零 SHA,变更文件集算不出来,`paths-ignore` 求值时被滤空) | ①②③ 逐条核对 §1 / §5.1 / §5.2;④ 用 `workflow_dispatch` 手动触发,或再推一个非文档路径的提交 | | 任务一直 **Waiting / 排队** | 没有 label 匹配 `windows` 的 runner | 检查 `--labels "windows:host"`;Settings→Runners 是否 Idle | @@ -1208,9 +1208,9 @@ runner 的日志走 **stderr**,于是上面两个日志文件都栽在这两 - **钩子集变化**(`.pre-commit-config.yaml` 增删钩子):CI 自动跟随,无需改 workflow; 但**必须核对条数**——`pre-commit run --all-files` 只跑 `pre-commit` stage(现 47 根), `commit-msg` stage 的钩子(gitlint)不在其中,靠 `ci_gitlint_range.ps1` 单独守(见 §7); - 带 `stages: [manual]` 的三根(`cppcheck` / `test-cppcheck` / `test-coverage`)也不在其中, + 带 `stages: [manual]` 的四根(`cppcheck` / `test-cppcheck` / `test-coverage` / `iec104-tcp`)也不在其中, 靠 static-gates 的「手动阶段门禁」一步逐根 `--hook-stage manual` 跑(新增 manual 钩子须同步加进 - 该步的 `$hooks` 列表,否则只声明不执行); + 该步的 `$hooks` 列表,否则只声明不执行;⚠ `iec104-tcp` 需模拟器产物而 CI 不构建模拟器,故它**只能本机跑**); - **`/keil-build` / 板端测试套件 / 主机侧回归**:永远留在本地,不要往 CI 加(需 Keil 授权与真机); - **runner 长时间不可用**时:CI 只是"多一道网",**提交前的本地 `ci_local.py` 仍是 静态门禁的唯一保障**, 不能因"已经配了 CI"放宽(理由见本文 §0 仓库状态行)。 diff --git a/docs/README.md b/docs/README.md index 05bf4dc8..80c06ba5 100644 --- a/docs/README.md +++ b/docs/README.md @@ -101,6 +101,7 @@ docs/ | [`网络/BSD_Socket_API_使用指南.md`](网络/BSD_Socket_API_使用指南.md) | **上层视图**:BSD Socket API 公开语义、示例、常见问题 | | [`网络/BSD_Socket_API_函数调用关系.md`](网络/BSD_Socket_API_函数调用关系.md) | **内部视图**:netTask / 消息队列 / 保护判据挂起 / 重试对账的调用关系与设计意图 | | [`网络/Net层阻塞模型架构设计.md`](网络/Net层阻塞模型架构设计.md) | **等待模型**:recv/send 挂起请求架构、数据结构与挂起槽状态机、recv 五路 + send 四路完成语义、模块接口契约(14 函数)、实现落点(20 集成点)、调用方契约、设计边界与性能特征 | +| [`网络/IEC104_Net适配契约.md`](网络/IEC104_Net适配契约.md) | **104 板端 Net 后端契约**:直译 vendor `Close(client)` 会毁掉监听的**反例**、按槽 role 的映射规则、LISTEN 恒定 / CLIENT 每次新建的双句柄模型、代次不变式、单调不复用句柄、`NET_NO_OS` 编译期边界与已知缺口、证据边界(fake 12/12,CH395F 板端未证) | | [`网络/网络自愈架构设计.md`](网络/网络自愈架构设计.md) | **网络自愈架构 + 监听生命周期**:现状权威描述——根因三层证据与 A′ 出局、ioLibrary 代码级对照、设计原则(不变量 I1~I8)、分层职责与三 tick、reconciler 形态①~⑤ + M3 门、驱动原语、读即清信源审计、FUN_PARA bit3 契约、recv 语义、KeepAlive、参数表与 E 锚点速查、红线、编号发现速查、代码级事实清点、决策记录、`net_listener.c` / `net_events.c` 模块化边界、延后项;审计与实施过程已归档 | --- diff --git a/docs/UI设计/UI_数据供给设计.md b/docs/UI设计/UI_数据供给设计.md index 2f065b3b..413787f3 100644 --- a/docs/UI设计/UI_数据供给设计.md +++ b/docs/UI设计/UI_数据供给设计.md @@ -18,7 +18,7 @@ | 相量(有效值/相角) | `App/algo/phasor.h` | 算法层 | | 频率 | `App/algo/freq.h` | 算法层 | | 定值(40 项 + 封存态) | `App/algo/prot_set.h` | 算法层 | -| 遥信位图 / 品质 | `App/protocol/iec104/iec104_pts.h` | 协议层 | +| 遥信位图 / 品质 / 单双点性质 | `App/protocol/iec104/iec104_dtu_table.h`(2026-11-17 割接前为 `iec104_pts.h`,该实现已删除) | 协议层 | | 时钟 | `App/util/sys_clock.h` | 工具层(**已在 ALLOW 豁免内**) | | 运行/自检记录 | `App/log/sys_log.h` | 服务层 | @@ -71,7 +71,7 @@ flowchart TB subgraph APP["App 层(业务)"] F["App/app/ui_data_feed.c
组装一帧(唯一填充者)"] - SRC["phasor / freq / prot_set / iec104_pts / sys_clock"] + SRC["phasor / freq / prot_set / ioboard / iec104_dtu_table / sys_clock"] F --> SRC end subgraph BSP["Drivers/BSP/UI(表现层)"] @@ -123,7 +123,7 @@ flowchart TB ```c #define UI_DATA_YC_N 9u /* 语义通道数:UA/UB/UC/UN/IA/IB/IC/IN/温度 */ -#define UI_DATA_YX_N 33u /* 遥信点数(与 104 点表同序) */ +#define UI_DATA_YX_N 33u /* 遥信点数:产品视图 33 行(割接前与旧 104 点表同序,见下方 yx_dp 要点) */ #define UI_DATA_PH_MAX 8u /* 相量实例槽上限(含谐波),见正文槽带说明 */ /* 品质位(与 104 QDS 语义对齐,页面只消费自己关心的位) */ @@ -171,7 +171,25 @@ typedef struct { - **`ph[]` 相量实例槽带**与 `yc[]` 语义通道带并存的理由:谐波(`Ia` 的二次/五次)无法在"语义通道"下标空间里表达——同一通道的谐波会与基波撞位,而交流量页要显示它们(`docs/UI设计/页面扩充详细方案.md` §3.1.1)。槽带按**相量实例序**索引,实际发布槽数由 `ph_n` 给出、超上限的实例本帧不发布(写侧口径在 `App/app/ui_data_feed.c` 的 `fill_rt()`)。两条带的元素同形(数值 + 品质),页面行表按需选一条。上限 8 = 现用 5 实例(UA/UN/IA 基波 + IA 二次/五次)+ 遥测谐波轨留位。 - **字符串只用定长数组**:`clock[20]` 在结构体内,无指针、无生命周期问题(跨层传指针是经典事故源)。 - **`yx_valid` 与 `yx_bits` 分开**:无效点不参与显示、不参与变位判断(沿用 104 点表的既有做法,避免"IV 通道抖动成变位")。 -- **`yx_dp`**:单点还是双点是 **104 点表事实**(`App/protocol/iec104/iec104_pts.c` 的 `YX_DP_N` / `iec104_pts_yx_is_dp()`),由写侧 `ui_data_feed.c` 逐点问点表后下发位图;页面只按位图选词(双点"合位/分位"、单点"动作/复归"、无效 "--")。把"前 4 点是双点"抄进表现层就是第二真相:点表改成双点段挪位或加高起始下标,屏上不会报错,只会用错词形容同一个点。V0.1 这 4 点无开入硬件 → 不在 `yx_valid` 内,值列仍打 "--"(本字段不参与无效判定)。点数一致性由写侧一条一次性 `DBG_ERROR` 兜(`UI_DATA_YX_N` 与 `iec104_pts_yx_count()` 不等时留痕),因为该常量在协议层是 .c 内的 `#define`,编译期拿不到。 +- **`yx_dp`**:单点还是双点是 **104 点表事实**,由写侧 `ui_data_feed.c` 的 `feed_yx_dp()` 逐点问点表 `type` 字段(1 = 单点、3 = 双点)后下发位图;页面只按位图选词(双点"合位/分位"、单点"动作/复归"、无效 "--")。把"前 4 点是双点"抄进表现层就是第二真相:点表改成双点段挪位或加高起始下标,屏上不会报错,只会用错词形容同一个点。 + **2026-11-17 通信骨架割接后,问的点表换了源**:旧的产品自有 33 点表实现 `App/protocol/iec104/iec104_pts.c`(`YX_N = 33`、`YX_DP_N = 4`,`iec104_pts_yx_is_dp()` 逐点判型)已随割接删除;现在问的是 DTU 标准表 `iec104_dtu_point()`(`App/protocol/iec104/iec104_dtu_table.c`)。两套点表语义不同:新表 index 0~58 是单点(0~42 → IOA 0x0001~0x002B,43~58 → 0x0032~0x0041,源表 0x002C~0x0031 空号)、59~74 是双点(IOA 0x1001 起)、75~104 是测量值,共 59 + 16 = 75 个遥信点,**双点不在 0~3 而在 59~74**。 + **这不改变任何像素**:本字段只覆盖 `UI_DATA_YX_N = 33` 行,即新表的单点段;双点段落在 33 之外,取不到。而产品视图的 YX1~4(页面名表"位置1~4")在新表里是单点、旧表里是双点——这 4 点 V0.1 无开入硬件,不在 `yx_valid` 内,页面先按 valid 短路打 "--",走不到双点/单点选词分支,所以屏上无差异。**点表口径差异是既有事实,不是本节引入的问题。** + 点数一致性由写侧一条一次性 `DBG_ERROR` 兜(`UI_DATA_YX_N` 与 DTU 表 `SP_COUNT + DP_COUNT = 75` 不等时留痕)——该口径**自割接起会打且是应打的**:33 行产品视图与 75 点标准表本就不等,这条日志让差异现场可见,不影响显示。 +- **页面名表与 DTU 标准表同名下标语义不一致——这是既有事实,当前无运行期风险**。产品视图 `s_yx_name`(`Drivers/BSP/UI/ui_page_yx.c`)的前 33 行是按**旧产品点表**起的名;DTU 标准表同位置(前 59 个单点段中的同一 index)是另一批信号。逐点对照(下标取产品视图行号,DTU 侧取 `App/protocol/iec60870/examples/iec104_dtu_profile.h` 的 `dtu_signals[]` 原始名): + + | 下标 | 产品视图名(页面) | DTU 标准表同下标信号(原名 / 释义) | + |---|---|---| + | 14 | `故障总` | `Battery bank alarm` / 开闭所(环网箱)蓄电池组告警 | + | 15 | `过流Ⅰ段` | `SW00 spare` / 00 开关备用 | + | 16 | `过流Ⅱ段` | `SW00 closed` / 00 开关合位信号 | + | 17 | `过流Ⅲ段` | `SW00 isolator closed` / 00 手车或隔离开关合位信号 | + | 22 | `过载` | `SW00 differential trip` / 00 开关光差保护动作 | + | 30 | `保护闭锁` | `SW00 reclose` / 00 开关重合闸 | + + 这 6 个下标恰好就是 `FEED_YX_VALID_MASK` 的 6 位(`App/app/ui_data_feed.c` 中的 `FEED_YX_BIT_FAULT_ALL` = 14、`OC1` = 15、`OC2` = 16、`OC3` = 17、`OL` = 22、`LOCK` = 30)——**即"屏上真能变的那 6 行,与标准表同下标信号全不是一回事"**。 + + **为什么现在不会错**:这 6 行的值来自保护元件状态(`prot_elm`),**不来自 104 点表**;`yx_valid` 由 `feed_yx()` 按保护判据置位,`feed_yx_dp()` 才去问点表类型,而单点/双点的选词差异对有效行无影响(见上一条)。也就是说点表在这里只提供"单点还是双点",不提供语义。 + **风险在哪**:将来若有人图省事把 `yx_bits` 改成"直接读 DTU 标准表对应下标",屏上就会出现"过流Ⅰ段"位置显示 00 开关备用之类的**静默错配**——不报错、不越界、像素照常刷新,只有对点的人能发现。真要接标准表,必须先重排产品视图名表并升 `UI_DATA_VER`,不能只换数据源。 - **板级开入开出四字段**(`dio_di_*` / `dio_do_*`)四条口径: 1. **板级引脚 ≠ 104 点表**:这四字段与 `yx_bits` / `yx_valid` / `yx_dp` 互不引用。板级开入 8 路与点表 33 点没有映射关系,把引脚状态塞进点表位图 = 篡改点表事实(点表 YX1~4 开关位置点在 V0.1 仍恒无效)。 2. **读失败语义**:开入经 `ioboard_di_snap_lookup()` → `ioboard_di_snap_read()` 取数(defaultTask 的 DI 去抖快照,`App/util/ioboard_di.h`,写侧按序号协议取一致值,不直接读引脚)。读不到(未登记 / 快照无效 / 读期被持续抢占)时 `dio_di_valid = 0`、mask 沿用**上一次成功读到的值**,绝不填 0——全 0 在现场等于"开入全部复归"。开出只读驱动影子寄存器(`ioboard_do_get()`),零硬件访问。 @@ -318,7 +336,7 @@ static void pg_refresh(uint16_t row, char *name, char *value) { - **六个实时页全部接入**。seq 恒随帧前进,所以轮询周期 = 稳态整页重绘频率——可见内容变化越慢取档越大:`ac`/`dc` 300 ms(电气量随 rt 帧帧帧推进;取值账目:轮询不得快于 200 ms 发布节拍、避开 400 ms 与其锁相、300 = 15 × LVGL 整刷周期 20 ms(两端 `LV_DEF_REFR_PERIOD` 同值),最坏屏上滞后 200 + 300 = 500 ms;全文在 `ui_page_ac.c` 的 `AC_AUTO_MS` 注释);`yx` 500 ms(变位低频事件,按"1 s 内上屏"到位——最坏 700 ms,较 300 档少 40% 稳态重绘);`clock` 1000 ms(快变项只有墙钟秒尾,快于 1 s 的轮询只会把同一秒多画几遍);`device_info`/`runreport` 1000 ms 并显式 `.auto_seq = ui_data_info_seq`(`info` 与 `rt` 同拍,见 §5.2)。各页取值账目在该页描述符注释里,本文不复述。 - **不迁移**:待机屏 `ui_standby.c`(自持 1 s 整屏定时器 + seq 门控)、整定视图 `ui_w_setview.c`(`sv_poll` 定时器盯 `par` 通道)——两处各自已有节拍,纳入框架只会多一只定时器。 -**回归确定性**:无头模式(`--keys` / 74 张黄金参考)从不跑 `lv_timer_handler`,定时器不可能在截屏前触发,且仿真仍是"一次发布冻结帧"——黄金参考逐字节不变(`check_content_pages.py` 实证)。自动失效路径的验证走开关 `--rtlive <键序> `:开页截 A → 发布第 1 号确定性斜坡帧 → **直接调用** `ui_content_page_auto_poll()`(等价定时器到点)→ 截 B;A≠B 即证明"零按键、新帧落屏"。窗口模式每 200 ms 发一帧斜坡值,屏上数值自己会走。 +**回归确定性**:无头模式(`--keys` / 76 张黄金参考)从不跑 `lv_timer_handler`,定时器不可能在截屏前触发,且仿真仍是"一次发布冻结帧"——黄金参考逐字节不变(`check_content_pages.py` 实证)。自动失效路径的验证走开关 `--rtlive <键序> `:开页截 A → 发布第 1 号确定性斜坡帧 → **直接调用** `ui_content_page_auto_poll()`(等价定时器到点)→ 截 B;A≠B 即证明"零按键、新帧落屏"。窗口模式每 200 ms 发一帧斜坡值,屏上数值自己会走。 --- diff --git a/docs/UI设计/UI_时间响应分析.md b/docs/UI设计/UI_时间响应分析.md index cc980b92..11515ac7 100644 --- a/docs/UI设计/UI_时间响应分析.md +++ b/docs/UI设计/UI_时间响应分析.md @@ -294,4 +294,4 @@ | 远端推流端到端延迟的完整实验 | `docs/测试说明/专项验证/链路延迟测试说明.md` | | UI 数据供给(快照层) | `docs/UI设计/UI_数据供给设计.md` | | 内容页架构与绘制 | `docs/UI设计/内容页架构.md` | -| 远端显示协议 | `docs/UI设计/RemoDispBus协议与接收设计说明.md` | \ No newline at end of file +| 远端显示协议 | `docs/UI设计/RemoDispBus协议与接收设计说明.md` | diff --git a/docs/UI设计/UI_自动化测试流程.md b/docs/UI设计/UI_自动化测试流程.md index 01956598..cf87a602 100644 --- a/docs/UI设计/UI_自动化测试流程.md +++ b/docs/UI设计/UI_自动化测试流程.md @@ -26,7 +26,7 @@ cmake --build simulator/build --config Debug # 0) 构建模拟器(须 0 警 | 步 | 脚本/命令 | 门禁内容 | 预期输出 | |---|---|---|---| | 1 | `simulator/tests/check_menu_rows.py` | 菜单 8 状态:选中行白带 / 非选行黑底白字 / 框体 1px 边框 / 往返像素一致(MENU-STATE-03==MENU-STATE-01、MENU-STATE-06==MENU-STATE-01、MENU-STATE-07==MENU-STATE-02)+ MENU-STATE-00 池基线 | `PASS: 8 状态全部断言通过(8 图,池基线 5368 B)` | -| 2 | `simulator/tests/check_content_pages.py` | ① 文本级断言(字形模板匹配,正向 484 条 + 反向 45 条,独立于 `ref/`)→ ② 74 张截图与 `ref/` 黄金参考**逐字节**比对 + 开页-关页往返池水位 → ③ `--rtlive` 框架自动失效实证(开交流量页截 A → 发布 1 帧确定性斜坡值 → 直调 `ui_content_page_auto_poll()` → 截 B,A≠B 即 PASS;机制见 `UI_数据供给设计说明.md` §5.5) | `PASS: 74 内容页 + 往返池水位 + rtlive 全部通过`(文本断言先于像素比对,失败即中止) | +| 2 | `simulator/tests/check_content_pages.py` | ① 文本级断言(字形模板匹配,正向 484 条 + 反向 45 条,独立于 `ref/`)→ ② 76 张截图与 `ref/` 黄金参考**逐字节**比对 + 开页-关页往返池水位 → ③ `--rtlive` 框架自动失效实证(开交流量页截 A → 发布 1 帧确定性斜坡值 → 直调 `ui_content_page_auto_poll()` → 截 B,A≠B 即 PASS;机制见 `UI_数据供给设计说明.md` §5.5) | `PASS: 76 内容页 + 往返池水位 + rtlive 全部通过`(文本断言先于像素比对,失败即中止) | | 3 | `keil-build` skill(`keil_build.py`) | MCU 端编译(UI 源码双端共用,改一端必须过另一端) | 退出码 0 = BUILD_OK | | 4 | `scripts/check_coding_standard.py` | 代码规范 V1.0 机械检查 | PASS | @@ -52,7 +52,7 @@ cmake --build simulator/build --config Debug # 0) 构建模拟器(须 0 警 | `POOL_AFTER_ROUNDTRIP` | check_content_pages.py | **5448 B** | 开页-关页往返后水位 = 基线 + 一次性残留 80 B | > 水位历史:4784 →(2026-09-14 待机模块常驻 +656)5440 / 5520 →(2026-10-11 裁剪 LVGL 控件类 −72)5368 / 5448。 -> 后一次漂移已核实为**有意且更优**:像素逐字节未变(**裁剪当时黄金参考只有 11 页**,在裁剪**前**生成、裁剪后全部一致;该集合现已扩至 74 张), +> 后一次漂移已核实为**有意且更优**:像素逐字节未变(**裁剪当时黄金参考只有 11 页**,在裁剪**前**生成、裁剪后全部一致;该集合现已扩至 76 张), > 且一次性残留仍是 80 B(5448 − 5368)→ 泄漏特征未变,只是 `lv_theme_apply` 不再为已不存在的控件类登记样式条目。 **漂移处理**:菜单/页面结构或样式变更导致门禁失败时,先确认新值合理(残留分解见 @@ -61,7 +61,7 @@ cmake --build simulator/build --config Debug # 0) 构建模拟器(须 0 警 ## 四、黄金参考(入库)与目检 PNG(本地产物) -`simulator/tests/ref/*.bin`(像素黄金参考,74 张 × 3200 B)**随仓库入库**;派生的 `.png` +`simulator/tests/ref/*.bin`(像素黄金参考,76 张 × 3200 B)**随仓库入库**;派生的 `.png` 目检图仍是本地产物(`.gitignore`)。入库的理由:比对是**逐字节**的,基线不入库时任何新克隆 或新工作树跑 `ui-golden` 都必然 FAIL(缺基准),这条门禁就只在"有老副本的机器"上真实存在。 可复现性实测(2026-10-22):两份各自独立构建的 `lvgl_sim`(不同构建目录、相隔 11 天的代码) @@ -154,7 +154,7 @@ cmake --build simulator/build --config Debug # 0) 构建模拟器(须 0 警 ### 7.3 用法与门禁档位 ```powershell -# 认屏快检:74 张黄金参考(+ 若有台架留档帧),秒级,不需要构建产物 +# 认屏快检:76 张黄金参考(+ 若有台架留档帧),秒级,不需要构建产物 & '.venv\Scripts\python.exe' scripts/board_ui_nav.py --selftest-quick # 完整自检:再加全绑定页闭环导航(需模拟器可执行文件,约 30 s) & '.venv\Scripts\python.exe' scripts/board_ui_nav.py --selftest diff --git a/docs/UI设计/内容页架构.md b/docs/UI设计/内容页架构.md index c2165e16..956f006f 100644 --- a/docs/UI设计/内容页架构.md +++ b/docs/UI设计/内容页架构.md @@ -473,7 +473,7 @@ extern const content_page_def_t ui_page_device_info_desc; /* 描述符(Flash ## 八、验证与回归 - **门禁**(`ui-verify` skill / `UI_自动化测试流程.md`): - 0) 模拟器构建 0 警告 → 1) 菜单 8 状态像素回归 + 池基线 → 2) 内容页文本断言 + 74 张黄金参考逐字节比对 + 0) 模拟器构建 0 警告 → 1) 菜单 8 状态像素回归 + 池基线 → 2) 内容页文本断言 + 76 张黄金参考逐字节比对 (网口设置 4 态 + 密码页 4 态等)+ 开页-关页往返水位 → 3) Keil 构建 0 错 0 警 → 4) 代码规范检查 - **门禁常量**(脚本头部):`MENU_POOL_BASELINE = 5368 B`、`POOL_AFTER_ROUNDTRIP = 5448 B` - **失败处置**:像素不一致 = 代码 bug(修代码,**禁止**刷参考掩盖);**有意**改视觉 → @@ -531,6 +531,6 @@ YYYY-MM-DD HH:MM:SS ← 底部实时时钟(每秒重绘) | 2026-10-27 | 内容页黄金参考 **47 → 53 页**(通讯设置页落地并绑 `#page=comm`;判据 = `simulator/tests/ref/` 入库 `shot_*.bin` 实数 53 张,`git diff --name-status 31ca4a1f HEAD -- simulator/tests/ref` 实测只有 6 个 `A`、零 `M` ⇒ 存量 47 张逐字节零漂移);本文件的当前态计数已同步 | | 2026-10-26 | 验证与回归段的页数口径修正为 **27 页**黄金参考(`simulator/tests/ref/` 入库 27 个 `shot_*.bin`,含整定 9 态);上方变更记录里的「11 页」是当时事实不动 | | 2026-10-26 | 门禁常量修正为 5368 B / 5448 B(= 两个回归脚本头部现值);本文件正文表早已是 5368/5448,只这一处残留 2026-10-11 裁剪 LVGL 控件类之前的 4784/4864 | -| 2026-11-13 | 五个实时页接入框架自动失效(task-3,用户裁定全接):`dc` 300 / `yx` 500 / `clock` 1000(rt 通道)与 `device_info` / `runreport` 1000 + `.auto_seq = ui_data_info_seq`(info 通道,`info` 与 `rt` 同拍 200 ms)描述符加 `.auto_ms`,取值账在各页注释;§三 字段表与 §六 内存表同步;实测黄金参考 74 张、往返水位 5448 B、菜单基线 5368 B 均不动(无头从不跑 `lv_timer_handler`) | +| 2026-11-13 | 五个实时页接入框架自动失效(task-3,用户裁定全接):`dc` 300 / `yx` 500 / `clock` 1000(rt 通道)与 `device_info` / `runreport` 1000 + `.auto_seq = ui_data_info_seq`(info 通道,`info` 与 `rt` 同拍 200 ms)描述符加 `.auto_ms`,取值账在各页注释;§三 字段表与 §六 内存表同步;实测当时黄金参考 74 张、往返水位 5448 B、菜单基线 5368 B 均不动(无头从不跑 `lv_timer_handler`) | | 2026-10-26 | 验证与回归段的黄金参考页数 **27 → 40 页**(UI 三页落地后 `simulator/tests/ref/` 实数 40 张);上方变更记录里的 11 / 27 是各当时下限,保留 | -| 2026-11-13 | 框架级自动失效(task-2):描述符尾部新增 `auto_ms`/`auto_seq`(当前仅 ac 页启用 300 ms),新增框架 API `ui_content_page_auto_poll()`(§3.1);§3.1 静态块与代码同步(补 `s_perm` 与自动失效 2 变量);回归脚本新增 `--rtlive` 零按键落屏检查(74 张黄金参考逐字节不变,实测 PASS);机制详述在 `UI_数据供给设计说明.md` §5.5 | +| 2026-11-13 | 框架级自动失效(task-2):描述符尾部新增 `auto_ms`/`auto_seq`(当前仅 ac 页启用 300 ms),新增框架 API `ui_content_page_auto_poll()`(§3.1);§3.1 静态块与代码同步(补 `s_perm` 与自动失效 2 变量);回归脚本新增 `--rtlive` 零按键落屏检查(当时 74 张黄金参考逐字节不变,实测 PASS);机制详述在 `UI_数据供给设计说明.md` §5.5 | diff --git a/docs/UI设计/页面扩充详细方案.md b/docs/UI设计/页面扩充详细方案.md index f58f8f3b..644b8334 100644 --- a/docs/UI设计/页面扩充详细方案.md +++ b/docs/UI设计/页面扩充详细方案.md @@ -156,6 +156,8 @@ V0.1 **无直流采样通道**(`ADC_SEM` 只有 8 路电气 + 温度),点 #### 3.1.3 遥信量(新建) +> **⚠ 2026-11-17 割接后:"33 点表"已不是协议点表;协议侧现为 DTU 标准表 75 个遥信点(SP 59 + DP 16),33 为产品 UI 视图行数。本节以下为立项时原文,保留不动。** + 33 点表,但只有 6 点有硬件来源(`YX_VALID_MASK`:YX15/16/17/18/23/31)。 | 方案 | 行表 | 优点 | 缺点 | @@ -182,7 +184,7 @@ V0.1 **无直流采样通道**(`ADC_SEM` 只有 8 路电气 + 温度),点 | 31~33 | `闭锁1~3` | 31 ✅ | 其余 `--` | - 名表放页面侧(Flash const),**不进快照**——显示文案属表现层(`docs/UI设计/UI_数据供给设计.md` §8)。 -- 双点遥信 4 点用 `iec104_pts_yx_is_dp()` 决定是否显示"分/合",当前恒无效。 +- 双点遥信 4 点用 `iec104_pts_yx_is_dp()` 决定是否显示"分/合",当前恒无效。(注:`iec104_pts` 实现已于 2026-11-17 割接删除,此处为立项时方案原文) - 规模:**M**(33 行名表 + `refresh` + 值映射,约 150 行)。 > **落地注(2026-10-25 道E task-15 批 4)**:已按方案 A 落地为 `Drivers/BSP/UI/ui_page_yx.c` @@ -349,15 +351,15 @@ V0.1 **无直流采样通道**(`ADC_SEM` 只有 8 路电气 + 温度),点 ### 3.3 三遥设置(5 页,阻塞于 `run_par`) -**现状**:死区是**编译期常量**——`App/protocol/iec104/iec104_pts.c` 的 `k_yc[].deadband`(第 244 行 `if (d > k_yc[i].deadband)`)。其余四项(系数/类型/防抖/双点)在固件里**完全没有对应结构**。 +**现状**:死区是**编译期常量**——`App/protocol/iec104/iec104_pts.c` 的 `k_yc[].deadband`(第 244 行 `if (d > k_yc[i].deadband)`)。其余四项(系数/类型/防抖/双点)在固件里**完全没有对应结构**。(注:`iec104_pts` 实现已于 2026-11-17 割接删除,此处为立项时方案原文;引用的源码行号随之失效) **所以这 5 页不是页面工作,是一个参数模型工作。** | 页 | 项数 | 数据模型 | 消费方 | |---|---|---|---| -| 遥测死区 | 9 | `run_par.deadband[9]`(float,工程量) | `iec104_pts_cov_check`(替换 `k_yc[].deadband`) | -| 遥测系数 | 9 | `run_par.gain[9]`(Q10 微调,1.000 基准) | `iec104_pts_yc_read`(乘在 fAmSQ 上) | -| 遥信类型 | 33 | `run_par.yx_type[33]`(单点/双点/常闭) | `iec104_pts` 的 `M_SP`/`M_DP` 选择 | +| 遥测死区 | 9 | `run_par.deadband[9]`(float,工程量) | `iec104_pts_cov_check`(替换 `k_yc[].deadband`)
(注:`iec104_pts` 实现已于 2026-11-17 割接删除,此处为立项时方案原文) | +| 遥测系数 | 9 | `run_par.gain[9]`(Q10 微调,1.000 基准) | `iec104_pts_yc_read`(乘在 fAmSQ 上)
(注:`iec104_pts` 实现已于 2026-11-17 割接删除,此处为立项时方案原文) | +| 遥信类型 | 33 | `run_par.yx_type[33]`(单点/双点/常闭) | `iec104_pts` 的 `M_SP`/`M_DP` 选择
(注:`iec104_pts` 实现已于 2026-11-17 割接删除,此处为立项时方案原文) | | 遥信防抖 | 33 | `run_par.yx_debounce[33]`(ms) | 开入采集(尚未实现,**当前无消费方**) | | 双点遥信 | 4 | `run_par.dp_map[4]`(虚端子映射) | 开入采集(同上) | @@ -442,7 +444,7 @@ int run_par_set_deadband(uint8_t yc_idx, float v); /* 范围校验 */ | 保护告警 | 同上 | `asserted` 上升沿 **且** `*_TRIP` = 0 | | 保护启动 | 同上(新增 `picked` 边沿检测) | `picked` 上升沿 | | 操作记录 | 定值保存成功 / 强制复归 / 时钟设置 / 清除记录(4 处) | 动作成功后写一条 | -| 遥控记录 | `iec104_pts_yk_exec()` 返回处 | 每次执行结果(成功/失败/选择态) | +| 遥控记录 | `iec104_pts_yk_exec()` 返回处(注:`iec104_pts` 实现已于 2026-11-17 割接删除,此处为立项时方案原文) | 每次执行结果(成功/失败/选择态) | > **本表只是页面侧的需求清单**(记录页要消费哪几类),**不是记录层的登记表**: > 5 个 ID 的定名、记录格式、条数与字节上限、写入时机、以及是否真的落地,一律以 @@ -626,7 +628,7 @@ SNTP 客户端 ──────→ 批4 SNTP设置 | 4 | 无源点显示 `--` | 遥信量无效点、直流量直流通道 | | 5 | 定值整定闭环 | 改 → 保存 → 重启 → 值保持 + 校验和自检通过 + 主站 C_RD 一致。**2026-10-26 半收口**:模拟器侧「改 → 保存 → `OK` → 回首屏新值已在帧里」与「越界被拒、值不落盘」已由像素 + 文本断言覆盖(`sparam_save` / `sparam_landed` / `sparam_oob`);**重启保持与 C_RD 一致只能上板**(模拟器无 NAND)。另注意 40 项里 **13 项 `comm_addr = 0`**(投退、返回系数、过频/低频段、全局软压板)主站不可寻址,不能拿 C_RD 当它们的判据 | | 6 | 分层门禁无新增 | `check_layer_deps.py` 退出码 0,基线 6 → 3。**现状:3**(记录 reader 已削 3 条;写路径走注入式 ops 函数表,未新增 include,见 `docs/UI设计/UI_数据供给设计.md` §6.2) | -| 7 | 像素回归稳定 | `ui-golden` 连续两次零差异。**已验(2026-10-26)**:27 页连跑两次逐字节一致——**该下限此后已扩至 66 张**(新增 clock / reset / clear 系列 13 张,其后 47→53→60→66,2026-10-29 录波 UI 道 +6 张),66 张上的双次逐字节一致**已验(2026-10-29:任务树重建模拟器后同一批 66 张连跑三次逐字节一致,页面池水位 5,448 B;菜单侧 `check_menu_rows.py` 8 状态连跑三次亦逐字节一致,5,368 B;三次之间未用更新模式写过任何参考图,故这是同口径的传递性证据)**。集合其后扩至 74 张——2026-11-13 按同口径跑过 74 张零差异(task-3 五页接自动刷新,无头不跑 `lv_timer_handler`,往返水位 5,448 B / 菜单 5,368 B 均不动) | +| 7 | 像素回归稳定 | `ui-golden` 连续两次零差异。**已验(2026-10-26)**:27 页连跑两次逐字节一致——**该下限此后已扩至 66 张**(新增 clock / reset / clear 系列 13 张,其后 47→53→60→66,2026-10-29 录波 UI 道 +6 张),66 张上的双次逐字节一致**已验(2026-10-29:任务树重建模拟器后同一批 66 张连跑三次逐字节一致,页面池水位 5,448 B;菜单侧 `check_menu_rows.py` 8 状态连跑三次亦逐字节一致,5,368 B;三次之间未用更新模式写过任何参考图,故这是同口径的传递性证据)**。集合其后扩至 74 张(当时值)——2026-11-13 按同口径跑过 74 张零差异(task-3 五页接自动刷新,无头不跑 `lv_timer_handler`,往返水位 5,448 B / 菜单 5,368 B 均不动) | | 8 | 每个新页有 golden 参考 | `simulator/tests/ref/` 新增对应 `.bin`。**整定 4 页已有 9 张**(含保存/越界/落定/回绕各态);参考图入库,改它 = 改判据,须逐页过目 | --- diff --git a/docs/UI设计/页面补齐规划.md b/docs/UI设计/页面补齐规划.md index 648c3669..ac793e6c 100644 --- a/docs/UI设计/页面补齐规划.md +++ b/docs/UI设计/页面补齐规划.md @@ -17,7 +17,7 @@ | 已绑内容页叶子 | **27**;注册表 `UI_PAGE_MAP_COUNT` = 31,差额 4 为「查看/整定」两组叶子的两态复用带来的映射条目 | `Drivers/BSP/UI/ui_page_registry.h` | | 未绑叶子 | **3**(遥信类型 / 遥信防抖 / 双点遥信) | `ui_menu_tree.txt` | | `ui_page_*.c` 源文件 | **30**(含 registry 与密码页两个非节点页) | `Drivers/BSP/UI/` | -| 像素黄金参考 | **74 张**(`simulator/tests/ref/shot_*.bin`) | 同目录实数 | +| 像素黄金参考 | **76 张**(`simulator/tests/ref/shot_*.bin`) | 同目录实数 | > 口径:叶子判定 = 无更深缩进后继者;已绑判定 = 该行带 `#page=`。复核方法与 `docs/UI设计/菜单页面设计.md` §3.9 一致。 diff --git a/docs/产品需求/产品需求设计文档.md b/docs/产品需求/产品需求设计文档.md index 49b38d84..07b7820e 100644 --- a/docs/产品需求/产品需求设计文档.md +++ b/docs/产品需求/产品需求设计文档.md @@ -629,7 +629,7 @@ flowchart LR 上电次数 + 本次复位原因快照)与 iec104_serv 的四个只读观测计数,经 info 帧下发 (口径 docs/UI设计/UI_数据供给设计.md §4.4)。 - 判据:五类记录各有写入点、可翻最近 20 条、空记录明确显示"无记录"、共用 reader——**软件面已满足** - (空态与四个范围标签由 74 张像素黄金钉住;模拟器侧这些文件没有写入方,只拍到空态)。 + (空态与四个范围标签由 76 张像素黄金钉住;模拟器侧这些文件没有写入方,只拍到空态)。 真记录翻页、掉电后保持(复位代理口径)、清除记录后归零、boot_count 自增、rst_cause=IWDG、 conn_up +1 **已于 2026-11-06 Issue #53 台架轮实机复核通过**;四态判定中「拔 RTC 电池落 RESTARTED」经用户裁定(2026-11-05)台架不可验销项(证据与口径见 Issue #53 与 @@ -1620,7 +1620,7 @@ pre-commit run --all-files - 菜单导航状态**不压层**,返回即原样还原;同一时刻至多一个内容页打开。 - 节点→页映射在逻辑层 `menu_content_page_for(node)`;未绑叶子进入空白终点框(不伪造数据)。 - 数据供给走**注入通道**(rt / par / info / 遥测死区与系数第四表),页面不直接触算法层; - 像素黄金用例当前 **74 张**(菜单 8 状态另计;2026-10-28 记录 5 页与运行报告 2 页落地 +7 张;2026-10-29 录波 UI 道 6 张:手动录波 3 态 + 录波回放 3 态;2026-11-04 SNTP 设置页 +8 张)。 + 像素黄金用例当前 **76 张**(菜单 8 状态另计;2026-10-28 记录 5 页与运行报告 2 页落地 +7 张;2026-10-29 录波 UI 道 6 张:手动录波 3 态 + 录波回放 3 态;2026-11-04 SNTP 设置页 +8 张;2026-11-16 DI/DO 状态页 +2 张;同日 DI/DO fold 进遥信页,删 2 加 2 净 0。即 74+2+0=76)。 ### 8.4 密码与权限 diff --git a/docs/代码规范/cppcheck使用说明.md b/docs/代码规范/cppcheck使用说明.md index ecd1ecaf..84fec148 100644 --- a/docs/代码规范/cppcheck使用说明.md +++ b/docs/代码规范/cppcheck使用说明.md @@ -15,7 +15,7 @@ cppcheck 是开源 C/C++ 静态分析工具,**不运行代码**,通过语法 ### 日常速度 -- **提交期**:不跑(`stages: [manual]`),一次带代码的 `git commit` 只跑 49 根快钩子 +- **提交期**:不跑(`stages: [manual]`),一次带代码的 `git commit` 只跑 48 根快钩子(pre-commit 阶段 47 + `gitlint`) - **全库扫描**(约 20 s;2026-10-28 实测 `cppcheck` 20.5 s、`test-cppcheck` 38.1 s):手工复跑 `& '.venv\Scripts\python.exe' -m pre_commit run --all-files --hook-stage manual `——**一次只能给一个 id**(`pre_commit run a b c` 实测报 `unrecognized arguments`),故 `cppcheck` / `test-cppcheck` 各跑一次 --- diff --git a/docs/代码规范/pre-commit使用说明.md b/docs/代码规范/pre-commit使用说明.md index d4185025..6b2ed8c7 100644 --- a/docs/代码规范/pre-commit使用说明.md +++ b/docs/代码规范/pre-commit使用说明.md @@ -39,7 +39,7 @@ git commit > **CI 侧的同一套门禁(2026-10-01 起)**:Gitea Actions(`.gitea/workflows/ci.yml`)在 push / PR 时 > 以 `pre-commit run --all-files` 复跑 **`pre-commit` 阶段的 47 根**(`mem-numbers` 在无 Keil `.map` 的 runner 上自适应跳过), -> 再以「手动阶段门禁」步**逐根** `--hook-stage manual` 复跑 `cppcheck` / `test-cppcheck` / `test-coverage` 三根 +> 再以「手动阶段门禁」步**逐根** `--hook-stage manual` 复跑 `cppcheck` / `test-cppcheck` / `test-coverage` 三根(本地还有第四根 `iec104-tcp`,需模拟器产物) > (`pre_commit run a b c` 不支持多 id,实测报 `unrecognized arguments`)。 > 本地提交前想跑同一套判定:`& '.venv\Scripts\python.exe' scripts/ci_local.py`。详见 `../测试说明/流程与规范/测试开发标准流程.md` §9。 @@ -93,7 +93,7 @@ git commit | 机制 | 口径 | |---|---| -| **三个阶段** | pre-commit 阶段 **48** 个钩子 + commit-msg 阶段 `gitlint`(= 一次 `git commit` 实跑 **49**)+ `manual` 阶段 3 根(`cppcheck` / `test-cppcheck` / `test-coverage`:`git commit` 不跑,只在远端 CI 的「手动阶段门禁」步与 `scripts/ci_local.py` 的 manual 段跑;三根实测合计约 165 s ≈ 一次带代码提交耗时的三分之二)→ 口径 = YAML 解析后的 hook 条目数 **51**;自查命令与「声明 / 文档 / 实跑」三数同源核对 → `docs/门禁说明/README.md` §2;`default_install_hook_types: [pre-commit, commit-msg]` 是显式声明的——换机后 `pre-commit install` 才会带上 commit-msg 钩子 | +| **三个阶段** | pre-commit 阶段 **47** 个钩子 + commit-msg 阶段 `gitlint`(= 一次 `git commit` 实跑 **48**)+ `manual` 阶段 4 根(`cppcheck` / `test-cppcheck` / `test-coverage` / `iec104-tcp`:`git commit` 不跑,只在远端 CI 的「手动阶段门禁」步与 `scripts/ci_local.py` 的 manual 段跑;前三根实测合计约 165 s ≈ 一次带代码提交耗时的三分之二,`iec104-tcp` 另需模拟器构建产物)→ 口径 = YAML 解析后的 hook 条目数 **52**;自查命令与「声明 / 文档 / 实跑」三数同源核对 → `docs/门禁说明/README.md` §2;`default_install_hook_types: [pre-commit, commit-msg]` 是显式声明的——换机后 `pre-commit install` 才会带上 commit-msg 钩子 | | **一根钩子在输出里出现两次** | 未声明 `stages:` 的钩子**默认属于所有阶段**,pre-commit 与 commit-msg 两遍都会列出它;第二遍的"文件"是提交信息文件,几乎必然 `(no files to check)Skipped`。**只看输出结尾会把"实跑通过"读成"没跑"**——判某钩子跑没跑要认它**第一次**出现的那行(实测 2026-10-24:只改 `.pre-commit-config.yaml` 的提交里 `test-coverage` 与 `bsp-err` 都是 Passed,尾巴那一遍是 Skipped) | | **stash 陷阱** | pre-commit 跑钩子前会 stash 未暂存改动,钩子看到的是"没有你中间状态"的树。**改代码 + 同时更新基线/受管区的,必须先 `git add` 再跑钩子**,否则会拿到假报警(本仓踩过,`docs/门禁说明/bsp-err.md` §4 记了现场)。**它藏不住什么,见下一行** | | **stash 覆盖面:只覆盖已跟踪文件的未暂存改动**(2026-10-26 读源码定案,**对所有钩子通用**) | 机制在 pre-commit 的 `staged_files_only._unstaged_changes_cleared()`:`git diff-index ` 取补丁 → `git checkout -- .` → 跑完 `git apply` 还原。所以「钩子实跑 = 只看到 HEAD + 本笔 staged」这句**对已跟踪文件成立、对未跟踪文件不成立**:未跟踪文件压根不在 `diff-index` 里,**不会被藏**;`git add -N`(intent-to-add)也救不了——pre-commit 只 `git rm --cached` 把它撤下索引(`_intent_to_add_cleared()`),**文件本体仍在盘上**。后果:别人写了尚未入库的文件(新页面实例 / 新单测目录 / 新文档)躺在树里时,**任何一笔碰到该文件所属钩子 `files:` 的提交都会被这份半成品拖红**——红的内容没错,但账不该记在这笔提交上。实测:`ui_page_clock.c`、`ui_page_reset.c` 处于未跟踪且未绑 `#page` 期间,`generated-fresh` 对**所有人**的 UI 提交都会 FAIL(现场日志 `docs/门禁说明/generated-fresh.md` §6 第 8 条)。三条结论:① 提交排序——会让全树变红的半成品要么先落地(绑引用 + 重跑生成器)要么先挪出工作树;② 凡「判定基准取工作区」的钩子(重跑比对类、全库统计类)在多人同树下必须配**静默窗口**;③ 真要 `--no-verify` 抢跑,正文必须点名是哪几个**未跟踪**文件拖的红,别让它被读成「钩子不可信」 | @@ -137,7 +137,7 @@ git commit | BOM 漂移 | `& '.venv\Scripts\python.exe' scripts/check_bom_drift.py --all` | HEAD 有 BOM 而工作区没有 → 1;⚠ **别用「有 BOM 就是错」的外行判据**——`Drivers/BSP/UI/*`、`App/task/ui_task.c` 等本就该带 BOM(名单与理由 → `docs/文档规范.md` §2;本文件 §2.2) | | 乱码 U+FFFD | `& '.venv\Scripts\python.exe' scripts/check_mojibake.py <本笔文件>` | 出现即 1 | | **字节卫生 = 改写型钩子的只读等价** | 下面的一行式 + `git diff --check` | 一次查完**待提交清单(含未跟踪新文件)**的 CR / 缺尾换行 / U+FFFD / 行尾空格,全程不写盘 | -| 受影响模块的主机单测 | `& '.venv\Scripts\python.exe' test/host/<模块>/run_unit_test.py` | 只跑你碰的那几套;**改过骨架** `test/host/common/unit_test_harness.py` 就要跑全套(等价 22 根钩子同时触发) | +| 受影响模块的主机单测 | `& '.venv\Scripts\python.exe' test/host/<模块>/run_unit_test.py` | 只跑你碰的那几套;**改过骨架** `test/host/common/unit_test_harness.py` 就要跑全套(等价 21 根钩子同时触发) | | 全量单测 + 覆盖率 | `& '.venv\Scripts\python.exe' scripts/check_test_coverage.py` | 0=全过且覆盖率未回退 / 1=有失败或回退 / 2=环境(缺 `cl.exe` / mscoverage) | | 编号 | `& '.venv\Scripts\python.exe' scripts/archive/id_gate/check_ids.py --strict` | 增量拦截:台账之外新错即 1;顺带核「可判定比例」与「不可判定绝对数」两行(2026-10-26 余量只剩 12 处) | | 文档链接与章节 | `& '.venv\Scripts\python.exe' scripts/check_doc_links.py --all` | 0 通过 / 1 有问题(钩子还多带 `--sections-strict`) | @@ -163,7 +163,7 @@ git commit | **改写型钩子** `trailing-whitespace` / `end-of-file-fixer` | 它们会**改文件**。真提交里改的是 stash 之后的树;而手跑 `--files` **不 stash**(§2.2 那两行),直接落在工作区——**列了别人在飞的文件就等于替人改文件** | 只列自己的文件:`-m pre_commit run --files <自己的文件>`;或先用 A 组的一行式查出问题自己修,别让钩子替你动盘 | | **要靠 stash 才能正确归因**的判定:`mem-numbers` / `mem-budget`(读磁盘 `.map`)、`stack_report`(读磁盘 `.htm`)、`ui-golden` / `uinav-selftest`(要模拟器 exe 与台架锁)、`test-coverage`(会编译,可能撞别人的 `.obj`) | 磁盘上的 `.map` / `.htm` / `.exe` 属于**最后一次构建的人**,不是你的 ⇒ 手跑红常常是替别人背账(今天 `mem-budget` 就红在「台账与 `.map` 不同码」,因为 `.map` 里混着三条在飞源码道) | **照样要跑**(宁可多跑),但**红先归因**:`git status --porcelain` 看是谁在飞、`.htm` 的时间戳是哪次构建;确认不属本笔就在提交正文点名,**不要改基线数字去凑绿** | | **只有真提交才会碰到的面**:`gitlint`(commit-msg 阶段)与未声明 `stages:` 会跑两遍的钩子 | 手跑脚本查不到提交信息规范(标题 ≤100、**正文每行 ≤80**) | 提交信息一律 `git commit -F ` 并自查最长行;或先老实提交一次让 `gitlint` 说话,再改成 `--no-verify` | -| **`manual` 阶段的三根**(`cppcheck` / `test-cppcheck` / `test-coverage`) | `pre-commit run --all-files` 只跑 `pre-commit` 阶段(47 根),**不会碰它们**——漏跑不会报红,只会静默少一道门禁 | 抢跑时补:`& '.venv\Scripts\python.exe' -m pre_commit run --all-files --hook-stage manual `,一次一个 id(见 §2.2「三个阶段」行) | +| **`manual` 阶段的四根**(`cppcheck` / `test-cppcheck` / `test-coverage` / `iec104-tcp`) | `pre-commit run --all-files` 只跑 `pre-commit` 阶段(47 根),**不会碰它们**——漏跑不会报红,只会静默少一道门禁 | 抢跑时补:`& '.venv\Scripts\python.exe' -m pre_commit run --all-files --hook-stage manual `,一次一个 id(见 §2.2「三个阶段」行) | #### C. 抢跑之后(三条都来自今天的真事,不是设想) @@ -266,7 +266,7 @@ git commit -m "紧急修复" --no-verify SKIP=cppcheck git commit -m "紧急修复" ``` -> ⚠️ **不推荐**:`--no-verify` 一次跳过 47 条(连 `gitlint` 一起 = 48 条;manual 阶段三根本来不随提交跑),不是「跳过格式检查」。**跳之前必须先跑 §2.4 抢跑自查表** +> ⚠️ **不推荐**:`--no-verify` 一次跳过 47 条(连 `gitlint` 一起 = 48 条;manual 阶段四根本来不随提交跑),不是「跳过格式检查」。**跳之前必须先跑 §2.4 抢跑自查表** > (尤其 `stack_report.py`——它不在钩子清单里,只有人会跑;数字与安全边界类问题不会自己冒出来)。跳之后按 §2.4 C 组 > 补齐三件事:`git status` 对交付清单、正文点名「哪些没跑 / 为什么 / 谁在飞」、静默窗口补一次 `run --all-files`。 @@ -332,7 +332,7 @@ $env:PATH = [Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [Env | 文件 | 位置 | 说明 | |---|---|---| -| `.pre-commit-config.yaml` | 仓库根 | 钩子配置(**52 个钩子**声明数,一次 `git commit` 实跑 49 根;口径 = YAML 解析后的 hook 条目数,自查命令 → `docs/门禁说明/README.md` §2。声明数与一次提交的实跑数分列,勿混写;计数改动的完整台账只记在 `docs/门禁说明/README.md` §2,本行不重述)。逐项详解在 `docs/门禁说明/`(索引 `docs/门禁说明/README.md`;主机侧单测 **22 根**合一篇,含各套件来历与「22 套无专属钩子」台账(现值 2026-10-29) `docs/门禁说明/host-unit-tests.md` §6;UI 侧另有 `font-charset` 与 `ui-golden` 两篇) | +| `.pre-commit-config.yaml` | 仓库根 | 钩子配置(**52 个钩子**声明数,一次 `git commit` 实跑 48 根 = pre-commit 阶段 47 + `gitlint`;口径 = YAML 解析后的 hook 条目数,自查命令 → `docs/门禁说明/README.md` §2。声明数与一次提交的实跑数分列,勿混写;计数改动的完整台账只记在 `docs/门禁说明/README.md` §2,本行不重述)。逐项详解在 `docs/门禁说明/`(索引 `docs/门禁说明/README.md`;主机侧单测 **21 根**合一篇,含各套件来历与「22 套无专属钩子」台账(套数为 2026-10-30 复点值) `docs/门禁说明/host-unit-tests.md` §6;UI 侧另有 `font-charset` 与 `ui-golden` 两篇) | | `.gitlint` | 仓库根 | gitlint 规则(宽松,兼容中文) | | `.cubemx_survival_baseline.json` | 仓库根 | CubeMX 易失定制基线(哈希;`--write` 重建) | | `scripts/check_mojibake.py` | scripts/ | U+FFFD 检测脚本 | diff --git a/docs/内存管理/RAM使用分析与优化方案.md b/docs/内存管理/RAM使用分析与优化方案.md index b8d0625d..4c938c30 100644 --- a/docs/内存管理/RAM使用分析与优化方案.md +++ b/docs/内存管理/RAM使用分析与优化方案.md @@ -47,10 +47,10 @@ dhara 失败类 +84;RO 另 +208,全是该失败类名表)→ `ER_IROM1` | 区域 | 用量 | 容量 | 占比 | |---|---|---|---| -| ER_IROM1 | 289,800 B (283.01 KB) | 1,048,576 B (1024 KB) | 27.6% | -| RW_IRAM1 | 97,368 B (95.09 KB) | 131,072 B (128 KB) | 74.3% | +| ER_IROM1 | 415,956 B (406.21 KB) | 1,048,576 B (1024 KB) | 39.7% | +| RW_IRAM1 | 118,408 B (115.63 KB) | 131,072 B (128 KB) | 90.3% | | RW_CCM | 57,376 B (56.03 KB) | 65,280 B (64 KB) | 87.9% | -| **Flash (ROM 合计)** | **291,904 B (285.1 KB)** | 1,048,576 B (1024 KB) | **27.8%** | +| **Flash (ROM 合计)** | **418,244 B (408.4 KB)** | 1,048,576 B (1024 KB) | **39.9%** | 各区的容量与常量来源: diff --git a/docs/内存管理/RAM预算台账.md b/docs/内存管理/RAM预算台账.md index a45a0369..04b8cf69 100644 --- a/docs/内存管理/RAM预算台账.md +++ b/docs/内存管理/RAM预算台账.md @@ -15,19 +15,19 @@ | 区域 | 用量 | 容量 | 占比 | 门禁(≤92%) | |---|---|---|---|---| -| ER_IROM1 (Flash) | 288,628 B | 1,048,576 B | 27.5% | 参考 | +| ER_IROM1 (Flash) | 415,956 B | 1,048,576 B | 39.7% | 参考 | | RW_CCM | 57,376 B | 65,280 B | 87.9% | PASS | | UNINIT_CCM | 48 B | 256 B | 18.8% | 参考 | -| RW_IRAM1 | 97,248 B | 131,072 B | 74.2% | PASS | +| RW_IRAM1 | 118,408 B | 131,072 B | 90.3% | PASS | | 子系统(静态 RW+ZI;除 RTOS 堆在 CCM 外均在 SRAM1) | 现值 | 配额 | 状态 | |---|---|---|---| -| 网络 | 13,958 B | 12 KB | ⚠ 超 1.6 KB | +| 网络 | 13,966 B | 12 KB | ⚠ 超 1.6 KB | | 存储 | 9,144 B | 12 KB | OK | -| UI | 36,731 B | 16 KB | ⚠ 超 19.9 KB | +| UI | 36,791 B | 16 KB | ⚠ 超 19.9 KB | | RTOS 堆 | 57,376 B | 56 KB | 堆=配额 | -| 应用 | 26,609 B | 8 KB | ⚠ 超 18.0 KB | -| 其它 | 10,792 B | — | 参考 | +| 应用 | 47,699 B | 8 KB | ⚠ 超 38.6 KB | +| 其它 | 10,795 B | — | 参考 | - **门禁**:pre-commit `mem-budget` 钩子(`scripts/ram_baseline.py --gate`)—— diff --git a/docs/子系统设计/IEC104_MCU落地规划.md b/docs/子系统设计/IEC104_MCU落地规划.md index 8d47b7d3..b8cc8436 100644 --- a/docs/子系统设计/IEC104_MCU落地规划.md +++ b/docs/子系统设计/IEC104_MCU落地规划.md @@ -93,7 +93,7 @@ **明确推荐**:经逐项批准后,由 netTask 直接运行无线程循环驱动(threadless)的共享核心与仅属主可用的短时尝试式硬件接口(try-BSP);参数耐久提交、时钟落地和文件快照交各自实际属主异步完成。禁止在 netTask 调公开网络 RPC(远程过程调用式队列请求)等待自身,禁止在网络循环内做文件系统操作或等保存结果。此路线复用成熟协议状态机,不增加另一套 TCP 协议实现。 -**实施前提**:先以隔离探针证明精确待收快照、会话代次、监听/数据句柄分离、短写、尾数据和关闭释放;还须核实禁用小包延迟(NODELAY)的真实等效能力。参数、时钟及 Type210 文件业务要新增保持线上格式的“开始/完成/取消/释放”异步生命周期;当前同步回调不能入队后返回已应用,也不能把文件读取 false 当暂忙。所有候选接口仍未实现。 +**实施前提**:先以隔离探针证明精确待收快照、会话代次、监听/数据句柄分离、短写、尾数据和关闭释放。禁用小包延迟已核实为平台偏离:CH395F 与网络层没有配置 TCP_NODELAY 的接口,等效为链路恒无 Nagle 延迟,板端不把它列为成功条件。参数、时钟及 Type210 文件业务要新增保持线上格式的“开始/完成/取消/释放”异步生命周期;当前同步回调不能入队后返回已应用,也不能把文件读取 false 当暂忙。所有候选接口仍未实现。 **不推荐的当前替代**:保留 iec104Task 加普通跨任务邮箱,在现接口下无法保持精确待收快照和超时先后边界;阻塞 RPC 更不可接受。若主推荐的栈、时限或硬件契约不能成立,暂停实施并申请实质性异步输入切片/调度合同改造,不能自动切到一个未证明的后备方案。 @@ -130,7 +130,7 @@ | 待逐项批准的变化 | 明确推荐与批准前提 | 不批准时的处置 | |---|---|---| -| 协议运行属主与网络驱动 | netTask 循环驱动核心并新增属主专用 try-BSP;精确待收、NODELAY、栈/时限探针先证明 | 停在规划/探针,不用阻塞 RPC 或薄包装顶替 | +| 协议运行属主与网络驱动 | netTask 循环驱动核心并新增属主专用 try-BSP;精确待收、栈/时限探针先证明。NODELAY 为已核实平台偏离,不作成功条件 | 停在规划/探针,不用阻塞 RPC 或薄包装顶替 | | 库业务异步生命周期 | 参数、校时、Type210 引入开始/完成/取消/释放;保持线上格式与 APPLIED 真实完成含义 | 不能接纳后先肯定再后台保存 | | 规范参数模型与全部读者接缝 | 一个权威提交代次,保护/运行/标定/UI 同代次读取,旧配置文件为派生镜像 | 不声称整批原子;不并列多份可写真源 | | 持久化布局、恢复与故障域 | 优先预分配短名冗余副本及独立提交记录,先界定掉电与卷故障保证;布局/版本迁移逐项核算 | 不以 rename 或两份同卷文件承诺任意故障保持 | @@ -163,6 +163,6 @@ **当前主推荐**为:netTask 无线程循环驱动成熟核心及属主专用尝试式网络接口;defaultTask 协调全类型参数的规范模型、耐久提交与跨读者同代次发布;历史/日志/录波、电能在既有实际属主补齐未来真实字段并生成不可变兼容导出。保持全部业务与原库并发能力,不用缩容、第二真源或伪历史换资源。 -**推荐的下一步不是直接移植,而是先批准最小可行性工作包**:完整状态结构与峰值预算设计、精确待收/NODELAY 隔离探针、读者同代次与耐久恢复故障模型、文件补采及兼容视图合同。当前资源证据已经表明默认闭包直接迁入超预算,不能把“待更多实测”写成默认可行。工作包不授权改变栈池、第三方行为或硬件;结构变化仍逐项审批。 +**推荐的下一步不是直接移植,而是先批准最小可行性工作包**:完整状态结构与峰值预算设计、精确待收隔离探针(禁用小包延迟已核实为平台偏离,不再列为探针)、读者同代次与耐久恢复故障模型、文件补采及兼容视图合同。当前资源证据已经表明默认闭包直接迁入超预算,不能把“待更多实测”写成默认可行。工作包不授权改变栈池、第三方行为或硬件;结构变化仍逐项审批。 **仍未闭环的实施前提**为:完整资源合格、网络关键能力证明、真实读者代次迁移及写旁路封闭、存储故障保证与旧资料处置批准。任一前提不成立就停止转实施,给出保持全功能的替代架构或硬件代价,不把条件推荐当已批准可运行方案。调查冻结与独立审查完成只表示规划可决策,**不表示 MCU 完整落地、既有旧栈可删或任何产品改动已获批准**。 diff --git a/docs/子系统设计/IEC104上行设计说明.md b/docs/子系统设计/IEC104上行设计说明.md index b805674b..57d6882c 100644 --- a/docs/子系统设计/IEC104上行设计说明.md +++ b/docs/子系统设计/IEC104上行设计说明.md @@ -46,6 +46,8 @@ `iec104_source_clock_set()` / `iec104_source_clock_read()` / `iec104_source_clock_ms()` 只维护虚拟设备墙钟,**不得改 Windows 系统钟**;超时使用独立单调时基。对时不应改变选择/链路超时或宿主时间。UI 时间一致性由适配层验证,不能据此推断 UI 参数已同源。 +**C_CS 对时的落点在骨架迁移中收窄**:迁移后的共享核心收到 C_CS 只调用 `iec104_source_clock_seed()` 更新虚拟设备墙钟种子,**不写 SD2506 实时时钟**;这与下文 §5 旧实现经 `sys_clock_set_unix()` 写回硬件 RTC 的行为不同,属行为变更,不能按旧口径宣称对时已落硬件。当前调用 `sys_clock_set_unix()` 的只有 `App/task/ui_task.c`(UI 手动校时)和 `App/sync/time_sntp.c`(SNTP 对时)两处;旧 `iec104Task` 的 C_CS 写 RTC 路径随该任务退役后不再存在。 + ### 0.4 验证状态与资源限制 - **仅模拟器首个里程碑通过,不代表全部替换完成**:最终二进制 SHA256 为 `d2285bbc68ce4353c814dbcc455a2083b56e81fc54bf88081402e821c6a92833`,测试作者及审查人独立真实 TCP 各 11 项通过,证据分别为 `ci-artifacts/iec104-tests/tcp-final/report.json`、`ci-artifacts/iec104-review/tcp-final/report.json`,各目录保留逐帧、点对象及运行日志。测试作者前轮 11 项通过报告仍保留在 `ci-artifacts/iec104-tests/tcp-snapshot2-corrected/report.json`;首轮失败快照 `ci-artifacts/iec104-tests/tcp-snapshot1/` 保留作修复轨迹。同哈希菜单 8 状态、内容 76 页及往返/实时数据回归通过,日志 `ci-artifacts/iec104-sim-menu-release.log`、`ci-artifacts/iec104-sim-content-release.log`;编译输入身份见 `ci-artifacts/iec104-sim-release-sources.sha256`(95 个编译 C 文件、160 个输入文件哈希)。未刷新黄金参考,不将旧二进制结果冒充最终结果。 @@ -56,6 +58,25 @@ - **历史日志与录波不另起示例文件栈**:未导入示例历史、录波及升级存储后端;后续接入复用现有 `App/log/` 与录波子系统,不宣称接缝已验证。 - **统计语义分开**:`written_i_frames` 是完整 I 帧交给本地 TCP 的记录,可能在协议确认或关闭时延迟交付;`acknowledged_i_frames` 是 IEC104 N(R),不是 TCP ACK。总召及命令完成计数是业务语义,不证明远端收到或物理动作完成;UI 须按实际观测展示。 +### 0.5 骨架阶段的记录缺口(有意收窄,不是回归 bug) + +**旧板端实现会写遥控与对时记录。** `git show HEAD:App/protocol/iec104/iec104_pts.c` 的 `s_src_yk_exec()` 有 7 处 `syslog_post_quiet()` 写 `SYSLOG_YK`(`/log/yk.log`),覆盖 8 种文案:`YK11 select`、`YK11 exec`、`YK12 select`、`YK12 exec on`、`YK12 exec off`、`YK12 exec fail`、`YK12 bad dpc`、`YK unknown ioa`;同一函数另有 2 处写 `SYSLOG_OPER`(`/log/oper.log`),覆盖 3 种文案:YK11 执行段调 `prot_elm_request_reset()` 后写 `force reset`,YK12 执行段调 `prot_set_set_sealed(PS_GLOBAL_EN, …)` 成功/失败后写 `plate in` / `plate out`。`git show HEAD:App/task/iec104_serv.c` 的 `s_clock_sync()` 在 `sys_clock_set_unix()` 返回 0 时写 `SYSLOG_OPER` 的 `clock set by 104`。 + +**迁移后的共享核心不写这些记录,因为无真事实可写。** `iec104_source_command()`(`App/protocol/iec104/iec104_source.c`,函数头注释「改变模拟遥信并标识替代源,绝不驱动物理出口」)是纯模拟态变更:选择段立即返回,执行段只改模拟 IOA 的状态与统计,其中复位动作的注释明确「只复归模拟锁存,绝不复归真实保护状态」。`App/protocol/` 与 `App/task/iec104_serv.c` 对 `prot_elm_request_reset` 与 `PS_GLOBAL_EN` 均为 0 次引用,即新核心不触碰任何真实控制目标(与 §0.2「遥控全部为模拟动作」同一事实)。因此骨架档若照旧写 `force reset` 或 `plate in/out`,写下的将是**伪造记录**——不写是当前唯一诚实的做法。 + +**可感知后果**(按用户可见面): + +| 面 | 现状 | +|---|---| +| `/log/yk.log` | 全仓已无生产者(`SYSLOG_YK` 仅在记录类型定义、UI 编号映射表与容量表中出现) | +| UI「遥控记录」页(`node 38`) | 读该日志 → 恒为空态,显示伪行「无记录」,页脚「共 1 页」 | +| `/log/oper.log` | 少 3 类文案:`force reset`、`plate in/out`、`clock set by 104`;面板侧操作(`App/task/ui_task.c` 的操作记录写入口)与 SNTP 侧(`App/sync/time_sntp.c` 的 `clock set by SNTP`)仍保留 | +| 审计面「面板操作 vs 主站操作」 | 远端那一半当前不存在 | + +该日志文件与容量仍登记在 `App/log/sys_log_mcu.c` 的路径/容量表中,「清除记录」页仍列出该条目——即**页面与文件都还在,只是没有写入方**,现场容易误判为设备故障。 + +**结论**:骨架阶段**有意不记录遥控与 104 对时**,原因是该阶段不驱动物理出口;这不是回归 bug,是交付范围收窄。恢复记录能力需要**新增观测接缝**(在源层命令路径加观测回调,或给核心加逐条命令结果回调)——现有接口不提供:厂商库无命令观察者 API,`iec104_core.h` 只暴露聚合计数 `commands_completed`,`iec104_source_command_feedback()` 仅告知命令影响了哪几个 IOA 且不区分成功/失败/拒绝。该新增涉及 `netTask` 栈预算(`iec104_serv_net_tick()` 在 `netTask` 上下文运行),**待另行立项,不并入本轮骨架割接**。 + ## 1. 范围(V0.1 子集) | 面 | 本期做 | 本期不做(登记 §8) | diff --git a/docs/子系统设计/故障录波设计说明.md b/docs/子系统设计/故障录波设计说明.md index 5d970b64..6150a9c7 100644 --- a/docs/子系统设计/故障录波设计说明.md +++ b/docs/子系统设计/故障录波设计说明.md @@ -567,7 +567,7 @@ bench 锁全程持有(任务 `exec-issue-84`,`_wt` 规范锁区手工获取 §4 与 §8(坏段轮 reject 行 = 预期内,其余 `[ERR]` 照旧停幕)。画面零改动:判废态仍 「该段不可读」逐比特不变(ui-golden `wave_play_bad` 零刷新实证)。 -主机面:ui-golden 全绿(内容页 74 张 + 菜单行 + 水位;三态帧零刷新);主机套件 ui_data 295 / +主机面:ui-golden 全绿(当时内容页 74 张 + 菜单行 + 水位;三态帧零刷新);主机套件 ui_data 295 / ui_sink 17 / wave_ring 113 / wave_store 170 / wave_trig 110 全过;Keil 0 错误 0 警告 (ER_IROM1 285,716→285,940 B:判废留痕单调用点含格式串常量共 +224 B,与 #93「每调用点约 90 B」的账同量级)。 diff --git a/docs/子系统设计/运行与自检记录设计.md b/docs/子系统设计/运行与自检记录设计.md index 7a959f32..a76ff05d 100644 --- a/docs/子系统设计/运行与自检记录设计.md +++ b/docs/子系统设计/运行与自检记录设计.md @@ -66,7 +66,7 @@ epoch 定宽 10 位是因为 2001-09-23 起 Unix 秒已是 10 位;uint32 到 2 | `/log/alarm.log` | `SYSLOG_ALARM` | 保护告警(告警型元件动作) | 1024 条(64 KB) | 同上 | | `/log/start.log` | `SYSLOG_START` | 保护启动(越限电平上升沿) | 1024 条(64 KB) | 同上 | | `/log/oper.log` | `SYSLOG_OPER` | 操作(改动了装置状态的运维动作) | 512 条(32 KB) | 同上 | -| `/log/yk.log` | `SYSLOG_YK` | 遥控(104 命令的选择/执行/拒绝) | 256 条(16 KB) | 同上 | +| `/log/yk.log` | `SYSLOG_YK` | ⚠ 原为遥控(104 命令的选择/执行/拒绝);该写入点随 2026-11-17 通信骨架割接删除,**当前无生产者**,骨架阶段有意不记(不驱动物理出口,照旧写即为伪造),见本文档 §2.2 与 `docs/子系统设计/IEC104上行设计说明.md` §0.5 | 256 条(16 KB) | 同上 | - **上限是逻辑上限,不是预分配**:文件按追加写自然增长,一条不写就不占簇;到顶才删除重建(串口打 `cap full, recreate`)。七类全满的名义峰值 = 4864 条 × 64 B = **304 KB**,相对 NAND 容量可忽略,且这些只在事件边沿写。 - 告警/启动给到 1024 条,是因为一次故障会连片触发多个元件,别让最能说明故障过程的两类最先被截掉。 diff --git a/docs/测试说明/单元测试/主机单测覆盖率口径.md b/docs/测试说明/单元测试/主机单测覆盖率口径.md index 3dad499a..2b4a04ae 100644 --- a/docs/测试说明/单元测试/主机单测覆盖率口径.md +++ b/docs/测试说明/单元测试/主机单测覆盖率口径.md @@ -176,7 +176,7 @@ **已落地**:脚本、基线台账、口径(本文);`test-coverage` 已并进 `scripts/ci_local.py` 的 manual 段(`--coverage` 旗标保留只为兼容旧命令)。 **接线状态:已挂**(2026-10-24,`test-coverage` 落在 `.pre-commit-config.yaml` 第 8 节,用户裁定 **FAIL** 语义)。 -它带 `stages: [manual]`——**`git commit` 阶段不跑**(一次带代码的提交只跑 49 根快钩子),由远端 CI 的 +它带 `stages: [manual]`——**`git commit` 阶段不跑**(一次带代码的提交只跑 48 根快钩子 = pre-commit 阶段 47 + `gitlint`),由远端 CI 的 「手动阶段门禁(覆盖率总闸 + 全量 cppcheck)」步与 `scripts/ci_local.py` 的 manual 段承担;手工复跑 `& '.venv\Scripts\python.exe' -m pre_commit run --all-files --hook-stage manual test-coverage`。 @@ -736,7 +736,7 @@ uint16_t ch395f_link_change_count(void); | 类别 | 体量 | 为什么不做 | 那它靠什么把关 | |---|---|---|---| | 芯片驱动(寄存器/时序) | `ch395f.c`(801)、`gd5f2gq5ue.c`(689)、`sd2506.c`(264)、`tpafe5160.c`(157)、`rs485.c`(79) = **1,990 行** | 把 HAL 与寄存器假到底 ≈ **重写一遍驱动**,测的是自己的桩而不是硬件行为(SPI 分频必须 8、DMA 流、I2C 时序在桩里怎么编都"对") | 板级套件(`board-test-suite` skill)+ `/serial-boot-test` 真机日志 + 4 个 Fault 现场;陷阱逐条登记在 `docs/问题记录/CH395F_Trap_Records.md`、`docs/问题记录/GD5F2GQ5UE_Trap_Records.md`、`docs/问题记录/SD2506_Trap_Records.md` | -| UI 侧 | 18 个 `.c` = **2,373 行**(2026-11-04 随 `ui_page_sntp.c` 从 17 个/1,942 行递增) | 与 PC 模拟器是**同一份源码**,行为回归已由 `ui-golden`(菜单 8 状态 + 内容页 74 张像素黄金参考)覆盖;再写单测是第三份重复投资 | `ui-verify` skill 五步 + `docs/UI设计/UI_自动化测试流程.md` | +| UI 侧 | 18 个 `.c` = **2,373 行**(2026-11-04 随 `ui_page_sntp.c` 从 17 个/1,942 行递增) | 与 PC 模拟器是**同一份源码**,行为回归已由 `ui-golden`(菜单 8 状态 + 内容页 76 张像素黄金参考)覆盖;再写单测是第三份重复投资 | `ui-verify` skill 五步 + `docs/UI设计/UI_自动化测试流程.md` | | 任务编排 | `default_task.c`(281)、`adc_task.c`(171)、`net_task.c`(123)、`protect_task.c`(90)、`ui_task.c`(71)、`rs485_task.c`(11) = **747 行** | 每个只有 4~5 个函数,主体是"按顺序调别人";真逻辑在被调模块里(那些已测或在 P1/P2)。给编排层写单测最容易写成"断言我调了几次"的自证 | 真机启动锚点计数 + IWDG `required_mask`(`/serial-boot-test`)+ `docs/架构设计/项目启动顺序管理.md` | | 内核前装配 | `app_main.c`(135) | 被测对象本身就是"`osKernelStart` 之前不许调内核 API"的时序,主机侧无法忠实复现(PC 上没有那个约束) | 同上 + `cubemx-survival` 审计 | diff --git a/docs/测试说明/板级测试/实机测试实施指南.md b/docs/测试说明/板级测试/实机测试实施指南.md index bbe9aefd..1bb20052 100644 --- a/docs/测试说明/板级测试/实机测试实施指南.md +++ b/docs/测试说明/板级测试/实机测试实施指南.md @@ -45,7 +45,7 @@ | A2 | 产品构建 0/0 | `& '.venv\Scripts\python.exe' .dsh\skills\keil-build\scripts\keil_build.py` | 末行 `BUILD_OK: 0 errors, 0 warnings` | | A3 | 构建产物为**产品态** | 检查 `test/board/test_config.h` L30-33 | 四个 `TEST_SUITE_*` **全部注释** | | A4 | `.map` 非测试态 | 看 `MDK-ARM/STM32F407-Demo/STM32F407-Demo.map` 的 `ER_IROM1` | 产品态基线随已接受的修复增长:262,100(初版)→ 262,836 B(10-02 第 1~6 轮台架)→ 264,284 B(第 7~9 轮台架)→ **264,936 B(当前,含 A2/A3/A4 补码)**;明显阶跃 ≈3.7KB 及以上(10-02 实测产品 262,836 → 套件 266,540)= 停在套件态 → 重跑 A2 | -| A5 | 全量静态门禁 | `pre-commit run --all-files`(现只覆盖 `pre-commit` 阶段 47 根;manual 阶段三根另跑 `--hook-stage manual `) | **当时 17/17 Passed**(2026-10-03 实测;含新增 `test-cppcheck`) | +| A5 | 全量静态门禁 | `pre-commit run --all-files`(现只覆盖 `pre-commit` 阶段 47 根;manual 阶段四根另跑 `--hook-stage manual `) | **当时 17/17 Passed**(2026-10-03 实测;含新增 `test-cppcheck`) | | A6 | ST-LINK 探针可见 | `& '.venv\Scripts\python.exe' .dsh\skills\stlink-flash\scripts\stlink_flash.py list`(CLI 经 `DTU_STLINK_CLI` / PATH 解析) | 列出探针 SN `0B250D12A218303030303032` | | A7 | 串口端口正确 | 检查 `.serialtest/config.json` 的 `portName` | 端口单一配置源 = 此文件(当前 COM6,2026-09-21 台架重插后由 COM7 变更);变更后先杀旧 daemon 再 `open` | | A8 | 串口助手 daemon 可用 | `& '.venv\Scripts\python.exe' .dsh/skills/serial-assistant/scripts/serial_tool.py status` | 返回 JSON,`open: true/false` 可读 | diff --git a/docs/测试说明/流程与规范/测试开发标准流程.md b/docs/测试说明/流程与规范/测试开发标准流程.md index d7ea2668..c4b09a15 100644 --- a/docs/测试说明/流程与规范/测试开发标准流程.md +++ b/docs/测试说明/流程与规范/测试开发标准流程.md @@ -373,7 +373,7 @@ cmake --build simulator/build --config Debug # 0) 构建模拟器(须 0 警 | 层 | 载体 | 抓住什么 | |---|---|---| | 文本层 | `check_content_pages.py` 字形模板匹配(310 条、覆盖当时 37 页,解析字体 cmap / glyph_dsc / bitmap) | 缺字显示空白 / 标签写错等**静默失败**(不依赖 `ref/`,先于像素比对运行、失败即中止防误刷参考) | -| 像素层 | 内容页黄金参考 74 张 + 菜单 8 状态,与黄金参考逐字节比对 | 几何 / 样式 / 光标反显 / 整体外观 | +| 像素层 | 内容页黄金参考 76 张 + 菜单 8 状态,与黄金参考逐字节比对 | 几何 / 样式 / 光标反显 / 整体外观 | | 池水位层 | `MENU_POOL_BASELINE=5368 B` / `POOL_AFTER_ROUNDTRIP=5448 B` | LVGL 内存池泄漏 / 结构性漂移(量的是 `used`,与 `LV_MEM_SIZE` 总大小无关) | ### 5.3 黄金参考与字体纪律 diff --git a/docs/测试说明/流程与规范/自动化测试流程.md b/docs/测试说明/流程与规范/自动化测试流程.md index 35509e5b..93969982 100644 --- a/docs/测试说明/流程与规范/自动化测试流程.md +++ b/docs/测试说明/流程与规范/自动化测试流程.md @@ -119,7 +119,7 @@ - **初始化回归**:`App/task/ui_task.c` 已有 `UI port init: OK` / `UI menu init: OK` / `UI net sink: started` 打印(见 `run_boot_test.py` 命令示例);将其加入 `--required` 即可经串口自动回归 UI 初始化。 -- **屏幕内容回归**:由 LVGL 模拟器像素回归覆盖(文本级断言 + 74 张黄金参考 + 池水位门禁, +- **屏幕内容回归**:由 LVGL 模拟器像素回归覆盖(文本级断言 + 76 张黄金参考 + 池水位门禁, 见 `docs/UI设计/UI_自动化测试流程.md`);上机屏幕仍需人工目检(见 `测试开发标准流程.md` §1)。 ## 扩展用法 diff --git a/docs/环境与部署/项目部署环境要求.md b/docs/环境与部署/项目部署环境要求.md index 5209a7ad..da7b93cc 100644 --- a/docs/环境与部署/项目部署环境要求.md +++ b/docs/环境与部署/项目部署环境要求.md @@ -199,14 +199,14 @@ python tools/font_gen/extract_cn.py # 任意 python3: | 项 | 要求 | 说明 | |---|---|---| -| pre-commit | 已安装并 `pre-commit install` | 提交门禁:`.pre-commit-config.yaml` 共 **53 个钩子**,一次提交实跑 **50 个**(pre-commit 阶段 49 + commit-msg 阶段 `gitlint`);余下 3 个带 `stages: [manual]`,归远端 CI 与 `ci_local.py` | -| cppcheck | 在 PATH 中 | 钩子直接调 `cppcheck --enable=warning,performance,portability,style`(`language: system`)。⚠ `cppcheck` / `test-cppcheck` / `test-coverage` 三根带 `stages: [manual]`:`git commit` 不跑,由远端 CI 的「手动阶段门禁」步与 `scripts/ci_local.py` 的 manual 段跑(CI runner 缺 cppcheck 则该步失败) | +| pre-commit | 已安装并 `pre-commit install` | 提交门禁:`.pre-commit-config.yaml` 共 **52 个钩子**,一次提交实跑 **48 个**(pre-commit 阶段 47 + commit-msg 阶段 `gitlint`);余下 4 个带 `stages: [manual]`,归远端 CI 与 `ci_local.py`(⚠ `iec104-tcp` 远端 CI 不构建模拟器、跑不了,只在本地跑) | +| cppcheck | 在 PATH 中 | 钩子直接调 `cppcheck --enable=warning,performance,portability,style`(`language: system`)。⚠ `cppcheck` / `test-cppcheck` / `test-coverage` / `iec104-tcp` 四根带 `stages: [manual]`:`git commit` 不跑,由远端 CI 的「手动阶段门禁」步与 `scripts/ci_local.py` 的 manual 段跑(CI runner 缺 cppcheck 则该步失败;`iec104-tcp` 需模拟器产物,远端 CI 因不构建模拟器而跑不了) | | python | 在 PATH 中 | 本地钩子调 `scripts/check_mojibake.py`(U+FFFD 乱码)、`scripts/check_coding_standard.py`(规范 V1.0,纯标准库) | | **MSVC `cl.exe`** | **装了 VS 即有(§2.3)** | **`watchdog-unit-test` 钩子必需**:改 `App/util/task_watchdog.*` 或 `test/host/watchdog/**` 时触发,用 `cl.exe` 离线编译真实源码跑单测。**未装 VS 时该钩子报环境错误(退出码 2)→ 拦截提交** | | gitlint | 随 pre-commit 自动拉取 | commit message 格式(宽松规则,兼容中文标题) | > 检查范围仅项目自有代码;`Lib/`、`Middlewares/`、`Drivers/BSP/UI`、`lftpd`、`dhara`、`test/` 等被排除。 -> 全库扫描:`pre-commit run --all-files`(跑提交期那 49 个;gitlint 属 commit-msg 阶段,不在其中);三根 manual 钩子逐根复跑: +> 全库扫描:`pre-commit run --all-files`(跑 pre-commit 阶段的 47 个;`gitlint` 属 commit-msg 阶段,不在其中);四根 manual 钩子逐根复跑: > `& '.venv\Scripts\python.exe' -m pre_commit run --all-files --hook-stage manual `(一次只能一个 id)。 > 详见 `docs/代码规范/pre-commit使用说明.md`、`docs/代码规范/cppcheck使用说明.md`。 > @@ -326,8 +326,8 @@ npm i -g lv_font_conv # 手动:https://www.npmjs.com/package/lv winget install cppcheck # 安装位置任意;入 PATH 或用 DTU_CPPCHECK 指向 # pre-commit 随 .venv 安装(§2.4,requirements.txt 已含),用 .venv 的解释器装钩子: & '.venv\Scripts\python.exe' -m pre_commit install -pre-commit run --all-files # 首次全库基线扫描(提交期 49 个) -# manual 阶段三根(cppcheck / test-cppcheck / test-coverage,提交期不跑)逐根跑,一次一个 id: +pre-commit run --all-files # 首次全库基线扫描(提交期 47 个) +# manual 阶段四根(cppcheck / test-cppcheck / test-coverage / iec104-tcp,提交期不跑)逐根跑,一次一个 id: & '.venv\Scripts\python.exe' -m pre_commit run --all-files --hook-stage manual cppcheck ``` @@ -366,7 +366,7 @@ pre-commit run --all-files # 首次全库基线扫描(提交期 49 & '.venv\Scripts\python.exe' simulator\tests\check_content_pages.py # PASS(基准 ref/*.bin 已入库,无需先生成) & '.venv\Scripts\python.exe' .dsh\skills\serial-assistant\scripts\serial_tool.py selftest # → SELFTEST PASS & '.venv\Scripts\python.exe' test\host\watchdog\run_unit_test.py # 主机侧单测 → 47/47 PASSED(退出码 0) -pre-commit run --all-files # 提交期 49 个(manual 三根另跑:--hook-stage manual ,或直接 ci_local.py) +pre-commit run --all-files # 提交期 47 个(manual 四根另跑:--hook-stage manual ,或直接 ci_local.py) ``` **搭建清单汇总**(随步骤逐项打勾): diff --git a/docs/网络/IEC104_Net适配契约.md b/docs/网络/IEC104_Net适配契约.md new file mode 100644 index 00000000..ca73721c --- /dev/null +++ b/docs/网络/IEC104_Net适配契约.md @@ -0,0 +1,134 @@ +# IEC 104 板端 Net 适配契约 + +> **定位**:`App/protocol/iec104/iec104_net_mcu.c` 把成熟 104 库的 `IEC104_Net.h` 后端 ABI 接到 +> `Drivers/BSP/NET/net_socket.h` 的 `net_*` 接口上,本契约说明**为什么不能直译、按什么规则映射、 +> 哪些不变量必须成立**。代码落点:`App/protocol/iec104/iec104_net_mcu.c` / `.h`。 +> **验证边界**:见 §7——经 fake net 层 12/12 与代码审查,**CH395F 板端行为未证**。 + +## 1. 反例:直译 vendor 的 `Close(client)` 会毁掉监听 + +成熟库按 **Windows/Winsock 式的"独立 client fd"** 设计:监听 socket 与接入后的数据 socket +是两个不同句柄,因此 `Accept` 失败清理、以及"已有客户端时又来一个"的分支,一律 +`IEC104_Net_Close(client, NULL)`——`App/protocol/iec60870/104/IEC104_TcpServer.c` 里共 **7 处** +(约 1606 / 1611 / 1616 / 1628 / 1636 / 1652 / 1665 行)。在 Winsock 下这让两侧各自独立,语义自洽。 + +CH395F 是**单连接模型**:`net_accept()` 返回的是**监听 socket 自己**,接入瞬间同一个 fd 从 +"监听"变成"数据通道"(见 `docs/网络/BSD_Socket_API_使用指南.md` §2.3 的 fd 模型对照表)。 +若把上面 7 处直译成 `net_close`: + +``` +Accept 成功 → 同 fd 转 ESTABLISHED → 走 Accept 失败/重复客户端分支 → net_close(client) + → 底层真的关闭该 fd → 监听消失 + → 一次会话结束后再也接不进新连接(不是"等下一个主站",是"监听没了") +``` + +这不是"偶发多关一次",而是**每次命中那条分支就把监听铲掉**,故障形态是静默的: +没有任何错误码,只是之后永远 Accept 不到。 + +> 反例的可执行版本见 `test/host/iec104_netmcu/MATRIX.md` 的 N1 / N8 / N11: +> fake net 层如实建模"`net_close` 对监听 fd 真实销毁监听并递增 `listen_closed_attempts`", +> 因此 `listen_closed_attempts == 0` 这条断言就是"没有踩这个反例"的机器判据。 + +## 2. 映射规则:按槽的 role 分流,不按句柄本身 + +正确做法是后端自己维护一张**槽表**,每个槽记录 `role`,`IEC104_Net_Close()` 先查槽再按 role 分流: + +| 关闭目标 | 后端动作 | 含义 | +|---|---|---| +| `role == SLOT_CLIENT` / `SLOT_CLIENT_EOF` | `net_drop_conn_locked()` | **拆会话、保监听**。这是 7 处 `Close(client)` 的正确落点 | +| `role == SLOT_LISTEN` | 真正关闭监听 fd(`net_close_sock()`)+ 清槽 | 仅库的 `TcpServer_Close` / Init 失败清理会走到 | + +判据是**槽的 role**,不是句柄值本身:两个槽可能持有同一个 fd 号,光看 fd 无法回答 +"它此刻代表谁"。后端内 CLIENT 分支**不存在关闭监听 fd 的任何调用路径**——这一点由 +`test/host/iec104_netmcu/` 的 S1 文本级静态检查机械断言(花括号范围匹配,不靠肉眼)。 + +LISTEN 分支还有一个顺序约束:若此时仍存在客户端槽,**先按 CLIENT 语义拆掉再关监听**, +避免留下无主的 client 槽。 + +## 3. 双句柄模型:LISTEN 恒定,CLIENT 每次 Accept 新建 + +库内 `server->listen_socket` 在 `IEC104_TcpServer.c` 里**只被赋值一次**(Listen 成功时,约 +2129 行),此后在 Accept、Wait、事件匹配等多处使用(约 1579 / 1782 / 1874 / 1983 行), +**整个监听生命周期内永不更新**。因此: + +- **LISTEN 槽**:`handle` 在监听生命周期内**不变**,`role` 恒为 `SLOT_LISTEN`。 + **绝不翻转监听槽的 role**,否则库的 `Close(listen)` / `Wait(ACCEPT)` 会失联。 +- **CLIENT 槽**:每次 `Accept` 成功另起一个**独立槽**、分配**新 handle**; + 该槽与监听槽同 fd、同代次(同一个 `net_gen`)。 +- **re-Accept 同 fd 时只清槽、绝不 drop_conn**:`net_accept_locked` 刚在同一个 fd 上完成新的 + ESTABLISHED,此刻对旧 client 槽调 `net_drop_conn` 会**拆掉刚接进来的新连接**。 + 这是最容易写错的一条,也是 N11 用例的判据来源(`drop_conn_calls` 不增、 + `net_fake_listener_armed() == 1`)。 + +## 4. 代次不变式(逐字,不得改写) + +> 后端槽的有效性只由 `slot->net_gen == net_get_generation()` 判定;网络初始化复位芯片后 +> (`net_init()` 做 `memset(s_net_socks, ...)` + `ch395f_reset()`)旧句柄一律失效, +> 后端绝不向跨代次的 fd 发任何硬件操作。 + +理由是**fd 号会复用**:跨代的旧槽里存的 fd 号,在新代次可能已经是另一个会话。 +所以"代次已变"必须直接等于"这个句柄作废";陈旧/跨代的 Close 一律**幂等返回 OK 且不碰硬件** +(不是报错,因为库会在失败路径上重复 Close)。这条不变式的行为证据是 N5 / N10: +代次推进后旧句柄的 Send/Recv/Pending/Accept 均 ERROR/BADF,旧 Close 幂等 OK 且 +`hardware_calls` 零增长。 + +## 5. 句柄分配:单调递增、永不复用 + +`IEC104_NetSocket_t` 只有一个 `uintptr_t` 整数,**装不下 session 身份**(拿不到"这个句柄是哪次 +Listen 发的")。因此不能靠句柄内嵌校验,只能靠**值本身不复用**来消灭 ABA: + +- 每次 Listen / Accept 成功都分配**新的 handle 值**,旧 handle 永远不会再次出现在表中; +- 溢出前整表重建; +- **不是**"fd + 1"这类编码——早前曾定过该方案,已撤回。 + +表容量等于 net 层 fd 上限(`NET_MAX_SOCKETS` = 8)。N6 是这条的反例自证:连续多次 +listen/close 后旧 handle 必然查表失败。 + +## 6. 编译期边界:5 个 MCU 专有接口模拟器看不到 + +后端需要的 5 个 owner 出口声明在 `net_socket.h` 的 `#ifndef NET_NO_OS` … `#endif` 段内 +(约 702–809 行):`net_drop_conn_locked`、`net_accept_locked`、`net_pending_bytes`、 +`net_send_try`、`net_mono_now_ms`。**模拟器定义 `NET_NO_OS`,因此看不到它们**—— +这也正是 `iec104_net_mcu.c` 只进 MCU 构建、模拟器由 `sim/iec104_sim.c` 提供同 ABI 替身的原因。 + +**已知一致性缺口**:头文件有 `NET_NO_OS` 门控,但 `net_socket.c` 里 `NET_NO_OS` 零命中—— +5 个实现**无条件编译**。当前不构成故障(模拟器不编 `net_socket.c`),但如果将来把 +`net_socket.c` 编进模拟器,会得到"实现存在但未声明"的孤儿符号:**链接不报错、 +调用处静默走空**。改这一块之前必须先把这个不对称补齐。 + +## 7. 证据边界:证明到哪、没证明什么 + +| 层面 | 状态 | +|---|---| +| fake net 层行为契约(N1~N11,共 12 个用例) | **12/12 PASS**(`test/host/iec104_netmcu/results/report.json`,逐次运行日志 `results/real/run.log`) | +| 静态检查(S1/S2,花括号范围机械匹配) | **2/2 PASS** + 变异自测 `real_rc=0 mutant_rc=1`(`results/static/`、`results/static_mutant/`) | +| 代码审查 | 通过(`ci-artifacts/iec104-cutover/review-net-backend.md`) | +| **CH395F 板端同 fd 语义** | **未证**——fake 只是按产品头语义忠实建模,不是真实驱动 | +| **core / TcpServer 完整链接** | **NOT_RUN**(完整 STARTDT 建链未跑) | +| **netTask 队列时序 / MCU WCET / 性能** | **未测** | + +> **禁止据此写"板端已验证"。** 本契约是**接口契约 + 反例防护**的证据,不是硬件行为证据。 + +--- + +## 附:源码行号索引(以 2026-11-17 本工作树为准) + +> `net_socket.c` / `net_socket.h` 的行号会随改动漂移(同一天已经漂过两次)。 +> **正文一律用函数名指代,行号只在此处集中登记**,引用时请重新 grep 核对。 + +| 符号 / 事实 | 位置 | +|---|---| +| `net_wait_result()` 定义 | `Drivers/BSP/NET/net_socket.c:930` | +| 其阻塞点 `xTaskNotifyWait(..., portMAX_DELAY)` | `net_socket.c:945`(`:939` 是零等待那一次,不是阻塞点) | +| 公开 `net_close` / `net_drop_conn`(无 owner 分支) | `net_socket.c:2515` / `:2574` | +| `net_close_locked`(static,非对外接口) | `net_socket.c:2098` | +| `net_drop_conn_locked`(owner 出口,拆会话保监听) | `net_socket.c:2174` | +| `net_close_sock`(owner 出口,关单个 socket) | `net_socket.c:3041` | +| `net_init` 内 `memset(s_net_socks, ...)` / `ch395f_reset()` | `net_socket.c:337` / `:351` | +| 5 个新声明所在的 `#ifndef NET_NO_OS` 段 | `net_socket.h:702` ~ `:809` | +| `net_drop_conn_locked` / `net_accept_locked` 声明 | `net_socket.h:769` / `:770` | +| `net_pending_bytes` / `net_send_try` / `net_mono_now_ms` 声明 | `net_socket.h:777` / `:785` / `:792` | +| 后端的 LISTEN / CLIENT 分流 | `App/protocol/iec104/iec104_net_mcu.c` 的 `IEC104_Net_Close()` | +| 后端的 role 查表 | 同文件 `find_role()` / `slot_by_handle()` | +| 7 处 `IEC104_Net_Close(client, NULL)` | `App/protocol/iec60870/104/IEC104_TcpServer.c` 约 1606/1611/1616/1628/1636/1652/1665 | +| `server->listen_socket` 赋值点 | 同文件 `:2129`(Listen 成功)/ `:322`、`:2146`、`:3322`(置无效) | diff --git a/docs/网络/Net层阻塞模型架构设计.md b/docs/网络/Net层阻塞模型架构设计.md index 12cf0f97..790a7d43 100644 --- a/docs/网络/Net层阻塞模型架构设计.md +++ b/docs/网络/Net层阻塞模型架构设计.md @@ -538,6 +538,8 @@ net_pending_capture_owner() ← 捕获执行者 - 清除掩码必须全 1(传 0 = 不清除,会残留上次结果被误读为本次结果); - **禁止在本路径加逐调用日志**——该路径每条 API 调用都过一遍,会淹没排查用的证据日志。 +**源码定位与 netTask 内调用边界**(板端割接实测,`Drivers/BSP/NET/net_socket.c`):`net_wait_result()` 定义在 `:930`,真正阻塞的是 `:945` 的 `xTaskNotifyWait(0xFFFFFFFFU, 0xFFFFFFFFU, &v, portMAX_DELAY)`;`:939` 的零等待那次是防丢通知的第一段,不是阻塞点。`net_send()` 本体的入队在 `:2289`(紧接 `:2297` 调 `net_wait_result("snd")`);全文件 `osMessageQueuePut(..., osWaitForever)` 共 12 处(`:1086` / `:1313` / `:1480` / `:1650` / `:2289` / `:2370` / `:2472` / `:2541` / `:2600` / `:2718` / `:2852` / `:2973`),即公开 `net_*` 入队一律无上界等待。公开版 `net_close`(`:2515`)、`net_drop_conn`(`:2574`)没有 owner 上下文分支,在 netTask 内调用就是等自己的回执而死锁;netTask 内要关单个 socket 用 `net_close_sock(net_sock_t *)`(`:3041`),要拆会话保留监听用 `net_drop_conn_locked(net_sock_t *)`(`:2174`)——不存在名为 `net_close_locked` 的对外接口,它只是 `net_close` 内部的 static 实现。本轮新增的 5 个声明 `net_drop_conn_locked`(`:769`)、`net_accept_locked`(`:770`)、`net_pending_bytes`(`:777`)、`net_send_try`(`:785`)、`net_mono_now_ms`(`:792`)都位于 `net_socket.h` 的 `:702` `#ifndef NET_NO_OS` … `:809` `#endif` 段内,模拟器(定义 `NET_NO_OS`)看不到它们。所以在 netTask 内写非阻塞代码时,凡 `net_*` 都要先问它内部是不是 `osWaitForever`。 + **13. 发送有界自旋**(`net_send_locked`):两个等待循环都在 `net_poll()` 之后判预算, **判定顺序不可交换**: diff --git a/docs/门禁说明/README.md b/docs/门禁说明/README.md index 8790d2c4..0805b072 100644 --- a/docs/门禁说明/README.md +++ b/docs/门禁说明/README.md @@ -1,7 +1,7 @@ # 门禁逐项说明(每种门禁一篇) -> 本目录逐项说明各门禁:**声明的 52 个钩子到底在干什么、拦谁、放谁、什么时候会骗人**——其中 3 根慢钩子带 -> `stages: [manual]`,一次 `git commit` 只实跑 49 根(口径见下条)。 +> 本目录逐项说明各门禁:**声明的 52 个钩子到底在干什么、拦谁、放谁、什么时候会骗人**——其中 4 根慢钩子带 +> `stages: [manual]`,一次 `git commit` 只实跑 48 根(口径见下条)。 > 每个门禁一篇,八段固定结构:查什么 / 为什么要它 / 触发面 / 报错怎么读 / 好处 / > **限制与盲区** / 豁免与基线 / 改门禁本身要注意什么。**最后一节是这套文档存在的理由**—— > 一份只看"拦了什么"的门禁文档,会让人以为绿就是对的。 @@ -9,54 +9,61 @@ - 配置事实源:`.pre-commit-config.yaml`。**钩子数的唯一口径 = YAML 解析后的 hook 条目数**,不是文件里的文本行数。 自查(打印声明数;加/删一条钩子后,这个数要与 **AGENTS.md 的「共 N 个钩子」**、**本目录 §2 标题**同时对齐): `& '.venv\Scripts\python.exe' -c "import yaml; d=yaml.safe_load(open('.pre-commit-config.yaml', encoding='utf-8')); print(sum(len(r['hooks']) for r in d['repos']))"` - → **51**(2026-10-26:49 → 50 加 `generated-fresh`;2026-10-27:50 → 51 加 `nested-comment`; + → **52**(2026-10-26:49 → 50 加 `generated-fresh`;2026-10-27:50 → 51 加 `nested-comment`; 2026-10-28:51 → 52 加 `id-check-new`、随即 52 → 51 摘掉 `id-check`(退役全库语料审计);2026-10-29:51 → 52 加 `skill-size`(SKILL.md 写侧上限与 reference 指针,详见 [`skill-size.md`](skill-size.md)); 同日 52 → **51** 退役 `id-check-new`——只查新增行的编号门禁整体退场,脚本与白名单移入 `scripts/archive/id_gate/`,此后**编号形态没有机器面**(留档 [`id-check-new.md`](id-check-new.md)); 2026-10-30:51 → **52** 加 `mermaid-syntax`(mermaid 围栏内确定性语法:坏图渲染失败靠肉眼才逮过, - 详见 [`mermaid-syntax.md`](mermaid-syntax.md)))。 + 详见 [`mermaid-syntax.md`](mermaid-syntax.md)); + 2026-11-17:52 → 51 摘掉 `iec104-unit-test`(旧自研协议层三源随 vendor 库接入整体删除,测试脚本 + `test/host/iec104/run_unit_test.py` 已不存在 ⇒ 死钩子,每次触发必 RC=2); + 2026-11-18:51 → **52** 加 `iec104-tcp`(IEC 104 真实回环 11 条 TCP 用例,`stages: [manual]`))。 + ⇒ **两笔合并后声明数仍是 52,但结构变了:pre-commit 阶段 48 → 47、manual 3 → 4。** ⚠ **别用 `grep -c` 去数配置里的声明行**:该文件里有一条**注释掉的**候选钩子(clang-format,第 65 行), 文本 grep 会多算 1(当前口径 52 会数成 53)——「声明比文档多 1 / 实跑又少一档」这种三个数不同源的争执就是这么来的。真要 grep, 用**锚定行首缩进**的模式(它天然跳过以 # 开头的注释行)2026-10-28 实测直接得 **51**(当时口径)、 - 2026-10-30 复测得 **52**,均与 YAML 口径一致; + 2026-11-18 复测得 **52**,均与 YAML 口径一致; 会多算 1(比口径多 1)的是**不锚定行首、按子串**匹配声明行的写法(那条被注释掉的候选也被它算进去)。 ⚠ 反过来的坑也真踩过(2026-10-27):在配置**注释里复述那个 grep 字面量**,会让文本 grep 再虚高 1—— 数数只认 YAML 解析,注释与文档里都别写出那个字面量(`docs/门禁说明/nested-comment.md` §8 记了现场)。 实跑侧口径:`scripts/ci_local.py` 的静态门禁汇总行 `[SUMMARY] …: pre-commit hooks -- passed=A failed=B skipped=C`(方括号里那一段是**层级名**,脚本输出与文档层的语义名正分头迁移 → 抓这行**按 `passed=` 字段匹配**,别把层级名前缀写死进字面量,否则会 grep 不到而误判「没有实跑数」), - `A+B+C` = **pre-commit 阶段**的钩子数(48 = 52 − 3 根 `stages: [manual]` − `gitlint`;2026-10-30 加 - `mermaid-syntax` 前该式子右侧是 51/47),再加 `gitlint` 1 条(它声明在本配置的 `repo: jorisroovers/gitlint` - 条目、`stages: [commit-msg]`(第 70 行),`--hook-stage commit` 的枚举不含它——2026-10-30 实测: - `--hook-stage commit` 枚举 **47 行** / `manual` 枚举 **50 行** / YAML 解析声明 **51**(加本钩后 48/51/52), - 47 + 3 + 1 = 51,差的那个就是 `gitlint`;旧说法「gitlint 声明在上游清单、本配置里查不到」已于当日随 + `A+B+C` = **pre-commit 阶段**的钩子数(**47** = 52 − 4 根 `stages: [manual]` − `gitlint`;2026-11-17 摘 + `iec104-unit-test` 前是 48,2026-10-30 加 `mermaid-syntax` 前该式子右侧是 51/47),再加 `gitlint` 1 条 + (它声明在本配置的 `repo: jorisroovers/gitlint` 条目、`stages: [commit-msg]`(第 70 行), + `--hook-stage commit` 的枚举不含它——**2026-11-18 实测**: + `--hook-stage commit` 枚举 **47 行** / `manual` 枚举 **51 行** / YAML 解析声明 **52**(47 + 4 + 1 = 52, + 差的那个就是 `gitlint`;旧说法「gitlint 声明在上游清单、本配置里查不到」已于 2026-10-30 随 `stages:` 接线作废) - → 48 + 1 = **49 = 一次 `git commit` 实跑的钩子数**;再加 3 根 manual 阶段的慢钩子才是声明数 52,三数同源(2026-10-29 加 `skill-size` 之前这四个数是 51 / 47 / 48;2026-10-30 加 `mermaid-syntax` 后是 52 / 48 / 49)。 + → 47 + 1 = **48 = 一次 `git commit` 实跑的钩子数**;再加 4 根 manual 阶段的慢钩子才是声明数 52,三数同源(2026-10-29 加 `skill-size` 之前这四个数是 51 / 47 / 48;2026-10-30 加 `mermaid-syntax` 后是 52 / 48 / 49;**2026-11-18 摘 `iec104-unit-test` 并加 `iec104-tcp` 后是 52 / 47 / 48**)。 枚举自查(不执行任何钩子,`SKIP` 列全部 id):`SKIP=<全部 id> -m pre_commit run --all-files --hook-stage commit` - 输出 47 行、`--hook-stage manual` 输出 50 行(47 常规 + 3 慢的)。 -- **三根慢钩子在 manual 阶段**:`cppcheck`、`test-cppcheck`、`test-coverage` 带 `stages: [manual]` → `git commit` - 阶段**不跑**(实测三根合计约 165 s,占一次带代码提交耗时的约三分之二),只在**远端 CI 的「手动阶段门禁」步** - (`.gitea/workflows/ci.yml`,逐根 `--hook-stage manual`)与 `scripts/ci_local.py` 的 **manual 段**里跑。 + 输出 47 行、`--hook-stage manual` 输出 51 行(47 常规 + 4 慢的)。 +- **四根慢钩子在 manual 阶段**:`cppcheck`、`test-cppcheck`、`test-coverage`、`iec104-tcp` 带 + `stages: [manual]` → `git commit` 阶段**不跑**(实测前三根合计约 165 s,占一次带代码提交耗时的约三分之二; + `iec104-tcp` 另需模拟器构建产物、单跑约 14 s),只在**远端 CI 的「手动阶段门禁」步** + (`.gitea/workflows/ci.yml`,逐根 `--hook-stage manual`;⚠ `iec104-tcp` **远端 CI 跑不了**——CI 不构建模拟器) + 与 `scripts/ci_local.py` 的 **manual 段**里跑。 本地手工复跑:`& '.venv\Scripts\python.exe' -m pre_commit run --all-files --hook-stage manual ` (**一次只能给一个 id**,多 id 实测报 `unrecognized arguments`)。声明数仍是 52,变的是「提交期实跑几根」。 - 通用机制(三个阶段 = `pre-commit` / `commit-msg` / `manual`、stash 陷阱、`always` 已废、增量拦截三段式、旧 §2.x 查号表): `docs/代码规范/pre-commit使用说明.md` §2。 -- 快速自查(不等提交):`& '.venv\Scripts\python.exe' scripts/ci_local.py`(静态段 48 根 + manual 段三根 + 提交信息门禁 + 体积门禁 + 主机侧纯逻辑单测;manual 段默认跑)。 +- 快速自查(不等提交):`& '.venv\Scripts\python.exe' scripts/ci_local.py`(静态段 47 根 + manual 段四根 + 提交信息门禁 + 体积门禁 + 主机侧纯逻辑单测;manual 段默认跑)。 ## 1. 三种拦截姿态(先分清这个,报错时才知道该干什么) | 姿态 | 含义 | 有哪些 | 失败时该做什么 | |---|---|---|---| | **改写型** | 不报错,直接改你的文件 | `trailing-whitespace`、`end-of-file-fixer` | 重新 `git add` 被改的文件再提交(它改的是工作区,不是索引) | -| **硬拦截** | 违反即失败,没有存量豁免 | `cppcheck`、`coding-standard`、`doc-links`、`no-mojibake`、`mem-budget`、`ui-golden`、`font-charset`、`lv-conf-sync`、`task-table`、`mem-numbers`、`registration-check`、`cubemx-survival`、`test-suite-switch`、`mermaid-syntax`(基线为空,先例是已退役的 `id-check-new`「零语料」;唯一排除面 = 外部资料目录,见其专篇 §7)、22 个主机单测、官方 5 个、`gitlint` | 只能改代码或改文档;**不要**找豁免开关 | +| **硬拦截** | 违反即失败,没有存量豁免 | `cppcheck`、`coding-standard`、`doc-links`、`no-mojibake`、`mem-budget`、`ui-golden`、`font-charset`、`lv-conf-sync`、`task-table`、`mem-numbers`、`registration-check`、`cubemx-survival`、`test-suite-switch`、`mermaid-syntax`(基线为空,先例是已退役的 `id-check-new`「零语料」;唯一排除面 = 外部资料目录,见其专篇 §7)、21 个主机单测、官方 5 个、`gitlint` | 只能改代码或改文档;**不要**找豁免开关 | | **增量拦截** | 规则恒生效,但存量钉在基线/台账里,只许减不许增 | `layer-deps`(3 条,2026-10-25 还清 UI 记录 3 条)、`bsp-err`(38 条)、`generated-fresh`(5 处 `docs/images/` 配图存量,脚本内 `BASELINE`)、`nested-comment`(2 处主机侧假件头,`test/host/common/`,脚本内 `BASELINE`) | 报错先分清是**新增**还是**存量搬家**:`--verbose` 看归类,`--prune` 看已还清 | | **只查新增** | 只看本次改动的增量,没有存量基线,也没有台账 | ~~`id-check-new`~~(**2026-10-29 退役**,脚本在 `scripts/archive/id_gate/`;这一姿态已无现役门禁) | 手工复查时才谈得上:改成语义短语(门禁不再跑,行内 `[编号豁免]` 也随之失效) | ⚠ 增量拦截最容易误会的一点:**绿灯不等于没问题**,只等于"没有比上次更差"。 每个增量拦截门禁的基线数字都写进它自己的文档,读那篇时第一眼看的就是"现在在册多少条"。 -## 2. 索引(52 个 hook → 30 篇,其中 2 篇是已退役门禁的留档 + 1 根只有本表指针(专篇待补)+ 1 根详解在 docs/测试说明/) +## 2. 索引(52 个 hook → 30 篇,其中 2 篇是已退役门禁的留档 + 2 根只有本表指针(专篇待补)+ 1 根详解在 docs/测试说明/) -> 带 `stages: [manual]` 的三根(`cppcheck` / `test-cppcheck` / `test-coverage`)**提交期不跑**,只在远端 CI 的 -> 「手动阶段门禁」步与 `scripts/ci_local.py` 的 manual 段跑;下表对应两行的「文档」列已标注。 +> 带 `stages: [manual]` 的四根(`cppcheck` / `test-cppcheck` / `test-coverage` / `iec104-tcp`)**提交期不跑**,只在远端 CI 的 +> 「手动阶段门禁」步与 `scripts/ci_local.py` 的 manual 段跑(⚠ `iec104-tcp` 远端 CI 跑不了,见该行说明);下表对应各行的「文档」列已标注。 | 门禁文档 | 覆盖的 hook id | 一句话它在查什么 | 改了哪类文件才会跑 | 文档 | |---|---|---|---|---| @@ -80,11 +87,12 @@ | [`cubemx-survival.md`](cubemx-survival.md) | `cubemx-survival` | CubeMX 重生成会不会把定制静默抹掉(人工目检审计兜底) | `.ioc`、`Src/`、`Inc/` | 已写 | | [`test-suite-switch.md`](test-suite-switch.md) | `test-suite-switch` | 板级套件开关必须互斥;全注释 = 产品构建 | `test/board/test_config.h` | 已写 | | [`font-charset.md`](font-charset.md) | `font-charset` | UI 用到的汉字是否都在子集字体里(缺字 = 白框) | `Drivers/BSP/UI/**`、字体脚本 | 已写 | -| [`ui-golden.md`](ui-golden.md) | `ui-golden` | UI 像素回归:菜单 8 状态 + 内容页 74 张黄金参考图比对 | UI 源码、模拟器 | 已写 | +| [`ui-golden.md`](ui-golden.md) | `ui-golden` | UI 像素回归:菜单 8 状态 + 内容页 76 张黄金参考图比对 | UI 源码、模拟器 | 已写 | | [`bom-guard.md`](bom-guard.md) | `bom-guard` | 带 BOM 的文件被编辑工具剥掉 BOM(ARMCC 换解码 → 假语法错) | `Drivers/BSP/UI/**` 等名单内文件 | 已写 | | [`setview-check.md`](setview-check.md) | `setview-check` | 定值查看行表与 `prot_set` 枚举序 / `g_prot_set_meta` 上下限是否同一份口径 | `tools/setview_check/**`、`ui_w_setview.*` | 已写 | | (专篇待补,档位与限度正文在 [`../UI设计/UI_自动化测试流程.md`](../UI设计/UI_自动化测试流程.md) §7.3) | `uinav-selftest` | 板端 UI 导航器认屏快检(黄金参考帧分类;完整闭环档=合入前/上板前手工跑,快检不互替) | `scripts/board_ui_nav.py`、`simulator/tests/ref/*.bin` | 指针 | -| [`host-unit-tests.md`](host-unit-tests.md) | 22 个 `*-unit-test` | 主机侧单测(同一机制 22 个实例):逻辑层在无硬件的 PC 上编译并跑断言 | 各自被测模块与其测试目录 | 已写 | +| (专篇待补,判据与包装器说明在 `scripts/check_iec104_tcp.py` 文件头的注释块里) | `iec104-tcp` | IEC 104 真实回环验收:`test/host/iec104_dtu/run_tcp_test.py` 的 11 条真实 TCP 用例(STARTDT/TESTFR、总召、电度、读、定值、区间、未知请求、最大 APDU、命令一律否定确认、校时不改主机钟) | IEC 104 装配层 / 协议库 / 该测试目录 / 模拟器源码 / 门禁自身 | 指针(`stages: [manual]`;⚠ 远端 CI 跑不了——CI 不构建模拟器) | +| [`host-unit-tests.md`](host-unit-tests.md) | 21 个 `*-unit-test` | 主机侧单测(同一机制 21 个实例):逻辑层在无硬件的 PC 上编译并跑断言 | 各自被测模块与其测试目录 | 已写 | | 详解在 [`../测试说明/单元测试/主机单测覆盖率口径.md`](../测试说明/单元测试/主机单测覆盖率口径.md)(口径 / 分母 / 基线 / 盲区都在那篇,本目录不重复) | `test-coverage` | **覆盖率总闸**:跑全部 47 套主机单测 + 已覆盖行只增不减的回退台账 | `App/`、`Drivers/BSP/`、`test/host/`、脚本与基线 | 已写(在 `docs/测试说明/`;`stages: [manual]`) | | [`trailing-whitespace.md`](trailing-whitespace.md) | `trailing-whitespace` | 行尾空白(改写型;CubeMX/Keil 生成文件豁免) | 全部 | 已写 | | [`end-of-file-fixer.md`](end-of-file-fixer.md) | `end-of-file-fixer` | 文件末尾必须恰好一个换行(改写型;同豁免) | 全部 | 已写 | diff --git a/docs/门禁说明/gitlint.md b/docs/门禁说明/gitlint.md index 04e8b72c..238146de 100644 --- a/docs/门禁说明/gitlint.md +++ b/docs/门禁说明/gitlint.md @@ -27,7 +27,7 @@ ## 3. 触发面 / 看不见什么 -- `git commit`、`--amend`、`-F`、合并生成的提交都会跑;**`--no-verify` 连它和其它 47 个 `pre-commit` 阶段钩子一起跳过**(`stages: [manual]` 的三根慢钩子(`cppcheck` / `test-cppcheck` / `test-coverage`)本来就不随提交跑,不受影响)。 +- `git commit`、`--amend`、`-F`、合并生成的提交都会跑;**`--no-verify` 连它和其它 47 个 `pre-commit` 阶段钩子一起跳过**(`stages: [manual]` 的四根慢钩子(`cppcheck` / `test-cppcheck` / `test-coverage` / `iec104-tcp`)本来就不随提交跑,不受影响)。 - 不校验:提交说明与 diff 是否相符、是否真的构建/测试过、是否夹带无关改动、是否该拆成多笔。 ## 4. 报错怎么读 diff --git a/docs/门禁说明/host-unit-tests.md b/docs/门禁说明/host-unit-tests.md index 6d9f20ee..df5c61f3 100644 --- a/docs/门禁说明/host-unit-tests.md +++ b/docs/门禁说明/host-unit-tests.md @@ -90,14 +90,16 @@ 4. **专属钩子不是唯一防线,而「没有专属钩子」也不等于「没被跑」**。2026-10-26 按 git 历史与实测重新 清点(2026-10-28 复点、2026-10-29 录波三套入库后再复点:下列数字已按复点值更新;上一版写「16 个模块有专属钩子、另有 12 套、总闸跑 28 套」——三个数都随 2026-10-25 的 六根新钩子与后续新增套件过期了,正是本目录反复在防的"文档与机器面不同码"): - - **22** 根专属钩子 = 有独立 `files:` 触发面、需要**秒级归因**的那个子集; + - **21** 根专属钩子 = 有独立 `files:` 触发面、需要**秒级归因**的那个子集(2026-11-17 由 22 → 21: + 旧 IEC 104 协议栈单测钩子随 `iec104_asdu/pts/link` 三源退役而摘除,其测试脚本已不存在); + ⚠ 紧随其后的套数与无钩子数是 **2026-10-30 的复点值**,套数复点另立一项,本页未同步; - `test/host/` 下带 `run_unit_test.py` 的套件实测 **47** 套(48 个目录,除 `common` 与 `__pycache__`;两个数分别来自 `check_test_coverage.py --list`(47 行)与 `ls -d test/host/*/`(48 个目录),2026-10-30 复点) ⇒ **没有专属钩子的是 25 套**:`boot_stats`、`cfg_file_store_mcu`、`console_log`、 `ftp_cfg`、`iec104_serv`、`lftpd`、`lftpd_inet`、`lftpd_io`、`net_cfg`、`net_events`、 `net_listener`、`net_pending`、`net_select`、`net_socket`、`prot_set_store`、`sb_led_map`、`sb_link`、`sb_proto`、`soe_store`、 `sys_log_mcu`、`task_prof`、`ui_sink`、`wave_ring`、`wave_store`、`wave_trig`(末三套 2026-10-29 随 - 故障录波入库,屏板三套(`sb_proto`/`sb_link` 2026-10-29、`sb_led_map` 2026-10-30)随屏板链路入库,同一条 Lead 裁定不补专属钩子;25 = 47 套 − 22 根专属钩子,逐点数与两处机器源互证); + 故障录波入库,屏板三套(`sb_proto`/`sb_link` 2026-10-29、`sb_led_map` 2026-10-30)随屏板链路入库,同一条 Lead 裁定不补专属钩子;25 = 47 套 − 22 根专属钩子,逐点数与两处机器源互证。**这三个数整体是 2026-10-30 复点口径**:2026-11-17 摘钩后专属钩子为 21 根,套数复点另立,勿把 21 与 25 直接相减); - 这 22 套每次 CI 与 `scripts/ci_local.py` 都由 `test-coverage` **总闸**真跑(该钩子带 `stages: [manual]`: `git commit` 阶段不跑它,这一根与 `cppcheck` / `test-cppcheck` 同属 CI 与 `ci_local.py` 的 manual 段); 发现规则是 diff --git a/docs/门禁说明/mermaid-syntax.md b/docs/门禁说明/mermaid-syntax.md index 348c071d..8b3fdffa 100644 --- a/docs/门禁说明/mermaid-syntax.md +++ b/docs/门禁说明/mermaid-syntax.md @@ -92,5 +92,6 @@ R1 改图类型头;R2 改 `-.->|t|` 或 `-. t .->`;R3 补/删 `end`(打印 是两份字面拷贝,改一处必改另一处——手跑面与提交面不一致就会变成「两个数」。 - 判定用「行首 token / 邻接字符」这类保守形态学,**不要**用「看起来像标签」的启发式—— 本仓围栏里混排中英文、全角符号、`µ`/`≠`/`→` 等字符,启发式必误伤。 -- 本条钩子使 YAML 解析口径 **51 → 52**、提交期实跑 **48 → 49**;加/摘钩子按 +- 本条钩子使 YAML 解析口径 **51 → 52**、提交期实跑 **48 → 49**(历史行,其后的 2026-11-17/18 两笔 + ——摘 `iec104-unit-test`、加 `iec104-tcp`——把口径收敛回 52 / 47 / 48);加/摘钩子按 `docs/门禁说明/README.md` §2 首条的自查命令三数同核(索引 §2 标题与 §1 计数同批改)。 diff --git a/docs/门禁说明/skill-size.md b/docs/门禁说明/skill-size.md index 4b89815c..3f184621 100644 --- a/docs/门禁说明/skill-size.md +++ b/docs/门禁说明/skill-size.md @@ -35,7 +35,7 @@ |---|---| | 全树实扫 | \`.dsh/skills\` 共 **17 个 SKILL.md:0 FAIL、0 WARN**,最大 \`task-worktree\` 28139 字节(42%);退出码 0 | | \`--selftest\` 五形态 | **5/5**:干净树 0 / 75% 线 0(带 WARN)/ 65546 字节 1 / 悬空指针 + BOM 1 / 根不存在 2 | -| 钩子接线 | YAML 解析条目 **51 → 52**;\`stages: [manual]\` 仍 **3** 根(一次 \`git commit\` 实跑 49);\`pre-commit run skill-size --all-files\` 与 \`--files .dsh/skills/task-worktree/SKILL.md\` 两种触发都 **Passed** | +| 钩子接线 | YAML 解析条目 **51 → 52**;\`stages: [manual]\` 仍 **3** 根(一次 \`git commit\` 实跑 49);\`pre-commit run skill-size --all-files\` 与 \`--files .dsh/skills/task-worktree/SKILL.md\` 两种触发都 **Passed**(以上为 2026-10-29 接线当时的实测值,保留原样;当前口径见 \`docs/门禁说明/README.md\` §2:声明 52 / pre-commit 阶段 47 / 一次 commit 实跑 48 / manual 4) | | 解释器面 | 钩子 entry 用裸 \`python\`:\`.venv\` 3.12 与 PATH 上的 3.14.7 都跑通——本脚本纯标准库,**不属于**「裸 `python` 不等于 `.venv`」那条教训的适用面(判据在 `keil-build` skill「调用形态」;那条针对 fontTools 这类第三方依赖) | | 负例落点 | 在 \`--selftest\` 的**临时树**里造,不在 \`.dsh/skills/\` 下造探针目录:那是活动技能目录,加载器与自进化都会看见它(见 §8) | diff --git a/docs/门禁说明/ui-golden.md b/docs/门禁说明/ui-golden.md index 3019917c..e0f3019e 100644 --- a/docs/门禁说明/ui-golden.md +++ b/docs/门禁说明/ui-golden.md @@ -1,4 +1,4 @@ -# `ui-golden` — UI 像素回归(菜单 8 状态 + 内容页 74 张黄金参考) +# `ui-golden` — UI 像素回归(菜单 8 状态 + 内容页 76 张黄金参考) > 一句话:改 UI 源码时,把模拟器增量重编 + 两条 golden 回归串成一次提交门禁,**像素对不上就拦**。 > 它是包装器:真正的判据在被包装的两条脚本与参考图里。 @@ -11,7 +11,7 @@ ## 1. 它在查什么 - 菜单侧:整棵菜单树的行渲染结果(8 个状态)与参考图逐像素比对; -- 内容页侧:74 张黄金参考(= 74 个截图态条目,同一内容页的多个状态各一张:分页页多拍的第 2 屏与确认链/录波的各态都单独计条目),逐张与参考图比对; +- 内容页侧:76 张黄金参考(= 76 个截图态条目,同一内容页的多个状态各一张:分页页多拍的第 2 屏与确认链/录波的各态都单独计条目),逐张与参考图比对; - 参考图 `simulator/tests/ref/*.bin` **就是判据本身**。 ## 2. 为什么要它(有牙的实测) @@ -57,7 +57,7 @@ 1. **参考图即判据**:刷新参考图 = 修改判据。评审时必须盯 `simulator/tests/ref/` 的 diff; 一旦"顺手更新",此后所有回归都只在和错的基线比。**门禁无法阻止这件事**,只能靠评审。 -2. 只覆盖 8 个菜单状态 + 74 张内容页黄金参考:未列入的状态(密码错误态、超长文本、缺字渲染、 +2. 只覆盖 8 个菜单状态 + 76 张内容页黄金参考:未列入的状态(密码错误态、超长文本、缺字渲染、 无 SD 卡 / 挂载失败的降级显示)**不会有任何回归**。 3. 跑的是**模拟器那份配置**,不是固件那份 —— 两份 `lv_conf.h` 漂移时,回归结论不能外推到固件 (所以 `lv-conf-sync` 是本门有效性的前提)。 diff --git a/scripts/README.md b/scripts/README.md index ab289c00..9cbb362c 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -41,7 +41,7 @@ | 脚本 / 文件 | 作用 | |---|---| -| `ci_local.py` | **本地跑与 CI 等价的门禁**(静态门禁 pre-commit 47 根 + **manual 段**(`cppcheck` / `test-cppcheck` / `test-coverage` 三根逐根 `--hook-stage manual`,默认跑)+ 提交信息门禁 + **体积门禁** + 主机侧纯逻辑单测):自动选用装了 pre-commit 的解释器;无 `.map` 时自适应跳过 `mem-numbers` / `mem-budget`(⚠ 那是 SKIP 不是通过,缺口由体积门禁兜住);退出码 0/1/2 与 CI 对齐。CI 定义见 `../.gitea/workflows/ci.yml`,覆盖边界见 `docs/测试说明/流程与规范/测试开发标准流程.md` §9 | +| `ci_local.py` | **本地跑与 CI 等价的门禁**(静态门禁 pre-commit 47 根 + **manual 段**(`cppcheck` / `test-cppcheck` / `test-coverage` / `iec104-tcp` 四根逐根 `--hook-stage manual`,默认跑)+ 提交信息门禁 + **体积门禁** + 主机侧纯逻辑单测):自动选用装了 pre-commit 的解释器;无 `.map` 时自适应跳过 `mem-numbers` / `mem-budget`(⚠ 那是 SKIP 不是通过,缺口由体积门禁兜住);退出码 0/1/2 与 CI 对齐。CI 定义见 `../.gitea/workflows/ci.yml`,覆盖边界见 `docs/测试说明/流程与规范/测试开发标准流程.md` §9 | | `check_size_gate.py` | **体积门禁的强制路径**:`.map` 只在本地有,钩子无它时自适应 SKIP,于是"没测=通过"。本脚本用**已提交的同码凭证** `scripts/size_attestation.json` 把这条判据变成无需 Keil 也能跑:`--stamp` 只在"`.map` 存在、比全部受管源码新、且未超 92%"时才盖章(已挂在 `ram_baseline.py --update` 里,无新增人工步骤);`--local` 供 ci_local 的体积门禁步;`--ci` 供 runner(同码性 + 按凭证数字复核红线,主干 push 拦红、其余事件 `--warn-only`);`--show` 排障。**口径与边界的唯一正文在本脚本模块 docstring** | | `size_attestation.json` | (被 `check_size_gate.py` 读写)体积同码凭证:受管源码指纹(`git ls-files` 范围内逐文件 sha256 聚合)+ 测量数字与占比 + `.map` 出处。改固件源码后不重测 → 指纹对不上 → 体积门禁与 CI 同时拦红 | | `check_test_coverage.py` | 主机单测**覆盖率**(2026-10-23):mscoverage 动态插桩跑 `test/host/**` 全部 47 套,统计自研生产源码行/函数覆盖(并集)+ 与 `test_coverage_baseline.json` 比回退;`--module/--update-baseline/--md/--json/--list`;挂在 `test-coverage` 钩子上(`stages: [manual]`,**`git commit` 不跑**),入口 = 远端 CI「手动阶段门禁」步 / `scripts/ci_local.py` 的 manual 段(`--coverage` 旗标保留只为兼容旧命令;口径见 `docs/测试说明/单元测试/主机单测覆盖率口径.md`) | @@ -57,13 +57,14 @@ ```bash # 全库跑门禁(用仓库 .venv 的 python,其 pre-commit 随 requirements.txt 安装; # 其他装有 pre-commit 的解释器可用 DTU_PRECOMMIT_PYTHON 指定) -# 只覆盖 `pre-commit` 阶段的 48 根(`git commit` 实跑 = 48 + gitlint = 49 根) +# 只覆盖 `pre-commit` 阶段的 47 根(`git commit` 实跑 = 47 + gitlint = 48 根) & '.venv\Scripts\python.exe' -m pre_commit run --all-files -# manual 阶段三根(带 stages: [manual],提交期不跑):一次只能给一个 id +# manual 阶段四根(带 stages: [manual],提交期不跑):一次只能给一个 id & '.venv\Scripts\python.exe' -m pre_commit run --all-files --hook-stage manual cppcheck & '.venv\Scripts\python.exe' -m pre_commit run --all-files --hook-stage manual test-cppcheck & '.venv\Scripts\python.exe' -m pre_commit run --all-files --hook-stage manual test-coverage +& '.venv\Scripts\python.exe' -m pre_commit run --all-files --hook-stage manual iec104-tcp # 需先有 simulator/build/Debug/lvgl_sim.exe(远端 CI 不构建模拟器,故只有本机能跑) # 本地跑与 CI 等价的门禁(静态门禁 + 提交信息门禁 + 体积门禁 + 主机侧纯逻辑单测) & '.venv\Scripts\python.exe' scripts/ci_local.py diff --git a/scripts/check_coding_standard.py b/scripts/check_coding_standard.py index c7bdf45f..336f2b3e 100644 --- a/scripts/check_coding_standard.py +++ b/scripts/check_coding_standard.py @@ -49,6 +49,14 @@ HEAP_ALLOC_ALLOWLIST = { 'simulator/sim/cfg_file_store_sim.c': frozenset({'malloc', 'free'}), } +# CODE-RULE-10 的例外:**外部 ABI 固定的名字**。原理与既有的 `HAL_` 豁免完全相同—— +# 名字不是我们起的、改了就链接不上或与厂商文档/头文件脱节。 +# HAL_ : ST 厂商回调名(脚本里硬编码,见 CODE-RULE-10 判定处) +# IEC104_Net_* : IEC 60870-5-104 子站库的平台网口契约(vendor `IEC104_Net.h` 以 +# `extern` 钉死 11 个符号;本项目后端 `iec104_net_mcu.c` 实现同一 ABI, +# 与 Windows 后端 `IEC104_Net_Windows.c` 平级)。改小写就连不上库。 +ABI_NAME_PREFIXES = ('HAL_', 'IEC104_Net_') + def _mask(text): """注释与字符串字面量替换为等长空白(保留换行,行号不变),防止误报。 @@ -200,9 +208,9 @@ def check_file(path): mlines = masked.splitlines() defs = _fn_defs(masked) - # CODE-RULE-10 (3.3.1) 函数名必须全小写(HAL_ 厂商 API 回调名豁免) + # CODE-RULE-10 (3.3.1) 函数名必须全小写(外部 ABI 固定的名字豁免,见 ABI_NAME_PREFIXES) for name, ln, _body, _pre, _bl, _pl in defs: - if re.search(r'[A-Z]', name) and not name.startswith('HAL_'): + if re.search(r'[A-Z]', name) and not name.startswith(ABI_NAME_PREFIXES): v.append((ln, 'CODE-RULE-10 3.3.1', '函数名须全小写: %s' % name)) # CODE-RULE-11 (2.3.5) 禁止相对/绝对路径 include(基于原始文本,字符串掩码会吃掉引号) diff --git a/scripts/check_iec104_tcp.py b/scripts/check_iec104_tcp.py new file mode 100644 index 00000000..ffaf8539 --- /dev/null +++ b/scripts/check_iec104_tcp.py @@ -0,0 +1,101 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +"""IEC 104 真实回环验收门禁包装器(manual 阶段专用)。 + +为什么要这根钩子(2026-11-18): + `test/host/iec104_dtu/` 下有两个 runner,但**只有** `run_unit_test.py` 会被 + `scripts/check_test_coverage.py` 的 `rglob("run_unit_test.py")` 发现,而它只跑 + 7 条 decoder/oracle 用例;真正的产品验收 `run_tcp_test.py`(13 条真实 TCP 回环) + 一直**没有**被任何门禁登记。结果是覆盖率表里 `iec104_dtu` 赫然在列, + 却让人误以为"104 的验收已经被门禁覆盖了"——这是最容易骗人的那种假象。 + 本钩子把那 13 条接进门禁,把假象补成真话。 + +为什么是 `stages: [manual]` 而不是提交期自动跑: + 实测全量 14.5 s(把 `--sbo-timeout` 从 30 s 降 2 s 之后;新增 2 条标准参数 + 用例各约 0.3 s),仍在本仓 + "2~4 秒自动门禁"判据之外(见 .pre-commit-config.yaml 里 cppcheck 那段的口径: + 一个逼人 --no-verify 的门禁等于没有门禁)。故与 cppcheck / test-coverage 同档, + 只在 `scripts/ci_local.py` 的 manual 段与手工复跑时执行。 + +为什么远端 CI 跑不了它: + `.gitea/workflows/ci.yml` 不构建模拟器(grep `lvgl_sim|build_sim|simulator` 零命中), + 而本钩子需要 `simulator/build/Debug/lvgl_sim.exe`。所以它在远端只能靠 + "本机有构建产物"这一前提,**远端 CI 不跑它**;这也是它没有进提交期自动门禁的 + 第二个理由。缺 exe 时本脚本**显式 FAIL 并给出可执行提示,不"跳过当通过"** + (与 uinav-selftest 的缺帧教训同一条:跳过即绿灯,绿灯即遗忘)。 + +被包装脚本不吃文件参数: + pre-commit 会把本次变更的文件名传给钩子,而 `run_tcp_test.py` 是按"整套 13 条用例" + 工作的、不接受文件参数,故本包装器**有意忽略** argv(与 check_ui_golden.py 同形)。 + +本地手工复跑: + & '.venv\\Scripts\\python.exe' scripts/check_iec104_tcp.py + 或只跑一根用例:`python test/host/iec104_dtu/run_tcp_test.py --exe --only test_link_start` +""" + +import os +import subprocess +import sys + +ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) +BUILD_BAT = os.path.join(ROOT, 'simulator', 'build_sim.bat') +EXE = os.path.join(ROOT, 'simulator', 'build', 'Debug', 'lvgl_sim.exe') +# 能力档位边界(2026-11-18 实测,必读):本钩子调 `build_sim.bat`,编出的是 +# **vendor 默认容量**(RX 2048 / HIGH 1024 / NORMAL 4096 / RECORD 32 / EVENT 68), +# 不是产品固件实际使用的 P6a 档(RX 256 / HIGH 288 / NORMAL 272 / RECORD 4 / EVENT 11)。 +# 因此本钩子证明的是"协议栈在默认容量下行为正确",**不证明 P6a 档**。P6a 的证据是 +# `ci-artifacts/iec104-cutover/build_sim_p6a.ps1`(独立 build-p6a 目录注入 5 个宏) +# 加同一 runner 的 13/13 PASS。两者的用例集相同、容量档不同,别拿这一份当另一份。 +RUNNER = os.path.join(ROOT, 'test', 'host', 'iec104_dtu', 'run_tcp_test.py') +OUTPUT = os.path.join(ROOT, 'ci-artifacts', 'iec104-tests', 'tcp-gate') +PY = sys.executable + + +def run(cmd): + """执行一条命令,透传输出,返回退出码。 + + 参数:cmd - 命令列表 list[str] + 返回值:子进程退出码 int + """ + return subprocess.call(cmd, cwd=ROOT) + + +def main(): + """先增量构建模拟器,再跑 13 条真实 TCP 回环验收。 + + 返回值:0 - 全部用例通过 + 1 - 构建失败或用例失败 + 2 - 环境错误(没装 VS / 工具链探测失败),与 pre-commit 的 2 号语义一致 + """ + print('[iec104-tcp] 增量构建模拟器 ...') + rc = run([BUILD_BAT]) + if rc == 3: + print('[iec104-tcp] 环境错误:模拟器构建找不到 VS 工具链(build_sim.bat 返回 3)。') + print('[iec104-tcp] 这是环境问题、不是本改动的问题;装好 VS 2019/2022/2026 后重跑,') + print('[iec104-tcp] 或临时 SKIP=iec104-tcp 提交(远端 CI 不构建模拟器,本就跑不了这根)。') + return 2 + if rc != 0: + print('[iec104-tcp] FAIL 模拟器构建失败(build_sim.bat 返回 %d),无法做回环验收' % rc) + return 1 + + if not os.path.exists(EXE): + print('[iec104-tcp] FAIL 构建成功但没找到 %s' % os.path.relpath(EXE, ROOT)) + print('[iec104-tcp] 这说明构建产物布局变了(build_sim.ps1 的 $Config 默认 Debug),') + print('[iec104-tcp] 请核对后同步本脚本的 EXE 常量 —— 不跳过、不当作通过。') + return 1 + + print('[iec104-tcp] 跑 13 条真实 TCP 回环验收 ...') + rc = run([PY, '-B', RUNNER, '--exe', EXE, '--output', OUTPUT]) + if rc == 0: + print('[iec104-tcp] PASS 13/13 真实 TCP 回环用例通过(证据目录 %s)' + % os.path.relpath(OUTPUT, ROOT)) + return 0 + + print('[iec104-tcp] FAIL run_tcp_test.py 退出码 %d' % rc) + print('[iec104-tcp] 证据(逐例耗时、simulator.log 的 START/READY/STOP 摘要)在 %s' + % os.path.relpath(OUTPUT, ROOT)) + return 1 + + +if __name__ == '__main__': + sys.exit(main()) diff --git a/scripts/check_registration.py b/scripts/check_registration.py index 8b20327f..416f7440 100644 --- a/scripts/check_registration.py +++ b/scripts/check_registration.py @@ -108,14 +108,11 @@ SIM_EXEMPT = [ ("App/sync/time_sntp.c", "SNTP 校时客户端(net+RTOS+sys_clock 依赖,2026-11-04 立项落地),MCU 专属;主机侧纯逻辑单测覆盖于 test/host/sntp"), ("App/task/adc_task.c", "固件 FreeRTOS 任务,模拟器不跑固件任务"), ("App/task/default_task.c", "固件 FreeRTOS 任务,模拟器不跑固件任务"), - ("App/task/iec104_serv.c", "固件 FreeRTOS 任务(104 上行,B4),模拟器不跑固件任务"), + ("App/task/iec104_serv.c", "固件 IEC104 服务(104 上行,由 netTask 单 owner 驱动 threadless core;不再有独立 iec104Task),模拟器不跑固件任务"), ("App/task/protect_task.c", "固件 FreeRTOS 任务(保护判据节拍,B5),模拟器不跑固件任务"), ("App/task/net_task.c", "固件 FreeRTOS 任务,模拟器不跑固件任务"), ("App/task/rs485_task.c", "固件 RS-485 任务,MCU 专属(另:uvprojx 缺口见 KNOWN_GAPS)"), ("App/task/ui_task.c", "固件 UI 任务,模拟器另有 main.c 驱动 UI"), - ("App/protocol/iec104/iec104_asdu.c", "104 ASDU 编解码纯逻辑,主机侧纯逻辑单测覆盖,模拟器无消费路径"), - ("App/protocol/iec104/iec104_link.c", "104 链路状态机纯逻辑(I/O 注入),主机侧纯逻辑单测覆盖,模拟器无消费路径"), - ("App/protocol/iec104/iec104_pts.c", "104 点表/数据源适配(phasor/prot 依赖),模拟器无消费路径"), ("App/util/sha256.c", "纯工具(FTP 鉴权在 MCU 端),模拟器无消费路径"), ("App/util/sys_clock.c", "RTC/SD2506 依赖墙钟,MCU 专属"), ("App/util/task_prof.c", "任务性能探针,MCU 专属"), @@ -150,6 +147,8 @@ SIM_EXEMPT = [ # 命中 -> WARN 不拦;新缺口 -> GAP FAIL。仅针对"存在但未注册"方向。 KNOWN_GAPS = { "App/task/rs485_task.c": "RS-485 接线门禁(驱动契约未修完,随 B2 暂缓)", + "App/protocol/iec60870/104/IEC104_Net_Windows.c": + "Windows 平台后端,板端由 App/protocol/iec104/iec104_net_mcu.c 提供同一 IEC104_Net ABI,不能同时编入(会抢 IEC104_Net_* 符号)", } diff --git a/scripts/ci_local.py b/scripts/ci_local.py index 22ea3f0c..cacb7a37 100644 --- a/scripts/ci_local.py +++ b/scripts/ci_local.py @@ -9,10 +9,15 @@ 覆盖范围(与 CI 完全一致): 静态门禁(static) = `pre-commit run --all-files` + 提交信息门禁(gitlint) - 手动阶段(manual,2026-10-28)= 三根带 `stages: [manual]` 的钩子: - cppcheck(全量)/ test-cppcheck / test-coverage(覆盖率总闸)。 - 它们**不在 git commit 时跑**(实测合计 ~165 s = 一次带代码提交耗时的三分之二), + 手动阶段(manual,2026-10-28)= 四根带 `stages: [manual]` 的钩子: + cppcheck(全量)/ test-cppcheck / test-coverage(覆盖率总闸)/ + iec104-tcp(IEC 104 真实回环 11 条用例,2026-11-18 加)。 + 它们**不在 git commit 时跑**(前三根实测合计 ~165 s = 一次带代码提交耗时的 + 三分之二;iec104-tcp 单跑 13.7 s 且依赖模拟器构建产物), 提交期只跑快的那些;CI 的 static-gates job 逐根跑同一批钩子(同口径)。 + ⚠ iec104-tcp 是唯一一根**远端 CI 跑不了**的:`.gitea/workflows/ci.yml` 不构建 + 模拟器,而它需要 simulator/build/Debug/lvgl_sim.exe。本脚本会先调 + simulator/build_sim.bat 增量构建;本机没装 VS 时它按环境错误返 2。 本地复跑:本脚本的 manual 段,或 `python -m pre_commit run --all-files --hook-stage manual `(一次只能给一个 id)。 体积门禁(size,强制路径,2026-10-25)= `scripts/check_size_gate.py --local` @@ -677,25 +682,27 @@ def run_static_gates(): return rc -MANUAL_STAGE_HOOKS = ("cppcheck", "test-cppcheck", "test-coverage") +MANUAL_STAGE_HOOKS = ("cppcheck", "test-cppcheck", "test-coverage", "iec104-tcp") def run_manual_stage(): - """手动阶段门禁:三根带 stages: [manual] 的钩子(覆盖率总闸 + 全量 cppcheck)。 + """手动阶段门禁:四根带 stages: [manual] 的钩子(覆盖率总闸 + 全量 cppcheck + 104 回环)。 为什么单独一段而不并进 static:它们在 .pre-commit-config.yaml 里固定成 manual 阶段 (2026-10-28 用户裁定),`pre-commit run --all-files` 不再覆盖它们;提交期跑它们 - 实测要 ~165 s。本脚本是"与 CI 等价"的完整自查,所以**默认照跑**。 + 实测要 ~165 s(前三根),iec104-tcp 另需模拟器构建产物。本脚本是"与 CI 等价"的 + 完整自查,所以**默认照跑**——但要注意 iec104-tcp 在远端 CI 上没有等价步骤 + (CI 不构建模拟器,见模块 docstring),本机跑它就是它的全部覆盖面。 逐根调用:`pre_commit run
` 不支持多 id(实测 argparse 报 "unrecognized arguments"),CI 侧同样是逐根跑(.gitea/workflows/ci.yml)。 """ print("") print("=" * 64) - print(" manual 手动阶段门禁(覆盖率总闸 + 全量 cppcheck,提交期不跑)") + print(" manual 手动阶段门禁(覆盖率总闸 + 全量 cppcheck + 104 回环,提交期不跑)") print("=" * 64) env = dict(os.environ) - env.pop("SKIP", None) # 三根都不涉及 Keil 依赖,SKIP 与它们无关 + env.pop("SKIP", None) # 四根都不涉及 Keil 依赖,SKIP 与它们无关 rc_all = 0 for hook in MANUAL_STAGE_HOOKS: rc, text = _run_capture([PY, "-m", "pre_commit", "run", "--all-files", @@ -933,7 +940,7 @@ def main(argv=None): if not args.host_unit_only: rc = run_static_gates() ran.append("static") - # 手动阶段三根(覆盖率总闸 + 全量 cppcheck):git commit 时不再跑,本脚本照跑—— + # 手动阶段四根(覆盖率总闸 + 全量 cppcheck + 104 回环):git commit 时不再跑,本脚本照跑—— # 本脚本存在的意义就是"与 CI 等价"。即使静态门禁已失败也照跑,一次看全所有违规项。 rc_manual = run_manual_stage() ran.append("manual") diff --git a/scripts/gate_python.py b/scripts/gate_python.py index 40874500..00008720 100644 --- a/scripts/gate_python.py +++ b/scripts/gate_python.py @@ -18,11 +18,25 @@ 退出码:0 表示被调脚本自己退出为 0;启动器自身失败一律 2(与 pre-commit「环境不可用」口径一致, 见 docs/草稿约定:2 = 配置/环境问题,1 = 检查结论不通过)。 + +为什么用 subprocess 转交而不是 os.execve(2026-11-18 实测定案,改动前请先看这段): + 本机(Windows + 本仓 worktree)上 os.execve/os.execv 对 .venv 里的解释器**静默不启动子进程**, + 只把一条 `can't open file '<路径被重复拼接>'` 打到 stderr 然后**退出码仍是 0**;pre-commit 因此把 + 「根本没跑」记成 Passed —— 即整仓所有经本启动器的钩子都是假绿。实测三种形态: + os.execve(venv python) -> 路径二次拼接 + Errno 2 或 0xC0000005(访问违例) + os.execv (venv python) -> 同样路径二次拼接,退出码 0(最坏:静默放弃) + subprocess.run(venv python) -> 正常,退出码可透传 + 机理:.venv/Scripts/python.exe 是 venv 的 redirector(会按 pyvenv.cfg 重新定位真实解释器并改写 argv); + 在 execv 家族下它的 argv[0]/脚本路径解析会叠加当前工作目录,于是形成 + `<工作目录>/<绝对路径>` 的重复拼接。改用 subprocess 后 redirector 拿到的是标准 CreateProcess 参数, + 不再发生拼接。 + 因此本文件**禁止**改回 os.execv/os.execve;任何启动器失败都必须以非零码退出(不能 0 = 通过)。 """ from __future__ import annotations import os +import subprocess import sys LAUNCHER_NAME = "gate_python.py" @@ -105,8 +119,16 @@ def main(argv: list[str]) -> int: env = dict(os.environ) env["DTU_GATE_PYTHON"] = exe child_argv = [exe, target, *argv[2:]] - os.execve(exe, child_argv, env) - return 0 # 不会走到这里:execve 成功即替换进程 + + # 用 subprocess 而非 os.execve 转交:理由见文件头「为什么用 subprocess 转交」。 + # 关键纪律:子进程的退出码必须原样透传;启动器自身任何异常都必须落到 2, + # 绝不允许以 0 退出——0 在 pre-commit 眼里就是「检查通过」。 + try: + completed = subprocess.run(child_argv, env=env) + except OSError as exc: + print(f"[gate_python] 启动子解释器失败:{exc}", file=sys.stderr) + return 2 + return completed.returncode if __name__ == "__main__": diff --git a/scripts/gen_task_table.py b/scripts/gen_task_table.py index 5677e852..e76bb2c9 100644 --- a/scripts/gen_task_table.py +++ b/scripts/gen_task_table.py @@ -64,7 +64,7 @@ TARGETS = [ # 文档中的展示顺序(与 README/AGENTS 既有一致;不在表内的任务按源码顺序追加)。 # 不用源码顺序:freertos.c 里 timeSyncTask 定义在最前,但文档按「主任务→辅助任务」排列。 DISPLAY_ORDER = ["defaultTask", "netTask", "ftpTask", "testTask", "uiTask", - "timeSyncTask", "adcTask", "iec104Task", "protectTask"] + "timeSyncTask", "adcTask", "protectTask"] # 各任务在文档里的「职责」描述(README 需要,AGENTS 不需要)。 # 只影响展示文案,不参与一致性判定;未知任务回落为空。 @@ -76,7 +76,6 @@ ROLE = { "uiTask": "LVGL UI 界面", "timeSyncTask": "墙钟时间同步", "adcTask": "TPAFE5160 采样(TIM3 1kHz 事件驱动 + 原子快照 + STM32 ADC DMA,纯消费者)", - "iec104Task": "IEC 60870-5-104 上行(工厂默认 :2404 监听,遥信/遥测/定值区)", "protectTask": "保护判据 20ms 节拍(保护判据元件 + 采样故障闭锁)", } diff --git a/scripts/ram_baseline.tsv b/scripts/ram_baseline.tsv index 8b932e95..fe238a94 100644 --- a/scripts/ram_baseline.tsv +++ b/scripts/ram_baseline.tsv @@ -23,3 +23,4 @@ date code ro rw zi er_irom1 er_pct iram1 iram1_pct ccm ccm_pct top_rwzi 2026-11-11 256024 31760 2080 152368 287784 27.4 97024 74.0 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;nand_ftl.o=8288;lftpd.o=7884;ui_net_sink.o=6802;ui_port.o=6432;wave_ring.o=5332;sb_link.o=4376;ch395f.o=4162;console_log.o=4132 2026-11-13 256592 32036 2088 152584 288628 27.5 97248 74.2 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;nand_ftl.o=8288;lftpd.o=7884;ui_net_sink.o=6802;ui_port.o=6432;wave_ring.o=5332;sb_link.o=4376;ch395f.o=4162;console_log.o=4132 2026-11-15 256592 32036 2088 152584 288628 27.5 97248 74.2 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;nand_ftl.o=8288;lftpd.o=7884;ui_net_sink.o=6802;ui_port.o=6432;wave_ring.o=5332;sb_link.o=4376;ch395f.o=4162;console_log.o=4132 +2026-11-18 365484 45852 2200 175424 411336 39.2 120200 91.7 57376 87.9 heap_4.o=57376;lv_mem_core_builtin.o=16384;iec104_tcpserver.o=13456;nand_ftl.o=8288;lftpd.o=7884;ui_net_sink.o=6802;ui_port.o=6432;wave_ring.o=5332;sb_link.o=4376;ch395f.o=4162 diff --git a/scripts/stack_report.py b/scripts/stack_report.py index 191dbc6c..ec580fb1 100644 --- a/scripts/stack_report.py +++ b/scripts/stack_report.py @@ -46,7 +46,6 @@ ROOTS = { "start_test_task": "testTask", "time_sync_task": "timeSyncTask", "adc_task_func": "adcTask", - "iec104_serv_task": "iec104Task", "protect_task": "protectTask", # 套件自起线程(xTaskCreateStatic,TCB 与栈都在 .bss,不在 freertos.c 的 # osThreadAttr_t 表里)。配置值由下面 STATIC_TASK_STACKS 直接读源码常量。 @@ -69,7 +68,6 @@ RUNTIME_ALIAS = { "testTask": "test", "timeSyncTask": "timesync", "adcTask": "adc", - "iec104Task": "iec104", "protectTask": "protect", } diff --git a/simulator/CMakeLists.txt b/simulator/CMakeLists.txt index 4f22a45c..1c90e3d2 100644 --- a/simulator/CMakeLists.txt +++ b/simulator/CMakeLists.txt @@ -167,6 +167,8 @@ set(ALGO_SOURCES # Portable shared runtime intended for both targets; currently enabled in sim. # Do not link the original import or the example server/main in parallel. +# iec104_net_mcu.c 是 MCU 平台后端(匹配 *_mcu.c 豁免规则), +# 模拟器由 vendor 的 IEC104_Net_Windows.c 提供同一 IEC104_Net ABI,故不在此注册。 set(IEC104_SOURCES ${PROJECT_ROOT}/App/protocol/iec104/iec104_comm.c ${PROJECT_ROOT}/App/protocol/iec104/iec104_core.c diff --git a/simulator/README.md b/simulator/README.md index be5f80ce..f45a12c1 100644 --- a/simulator/README.md +++ b/simulator/README.md @@ -53,7 +53,7 @@ simulator/ | `build_sim.bat` / `build_sim.ps1` | 一键构建入口:vswhere 探测本机 VS 大版本(16=2019 / 17=2022 / 18=2026,取已装最高)→ 映射 CMake 生成器;`build/` 缓存生成器与本机不符(换机/升级 VS)时自动删除重建(带重试,抗文件锁)。**构建入口一律走它,文档/命令中勿写死生成器版本**;`.bat` 仅负责绕过 PowerShell 执行策略并转交 `.ps1` | | `CMakeLists.txt` | 收集 LVGL 源码(`../Lib/lvgl`)+ 共享 UI 源码(`../Drivers/BSP/UI`)+ 通用配置文件引擎(`../App/cfg_file.c`、`../Drivers/BSP/NETCFG` 的 net_cfg;`net_cfg_legacy` 已于 2026-10-10 删除)+ `sim/` 平台层,链接预编译 SDL2,产出 `lvgl_sim.exe` | | `i1_to_png.py` | 把 `--screenshot` 产出的 I1(1bpp) 原始位图转成 PNG,便于离线比对设计稿。详见 §3.5 | -| `tests/` | 无头回归脚本(菜单 8 状态像素回归 + 内容页 74 张:文本断言 / 反向断言 / 黄金参考逐字节比对);`ref/shot_*.bin` **随仓库入库**(判据本体,改动等于改判据,评审须逐页过目),`ref/*.png` 是本地派生的目检图(`.gitignore` 挡掉)。详见 §3.6 | +| `tests/` | 无头回归脚本(菜单 8 状态像素回归 + 内容页 76 张:文本断言 / 反向断言 / 黄金参考逐字节比对);`ref/shot_*.bin` **随仓库入库**(判据本体,改动等于改判据,评审须逐页过目),`ref/*.png` 是本地派生的目检图(`.gitignore` 挡掉)。详见 §3.6 | > **共享代码不复制**:`ui_menu.c` / `ui_font_cn_12.c` / `ui_net_sink.c` 直接引用 `Drivers/BSP/UI/` 下的原件, > MCU 与 PC 两端永远同步。**不要**在本目录内复制 UI 源码。 @@ -245,7 +245,7 @@ UI 改动的自动化门禁脚本(完整流程见 `docs/UI设计/UI_自动化 | 脚本 | 原理 | 失败输出 | |------|------|----------| | `check_menu_rows.py` | 键序注入(u/d/e/s)跑 8 个菜单状态,断言选中行白带、非选行黑底白字、框体边框、往返状态逐像素一致;MENU-STATE-00 池水位须等于脚本内 `MENU_POOL_BASELINE` | 未过断言清单 + 保留临时截图 | -| `check_content_pages.py` | ① 文本断言(解析字体字形,在截图 y 带内精确匹配期望串,不依赖 `ref/`)② **反向断言**(`ABSENT` 表:某串**不该**出现,如查看页/只读态不得出现「未标定」徽标与「保存」行——像素参考会被 `--update` 刷成"自证正确",反向断言不依赖参考图)③ **74 张**无头截图与 `tests/ref/shot_*.bin` **逐字节**比对(含 2026-10-26 新增的整定 9 态:进页 / 保存行 / 只读态 / 编辑态 / 越界 / 保存 OK / 落定后可读 / 二态回绕);另校验开页-关页往返池水位 = `POOL_AFTER_ROUNDTRIP` | 文本未命中项 / 反向断言被命中 / 差异像素数 + 双方 ink runs 对照 | +| `check_content_pages.py` | ① 文本断言(解析字体字形,在截图 y 带内精确匹配期望串,不依赖 `ref/`)② **反向断言**(`ABSENT` 表:某串**不该**出现,如查看页/只读态不得出现「未标定」徽标与「保存」行——像素参考会被 `--update` 刷成"自证正确",反向断言不依赖参考图)③ **76 张**无头截图与 `tests/ref/shot_*.bin` **逐字节**比对(含 2026-10-26 新增的整定 9 态:进页 / 保存行 / 只读态 / 编辑态 / 越界 / 保存 OK / 落定后可读 / 二态回绕);另校验开页-关页往返池水位 = `POOL_AFTER_ROUNDTRIP` | 文本未命中项 / 反向断言被命中 / 差异像素数 + 双方 ink runs 对照 | | `check_remo_sink.py` | 启动**窗口**模拟器(非无头,`CREATE_NEW_PROCESS_GROUP` 防管道阻塞),经 TCP 7003 发 LCDMEM 取 1bpp 帧;断言首帧=LCDMEM(无 INIT 污染)/位图 3200 字节/非平凡;复用 `i1_to_png` 出目检 PNG;与无头参考(`lvgl_sim --screenshot`)逐位比对 <2% 判 MATCH。守护"INIT 污染 / 快照卡死"两个历史缺陷 | 各判据失败原因 + `sim_err.txt` 尾部 + 保留 PNG(默认不删,`--clean` 才删) | - **黄金参考与目检 PNG**(`ref/*.bin` **入库**、`ref/*.png` 本地派生不入库):换机或想目检时—— diff --git a/simulator/tests/README.md b/simulator/tests/README.md index 018ef2cb..18ba0ae2 100644 --- a/simulator/tests/README.md +++ b/simulator/tests/README.md @@ -11,7 +11,7 @@ | `check_content_pages.py` | **内容页回归**:各内容页渲染比对 | | `check_remo_sink.py` | **推流(RemoDispBus)回归**:接收端渲染比对 | | `regen_ref_png.py` | 由 `ref/*.bin` 批量出**目检 PNG**(不产生基准;基准由 `check_content_pages.py --update` 刷) | -| `ref/*.bin` | **像素黄金参考(入库)**:74 张 × 3200 B,160×160 单色打包(2026-10-29 录波 UI 道 +6 张;2026-11-04 SNTP 设置页 +8 张) | +| `ref/*.bin` | **像素黄金参考(入库)**:76 张 × 3200 B,160×160 单色打包(2026-10-29 录波 UI 道 +6 张;2026-11-04 SNTP 设置页 +8 张;2026-11-16 DI/DO 状态页 +2 张,同日 fold 进遥信页净 0) | ## 使用方式 diff --git a/simulator/tests/check_content_pages.py b/simulator/tests/check_content_pages.py index 85abe827..5c3dfff8 100644 --- a/simulator/tests/check_content_pages.py +++ b/simulator/tests/check_content_pages.py @@ -198,7 +198,7 @@ PAGES = [ # 计数范围/复位原因/主站接入 + 范围标签"本次开机",第 2 页钉 104 另外三枚(发送帧数 # 128 / 发送失败 0 / 接收字节 4096)与页脚真实页码 2/2。四枚假数据值互不相同是刻意的: # 行错位/串行只有"像素 + 逐行文本断言"两把尺子同时才照得出来(Lead 裁定 2026-10-28, - # 因此当时用例是 53+7=60 张,不是 53+6=59;现集合 74 张,见 PAGES 表)。 + # 因此当时用例是 53+7=60 张,不是 53+6=59;该集合此后扩至 74 张(现为 76 张,见 PAGES 表)。 ("runreport", "dddddde dddddddd e"), ("runreport_p2", "dddddde dddddddd e dddddddd"), # 页内再 8 下 → 第 2 页(选中落 r0=发送帧数) # ── 故障录波 UI 道(2026-10-29):手动录波三态 + 回放三态(真实波形/空态/坏段)── @@ -1029,7 +1029,7 @@ EXTRA = { # sim_oper.log 已经攒了 3 条(192 B = 3×64 B)→ "操作记录"页读到的是真记录, # 空态判据(第 0 行"无记录")根本拍不到。**判据本身没错,错在跑它的环境被前面的写路径 # 污染了**,所以给这 5 页各开一个空目录 = 现场"这些日志文件还不存在"的确定态; -# 其余 55 页环境一字不变(对当时存量 53 张黄金零影响,实测逐字节零漂移;当时集合 60 张,现集合 74 张)。 +# 其余 55 页环境一字不变(对当时存量 53 张黄金零影响,实测逐字节零漂移;当时集合 60 张,此后扩至 74 张,现为 76 张)。 FRESH_CWD = ("accident", "oper", "alarm", "start", "yk") diff --git a/test/host/iec104/iec104_test.c b/test/host/iec104/iec104_test.c deleted file mode 100644 index 6ca97d48..00000000 --- a/test/host/iec104/iec104_test.c +++ /dev/null @@ -1,1618 +0,0 @@ -/* - * 模块名称:IEC 60870-5-104 被控站协议栈主机侧单元测试 - * 模块功能:在 PC 上对 App/protocol/iec104 全栈(asdu + pts + link)做离线验证。 - * - * 被测对象:真实源文件(#include 原样纳入): - * iec104_asdu.c + iec104_pts.c + iec104_link.c(B4 协议核心) - * + iec104_comm.c(道G task-8 [comm] 段,真链注册) - * prot_set.c + prot_elm.c + phasor.c + sample_ring.c(板端默认源 - * 的链接依赖;定值两段写走**真实 prot_set**) - * 数据源经 iec104_pts_bind_src 注入假源(YC/YX/YK 可控), - * 发送经 send_apdu 回调全量捕获,时基由测试注入。 - * - * 覆盖点(docs/子系统设计/IEC104上行设计说明.md §7): - * TC-IEC104-001 CP56Time2a 往返 / 闰年 / IV / 钳位 - * TC-IEC104-002 IOA 3B 与短浮点小端往返 - * TC-IEC104-003 APCI 重组:半帧 / 粘帧 / 坏起始符 / 坏长度 - * TC-IEC104-004 STARTDT 握手 → RUN - * TC-IEC104-005 OPEN 态 I 帧忽略(序号不消费) - * TC-IEC104-006 总召全流程:actcon→4 分片(首召 COT=4)→actterm;二召 COT=2;RBT→COT=4 - * TC-IEC104-007 遥信变位 COV(COT=3);无效位不触发 - * TC-IEC104-008 遥测死区 COV(104 改读快照起 = 2 点确认):死区内不发 / 首越只挂起 / - * 连续第 2 越点上送 - * TC-IEC104-009 k 窗:12 未确认停发;S 确认后恢复 - * TC-IEC104-010 w 阈:收满 8 发 S - * TC-IEC104-011 t2 到期发 S - * TC-IEC104-012 t3 空闲发 TESTFR act;未答 t1 超时 → IDLE;con 清挂起不误杀 - * TC-IEC104-013 遥控两段式:选择/执行成功;失配 PN;拒绝类选择段即 PN - * TC-IEC104-030 遥控 / 操作记录投递(道F task-10 的 104 侧写入点):未知 IOA、 - * YK11 选择与执行、YK12 选择 / 执行 / 非法 DPC 各投哪一类哪一句,外加 - * "拒绝不投操作记录""记录与压板实际状态一致""文案不超 28 字节"三条会 - * 静默变坏但台架看不出的点(YK12 的 set_sealed 失败腿不可达,理由写在 - * 该用例注释里,没有为它伪造定值范围) - * —— 以下为道G task-8「[comm] 段与 104 消费」(2026-10-26;置于 main 末位, - 段注册表清理不影响其余 TC)—— - * TC-IEC104-031 [comm] 注册 + 无文件出厂模板落盘(含 [comm]/ca=1/port=2404, - * 模板长度钉上限)+ 改档 poll 沉降重载 getter 跟变 - * TC-IEC104-032 文件值带外(ca=0 / port=80)→ RAM 存原值、getter 自愈回默认; - * setter 守卫(0 拒 / 1023 拒 / 65535 收 / 带内提交) - * TC-IEC104-033 ca 端到端:ca=comm 值时 C_RD 正答 COT5 且 TX 头回显同值; - * 旧写死值 ca=1 变错地址 → COT13+EVI(证明过滤真源已迁移) - * TC-IEC104-034 [comm] 落盘脏位:置脏/清脏/空转/带外拒不置脏(道G task-9, - * 通讯设置页保存行 WAIT/OK 的判据源) - * TC-IEC104-014 定值两段写(真实 prot_set):越界 PN;执行后 get_f + selfcheck - * TC-IEC104-015 C_RD:YC 命中 / 定值命中 / 未知 IOA COT14+EVI - * TC-IEC104-016 C_CS:clock_sync 收正确 epoch;IV → PN;clock_sync 失败 → PN - * TC-IEC104-017 未知类型 COT12+EVI;错公共地址 COT13+EVI - * TC-IEC104-018 STOPDT:数据停发,TESTFR 仍应答 - * TC-IEC104-019 序号错 → IDLE(链路故障) - * TC-IEC104-020 pts:无效通道 IV / 未就绪 NT / 无效遥信 IV / is_dp / 表尺寸 - * TC-IEC104-021 C_TS / C_RP actcon - * TC-IEC104-022 周期上送 COT=1(YC 组 + 频率) - * TC-IEC104-023 k 窗满 COV 不丢事件(pend 暂存,窗开后补发) - * —— 以下为「数据可信」104 改读快照与频率点绑定(道D,2026-10-25;板端默认源 = 真实 - L2 链 ring→phasor→freq→meas,非桩)—— - * TC-IEC104-025 板端源读快照(024 号已归 B7 用例):未发布 - * IV|NT / 值=基波有效值 / 削顶 CLIPPED - * →线上 IV 清零 / 干净路品质 0 / 频率未新鲜 IV - * TC-IEC104-026 0x401D 绑频:收敛后 ±0.02 Hz / freq_valid==0 → IV 清零 - * (频率点绑定 DoD 原句) - * TC-IEC104-027 死区运行时化(运行参数段后 = run_par 真源 + 转发壳):set/get - * + 非法拒 + 运行档压旧档 + 2 点确认/回摆撤销 + 壳清半截确认计数 - * TC-IEC104-028 品质翻转直报(假源)+ 板端 seq 去重(同帧不计两点)+ - * 换帧只变品质时按集合直报 - * TC-IEC104-029 运行参数段路由:0x8030/0x8038 命中 / 0x8027 仍归 prot_set / - * 空隙 COT14 / C_SE 两段式 / k 带拒 / b 单侧 RMW 保 k - * - * 通过:全部 TC PASS(main 返回 0)。 - * 创建日期:2026-10-12(B4) - */ -#include -#include -#include - -static int s_total = 0, s_passed = 0, s_failed = 0; - -#define CHECK(cond, name) do { \ - s_total++; \ - if (cond) { s_passed++; printf(" [PASS] %s\n", name); } \ - else { s_failed++; printf(" [FAIL] %s (line %d)\n", name, __LINE__); } \ -} while (0) - -#include "iec104_asdu.c" -#include "prot_set.c" -#include "sample_ring.c" -#include "phasor.c" -#include "freq.c" -#include "meas.c" /* 104 改读快照:板端默认 YC 源 = L2 遥测快照(真实链,非桩) */ - -/* ===================== 运行参数段真链桩(同 adc_cal 套件先例) ===================== - * run_par 依赖真实 cfg 引擎与 adc_cal:dbg_log 走 stub/ 计数宏,文件/堆走 - * 内存虚拟盘(cfg_store_* 强符号),adc_input_desc 按 V0.1 权威映射给桩。 - * 顺序敏感:桩头与强符号先于被纳入的 .c。 */ -#include "dbg_log.h" /* stub/ 优先解析:DBG_* → 计数 */ -#include -#include "cfg_file_store.h" - -#define RP_VFS_CAP 8192u - -static uint8_t rp_s_vfs[RP_VFS_CAP]; -static size_t rp_s_vfs_len = 0u; -static uint32_t rp_s_vfs_mtime = 100u; -static int rp_s_vfs_exists = 0; - -void *cfg_store_alloc(size_t size) { return malloc(size); } -void cfg_store_free(void *p_buf) { free(p_buf); } -uint32_t cfg_store_heap_free(void) { return 0u; } - -int cfg_store_read(const char *p_path, uint8_t *p_buf, size_t cap, size_t *p_nread) { - size_t n; - - (void)p_path; - if (!rp_s_vfs_exists) { - return -1; - } - n = rp_s_vfs_len; - if (n > cap) { - n = cap; - } - (void)memcpy(p_buf, rp_s_vfs, n); - *p_nread = n; - return 0; -} - -int cfg_store_write_atomic(const char *p_path, const uint8_t *p_buf, size_t len) { - (void)p_path; - if (len > RP_VFS_CAP) { - return -1; - } - (void)memcpy(rp_s_vfs, p_buf, len); - rp_s_vfs_len = len; - rp_s_vfs_exists = 1; - rp_s_vfs_mtime++; - return 0; -} - -int cfg_store_stat(const char *p_path, cfg_file_stat_t *p_st) { - (void)p_path; - if (!rp_s_vfs_exists) { - return -1; - } - p_st->size = (uint32_t)rp_s_vfs_len; - p_st->mtime = rp_s_vfs_mtime; - return 0; -} - -int cfg_store_remove(const char *p_path) { - (void)p_path; - rp_s_vfs_exists = 0; - rp_s_vfs_len = 0u; - return 0; -} - -const char *cfg_store_config_path(void) { return "/config.ini"; } -const char *cfg_store_tmp_path(void) { return "/config.tmp"; } - -/* ---- sys_log 桩:只计数自检留痕 ---- */ -#include "sys_log.h" - -static int rp_s_syslog_count = 0; - -void syslog_post(syslog_id_t id, const char *desc) { - (void)id; - (void)desc; - rp_s_syslog_count++; -} - -/* ---- syslog_post_quiet 桩:记下投了什么(task-10 遥控 / 操作记录用) ---- - * 真机上 quiet 与 post 的差别只在"投递侧不打日志",收/丢判据逐条相同; - * 本套件是协议栈单测,不验投递本身(那归 test/host/sys_log_mcu),只验 - * **板端源在每条返回路径上投了哪一类、哪一句**——所以这里存成环形日志。 */ -#define RP_REC_MAX 16u -static uint8_t rp_s_rec_id[RP_REC_MAX]; -static char rp_s_rec_desc[RP_REC_MAX][SYSLOG_DESC_MAX + 1u]; -static uint32_t rp_s_rec_n; /* 累计条数(不回绕,供"一条都没多投"断言) */ -static uint32_t rp_s_drop_quiet; /* 本桩不模拟丢弃,恒 0 */ - -void syslog_post_quiet(syslog_id_t id, const char *desc) { - uint32_t slot; - size_t dl = 0u; - - if (desc == NULL) { - return; - } - slot = rp_s_rec_n % RP_REC_MAX; - rp_s_rec_id[slot] = (uint8_t)id; - while ((dl < SYSLOG_DESC_MAX) && (desc[dl] != '\0')) { - dl++; - } - (void)memcpy(rp_s_rec_desc[slot], desc, dl); - rp_s_rec_desc[slot][dl] = '\0'; - rp_s_rec_n++; -} - -uint32_t syslog_post_dropped(void) { return rp_s_drop_quiet; } - -/* 第 k 条(0 起)记录;越界返回 -1 */ -static int rp_rec_at(uint32_t k, syslog_id_t id, const char *desc) -{ - if (k >= rp_s_rec_n) { - return -1; - } - return (rp_s_rec_id[k % RP_REC_MAX] == (uint8_t)id) - && (strcmp(rp_s_rec_desc[k % RP_REC_MAX], desc) == 0) ? 1 : 0; -} - -/* 某类记录一共投了几条 */ -static uint32_t rp_rec_cnt(syslog_id_t id) -{ - uint32_t i, n = 0u; - - for (i = 0u; (i < rp_s_rec_n) && (i < RP_REC_MAX); i++) { - if (rp_s_rec_id[i] == (uint8_t)id) { - n++; - } - } - return n; -} - -static void rp_rec_clear(void) -{ - rp_s_rec_n = 0u; - (void)memset(rp_s_rec_id, 0, sizeof(rp_s_rec_id)); - (void)memset(rp_s_rec_desc, 0, sizeof(rp_s_rec_desc)); -} - -/* ---- adc_input_desc 桩:V0.1 权威映射(docs/硬件平台/ADC通道映射说明.md) ---- */ -#include "adc_input.h" - -static const adc_channel_desc_t rp_s_desc[ADC_SEM_COUNT] = { - { ADC_SRC_TPAFE, 6u }, /* UA = buf[6] */ - { ADC_SRC_STM32, 14u }, /* UB = CH14(PC4) */ - { ADC_SRC_STM32, 3u }, /* UC = CH3 */ - { ADC_SRC_TPAFE, 5u }, /* UN = buf[5] */ - { ADC_SRC_TPAFE, 2u }, /* IA = buf[2] */ - { ADC_SRC_STM32, 6u }, /* IB = CH6 */ - { ADC_SRC_STM32, 1u }, /* IC = CH1 */ - { ADC_SRC_STM32, 2u }, /* IN = CH2 */ - { ADC_SRC_STM32, 5u }, /* TEMP = CH5 */ -}; - -const adc_channel_desc_t *adc_input_desc(adc_semantic_t ch) { - if ((int)ch < 0 || (unsigned)ch >= (unsigned)ADC_SEM_COUNT) { - return NULL; - } - return &rp_s_desc[(unsigned)ch]; -} - -/* dbg 计数定义(stub/dbg_log.h 声明 extern) */ -int g_dbgstub104_err_count = 0; -int g_dbgstub104_info_count = 0; -int g_dbgstub104_debug_count = 0; - -#include "cfg_file.c" -#include "iec104_comm.c" /* 道G task-8:[comm] 段(配对模块,注册走真引擎) */ -#include "adc_cal.c" -#include "run_par.c" -#include "prot_elm.c" -#include "iec104_pts.c" -#include "iec104_link.c" - -/* ---------------- 假数据源(定值转发真实 prot_set) ---------------- */ -static float s_f_yc[9]; -static int s_f_yc_rc[9]; -static uint64_t s_f_bits; -static uint64_t s_f_valid; -static uint32_t s_f_yk_ioa; -static uint8_t s_f_yk_dpc; -static uint8_t s_f_yk_sel; - -static int f_yc(uint8_t idx, float *out) -{ - if (idx >= 9u) { - return -1; - } - if (s_f_yc_rc[idx] != 0) { - return s_f_yc_rc[idx]; - } - *out = s_f_yc[idx]; - return 0; -} -static uint64_t f_bits(void) { return s_f_bits; } -static uint64_t f_valid(void) { return s_f_valid; } -static int f_yk(uint32_t ioa, uint8_t dpc, uint8_t sel) -{ - s_f_yk_ioa = ioa; - s_f_yk_dpc = dpc; - s_f_yk_sel = sel; - if (ioa == 0x600Bu) { - /* YK12 全局软压板(B7):转真实板端源(prot_set_set_sealed 原子路径) */ - return s_src_yk_exec(ioa, dpc, sel); - } - return (ioa == 0x600Au) ? 0 : -1; -} -static int f_set_read(uint32_t addr, float *out) -{ - return s_src_set_read(addr, out); -} -static int f_set_write(uint32_t addr, float v, uint8_t sel) -{ - return s_src_set_write(addr, v, sel); -} -static const iec104_pts_src_t g_fake = { - f_yc, f_bits, f_valid, f_yk, f_set_read, f_set_write -}; - -/* ---------------- 发送捕获 + 对时假回调 ---------------- */ -#define CAP_MAX 48 -#define CAP_SZ 260 -static uint8_t s_cap[CAP_MAX][CAP_SZ]; -static int s_cap_n; -static uint64_t s_clock_ms; -static int s_clock_rc; - -static void cap_send(void *ctx, const uint8_t *apdu, uint16_t len) -{ - (void)ctx; - if ((s_cap_n < CAP_MAX) && (len <= CAP_SZ)) { - (void)memcpy(s_cap[s_cap_n], apdu, len); - s_cap_n++; - } -} -static int f_clock(void *ctx, uint64_t ms) -{ - (void)ctx; - s_clock_ms = ms; - return s_clock_rc; -} -/* B9 时标源假回调:s_epoch_val = UINT64_MAX → 时钟无效(CP56 IV) */ -static uint64_t s_epoch_val; -static uint64_t f_epoch(void *ctx) -{ - (void)ctx; - return s_epoch_val; -} - -static iec104_link_t g_lk; -static const iec104_link_cfg_t g_cfg = { 1u, cap_send, f_clock, f_epoch }; - -/* ---------------- 主站侧模拟(N(R) 单调,照真实主站) ---------------- */ -static uint16_t m_ns; -static uint16_t m_nr; - -static void m_reset(void) -{ - m_ns = 0u; - m_nr = 0u; - s_cap_n = 0; -} -static void feed_u(uint8_t q, uint32_t now) -{ - uint8_t b[6]; - - b[0] = 0x68u; b[1] = 4u; b[2] = q; b[3] = 0u; b[4] = 0u; b[5] = 0u; - iec104_link_on_rx(&g_lk, b, 6u, now); -} -static void feed_i(const uint8_t *asdu, uint16_t len, uint32_t now) -{ - uint8_t b[6u + 250u]; - uint16_t fs = (uint16_t)(m_ns << 1); - uint16_t fr = (uint16_t)(m_nr << 1); /* N(R) 单调(feed_s 推进) */ - - b[0] = 0x68u; - b[1] = (uint8_t)(4u + len); - b[2] = (uint8_t)(fs & 0xFFu); - b[3] = (uint8_t)(fs >> 8); - b[4] = (uint8_t)(fr & 0xFFu); - b[5] = (uint8_t)(fr >> 8); - (void)memcpy(&b[6], asdu, len); - iec104_link_on_rx(&g_lk, b, (uint16_t)(6u + len), now); - m_ns = (uint16_t)((m_ns + 1u) % 32768u); -} -static void feed_s(uint16_t nr, uint32_t now) -{ - uint8_t b[6]; - uint16_t f = (uint16_t)(nr << 1); - - b[0] = 0x68u; b[1] = 4u; b[2] = 1u; b[3] = 0u; - b[4] = (uint8_t)(f & 0xFFu); - b[5] = (uint8_t)(f >> 8); - m_nr = nr; /* 主站确认推进(单调) */ - iec104_link_on_rx(&g_lk, b, 6u, now); -} -static uint16_t mk_asdu(uint8_t *b, uint8_t type, uint8_t vsq, uint8_t cot, - uint8_t cot_hi, uint8_t with_ioa, uint32_t ioa, - const uint8_t *body, uint16_t blen) -{ - uint16_t n = iec104_asdu_put_hdr(b, type, vsq, cot, cot_hi, 1u); - - if (with_ioa != 0u) { - iec104_put_ioa(&b[n], ioa); - n += 3u; - } - if (blen > 0u) { - (void)memcpy(&b[n], body, blen); - n += blen; - } - return n; -} - -/* ---------------- 复位 / 握手 ---------------- */ -static void reset_all(uint32_t now) -{ - prot_set_init(); - prot_elm_init(); - run_par_init(); /* 运行参数段:死区/脏复位到工厂默认(重复注册 -1 走计数桩,无害) */ - iec104_pts_init(); - iec104_pts_bind_src(&g_fake); - (void)memset(s_f_yc, 0, sizeof(s_f_yc)); - (void)memset(s_f_yc_rc, 0, sizeof(s_f_yc_rc)); - s_f_bits = 0u; - s_f_valid = (1uLL << 14) | (1uLL << 15) | (1uLL << 16) | (1uLL << 17) - | (1uLL << 22) | (1uLL << 30); - s_clock_rc = 0; - s_clock_ms = 0u; - s_epoch_val = 1760234567000ULL; /* B9:固定时标(2025-10-12 UTC) */ - iec104_link_init(&g_lk, &g_cfg, NULL); - iec104_link_open(&g_lk, now); - m_reset(); -} -static void handshake(uint32_t now) -{ - feed_u(0x07u, now); /* STARTDT act */ -} - -/* ---------------- 捕获检查 ---------------- */ -typedef struct { - uint8_t type, vsq, cot, cot_hi, oa; - uint32_t ca, ioa; - const uint8_t *obj; /* ioa 之后的信息体 */ - uint16_t obj_len; -} cap_t; - -static int cap_i_count(void) -{ - int k, n = 0; - - for (k = 0; k < s_cap_n; k++) { - if ((s_cap[k][2] & 0x01u) == 0u) { - n++; - } - } - return n; -} -static int cap_u_count(uint8_t q) -{ - int k, n = 0; - - for (k = 0; k < s_cap_n; k++) { - if ((s_cap[k][2] & 0x03u) == 0x03u && s_cap[k][2] == q) { - n++; - } - } - return n; -} -static int cap_has_s(uint16_t *nr_out) -{ - int k; - - for (k = s_cap_n - 1; k >= 0; k--) { - const uint8_t *p = s_cap[k]; - - if ((p[2] & 0x03u) == 0x01u) { - *nr_out = (uint16_t)(((uint16_t)p[4] | ((uint16_t)p[5] << 8)) >> 1); - return 1; - } - } - return 0; -} -static int cap_i(int n, cap_t *o) -{ - int k, seen = 0; - - for (k = 0; k < s_cap_n; k++) { - const uint8_t *p = s_cap[k]; - uint16_t lf = p[1]; - iec104_asdu_hdr_t h; - - if ((p[2] & 0x01u) != 0u) { - continue; - } - if (seen == n) { - if (iec104_asdu_parse_hdr(&p[6], (uint16_t)(lf - 4u), &h) != 0) { - return -1; - } - o->type = h.type; - o->vsq = h.vsq; - o->cot = h.cot; - o->cot_hi = h.cot_hi; - o->oa = h.oa; - o->ca = h.ca; - if (h.obj_len >= 3u) { - o->ioa = iec104_get_ioa(h.obj); - o->obj = h.obj + 3u; - o->obj_len = (uint16_t)(h.obj_len - 3u); - } else { - o->ioa = 0u; - o->obj = h.obj; - o->obj_len = 0u; - } - return 0; - } - seen++; - } - return -1; -} - -/* ============================ 测试用例 ============================ */ - -static void tc_cp56(void) -{ - uint8_t b[7]; - uint64_t e1 = 946684800000ULL; /* 2000-01-01 00:00:00.000 */ - uint64_t e2 = 1709188496789ULL; /* 2024-02-29 06:34:56.789(闰日) */ - uint64_t back = 0u; - int rc; - - iec104_epoch_ms_to_cp56(e1, b); - rc = iec104_cp56_to_epoch_ms(b, &back); - CHECK((rc == 0) && (back == e1), "TC-IEC104-001 CP56 round trip on 2000-01-01"); - iec104_epoch_ms_to_cp56(e2, b); - back = 0u; - rc = iec104_cp56_to_epoch_ms(b, &back); - CHECK((rc == 0) && (back == e2), "TC-IEC104-001 CP56 round trip on the leap day 2024-02-29"); - b[2] |= 0x80u; - CHECK(iec104_cp56_to_epoch_ms(b, &back) == -2, "TC-IEC104-001 IV -> -2"); - iec104_epoch_ms_to_cp56(0u, b); /* 早于 2000 → 钳位 */ - back = 0u; - (void)iec104_cp56_to_epoch_ms(b, &back); - CHECK(back == e1, "TC-IEC104-001 a value before 2000 is clamped"); -} - -static void tc_ioa_float(void) -{ - uint8_t b[8]; - - iec104_put_ioa(b, 0x123456u); - CHECK((iec104_get_ioa(b) == 0x123456u) && (b[0] == 0x56u) && (b[1] == 0x34u) - && (b[2] == 0x12u), "TC-IEC104-002 IOA is 3 bytes little endian"); - iec104_put_float(b, 1.0f); - CHECK((b[0] == 0x00u) && (b[1] == 0x00u) && (b[2] == 0x80u) - && (b[3] == 0x3Fu), "TC-IEC104-002 float in IEEE754 little endian"); - iec104_put_float(b, -12.5f); - CHECK(iec104_get_float(b) == -12.5f, "TC-IEC104-002 float round trip"); -} - -static void tc_apci(void) -{ - uint32_t now = 1000u; - - reset_all(now); - { - static const uint8_t b[6] = { 0x68u, 4u, 0x07u, 0u, 0u, 0u }; - - iec104_link_on_rx(&g_lk, b, 3u, now); - CHECK(cap_u_count(0x0Bu) == 0, "TC-IEC104-003 a half frame triggers nothing"); - iec104_link_on_rx(&g_lk, &b[3], 3u, now); - CHECK(cap_u_count(0x0Bu) == 1, "TC-IEC104-003 a half frame is reassembled then con"); - } - { - static const uint8_t b[12] = { - 0x68u, 4u, 0x43u, 0u, 0u, 0u, /* TESTFR act */ - 0x68u, 4u, 0x13u, 0u, 0u, 0u /* STOPDT act */ - }; - - iec104_link_on_rx(&g_lk, b, 12u, now); - CHECK((cap_u_count(0x83u) == 1) - && (iec104_link_state(&g_lk) == IEC104_ST_STOPPED), - "TC-IEC104-003 a coalesced frame is handled one by one and STOPDT takes effect"); - } - reset_all(now); - { - static const uint8_t b[6] = { 0x69u, 4u, 0x07u, 0u, 0u, 0u }; - - iec104_link_on_rx(&g_lk, b, 6u, now); - CHECK(iec104_link_state(&g_lk) == IEC104_ST_IDLE, "TC-IEC104-003 a bad start byte -> IDLE"); - } - reset_all(now); - { - static const uint8_t b[6] = { 0x68u, 3u, 0x07u, 0u, 0u, 0u }; - - iec104_link_on_rx(&g_lk, b, 6u, now); - CHECK(iec104_link_state(&g_lk) == IEC104_ST_IDLE, "TC-IEC104-003 a bad length -> IDLE"); - } -} - -static void tc_startdt(void) -{ - uint32_t now = 1000u; - - reset_all(now); - CHECK(iec104_link_state(&g_lk) == IEC104_ST_OPEN, "TC-IEC104-004 open -> OPEN"); - handshake(now); - CHECK((cap_u_count(0x0Bu) == 1) - && (iec104_link_state(&g_lk) == IEC104_ST_RUN), "TC-IEC104-004 STARTDT -> RUN"); -} - -static void tc_open_ignore(void) -{ - uint32_t now = 1000u; - uint8_t a[16]; - uint16_t n; - - reset_all(now); - n = mk_asdu(a, IEC104_T_C_RD_NA_1, 1u, IEC104_COT_REQ, 0u, 1u, 0x4011u, NULL, 0u); - feed_i(a, n, now); - CHECK((cap_i_count() == 0) && (iec104_link_state(&g_lk) == IEC104_ST_OPEN), - "TC-IEC104-005 an I frame in OPEN state is ignored"); - handshake(now); - m_ns = 0u; /* OPEN 忽略不消费序号 → 主站仍从 0 起 */ - feed_i(a, n, now); /* ns=0 仍有效(序号未被消费) */ - CHECK(cap_i_count() == 1, "TC-IEC104-005 after RUN the same ns is answered normally"); -} - -static void tc_interrogation(void) -{ - uint32_t now = 5000u; - uint8_t a[32]; - uint8_t body[1]; - uint16_t n; - cap_t c; - - reset_all(now); - s_f_yc[0] = 111.0f; - s_f_yc_rc[1] = -1; /* idx1(1Ub)无效通道 */ - handshake(now); - body[0] = IEC104_RQT_GROUP1; - n = mk_asdu(a, IEC104_T_C_IC_NA_1, 1u, IEC104_COT_ACT, 0u, 1u, 0u, body, 1u); - feed_i(a, n, now); - CHECK((cap_i_count() == 1) && (cap_i(0, &c) == 0) && (c.type == 100u) - && (c.cot == IEC104_COT_ACTCON), "TC-IEC104-006 actcon is sent right away, COT7"); - iec104_link_poll(&g_lk, now); - CHECK(cap_i_count() == 5, "TC-IEC104-006 the first poll uses the whole budget of 4 frames"); - CHECK((cap_i(1, &c) == 0) && (c.type == 3u) && (c.cot == IEC104_COT_INIT) - && (c.vsq == (uint8_t)(IEC104_VSQ_SQ | 4u)) && (c.ioa == 1u), - "TC-IEC104-006 YX double-point group, first call COT=4"); - CHECK((cap_i(2, &c) == 0) && (c.type == 1u) - && (c.vsq == (uint8_t)(IEC104_VSQ_SQ | 29u)) && (c.ioa == 5u), - "TC-IEC104-006 YX single-point group with 29 points"); - CHECK((cap_i(3, &c) == 0) && (c.type == 13u) - && (c.vsq == (uint8_t)(IEC104_VSQ_SQ | 8u)) && (c.ioa == 0x4011u) - && (c.obj_len == 40u), "TC-IEC104-006 YC group of 8 points, 40 bytes"); - if (cap_i(3, &c) == 0) { - CHECK((iec104_get_float(c.obj) == 111.0f) && (c.obj[4] == 0u), - "TC-IEC104-006 YC value 111.0 with QDS=0"); - CHECK(c.obj[9] == IEC104_QDS_IV, "TC-IEC104-006 an invalid channel sets QDS=IV"); - } - CHECK((cap_i(4, &c) == 0) && (c.ioa == 0x401Du) && (c.vsq == 1u), - "TC-IEC104-006 frequency as a single point with SQ=0"); - iec104_link_poll(&g_lk, now + 100u); - CHECK((cap_i_count() == 6) && (cap_i(5, &c) == 0) && (c.type == 100u) - && (c.cot == IEC104_COT_ACTTERM), "TC-IEC104-006 actterm closes the sequence"); - /* 二召:init 已清 → COT=2 */ - n = mk_asdu(a, IEC104_T_C_IC_NA_1, 1u, IEC104_COT_ACT, 0u, 1u, 0u, body, 1u); - feed_i(a, n, now + 200u); - iec104_link_poll(&g_lk, now + 200u); - CHECK((cap_i(7, &c) == 0) && (c.type == 3u) && (c.cot == IEC104_COT_BG_SCAN), - "TC-IEC104-006 second call COT=2"); - /* RBT 位 → COT=4(actcon3 是第 12 个未确认帧 → 先 S 确认窗才开) */ - n = mk_asdu(a, IEC104_T_C_IC_NA_1, 1u, IEC104_COT_ACT, IEC104_COT_BIT_RBT, - 1u, 0u, body, 1u); - feed_i(a, n, now + 300u); - feed_s(12u, now + 300u); - iec104_link_poll(&g_lk, now + 300u); - CHECK((cap_i(12, &c) == 0) && (c.type == 3u) && (c.cot == IEC104_COT_INIT), - "TC-IEC104-006 RBT -> COT=4"); -} - -static void tc_cov_yx(void) -{ - uint32_t now = 1000u; - cap_t c; - uint64_t back; - - reset_all(now); - handshake(now); - iec104_link_poll(&g_lk, now); /* 建快照 */ - CHECK(cap_i_count() == 0, "TC-IEC104-007 the first poll sends nothing spontaneous"); - s_f_bits |= (1uLL << 15); /* YX16(idx15)动作 */ - iec104_link_poll(&g_lk, now + 100u); - /* B9:单点 YX 自发 = M_SP_TB_1(30)带 CP56Time2a 时标(SOE 上送路径) */ - CHECK((cap_i_count() == 1) && (cap_i(0, &c) == 0) && (c.type == 30u) - && (c.cot == IEC104_COT_SPONT) && (c.ioa == 16u) - && (c.obj_len == 8u) && (c.obj[0] == 1u), "TC-IEC104-007 a YX16 change of state sends COT3 with TB"); - if ((cap_i(0, &c) == 0) && (c.obj_len == 8u)) { - CHECK(iec104_cp56_to_epoch_ms(&c.obj[1], &back) == 0, - "TC-IEC104-007 the CP56 time tag decodes"); - CHECK(back == s_epoch_val, "TC-IEC104-007 the time tag equals the epoch_ms source"); - } - s_f_bits &= ~(1uLL << 15); /* 复归 */ - iec104_link_poll(&g_lk, now + 200u); - CHECK((cap_i_count() == 2) && (cap_i(1, &c) == 0) && (c.type == 30u) - && (c.ioa == 16u) && (c.obj[0] == 0u), "TC-IEC104-007 YX16 is reset and changes again"); - /* B9 IV 路径:时标源无效 → CP56 IV 位如实置位 */ - s_epoch_val = UINT64_MAX; - s_f_bits |= (1uLL << 16); /* YX17(idx16)动作 */ - iec104_link_poll(&g_lk, now + 300u); - CHECK((cap_i_count() == 3) && (cap_i(2, &c) == 0) && (c.type == 30u) - && (c.ioa == 17u) && ((c.obj[3] & 0x80u) != 0u), - "TC-IEC104-007 an invalid clock sets the CP56 IV bit"); - s_epoch_val = 1760234567000ULL; - s_f_bits |= (1uLL << 0); /* idx0 无效位 → 不触发 */ - iec104_link_poll(&g_lk, now + 400u); - CHECK(cap_i_count() == 3, "TC-IEC104-007 a change while the IV bit is set triggers nothing"); -} - -static void tc_cov_yc(void) -{ - uint32_t now = 1000u; - cap_t c; - - reset_all(now); - handshake(now); - s_f_yc[0] = 100.0f; - iec104_link_poll(&g_lk, now); /* 快照 = 100 */ - s_f_yc[0] = 100.4f; /* 死区 0.5 V 内(工程量重定后的二次值口径:0.5 %×100 V, - * 旧拟定码值死区 10 已由「数据可信」下游常数按工程量重定) */ - iec104_link_poll(&g_lk, now + 100u); - CHECK(cap_i_count() == 0, "TC-IEC104-008 inside the deadband nothing is uploaded"); - s_f_yc[0] = 101.25f; /* 101.25-100=1.25 > 0.5,第 1 越点 */ - iec104_link_poll(&g_lk, now + 200u); - CHECK(cap_i_count() == 0, "TC-IEC104-008 first deadband crossing only arms (2-point confirm)"); - iec104_link_poll(&g_lk, now + 300u); /* 第 2 个连续测点仍越 -> 确认上送 */ - CHECK((cap_i_count() == 1) && (cap_i(0, &c) == 0) && (c.type == 13u) - && (c.cot == IEC104_COT_SPONT) && (c.ioa == 0x4011u) - && (iec104_get_float(c.obj) == 101.25f), - "TC-IEC104-008 second consecutive crossing uploads (Card 9 confirm)"); -} - -static void feed_rd(uint32_t now) -{ - uint8_t a[16]; - uint16_t n = mk_asdu(a, IEC104_T_C_RD_NA_1, 1u, IEC104_COT_REQ, 0u, - 1u, 0x4011u, NULL, 0u); - - feed_i(a, n, now); -} - -static void tc_k_window(void) -{ - uint32_t now = 1000u; - int i; - - reset_all(now); - handshake(now); - for (i = 0; i < 12; i++) { - feed_rd(now); - } - CHECK(cap_i_count() == 12, "TC-IEC104-009 the k=12 window caps the outstanding frames"); - feed_rd(now); - CHECK(cap_i_count() == 12, "TC-IEC104-009 the 13th frame is suppressed by the k window"); - feed_s(12u, now); /* 全确认 → 窗开 */ - feed_rd(now); - CHECK(cap_i_count() == 13, "TC-IEC104-009 sending resumes after the S acknowledgement"); -} - -static void tc_w_thresh(void) -{ - uint32_t now = 1000u; - uint16_t nr = 0xFFFFu; - int i; - - reset_all(now); - handshake(now); - for (i = 0; i < 7; i++) { - feed_rd(now); - } - CHECK(cap_has_s(&nr) == 0, "TC-IEC104-010 after 7 received frames no S has been sent yet"); - feed_rd(now); /* 第 8 个 → w 阈 */ - CHECK((cap_has_s(&nr) == 1) && (nr == 8u), "TC-IEC104-010 w=8 -> S with nr=8"); -} - -static void tc_t2(void) -{ - uint32_t now = 1000u; - uint16_t nr = 0xFFFFu; - - reset_all(now); - handshake(now); - feed_rd(now); /* rx_unacked=1,t2 起爆 */ - iec104_link_poll(&g_lk, now + 9999u); - CHECK(cap_has_s(&nr) == 0, "TC-IEC104-011 no S before t2 expires"); - iec104_link_poll(&g_lk, now + 10001u); - CHECK((cap_has_s(&nr) == 1) && (nr == 1u), "TC-IEC104-011 S is sent once t2 expires"); -} - -static void tc_t3_t1(void) -{ - uint32_t now = 1000u; - - reset_all(now); - handshake(now); - iec104_link_poll(&g_lk, now + 19999u); - CHECK(cap_u_count(0x43u) == 0, "TC-IEC104-012 no TESTFR before t3 expires"); - iec104_link_poll(&g_lk, now + 20001u); - CHECK(cap_u_count(0x43u) == 1, "TC-IEC104-012 TESTFR act is sent once t3 expires"); - iec104_link_poll(&g_lk, now + 20001u + 15001u); - CHECK(iec104_link_state(&g_lk) == IEC104_ST_IDLE, "TC-IEC104-012 an unanswered TESTFR hits t1 -> IDLE"); - /* con 清挂起 → 不误杀 */ - reset_all(now); - handshake(now); - iec104_link_poll(&g_lk, now + 20001u); - CHECK(cap_u_count(0x43u) == 1, "TC-IEC104-012 after reconnect t3 fires again"); - feed_u(0x83u, now + 20100u); /* TESTFR con */ - iec104_link_poll(&g_lk, now + 35000u); - CHECK(iec104_link_state(&g_lk) == IEC104_ST_RUN, "TC-IEC104-012 once con clears the pending frame t1 does not kill it by mistake"); -} - -static void tc_dc(void) -{ - uint32_t now = 1000u; - uint8_t a[16]; - uint8_t body[1]; - uint16_t n; - cap_t c; - - reset_all(now); - handshake(now); - body[0] = 0x82u; /* S=1, DPC=ON */ - n = mk_asdu(a, IEC104_T_C_DC_NA_1, 1u, IEC104_COT_ACT, 0u, 1u, 0x600Au, body, 1u); - feed_i(a, n, now); - CHECK((cap_i(0, &c) == 0) && (c.type == 52u) && (c.cot == IEC104_COT_ACTCON) - && ((c.cot_hi & IEC104_COT_BIT_PN) == 0u), "TC-IEC104-013 the select phase answers actcon"); - CHECK((s_f_yk_sel == 1u) && (s_f_yk_ioa == 0x600Au), "TC-IEC104-013 the select phase forwards the source"); - body[0] = 0x02u; /* 执行 ON */ - n = mk_asdu(a, IEC104_T_C_DC_NA_1, 1u, IEC104_COT_ACT, 0u, 1u, 0x600Au, body, 1u); - feed_i(a, n, now); - CHECK((cap_i(1, &c) == 0) && ((c.cot_hi & IEC104_COT_BIT_PN) == 0u) - && (s_f_yk_sel == 0u), "TC-IEC104-013 the execute phase answers actcon"); - /* 失配:选 ON 执 OFF */ - body[0] = 0x82u; - n = mk_asdu(a, IEC104_T_C_DC_NA_1, 1u, IEC104_COT_ACT, 0u, 1u, 0x600Au, body, 1u); - feed_i(a, n, now); - body[0] = 0x01u; - n = mk_asdu(a, IEC104_T_C_DC_NA_1, 1u, IEC104_COT_ACT, 0u, 1u, 0x600Au, body, 1u); - feed_i(a, n, now); - CHECK((cap_i(3, &c) == 0) && ((c.cot_hi & IEC104_COT_BIT_PN) != 0u), - "TC-IEC104-013 a mismatching execute phase returns PN"); - /* 拒绝类(YK1):选择段即 PN */ - body[0] = 0x82u; - n = mk_asdu(a, IEC104_T_C_DC_NA_1, 1u, IEC104_COT_ACT, 0u, 1u, 0x6000u, body, 1u); - feed_i(a, n, now); - CHECK((cap_i(4, &c) == 0) && ((c.cot_hi & IEC104_COT_BIT_PN) != 0u), - "TC-IEC104-013 a YK without output hardware returns PN in the select phase"); -} - -/* TC-IEC104-024(B7):YK12 全局软压板两段式转真(经真实板端源 + 原子封存) */ -static void tc_dc_yk12(void) -{ - uint32_t now = 1000u; - uint8_t a[16]; - uint8_t body[1]; - uint16_t n; - cap_t c; - - reset_all(now); - handshake(now); - CHECK(prot_set_get_ctl(PS_GLOBAL_EN) == 1u, "TC-IEC104-024 soft plates are engaged by default"); - body[0] = 0x81u; /* S=1, DPC=OFF:选择段 */ - n = mk_asdu(a, IEC104_T_C_DC_NA_1, 1u, IEC104_COT_ACT, 0u, 1u, 0x600Bu, body, 1u); - feed_i(a, n, now); - CHECK((cap_i(0, &c) == 0) && (c.cot == IEC104_COT_ACTCON) - && ((c.cot_hi & IEC104_COT_BIT_PN) == 0u), "TC-IEC104-024 the YK12 select phase answers actcon"); - CHECK(prot_set_get_ctl(PS_GLOBAL_EN) == 1u, "TC-IEC104-024 the select phase performs no action"); - body[0] = 0x01u; /* 执行 OFF */ - n = mk_asdu(a, IEC104_T_C_DC_NA_1, 1u, IEC104_COT_ACT, 0u, 1u, 0x600Bu, body, 1u); - feed_i(a, n, now); - CHECK((cap_i(1, &c) == 0) && ((c.cot_hi & IEC104_COT_BIT_PN) == 0u), - "TC-IEC104-024 the YK12 execute phase answers actcon"); - CHECK(prot_set_get_ctl(PS_GLOBAL_EN) == 0u, "TC-IEC104-024 the execute phase drives the soft plate to the released state"); - CHECK(prot_set_selfcheck() == 0, "TC-IEC104-024 set_sealed seals atomically and selfcheck passes"); - CHECK(prot_set_dirty_peek() == 1u, "TC-IEC104-024 the dirty flag is set for persistence"); - body[0] = 0x82u; /* 再投入:选择 ON */ - n = mk_asdu(a, IEC104_T_C_DC_NA_1, 1u, IEC104_COT_ACT, 0u, 1u, 0x600Bu, body, 1u); - feed_i(a, n, now); - body[0] = 0x02u; /* 执行 ON */ - n = mk_asdu(a, IEC104_T_C_DC_NA_1, 1u, IEC104_COT_ACT, 0u, 1u, 0x600Bu, body, 1u); - feed_i(a, n, now); - CHECK((cap_i(3, &c) == 0) && ((c.cot_hi & IEC104_COT_BIT_PN) == 0u), - "TC-IEC104-024 the engage command executes with actcon"); - CHECK(prot_set_get_ctl(PS_GLOBAL_EN) == 1u, "TC-IEC104-024 the soft plate reaches the engaged state"); - body[0] = 0x80u; /* DPC=00 非法:选择段即 PN */ - n = mk_asdu(a, IEC104_T_C_DC_NA_1, 1u, IEC104_COT_ACT, 0u, 1u, 0x600Bu, body, 1u); - feed_i(a, n, now); - CHECK((cap_i(4, &c) == 0) && ((c.cot_hi & IEC104_COT_BIT_PN) != 0u), - "TC-IEC104-024 an invalid DPC returns PN in the select phase"); -} - -/* TC-IEC104-030(道F task-10):遥控记录——板端默认源 s_src_yk_exec() 的三条返回 - * 路径各投哪一类记录、投几句、是否顺手投了操作记录。 - * 为什么直接调 s_src_yk_exec 而不是发 ASDU:本套件绑定的是**假源** f_yk, - * YK11 / 未知 IOA 在 f_yk 里就被短路(只有 YK12 转发到真板端源,见 f_yk), - * 走 ASDU 反而测不到要验的那两条腿;"ASDU -> link -> pts -> 源"这条转发链 - * 已由 TC-IEC104-013/024 覆盖,不重复。**投递本身**(quiet 通道的收/丢)归 - * test/host/sys_log_mcu,本用例只钉"哪条路径投了哪一条"。 - * 覆盖不到的一条腿(登记,不假装):YK12 的 rc!=0 分支要 prot_set_set_sealed - * 返 -1 才进得去,而 PS_GLOBAL_EN 的 min/max 恰好就是本函数会写的 0/1 两值 - * → 该产品路径上不可达,是防御性分支;不为它伪造定值范围(那是改判据)。 */ -static void tc_yk_records(void) -{ - uint32_t now = 1000u; - - reset_all(now); - rp_rec_clear(); - - /* 1) 未知 IOA:拒绝,只投一条遥控记录;拒绝没改动任何东西 -> 不该有操作记录 */ - CHECK(s_src_yk_exec(0x6000u, (uint8_t)IEC104_DPC_ON, 1u) == -1, - "TC-IEC104-030 an IOA without output hardware is still rejected"); - CHECK((rp_s_rec_n == 1u) && (rp_rec_at(0u, SYSLOG_YK, "YK unknown ioa") == 1), - "TC-IEC104-030 the reject path posts exactly one telecontrol record"); - CHECK(rp_rec_cnt(SYSLOG_OPER) == 0u, - "TC-IEC104-030 a rejected command posts no operation record"); - - /* 2) YK11 选择段:受理但未动作 -> 只有遥控记录 */ - rp_rec_clear(); - CHECK((s_src_yk_exec(0x600Au, (uint8_t)IEC104_DPC_ON, 1u) == 0) - && (rp_s_rec_n == 1u) && (rp_rec_at(0u, SYSLOG_YK, "YK11 select") == 1), - "TC-IEC104-030 the YK11 select phase posts a select record and acts on nothing"); - CHECK(rp_rec_cnt(SYSLOG_OPER) == 0u, - "TC-IEC104-030 the select phase is not an operation yet"); - - /* 3) YK11 执行段:遥控记录 + 操作记录各一条,顺序 = 先命令后动作 */ - rp_rec_clear(); - CHECK((s_src_yk_exec(0x600Au, (uint8_t)IEC104_DPC_ON, 0u) == 0) - && (rp_s_rec_n == 2u) - && (rp_rec_at(0u, SYSLOG_YK, "YK11 exec") == 1) - && (rp_rec_at(1u, SYSLOG_OPER, "force reset") == 1), - "TC-IEC104-030 the YK11 execute phase posts one telecontrol plus one operation record"); - - /* 4) YK12 非法双点值:拒绝 + 一条带原因的遥控记录,压板不动 */ - rp_rec_clear(); - CHECK((s_src_yk_exec(0x600Bu, 0u, 0u) == -1) && (rp_s_rec_n == 1u) - && (rp_rec_at(0u, SYSLOG_YK, "YK12 bad dpc") == 1), - "TC-IEC104-030 an invalid DPC posts the reason and changes nothing"); - CHECK(prot_set_get_ctl(PS_GLOBAL_EN) == 1u, - "TC-IEC104-030 the invalid DPC leaves the soft plate engaged"); - - /* 5) YK12 执行 OFF:遥控 off + 操作 plate out,且压板真的退出了(记录与事实同步) */ - rp_rec_clear(); - CHECK((s_src_yk_exec(0x600Bu, (uint8_t)IEC104_DPC_OFF, 0u) == 0) - && (rp_s_rec_n == 2u) - && (rp_rec_at(0u, SYSLOG_YK, "YK12 exec off") == 1) - && (rp_rec_at(1u, SYSLOG_OPER, "plate out") == 1), - "TC-IEC104-030 releasing the soft plate records both the command and the operation"); - CHECK(prot_set_get_ctl(PS_GLOBAL_EN) == 0u, - "TC-IEC104-030 the record agrees with the plate state the settings layer holds"); - - /* 6) YK12 执行 ON:对称的另一半(只测 OFF 的话,两条 desc 写反也发现不了) */ - rp_rec_clear(); - CHECK((s_src_yk_exec(0x600Bu, (uint8_t)IEC104_DPC_ON, 0u) == 0) - && (rp_rec_at(0u, SYSLOG_YK, "YK12 exec on") == 1) - && (rp_rec_at(1u, SYSLOG_OPER, "plate in") == 1), - "TC-IEC104-030 engaging the soft plate records the matching pair"); - - /* 7) 选择段不落地:YK12 select 只投一条,压板状态不变 */ - rp_rec_clear(); - CHECK((s_src_yk_exec(0x600Bu, (uint8_t)IEC104_DPC_OFF, 1u) == 0) - && (rp_s_rec_n == 1u) && (rp_rec_at(0u, SYSLOG_YK, "YK12 select") == 1) - && (prot_set_get_ctl(PS_GLOBAL_EN) == 1u), - "TC-IEC104-030 the YK12 select phase records the intent without changing the plate"); - - /* 8) 文案长度契约:desc 全是 ROM 常量,任何一条超过 SYSLOG_DESC_MAX 都会在 - * 投递侧被静默截断(屏上少几个字,没人会去数)-> 在单测里钉住。 */ - CHECK((strlen(YK_REC_UNKNOWN) <= SYSLOG_DESC_MAX) - && (strlen(YK_REC_YK11_EXEC) <= SYSLOG_DESC_MAX) - && (strlen(YK_REC_YK12_OFF) <= SYSLOG_DESC_MAX) - && (strlen(YK_REC_YK12_FAIL) <= SYSLOG_DESC_MAX) - && (strlen(YK_REC_DPC_BAD) <= SYSLOG_DESC_MAX) - && (strlen(YK_REC_YK12_SEL) <= SYSLOG_DESC_MAX) - && (strlen(YK_REC_YK11_SEL) <= SYSLOG_DESC_MAX) - && (strlen(YK_REC_YK12_ON) <= SYSLOG_DESC_MAX), - "TC-IEC104-030 every telecontrol description fits the 28-byte record field"); - rp_rec_clear(); -} - -static void tc_se(void) -{ - uint32_t now = 1000u; - uint8_t a[24]; - uint8_t body[5]; - uint16_t n; - uint32_t addr = g_prot_set_meta[PS_OC1_CUR].comm_addr; /* 0x8858 */ - cap_t c; - - reset_all(now); - handshake(now); - CHECK(addr == 0x8858u, "TC-IEC104-014 the OC1 current setting communication address"); - iec104_put_float(body, 5.0f); - body[4] = IEC104_QDC_S; /* 选择段 */ - n = mk_asdu(a, IEC104_T_C_SE_NC_1, 1u, IEC104_COT_ACT, 0u, 1u, addr, body, 5u); - feed_i(a, n, now); - CHECK((cap_i(0, &c) == 0) && (c.type == 50u) - && ((c.cot_hi & IEC104_COT_BIT_PN) == 0u), "TC-IEC104-014 selecting a setting answers actcon"); - body[4] = 0u; /* 执行段 */ - n = mk_asdu(a, IEC104_T_C_SE_NC_1, 1u, IEC104_COT_ACT, 0u, 1u, addr, body, 5u); - feed_i(a, n, now); - CHECK((cap_i(1, &c) == 0) && ((c.cot_hi & IEC104_COT_BIT_PN) == 0u), - "TC-IEC104-014 executing a setting answers actcon"); - CHECK(prot_set_get_f(PS_OC1_CUR) == 5.0f, "TC-IEC104-014 the setting really was written (real prot_set)"); - CHECK(prot_set_selfcheck() == 0, "TC-IEC104-014 sealing after execute keeps selfcheck passing"); - CHECK(prot_set_dirty_peek() == 1u, "TC-IEC104-014 the execute phase sets dirty (B7, waiting to be persisted)"); - iec104_put_float(body, 100000.0f); /* 越上限 */ - body[4] = IEC104_QDC_S; - n = mk_asdu(a, IEC104_T_C_SE_NC_1, 1u, IEC104_COT_ACT, 0u, 1u, addr, body, 5u); - feed_i(a, n, now); - CHECK((cap_i(2, &c) == 0) && ((c.cot_hi & IEC104_COT_BIT_PN) != 0u), - "TC-IEC104-014 an out-of-range select phase returns PN"); -} - -static void tc_rd(void) -{ - uint32_t now = 1000u; - uint8_t a[16]; - uint16_t n; - cap_t c; - - reset_all(now); - handshake(now); - s_f_yc[0] = 222.0f; - n = mk_asdu(a, IEC104_T_C_RD_NA_1, 1u, IEC104_COT_REQ, 0u, 1u, 0x4011u, NULL, 0u); - feed_i(a, n, now); - CHECK((cap_i(0, &c) == 0) && (c.type == 13u) && (c.cot == IEC104_COT_REQ) - && (iec104_get_float(c.obj) == 222.0f), "TC-IEC104-015 C_RD hits a YC group"); - n = mk_asdu(a, IEC104_T_C_RD_NA_1, 1u, IEC104_COT_REQ, 0u, 1u, 0x8858u, NULL, 0u); - feed_i(a, n, now); - CHECK((cap_i(1, &c) == 0) && (c.type == 13u) && (c.ioa == 0x8858u), - "TC-IEC104-015 C_RD hits a setting"); - n = mk_asdu(a, IEC104_T_C_RD_NA_1, 1u, IEC104_COT_REQ, 0u, 1u, 0x9999u, NULL, 0u); - feed_i(a, n, now); - CHECK((cap_i(2, &c) == 0) && (c.type == 102u) - && (c.cot == IEC104_COT_UNK_IOA) && ((c.oa & 0x80u) != 0u), - "TC-IEC104-015 an unknown IOA answers COT14 plus EVI"); - n = mk_asdu(a, IEC104_T_C_RD_NA_1, 1u, IEC104_COT_REQ, 0u, 1u, 0u, NULL, 0u); - feed_i(a, n, now); - CHECK((cap_i(3, &c) == 0) && (c.cot == IEC104_COT_UNK_IOA), - "TC-IEC104-015 a local setting item (comm_addr=0) is not addressable (B7)"); -} - -static void tc_cs(void) -{ - uint32_t now = 1000u; - uint8_t a[24]; - uint8_t cp[7]; - uint16_t n; - cap_t c; - uint64_t e = 1709188496789ULL; - - reset_all(now); - handshake(now); - (void)iec104_epoch_ms_to_cp56(e, cp); - n = mk_asdu(a, IEC104_T_C_CS_NA_1, 1u, IEC104_COT_ACT, 0u, 1u, 0u, cp, 7u); - feed_i(a, n, now); - CHECK((cap_i(0, &c) == 0) && (c.type == 103u) - && ((c.cot_hi & IEC104_COT_BIT_PN) == 0u) && (s_clock_ms == e), - "TC-IEC104-016 C_CS syncs the clock with an exact epoch"); - cp[2] |= 0x80u; /* IV */ - n = mk_asdu(a, IEC104_T_C_CS_NA_1, 1u, IEC104_COT_ACT, 0u, 1u, 0u, cp, 7u); - feed_i(a, n, now); - CHECK((cap_i(1, &c) == 0) && ((c.cot_hi & IEC104_COT_BIT_PN) != 0u), - "TC-IEC104-016 CP56 IV -> PN"); - (void)iec104_epoch_ms_to_cp56(e, cp); - s_clock_rc = -1; /* 系统侧拒绝 */ - n = mk_asdu(a, IEC104_T_C_CS_NA_1, 1u, IEC104_COT_ACT, 0u, 1u, 0u, cp, 7u); - feed_i(a, n, now); - CHECK((cap_i(2, &c) == 0) && ((c.cot_hi & IEC104_COT_BIT_PN) != 0u), - "TC-IEC104-016 a clock_sync failure -> PN"); -} - -static void tc_err_resp(void) -{ - uint32_t now = 1000u; - uint8_t a[16]; - uint16_t n, m; - cap_t c; - - reset_all(now); - handshake(now); - n = mk_asdu(a, 200u, 1u, IEC104_COT_ACT, 0u, 1u, 0u, NULL, 0u); - feed_i(a, n, now); - CHECK((cap_i(0, &c) == 0) && (c.type == 200u) && (c.cot == IEC104_COT_UNK_COT) - && ((c.oa & 0x80u) != 0u), "TC-IEC104-017 an unknown type answers COT12 plus EVI"); - m = iec104_asdu_put_hdr(a, IEC104_T_C_IC_NA_1, 1u, IEC104_COT_ACT, 0u, 2u); - a[m] = IEC104_RQT_GROUP1; - m++; - feed_i(a, m, now); /* ca=2 ≠ 1 */ - CHECK((cap_i(1, &c) == 0) && (c.cot == IEC104_COT_UNK_CA) - && ((c.oa & 0x80u) != 0u), "TC-IEC104-017 a wrong common address answers COT13 plus EVI"); -} - -static void tc_stopdt(void) -{ - uint32_t now = 1000u; - uint8_t a[16]; - uint8_t body[1]; - uint16_t n; - - reset_all(now); - handshake(now); - feed_u(0x13u, now); /* STOPDT act */ - CHECK((cap_u_count(0x23u) == 1) - && (iec104_link_state(&g_lk) == IEC104_ST_STOPPED), "TC-IEC104-018 STOPDT con"); - body[0] = IEC104_RQT_GROUP1; - n = mk_asdu(a, IEC104_T_C_IC_NA_1, 1u, IEC104_COT_ACT, 0u, 1u, 0u, body, 1u); - feed_i(a, n, now); - CHECK(cap_i_count() == 0, "TC-IEC104-018 in STOPPED state the data service is off"); - feed_u(0x43u, now); - CHECK(cap_u_count(0x83u) == 1, "TC-IEC104-018 in STOPPED state TESTFR is still answered"); -} - -static void tc_seq_err(void) -{ - uint32_t now = 1000u; - uint8_t a[16]; - uint16_t n; - - reset_all(now); - handshake(now); - m_ns = 5u; /* 期望 0,投 5 */ - n = mk_asdu(a, IEC104_T_C_RD_NA_1, 1u, IEC104_COT_REQ, 0u, 1u, 0x4011u, NULL, 0u); - feed_i(a, n, now); - CHECK(iec104_link_state(&g_lk) == IEC104_ST_IDLE, "TC-IEC104-019 a sequence error -> IDLE"); -} - -static void tc_pts(void) -{ - float v; - uint8_t q; - uint8_t d; - - reset_all(1000u); - CHECK((iec104_pts_yc_count() == 9u) && (iec104_pts_yx_count() == 33u) - && (iec104_pts_yc_ioa(8u) == 0x401Du), "TC-IEC104-020 table size and IOA layout"); - s_f_yc[0] = 7.5f; - CHECK((iec104_pts_yc_read(0u, &v, &q) == 0) && (v == 7.5f) && (q == 0u), - "TC-IEC104-020 a valid YC"); - s_f_yc_rc[1] = -1; - (void)iec104_pts_yc_read(1u, &v, &q); - CHECK((v == 0.0f) && (q == IEC104_QDS_IV), "TC-IEC104-020 an invalid channel gives IV"); - s_f_yc_rc[2] = -2; - (void)iec104_pts_yc_read(2u, &v, &q); - CHECK(q == IEC104_QDS_NT, "TC-IEC104-020 not ready gives NT"); - iec104_pts_yx_read(0u, &d); - CHECK(d == IEC104_DIQ_IV, "TC-IEC104-020 an invalid telemetry point gives IV"); - CHECK((iec104_pts_yx_is_dp(0u) == 1u) && (iec104_pts_yx_is_dp(4u) == 0u), - "TC-IEC104-020 the is_dp boundary"); - s_f_bits = (1uLL << 15); - iec104_pts_yx_read(15u, &d); - CHECK(d == 1u, "TC-IEC104-020 a valid telemetry point gives ON"); -} - -static void tc_ts_rp(void) -{ - uint32_t now = 1000u; - uint8_t a[16]; - uint8_t body[2]; - uint16_t n; - cap_t c; - - reset_all(now); - handshake(now); - body[0] = 0u; - n = mk_asdu(a, IEC104_T_C_TS_NA_1, 1u, IEC104_COT_ACT, 0u, 1u, 0u, body, 1u); - feed_i(a, n, now); - CHECK((cap_i(0, &c) == 0) && (c.type == 104u) && (c.cot == IEC104_COT_ACTCON), - "TC-IEC104-021 C_TS actcon"); - n = mk_asdu(a, IEC104_T_C_RP_NA_1, 1u, IEC104_COT_ACT, 0u, 1u, 0u, body, 1u); - feed_i(a, n, now); - CHECK((cap_i(1, &c) == 0) && (c.type == 105u) && (c.cot == IEC104_COT_ACTCON), - "TC-IEC104-021 C_RP actcon"); -} - -static void tc_periodic(void) -{ - uint32_t now = 1000u; - cap_t c; - - reset_all(now); - handshake(now); - iec104_link_poll(&g_lk, now + 60001u); - CHECK(cap_i_count() == 2, "TC-IEC104-022 the cyclic upload takes 2 frames"); - CHECK((cap_i(0, &c) == 0) && (c.type == 13u) && (c.cot == IEC104_COT_PERIODIC) - && (c.ioa == 0x4011u), "TC-IEC104-022 the cyclic YC group uses COT=1"); - CHECK((cap_i(1, &c) == 0) && (c.ioa == 0x401Du), "TC-IEC104-022 the cyclic frequency point"); -} - -static void tc_cov_kfull(void) -{ - uint32_t now = 1000u; - int i; - cap_t c; - - reset_all(now); - handshake(now); - iec104_link_poll(&g_lk, now); /* 先建快照(首 poll 只建不算变位) */ - for (i = 0; i < 12; i++) { - feed_rd(now); /* k 窗占满 */ - } - s_f_bits |= (1uLL << 14); /* YX15 变位 */ - iec104_link_poll(&g_lk, now + 100u); - CHECK(cap_i_count() == 12, "TC-IEC104-023 with k full nothing spontaneous can go out"); - feed_s(12u, now + 200u); /* 窗开 */ - iec104_link_poll(&g_lk, now + 300u); - CHECK((cap_i_count() == 13) && (cap_i(12, &c) == 0) && (c.ioa == 15u) - && (c.cot == IEC104_COT_SPONT), "TC-IEC104-023 once the window opens the backlogged event is sent, none lost"); -} - -/* ====== 104 改读快照与频率点绑定:板端默认源(真实 L2 链:ring→phasor→freq→meas) ====== */ - -/* 与 App/task/adc_task.c 同型的单拍编排:压环 → phasor_run →(可选 freq_run)。 - * 9 路同幅错相正弦(整周波 → 各路基波有效值 = A/√2,与相位无关,期望好算) */ -static double s_ph2 = 0.0; -static void snap_beats(int n, double amp, int run_freq) -{ - float f[ADC_SEM_COUNT]; - int i; - int s; - - for (i = 0; i < n; i++) { - for (s = 0; s < (int)ADC_SEM_TEMP; s++) { - f[s] = (float)(amp * sin(s_ph2 + (double)s * 0.35)); - } - f[ADC_SEM_TEMP] = 1234.0f; - s_ph2 += 2.0 * 3.14159265358979323846 * 50.0 / 1000.0; /* 50 Hz */ - (void)sample_ring_push_frame(f, (uint8_t)ADC_SEM_COUNT); - phasor_run(); - if (run_freq != 0) { - freq_run(); - } - } -} -/* 200 ms 发布拍(读同拍 freq 状态,adc_task v3.2 编排的镜像) */ -static void snap_pub(uint32_t ms, uint32_t clip_mask) -{ - meas_tick(ms, freq_valid(), freq_last(), clip_mask); -} - -static void tc_pts_snap(void) -{ - float v; - uint8_t q; - - reset_all(1000u); - iec104_pts_bind_src(NULL); /* 板端默认源 = 真实快照链 */ - (void)phasor_init(); /* 环 + 相量双区清零 */ - (void)meas_init(); - CHECK((iec104_pts_yc_read(0u, &v, &q) == -1) - && (q == (uint8_t)(IEC104_QDS_IV | IEC104_QDS_NT)) && (v == 0.0f), - "TC-IEC104-025 before first publish -> IV|NT, value zero"); - snap_beats(20, 100.0, 0); - snap_pub(200u, 0xE6u); /* 削顶位图同板端默认构建(cl=0xE6) */ - CHECK((iec104_pts_yc_read(0u, &v, &q) == 0) && (q == 0u) - && (fabsf(v - 70.711f) < 0.1f), - "TC-IEC104-025 UA = snapshot fundamental RMS (engineering domain)"); - CHECK((iec104_pts_yc_read(3u, &v, &q) == 0) && (q == 0u), - "TC-IEC104-025 UN (bit3 not in 0xE6) stays valid"); - CHECK((iec104_pts_yc_read(4u, &v, &q) == 0) && (q == 0u), - "TC-IEC104-025 IA valid"); - CHECK((iec104_pts_yc_read(1u, &v, &q) == -1) && (q == IEC104_QDS_IV) - && (v == 0.0f), "TC-IEC104-025 clipped UB: CLIPPED maps to wire IV, value zero"); - CHECK((iec104_pts_yc_read(2u, &v, &q) == -1) && (q == IEC104_QDS_IV), - "TC-IEC104-025 clipped UC IV"); - CHECK((iec104_pts_yc_read(5u, &v, &q) == -1) && (q == IEC104_QDS_IV), - "TC-IEC104-025 clipped IB IV"); - CHECK((iec104_pts_yc_read(8u, &v, &q) == -1) && (q == IEC104_QDS_IV), - "TC-IEC104-025 freq point published but not fresh -> IV (Card 11 rule)"); -} - -static void tc_pts_freq(void) -{ - float v; - uint8_t q; - int k; - - reset_all(1000u); - iec104_pts_bind_src(NULL); - (void)phasor_init(); - (void)freq_init(); - (void)meas_init(); - for (k = 0; k < 5; k++) { /* 100 拍:测频启动收敛需 20 拍 */ - snap_beats(20, 100.0, 1); - snap_pub((uint32_t)(k + 1) * 200u, 0u); - } - CHECK(freq_valid() == 1u, "TC-IEC104-026 drive precondition: freq converged"); - CHECK((iec104_pts_yc_read(8u, &v, &q) == 0) && (q == 0u) - && (fabsf(v - 50.0f) <= 0.02f), - "TC-IEC104-026 0x401D carries freq reading within 0.02 Hz of synthetic 50.000"); - for (k = 0; k < 3; k++) { /* 浮空:幅值门落下 */ - snap_beats(20, 0.0, 1); - snap_pub((uint32_t)(6 + k) * 200u, 0u); - } - CHECK((freq_valid() == 0u) && (iec104_pts_yc_read(8u, &v, &q) == -1) - && (q == IEC104_QDS_IV) && (v == 0.0f), - "TC-IEC104-026 freq_valid==0 -> IV with zeroed value (Card 11 DoD)"); -} - -static void tc_db_runtime(void) -{ - iec104_pts_cov_t cov; - - reset_all(1000u); /* 假源在场 = 每次 cov_check 一测点 */ - CHECK((iec104_pts_yc_set_deadband(0u, 2.0f) == 0) - && (iec104_pts_yc_deadband(0u) == 2.0f), - "TC-IEC104-027 runtime deadband write + readback"); - CHECK((iec104_pts_yc_set_deadband(9u, 1.0f) == -1) - && (iec104_pts_yc_set_deadband(0u, -0.1f) == -1) - && (iec104_pts_yc_deadband(0u) == 2.0f), - "TC-IEC104-027 bad idx / negative rejected, RAM untouched"); - CHECK(iec104_pts_yc_deadband(8u) == 0.5f, "TC-IEC104-027 freq point ROM default kept"); - s_f_yc[0] = 100.0f; - iec104_pts_cov_check(&cov); /* 建线 rep=100(档 2.0) */ - s_f_yc[0] = 101.0f; /* 越旧档 0.5、未越运行档 2.0 */ - iec104_pts_cov_check(&cov); - CHECK((cov.yc_changed & 0x0001u) == 0u, "TC-IEC104-027 runtime db gates the old step"); - iec104_pts_cov_check(&cov); - CHECK((cov.yc_changed & 0x0001u) == 0u, "TC-IEC104-027 2nd point under 2.0 still silent"); - - run_par_init(); /* 恢复工厂默认档(0.5)——运行参数段复位入口 */ - iec104_pts_init(); - iec104_pts_bind_src(&g_fake); - s_f_yc[0] = 100.0f; - iec104_pts_cov_check(&cov); /* 建线 */ - s_f_yc[0] = 100.6f; /* d=0.6 > 0.5,第 1 越 */ - iec104_pts_cov_check(&cov); - CHECK((cov.yc_changed & 0x0001u) == 0u, "TC-IEC104-027 crossing arms only (2-point)"); - iec104_pts_cov_check(&cov); - CHECK((cov.yc_changed & 0x0001u) != 0u, "TC-IEC104-027 second consecutive crossing confirms"); - s_f_yc[0] = 101.4f; /* 新基准 100.6 起 d=0.8 第 1 越 */ - iec104_pts_cov_check(&cov); - CHECK((cov.yc_changed & 0x0001u) == 0u, "TC-IEC104-027 pullback test step 1 armed"); - s_f_yc[0] = 100.8f; /* 回摆入死区 -> 撤销候选 */ - iec104_pts_cov_check(&cov); - s_f_yc[0] = 101.4f; /* 重新起算:单点不报 */ - iec104_pts_cov_check(&cov); - CHECK((cov.yc_changed & 0x0001u) == 0u, "TC-IEC104-027 pullback cleared pending count"); - iec104_pts_cov_check(&cov); - CHECK((cov.yc_changed & 0x0001u) != 0u, "TC-IEC104-027 two fresh crossings confirm again"); - - /* 壳语义钉(lead 裁⑤):iec104_pts_yc_set_deadband 成功须清零该点半截确认 - * 计数——若不清,下面第一拍就凑满 2 点直发,与"跨档位重新起算"矛盾 */ - s_f_yc[0] = 100.0f; /* rep=101.4 起 d=1.4 > 0.5:第 1 越挂起 */ - iec104_pts_cov_check(&cov); - CHECK((cov.yc_changed & 0x0001u) == 0u, "TC-IEC104-027 shell pin arms first"); - iec104_pts_yc_set_deadband(0u, 0.4f); - s_f_yc[0] = 100.5f; /* d=0.9 > 0.4:计数已清则仍只是第 1 越 */ - iec104_pts_cov_check(&cov); - CHECK((cov.yc_changed & 0x0001u) == 0u, "TC-IEC104-027 shell clears pending count"); - iec104_pts_cov_check(&cov); /* 新档连续第 2 越 → 确认 */ - CHECK((cov.yc_changed & 0x0001u) != 0u, "TC-IEC104-027 reconfirms after shell clear"); -} - -static void tc_cov_qds_seq(void) -{ - iec104_pts_cov_t cov; - - reset_all(1000u); /* 假源段:品质翻转 */ - s_f_yc[1] = 50.0f; - iec104_pts_cov_check(&cov); - s_f_yc_rc[1] = -1; - iec104_pts_cov_check(&cov); - CHECK((cov.yc_changed & 0x0002u) != 0u, "TC-IEC104-028 valid->IV reported at once"); - iec104_pts_cov_check(&cov); - CHECK((cov.yc_changed & 0x0002u) == 0u, "TC-IEC104-028 IV steady state not repeated"); - s_f_yc_rc[1] = 0; - iec104_pts_cov_check(&cov); - CHECK((cov.yc_changed & 0x0002u) != 0u, "TC-IEC104-028 IV->valid recovery reported at once"); - - iec104_pts_init(); /* 板端段:seq 去重 */ - iec104_pts_bind_src(NULL); - (void)phasor_init(); - (void)meas_init(); - snap_beats(20, 100.0, 0); - snap_pub(200u, 0u); /* seq=1 */ - iec104_pts_cov_check(&cov); /* 建线帧 */ - CHECK(cov.yc_changed == 0u, "TC-IEC104-028 baseline frame silent"); - snap_beats(20, 200.0, 0); - snap_pub(400u, 0u); /* seq=2:第 1 越点 */ - iec104_pts_cov_check(&cov); - CHECK((cov.yc_changed & 0x0001u) == 0u, "TC-IEC104-028 one new frame arms only"); - iec104_pts_cov_check(&cov); - iec104_pts_cov_check(&cov); /* 无换帧:不得计为第 2 点 */ - CHECK((cov.yc_changed & 0x0001u) == 0u, "TC-IEC104-028 same frame never counts twice"); - snap_beats(20, 200.0, 0); - snap_pub(600u, 0u); /* seq=3:连续第 2 越点 */ - iec104_pts_cov_check(&cov); - CHECK((cov.yc_changed & 0x0001u) != 0u, "TC-IEC104-028 second new frame confirms"); - snap_pub(800u, 0xE6u); /* 换帧仅变品质(削顶注入) */ - iec104_pts_cov_check(&cov); - CHECK((cov.yc_changed & 0x00E6u) == 0x00E6u, - "TC-IEC104-028 clipped flip per frame reported as a set"); -} - -/* 运行参数段:0x8020~0x8058 读写路由(板端默认源,run_par 表先 / prot_set 后) */ -static void tc_pts_rpar_route(void) -{ - float v; - - reset_all(1000u); - iec104_pts_bind_src(NULL); - CHECK((iec104_pts_set_read(0x8030u, &v) == 0) && (fabsf(v - 0.5f) < 1e-4f), - "TC-IEC104-029 0x8030 deadband UA reads factory default"); - CHECK((iec104_pts_set_read(0x8038u, &v) == 0) && (fabsf(v - 0.5f) < 1e-4f), - "TC-IEC104-029 0x8038 deadband freq reads factory 0.5 Hz"); - /* 0x8027~0x802A = prot_set 告警段(欠压默认 20 V)——run_par 精确匹配 - * 永不覆盖;路由顺序的直接证据 */ - CHECK((iec104_pts_set_read(0x8027u, &v) == 0) && (fabsf(v - 20.0f) < 0.01f), - "TC-IEC104-029 0x8027 still served by prot_set table"); - CHECK(iec104_pts_set_read(0x8039u, &v) == -1, "TC-IEC104-029 gap address unknown"); - /* C_SE 两段式:选择段校验不提交,执行段落真源 */ - CHECK((iec104_pts_set_write(0x8031u, 0.7f, 1u) == 0) - && (fabsf(iec104_pts_yc_deadband(1u) - 0.5f) < 1e-4f), - "TC-IEC104-029 select phase validates without commit"); - CHECK((iec104_pts_set_write(0x8031u, 0.7f, 0u) == 0) - && (fabsf(iec104_pts_yc_deadband(1u) - 0.7f) < 1e-4f) - && (run_par_dirty_peek() != 0u), - "TC-IEC104-029 execute commits and marks dirty"); - CHECK(iec104_pts_set_write(0x8031u, 51.0f, 1u) == -1, - "TC-IEC104-029 over-range rejected in select"); - /* k/b 覆盖直通 adc_cal(UA 合法带 = ROM x[0.5,2.0] = [76.29,305.17]) */ - CHECK((iec104_pts_set_write(0x8040u, 300.0f, 0u) == 0) - && (fabsf(adc_cal_k_uv(ADC_SEM_UA) - 300.0f) < 0.01f), - "TC-IEC104-029 k override lands in adc_cal"); - CHECK(iec104_pts_set_write(0x8040u, 400.0f, 0u) == -1, - "TC-IEC104-029 k band reject (via adc_cal)"); - CHECK((iec104_pts_set_write(0x8048u, -5.0f, 0u) == 0) - && (fabsf(adc_cal_b_codes(ADC_SEM_UA) + 5.0f) < 1e-3f) - && (fabsf(adc_cal_k_uv(ADC_SEM_UA) - 300.0f) < 0.01f), - "TC-IEC104-029 b single-side write keeps k (RMW)"); - CHECK((iec104_pts_set_read(0x8048u, &v) == 0) && (fabsf(v + 5.0f) < 1e-3f), - "TC-IEC104-029 b echo via run_par read path"); - run_par_init(); /* 收尾:把 k/b 脏与副本复位留给后续 TC 的干净出厂态 */ -} - -/* ===================== 道G task-8:[comm] 段 ===================== - * 真实 cfg 引擎(上方已 #include cfg_file.c)+ 运行参数段的 RAM 虚拟盘。 - * 白盒清理 = cfg_file_test 同款(生产静态无公开复位接口,白盒单测可接受)。 - * ⚠ tc_comm 必须排在 main 末位:comm_reg_reset 会清空**整张**段注册表。 */ -static void comm_reg_reset(void) -{ - (void)memset(s_sections, 0, sizeof(s_sections)); - (void)memset(&s_base, 0, sizeof(s_base)); - (void)memset(&s_last, 0, sizeof(s_last)); - s_stable = 0u; - s_base_valid = 0u; - (void)memset(s_snap, 0, sizeof(s_snap)); - (void)memset(s_sec_hdr, 0, sizeof(s_sec_hdr)); - (void)memset(s_key_line, 0, sizeof(s_key_line)); - rp_s_vfs_exists = 0; - rp_s_vfs_len = 0u; -} - -/* 向 RAM 虚拟盘放一份 config.ini(mtime 令牌 +1 = 外部写盘语义) */ -static void comm_put(const char *text) -{ - size_t n = strlen(text); - - (void)memcpy(rp_s_vfs, text, n); - rp_s_vfs_len = n; - rp_s_vfs_exists = 1; - rp_s_vfs_mtime++; -} - -/* 虚拟盘前 n 字节取成 C 串(断言模板/文件内容用) */ -static const char *comm_vfs_head(size_t n) -{ - static char buf[1024]; - - if (n > rp_s_vfs_len) { - n = rp_s_vfs_len; - } - if (n > sizeof(buf) - 1u) { - n = sizeof(buf) - 1u; - } - (void)memcpy(buf, rp_s_vfs, n); - buf[n] = '\0'; - return buf; -} - -static void tc_comm(void) -{ - cap_t c; - uint8_t a[24]; - uint16_t m; - uint32_t now = 1000u; - static iec104_link_cfg_t comm_cfg; /* 生命周期覆盖整链(link 存指针) */ - - /* ---- TC-IEC104-031:注册 / 出厂模板 / poll 沉降重载 ---- */ - printf("[TC-IEC104-031] [comm] register + factory template + settle reload\n"); - comm_reg_reset(); - CHECK(iec104_comm_init() == 0, "TC-IEC104-031 [comm] registers into engine"); - CHECK((iec104_comm_ca() == IEC104_COMM_DEF_CA) - && (iec104_comm_port() == IEC104_COMM_DEF_PORT), - "TC-IEC104-031 factory defaults before any file (ca=1 port=2404)"); - CHECK(cfg_file_load() == 0, "TC-IEC104-031 load without file falls back to defaults"); - CHECK(rp_s_vfs_exists == 1, "TC-IEC104-031 load generates factory template"); - /* 容量钉:本套单 comm 段模板必须远小于 4096(生产 6 段全量估算 ~1.3 KB, - * 见 docs/子系统设计/配置文件设计.md;上限被顶 = 文件判损坏重建) */ - CHECK(rp_s_vfs_len <= 1024u, "TC-IEC104-031 single-comm template well under 4096 cap"); - CHECK(strstr(comm_vfs_head(1023u), "[comm]") != NULL, "TC-IEC104-031 template carries [comm]"); - CHECK(strstr(comm_vfs_head(1023u), "ca=1") != NULL, "TC-IEC104-031 template writes ca default"); - CHECK(strstr(comm_vfs_head(1023u), "port=2404") != NULL, "TC-IEC104-031 template writes port default"); - cfg_file_poll(); /* 基线 = 出厂模板(首 poll 只建基线,cfg_file.c:1318) */ - comm_put("[comm]\r\nca=7\r\nport=8104\r\n"); /* 外部写盘:内容变 + 令牌变 */ - cfg_file_poll(); /* 检出变更(沉降 1) */ - cfg_file_poll(); /* 稳定确认(沉降 2)-> 重载 */ - CHECK((iec104_comm_ca() == 7u) && (iec104_comm_port() == 8104u), - "TC-IEC104-031 edited file reload moves both getters"); - - /* ---- TC-IEC104-032:带外自愈 + setter 守卫 ---- */ - printf("[TC-IEC104-032] [comm] out-of-band self-heal + setter guards\n"); - comm_put("[comm]\r\nca=0\r\nport=80\r\n"); - cfg_file_poll(); - cfg_file_poll(); - CHECK((s_comm.ca == 0u) && (s_comm.port == 80u), - "TC-IEC104-032 raw out-of-band values land verbatim in RAM copy"); - CHECK((iec104_comm_ca() == IEC104_COMM_DEF_CA) - && (iec104_comm_port() == IEC104_COMM_DEF_PORT), - "TC-IEC104-032 getters self-heal to factory defaults (adc_cal band precedent)"); - CHECK(iec104_comm_ca_set(0u) == -1, "TC-IEC104-032 ca=0 rejected by setter"); - CHECK(iec104_comm_ca() == IEC104_COMM_DEF_CA, "TC-IEC104-032 rejected write does not commit"); - CHECK(iec104_comm_port_set(1023u) == -1, "TC-IEC104-032 reserved-band port rejected"); - CHECK((iec104_comm_port_set(IEC104_COMM_PORT_MIN) == 0) - && (iec104_comm_port() == IEC104_COMM_PORT_MIN), - "TC-IEC104-032 band edge 1024 accepted"); - CHECK((iec104_comm_ca_set(IEC104_COMM_CA_MAX) == 0) - && (iec104_comm_ca() == IEC104_COMM_CA_MAX), - "TC-IEC104-032 ca band edge 65535 accepted"); - CHECK(iec104_comm_init() == -1, "TC-IEC104-032 re-init is idempotent-reject (dup name)"); - CHECK((iec104_comm_ca() == IEC104_COMM_DEF_CA) - && (iec104_comm_port() == IEC104_COMM_DEF_PORT), - "TC-IEC104-032 re-init still resets RAM copy to factory defaults"); - - /* ---- TC-IEC104-033:ca 端到端(消费真源 = [comm],旧写死 1 变错地址) ---- */ - printf("[TC-IEC104-033] comm ca reaches the 104 wire\n"); - reset_all(now); /* 复位假源/链路(g_cfg ca=1) */ - (void)iec104_comm_ca_set(7u); - comm_cfg.ca = iec104_comm_ca(); /* 板端 s_apply_comm_ca() 的同款动作 */ - comm_cfg.send_apdu = cap_send; - comm_cfg.clock_sync = f_clock; - comm_cfg.epoch_ms = f_epoch; - iec104_link_init(&g_lk, &comm_cfg, NULL); - iec104_link_open(&g_lk, now); - m_reset(); - handshake(now); - m = iec104_asdu_put_hdr(a, IEC104_T_C_RD_NA_1, 1u, IEC104_COT_REQ, 0u, 7u); - iec104_put_ioa(&a[m], 0x4011u); - m += 3u; - feed_i(a, m, now); - CHECK((cap_i(0, &c) == 0) && (c.type == 13u) && (c.cot == IEC104_COT_REQ) - && (c.ca == 7u), - "TC-IEC104-033 C_RD accepted at comm ca, TX header echoes comm ca"); - m = iec104_asdu_put_hdr(a, IEC104_T_C_RD_NA_1, 1u, IEC104_COT_REQ, 0u, 1u); - iec104_put_ioa(&a[m], 0x4011u); - m += 3u; - feed_i(a, m, now); - CHECK((cap_i(1, &c) == 0) && (c.cot == IEC104_COT_UNK_CA) && ((c.oa & 0x80u) != 0u), - "TC-IEC104-033 the retired hardwired ca=1 now answers COT13+EVI"); - (void)iec104_comm_ca_set(IEC104_COMM_DEF_CA); /* 收尾:复位出厂 ca */ - (void)iec104_comm_port_set(IEC104_COMM_DEF_PORT); - - /* ===== TC-IEC104-034 [comm] 落盘脏位与 store_save(道G task-9,页面链前置)===== - * 契约 = iec104_comm.h 的两个新出口:setter 成功置脏 / store_save 成功清脏 / - * 无脏空转返 0 / 带外拒不置脏。defaultTask 每轮无条件调 store_save(挂载点 - * 在 App/task/default_task.c,run_par_store_save 同点位),屏上 WAIT/OK 全看 - * 这枚脏位——脏位错 = 通讯页保存行说谎,这是本条用例钉的东西。 - * 编号 034 = 向 Lead 申请发号(cursor_owner_only),cursor 现 033。 */ - printf("[TC-IEC104-034] comm dirty bit drives the store_save cycle\n"); - CHECK(iec104_comm_dirty_peek() == 1u, - "TC-IEC104-034 successful setters leave the section dirty"); - CHECK((iec104_comm_store_save() == 0) && (iec104_comm_dirty_peek() == 0u), - "TC-IEC104-034 store_save clears dirty only on write success"); - CHECK((strstr(comm_vfs_head(rp_s_vfs_len), "ca=1") != NULL) && - (strstr(comm_vfs_head(rp_s_vfs_len), "port=2404") != NULL), - "TC-IEC104-034 the saved file carries the committed values"); - CHECK((iec104_comm_store_save() == 0) && (iec104_comm_dirty_peek() == 0u), - "TC-IEC104-034 a save with no dirty is a silent no-op (poll cost)"); - CHECK((iec104_comm_ca_set(0u) == -1) && (iec104_comm_dirty_peek() == 0u) && - (iec104_comm_ca() == IEC104_COMM_DEF_CA), - "TC-IEC104-034 out-of-band reject neither dirties nor moves the copy"); -} - - -int main(void) -{ - printf("=== IEC104 Protocol Stack Host Tests ===\n"); - tc_cp56(); - tc_ioa_float(); - tc_apci(); - tc_startdt(); - tc_open_ignore(); - tc_interrogation(); - tc_cov_yx(); - tc_cov_yc(); - tc_k_window(); - tc_w_thresh(); - tc_t2(); - tc_t3_t1(); - tc_dc(); - tc_dc_yk12(); - tc_yk_records(); - tc_se(); - tc_rd(); - tc_cs(); - tc_err_resp(); - tc_stopdt(); - tc_seq_err(); - tc_pts(); - tc_ts_rp(); - tc_periodic(); - tc_cov_kfull(); - tc_pts_snap(); - tc_pts_freq(); - tc_db_runtime(); - tc_cov_qds_seq(); - tc_pts_rpar_route(); - tc_comm(); - printf("=== IEC104 Tests: %d/%d PASSED (failed=%d) ===\n", - s_passed, s_total, s_failed); - return (s_failed == 0) ? 0 : 1; -} diff --git a/test/host/iec104/run_unit_test.py b/test/host/iec104/run_unit_test.py deleted file mode 100644 index 3bfddf80..00000000 --- a/test/host/iec104/run_unit_test.py +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -"""IEC 60870-5-104 被控站协议栈(B4)主机侧纯逻辑单元测试运行器(纯标准库)。 - -做什么:用本机 MSVC 离线编译 test/host/iec104/iec104_test.c(#include 纳入 - 生产源文件 iec104_asdu.c + iec104_pts.c + iec104_link.c,及数据源链接 - 依赖 prot_set.c + prot_elm.c + phasor.c + sample_ring.c + freq.c + - meas.c,运行参数段起再 + cfg_file.c + adc_cal.c + run_par.c 真链),验证 - APCI 重组 / STARTDT 握手 / 总召分片 / COV / k-w-t1~t3 / 遥控与定值两段式 / - C_RD / C_CS / 错误应答(EVI)。 - -用法(仓库根目录): - & '.venv\\Scripts\\python.exe' test/host/iec104/run_unit_test.py - -退出码:0=PASS / 1=测试失败 / 2=环境错误。 - -设计依据:docs/子系统设计/IEC104上行设计说明.md §7(测试方案)。 -创建日期:2026-10-12 -""" -import os -import sys - -HERE = os.path.dirname(os.path.abspath(__file__)) -ROOT = os.path.dirname(os.path.dirname(os.path.dirname(HERE))) -sys.path.insert(0, os.path.join(ROOT, "test", "host", "common")) - -from unit_test_harness import TestBuild, run_host_unit_test # noqa: E402 - -BUILD = TestBuild( - name="IEC104 Tests", - src=os.path.join(HERE, "iec104_test.c"), - # 运行参数段起 stub 先于生产目录(dbg_log.h → 计数宏桩);App/cfg + App/log - # 真头供 cfg_file.h / cfg_file_store.h / sys_log.h;adc_input_desc / - # syslog_post / cfg_store_* 由测试单元给强符号桩(同 adc_cal 套件先例)。 - include_dirs=[ - os.path.join(HERE, "stub"), - os.path.join(ROOT, "App", "algo"), - os.path.join(ROOT, "App", "cfg"), - os.path.join(ROOT, "App", "log"), - os.path.join(ROOT, "App", "protocol", "iec104"), - HERE, - ], - summary_marker="=== IEC104 Tests:", -) - -if __name__ == "__main__": - sys.exit(run_host_unit_test(BUILD)) diff --git a/test/host/iec104_dtu/MATRIX.md b/test/host/iec104_dtu/MATRIX.md index 3545d1ec..f0ef2dca 100644 --- a/test/host/iec104_dtu/MATRIX.md +++ b/test/host/iec104_dtu/MATRIX.md @@ -19,7 +19,7 @@ Read-only reference: `IEC60870-Slave/examples/iec104_dtu_profile.h`, `iec104_exa Measured status: `ci-artifacts/iec104-tests/tcp-final/report.json` records 11/11 PASS on the frozen `lvgl_sim.exe` SHA256 `d2285bbc68ce4353c814dbcc455a2083b56e81fc54bf88081402e821c6a92833`. Exact GI225 includes parameter value/QPM checks; CI8 uses original default Type206; Read121 checks zero/IV or SB plus CP56 legality; remote345 compares independent original typed defaults. The run includes area changes, preset/read unchanged/commit/read changed/cancel, disconnected stage invalidation, committed RAM retained across TCP reconnect, UInt16777217 precision, unknown/unconfigured addresses, malformed typed values, APDU255, split/coalesced streams, causal SBO state/feedback and rejected-command invariance, full device time and progression, unchanged host clock, and 30-second monotonic SBO expiry. Normal pre-START TESTFR and illegal pre-START I-frame close are distinct assertions. Source/transport/core probes record 10/10 PASS in `transport-final/report.json`; these are separately linked migrated production sources, not old-library binaries. -Remaining unverified: malformed GI CA/IOA/QOI combinations; inbound APDU overlimit close; wrong TLV declared length on product TCP; every one of the 65 command entries and default-disabled extension permissions; nonzero measurement deadband reference stability; Spontaneous negative time_kind; injected Close/Destroy/GetStatus cleanup failures (no supported fixture injection); atomic platform apply rejection after validation; mapped-UShort callback overflow/fraction (no reachable mapped UShort entry). TCP tests terminate the process, so normal finite-deadline shutdown and UI are separately owned simulator evidence. The 11-case TCP suite is not an assertion that all commands/features were exhaustively tested. Diagnostic aliases150 are deliberately excluded by Lead scope decision and must return unknown rather than fabricated zero success. +Remaining unverified: malformed GI CA/IOA/QOI combinations; inbound APDU overlimit close; wrong TLV declared length on product TCP; every one of the 65 command entries and default-disabled extension permissions; nonzero measurement deadband reference stability; Spontaneous negative time_kind; injected Close/Destroy/GetStatus cleanup failures (no supported fixture injection); atomic platform apply rejection after validation; mapped-UShort callback overflow/fraction (no reachable mapped UShort entry). Type 110/111/112 LOAD is now covered (`test_standard_parameter_load_110_111_112`: accept per type, KPA mismatch, type mismatch, unknown IOA/CA/COT, per-group range, NaN, TEST bit, single-GI readback, restore) and Type 113 activation is covered (`test_standard_parameter_activation_113`: QPA=3 activate/deactivate, QPA=1/2 refusal while their config extensions stay off, IOA!=0 refusal, TEST bit, COT 45/46). What remains unverified there: QPA=1/QPA=2 positive paths (require `IEC104_PARAMETER_EXT_QPA_LOADED`/`_OBJECT` to be enabled, which this build does not do), the two-phase PREPARE/COMMIT apply-on-ACK flow, and periodic-scan output after QPA=3 activation. TCP tests terminate the process, so normal finite-deadline shutdown and UI are separately owned simulator evidence. The TCP suite (11 cases in the frozen snapshot above, 13 as of 2026-11-18) is not an assertion that all commands/features were exhaustively tested. Diagnostic aliases150 are deliberately excluded by Lead scope decision and must return unknown rather than fabricated zero success. Initialization contract frozen by Lead after data/core review: observations are zero with IV; step/bit simulation is zero with SB. Parameters are configuration, not sampled observations: preserve original legal typed defaults and read-only mappings. This is the chosen integration contract, not a quotation of the original user wording. Committed values survive ordinary TCP reconnect in RAM; reconnect discards selections/stages; explicit service initialization restores defaults; no persistence is claimed. @@ -58,7 +58,7 @@ python -B test/host/iec104_dtu/run_transport_test.py --only vendor_boundary --ou TCP requires Python standard library and the final same-UI simulator binary; use a distinct `--port` when tests run concurrently. Transport/probes require MSVC x64 and Windows SDK, discovered by existing `test/host/common/unit_test_harness.py::locate_toolchain` (standard VS installation directories, no `vcvars` or `vswhere` invocation). Explicit `DTU_MSVC_CL` and `DTU_WINDOWS_KITS_ROOT` overrides obey that shared harness contract. Compiler path, command, source SHA256 and per-fixture build/run logs are retained. `/W3 /WX /std:c11 /utf-8` are used without warning suppression. Idle upstream fixture has a checked size_t-to-uint32 conversion in its generated artifact copy; report preserves upstream and adapted hashes. Original library and old host tests are not edited. Preserved legacy runners were actually executed: IEC104179/179 and IEC104 SERV37/37 PASS, combined command exit0; summary `ci-artifacts/iec104-tests/legacy-regression.txt` records existing compiler warnings, so this is not a zero-warning legacy-build claim. -The self-test runner only tests the independent decoder/oracle (7 tests), not product acceptance. Existing total host discovery sees `run_unit_test.py`; real TCP and MSVC transport runners are explicit acceptance entrypoints, NOT yet registered as automatic CI coverage gates. New firmware registration/Keil build and existing host coverage gates are separately owned; this file does not claim CI/coverage/dual-target registration passed. No old tests were deleted to hide regressions. +The self-test runner only tests the independent decoder/oracle (7 tests), not product acceptance. Existing total host discovery sees `run_unit_test.py`. As of 2026-11-18 the real TCP runner IS registered as an automatic coverage gate: `.pre-commit-config.yaml` declares hook `iec104-tcp` (`stages: [manual]`, entry = the repo's gate launcher `gate_python.py` followed by `check_iec104_tcp.py`, `pass_filenames: false`), which builds `lvgl_sim.exe` incrementally, runs `run_tcp_test.py`, and writes `ci-artifacts/iec104-tests/tcp-gate/{report.json,wire.json,objects.json,simulator.log}`. Verified by a genuine run: `pre-commit run --all-files --hook-stage manual iec104-tcp` -> `Passed`, wall clock 16.8 s, report recorded 11/11 PASS at that time; as of 2026-11-18 the suite is 13 cases (`test_standard_parameter_load_110_111_112`, `test_standard_parameter_activation_113` added) and a full run gives 13/13, canonical evidence `ci-artifacts/iec104-tests/s5/report.json`. Three limits are stated rather than hidden: (1) it is a manual-stage hook, so `git commit` does not run it - the local sweep is `scripts/ci_local.py` and the remote CI's manual stage; (2) the remote CI (`.gitea/workflows/ci.yml`) does NOT build the simulator, so it deliberately omits this hook from its `$hooks` list - the gate only ever runs on a developer machine that has `simulator/build/Debug/lvgl_sim.exe`; (3) the hook builds through `build_sim.bat`, i.e. VENDOR DEFAULT capacities (RX 2048 / HIGH 1024 / NORMAL 4096 / RECORD 32 / EVENT 68), so it does NOT exercise the P6a tier the firmware actually ships (RX 256 / HIGH 288 / NORMAL 272 / RECORD 4 / EVENT 11); the P6a evidence is a separate build via `ci-artifacts/iec104-cutover/build_sim_p6a.ps1` plus the same runner, and the two must not be quoted for each other. The MSVC transport runner remains an explicit acceptance entrypoint only (recorded in `transport-final/report.json`), not a hook. New firmware registration/Keil build and existing host coverage gates are separately owned; this file does not claim CI/coverage/dual-target registration passed. No old tests were deleted to hide regressions. Oracle corrections retained with failures: QPM is `{1,3,4,2}` from original enum, not group+1; original CI defaults to Type206, not15; pre-START I-frame is FATAL close per original Link; wrong-IOA EXEC does not clear a prior selection, so reselecting without cancellation invokes duplicate-select rejection. The genuine product Read Type1/3 compatibility defect was separately repaired to Type30/31 CP56 before the final binary. Earlier failing snapshots remain in artifacts. diff --git a/test/host/iec104_dtu/run_tcp_test.py b/test/host/iec104_dtu/run_tcp_test.py index 87efec24..caf3698b 100644 --- a/test/host/iec104_dtu/run_tcp_test.py +++ b/test/host/iec104_dtu/run_tcp_test.py @@ -5,10 +5,12 @@ import hashlib import json import math from pathlib import Path +import re import socket import struct import subprocess import tempfile +import threading import time import traceback @@ -241,52 +243,61 @@ class Acceptance: def position(self): return tuple(self.read(ioa)["value"] for ioa in (0x1001, 0x0011, 0x0028)) - def execute_with_feedback(self, value): - before = self.position() - self.command(value, select=True) - assert self.position() == before, "selection acted" - start = len(self.client.asdus) - self.command(value) - self.client.receive(lambda d: header(d)["type"] == 46 and header(d)["cot"] == 10) - frames = self.client.asdus[start:] - rows = [r for d in frames if header(d)["type"] in (1, 3, 30, 31) for r in objects(d)] - self.decoded.extend(rows) - expected = (value, int(value == 2), int(value == 1)) - assert before != expected, "test must request a real state transition" - assert self.position() == expected - for ioa, result in zip((0x1001, 0x0011, 0x0028), expected): - assert any(r["ioa"] == ioa and r["value"] == result and r["quality"] == 32 for r in rows), ("missing simulated feedback", ioa, rows) + def denied(self, value, select=False, ioa=0x6002): + """A refused command is answered COT 7 with P/N=1 and leaves the state alone.""" + data = self.command(value, select=select, ioa=ioa, pn=True) + assert header(data)["cot"] == 7, ("refusal must echo COT 7", data.hex()) + return data - def test_sbo_order_feedback_and_reconnect(self): + def expect_no_completion(self, seconds=0.3): + """A refused command must not be followed by ACT_TERM (COT 10) nor return info (COT 11).""" + start = len(self.client.asdus) + deadline = time.monotonic() + seconds + try: + while time.monotonic() < deadline: + self.client.frame(deadline) + except (socket.timeout, TimeoutError): + pass + for data in self.client.asdus[start:]: + h = header(data) + assert not (h["type"] == 46 and h["cot"] == 10), ("unexpected ACT_TERM", data.hex()) + assert h["cot"] != 11, ("unexpected return info", data.hex()) + + def test_sbo_order_and_refusal_semantics(self): + """Every command is refused in the skeleton build: COT 7 + P/N=1, state untouched. + + The DTU command table still declares SELECT_EXECUTE points and the vendor module + still enforces SBO ordering and address checking; those paths are exercised here + through the refusal branch (COT 46 for a wrong common address, P/N=1 everywhere), + but no command may ever reach COT 10 (ACT_TERM) or COT 11 (return info). + """ initial = self.position() - self.command(2, pn=True) + self.denied(2) assert self.position() == initial - self.command(2, select=True) - self.command(1, pn=True) + self.denied(2, select=True) assert self.position() == initial - self.command(2, select=True) - self.command(2, ioa=0x6004, pn=True) + self.denied(1) assert self.position() == initial - self.connect() # Wrong-IOA EXEC does not cancel the original selection. - self.execute_with_feedback(1 if initial[0] == 2 else 2) - after = self.position() - self.command(after[0], pn=True) - assert self.position() == after - opposite = 1 if after[0] == 2 else 2 - self.command(opposite, select=True) - self.connect() - self.command(opposite, pn=True) - assert self.position() == after, "old connection selection survived" - self.client.request(asdu(46, u24(0x6002) + bytes((opposite | 128,)), ca=2)) + self.connect() # Reconnect must not turn a refused command into an accepted one. + self.denied(1, select=True) + self.denied(1) + assert self.position() == initial + # A wrong common address is still rejected by the command module as UNKNOWN_IOA. + self.client.request(asdu(46, u24(0x6002) + bytes((2 | 128,)), ca=2)) reply, _ = self.client.receive(lambda d: header(d)["type"] == 46) assert header(reply)["cot"] == 46 and header(reply)["pn"] - self.command(opposite, pn=True) - assert self.position() == after, "wrong CA acted or selected" - self.execute_with_feedback(opposite) + # Direct-execute step and setpoint points take the same refusal path. + self.denied(1, ioa=0x6101) + self.denied(1, ioa=0x6301) + assert self.position() == initial + self.expect_no_completion() + self.denied(2) + self.expect_no_completion() - def test_clock_is_device_only_and_sbo_is_monotonic(self): + def test_clock_is_device_only_and_no_command_completes(self): host_delta = time.time() - time.monotonic() - self.command(2, select=True) + initial = self.position() + self.denied(2, select=True) # Year2035 is deliberately far from the host clock; no OS clock API is used. stamp = struct.pack("= 100). + + Cost note (measured 2026-11-18, must be respected when editing this test): + one full GI here is ~126 I-frames / ~3.9 s wall clock, because the 120 + standard parameter rows cannot be coalesced - they span types 110/111/112 + and each ASDU carries exactly one object. Call this only as often as the + assertion genuinely needs; every extra call costs ~4 s in the manual gate. + """ + self.client.request(asdu(100, u24(0) + b"\x14")) + self.client.response(100, 7) + rows = [] + while True: + data, _ = self.client.receive(lambda d: header(d)["cot"] in (20, 10)) + if header(data)["type"] == 100: + assert header(data)["cot"] == 10 + break + rows.extend(objects(data)) + self.decoded.extend(rows) + return {row["ioa"]: row for row in rows if row["type"] >= 100} + + def param_load(self, type_id, ioa, value, kpa, test=False, cot=6): + payload = struct.pack("=4 is type 110, else 111 + # group 1 (0x8621..): kind LOW_LIMIT(3), type 111 + # group 2 (0x8641..): kind HIGH_LIMIT(4), type 111 + # group 3 (0x8661..): kind SMOOTHING(2), type 112 + before = self.standard_params() + assert before[0x8601]["type"] == 111 and before[0x8601]["value"] == 200 + assert before[0x8605]["type"] == 110 and before[0x8605]["value"] == 655 + assert before[0x8661]["type"] == 112 and before[0x8661]["value"] == 0.0 + + # --- accepted LOADs, one per type ------------------------------------- + data, h = self.param_load(110, 0x8605, 700, 1) + assert h["cot"] == 7 and not h["pn"], ("110 LOAD must be accepted", data.hex()) + assert objects(data)[0]["value"] == 700, "positive CON must carry the stored value" + data, h = self.param_load(111, 0x8621, -9999, 3) + assert h["cot"] == 7 and not h["pn"], ("111 LOAD must be accepted", data.hex()) + data, h = self.param_load(112, 0x8661, 12.5, 2) + assert h["cot"] == 7 and not h["pn"], ("112 LOAD must be accepted", data.hex()) + + # --- rejection: unknown IOA / unknown CA / unknown COT ---------------- + # These use the standard error causes and echo the request bytes verbatim, + # because no point row matched so no running value could be frozen. + data, h = self.param_load(111, 0x9999, -5, 1) + assert h["cot"] == 47 and h["pn"], ("unknown IOA -> COT 47", data.hex()) + data, h = self.param_load(111, 0x8601, -5, 1, cot=3) + assert h["cot"] == 45 and h["pn"], ("unknown COT -> COT 45", data.hex()) + + # --- rejection: KPA (kind) must match the row ------------------------- + data, h = self.param_load(111, 0x8601, -5, 3) + assert h["cot"] == 7 and h["pn"], ("kind mismatch must be a negative CON", data.hex()) + assert objects(data)[0]["value"] == -5, \ + "address matched but kind did not, so no running value was frozen: reply echoes the request" + + # --- rejection: type id must match the row ---------------------------- + data, h = self.param_load(110, 0x8601, -5, 1) + assert h["cot"] == 7 and h["pn"], ("type mismatch must be a negative CON", data.hex()) + assert objects(data)[0]["value"] == -5, "type mismatch likewise echoes the request" + + # --- rejection: range/content per group ------------------------------- + # group 0 requires a non-negative value, so -1 is refused on a 110 row. + # NOTE the contrast with the two cases above: the row DID match here, so + # the module froze the running value and the negative CON carries 700 + # (the current value), not the refused request value. Getting this + # backwards is the easiest way to write a test that passes for the wrong + # reason, so both shapes are asserted explicitly. + data, h = self.param_load(110, 0x8605, -1, 1) + assert h["cot"] == 7 and h["pn"], ("negative on unsigned-style row must be refused", data.hex()) + assert objects(data)[0]["value"] == 700, \ + "row matched so the running value is frozen: negative CON carries the CURRENT value, not the request" + data, h = self.param_load(111, 0x8621, -10001, 3) # below LOW_LIMIT's own floor + assert h["cot"] == 7 and h["pn"], "below low limit must be refused" + data, h = self.param_load(111, 0x8641, 10001, 4) # above HIGH_LIMIT's own ceiling + assert h["cot"] == 7 and h["pn"], "above high limit must be refused" + data, h = self.param_load(112, 0x8661, 61.0, 2) # smoothing is 0..60 s + assert h["cot"] == 7 and h["pn"], "float above 60 must be refused" + data, h = self.param_load(112, 0x8661, float("nan"), 2) + assert h["cot"] == 7 and h["pn"], "NaN must be refused before it can poison the store" + + # --- TEST bit: accepted, but must not mutate -------------------------- + data, h = self.param_load(111, 0x8621, -100, 3, test=True) + assert h["cot"] == 7 and not h["pn"], ("TEST LOAD must be accepted", data.hex()) + + # --- ONE readback verifies everything above at once ------------------- + # Single GI, deliberately: each call costs ~4 s (see standard_params). + # It must show the three accepted values, prove the six refusals and the + # TEST request moved nothing, and prove an untouched row stayed put. + after = self.standard_params() + assert after[0x8605]["value"] == 700, "110 LOAD did not reach the value store" + assert after[0x8621]["value"] == -9999, "111 LOAD did not reach the value store, or a refusal/TEST leaked" + assert after[0x8661]["value"] == 12.5, "112 LOAD did not reach the value store, or a refusal leaked" + assert after[0x8601]["value"] == 200, "untouched row must not move" + assert after[0x8641]["value"] == 10000, "high-limit row was mutated by a refusal" + assert after[0x8622]["value"] == -10000, "TEST LOAD mutated a sibling row in its group" + + # --- restore so the run is repeatable --------------------------------- + for type_id, ioa, value, kpa in ((110, 0x8605, 655, 1), (111, 0x8621, -10000, 3), + (112, 0x8661, 0.0, 2)): + data, h = self.param_load(type_id, ioa, value, kpa) + assert h["cot"] == 7 and not h["pn"], ("restore failed", data.hex()) + # A second GI is the only way to prove the restore actually landed; it is + # worth the ~4 s because a silent restore failure would poison every later + # GI-based test in this suite. + assert self.standard_params() == before, "restore did not return the exact initial snapshot" + + def test_standard_parameter_activation_113(self): + # QPA selects the activation flavour. Only QPA=3 (cyclic transmission) is + # enabled by default; QPA=1/2 are gated behind config extensions that this + # build does not turn on, so they must be refused rather than silently + # accepted. This distinction is the point of the test. + data, h = self.param_activate(0, 3) + assert h["cot"] == 7 and not h["pn"], ("QPA=3 activate must be accepted", data.hex()) + data, h = self.param_activate(0, 3, cot=8) + assert h["cot"] == 9 and not h["pn"], ("QPA=3 deactivate must be confirmed with COT 9", data.hex()) + + # A non-zero IOA with QPA=3 reaches the application, which refuses it + # because periodic transmission is addressed by IOA 0 only. + data, h = self.param_activate(0x1234, 3) + assert h["cot"] == 7 and h["pn"], ("QPA=3 with IOA!=0 must be refused", data.hex()) + + for qpa in (1, 2): + data, h = self.param_activate(0, qpa) + assert h["cot"] == 7 and h["pn"], \ + ("QPA=%d must be refused: its config extension is off" % qpa, data.hex()) + + # TEST bit is accepted and must not alter the schedule. + data, h = self.param_activate(0, 3, test=True) + assert h["cot"] == 7 and not h["pn"], ("TEST activate must be accepted", data.hex()) + + # Error causes. + data, h = self.param_activate(0, 3, cot=3) + assert h["cot"] == 45 and h["pn"], ("unknown COT -> COT 45", data.hex()) + self.client.request(asdu(113, u24(0) + bytes((3,)), ca=9)) + data, _ = self.client.receive(lambda d: header(d)["type"] == 113) + h = header(data) + assert h["cot"] == 46 and h["pn"], ("unknown CA -> COT 46", data.hex()) + + # Leave the periodic scan off so it cannot perturb anything after us. + data, h = self.param_activate(0, 3, cot=8) + assert h["cot"] == 9 and not h["pn"], ("final deactivate failed", data.hex()) + + +READY_PATTERN = re.compile(r"^\[iec104\] READY address=(?P
\S+) port=(?P\d+) ca=(?P\d+) mode=(?P\S+)\s*$") + + +class ReadyWatcher: + """转发模拟器 stdout 到日志文件,并从中取回 READY 行里的实际监听端口。 + + 为什么不靠轮询端口探活(2026-11-18 改): + 1) 探活的每一次 connect 都会被固件当成一次真实接入,白白吃掉一次 accept, + 让 STOP 摘要里的 connections 多算一次,也让单连接模型的会话序列多一段; + 2) 端口固定时探活"成功"只说明有人在这个号上监听,并行构建或端口被别的进程 + 占住时会把真正的失败伪装成通过; + 3) READY 行里的 port 是固件 bind 成功后回报的 bound_port,--iec104-port 0 时 + 这正是唯一能拿到实际端口的途径(simulator/README.md 明确要求读它)。 + 日志必须保留:它带着 START/READY/STOP 摘要,是人工复核的证据面。 + """ + + def __init__(self, log): + self.log = log + self.ready = threading.Event() + self.port = None + self.ca = None + self.address = None + self.mode = None + self.error = None + self._thread = threading.Thread(target=self._pump, name="sim-stdout", daemon=True) + + def start(self, stream): + self._stream = stream + self._thread.start() + + def _pump(self): + try: + for line in self._stream: + self.log.write(line) + self.log.flush() + match = READY_PATTERN.match(line) + if match and not self.ready.is_set(): + self.port = int(match.group("port")) + self.ca = int(match.group("ca")) + self.address = match.group("address") + self.mode = match.group("mode") + self.ready.set() + except Exception as exc: # 读管道失败也要让主线程拿到结论 + self.error = exc + self.ready.set() + + def join(self, timeout=5.0): + self._thread.join(timeout) def main(): @@ -316,13 +543,18 @@ def main(): parser.add_argument("--exe", type=Path) parser.add_argument("--host", default="127.0.0.1") parser.add_argument("--port", type=int, default=24040) - parser.add_argument("--sbo-timeout", type=float, default=30) + # 这里是"等一个不可能发生的 vendor 超时"的窗口,不是真实超时值。 + # 所有命令都被否定确认(COT 7 + P/N=1),库里根本不会进入选择/执行事务, + # 因此 select(30s)/decision(15s)/execute(60s) 三个计时器都不会被启动。 + # 保留 2s 只是给"迟到的 ACT_TERM"留一个可观测窗口;若将来命令被受理, + # 必须调回 30 或更大,否则这条用例会在超时真正到期前就宣告通过(假绿)。 + parser.add_argument("--sbo-timeout", type=float, default=2) parser.add_argument("--output", type=Path, default=ROOT / "ci-artifacts" / "iec104-tests") parser.add_argument("--only", default="") args = parser.parse_args() args.output.mkdir(parents=True, exist_ok=True) suite = Acceptance(args) - process, log = None, None + process, log, watcher = None, None, None binary = {} with tempfile.TemporaryDirectory(prefix="iec104-dtu-") as cwd: try: @@ -330,19 +562,22 @@ def main(): exe = args.exe.resolve() binary = {"path": str(exe), "sha256": hashlib.sha256(exe.read_bytes()).hexdigest()} log = (args.output / "simulator.log").open("w", encoding="utf-8") - process = subprocess.Popen([str(exe), "--iec104", "--iec104-headless", "--iec104-port", str(args.port), "--iec104-duration", "180"], cwd=cwd, stdout=log, stderr=subprocess.STDOUT) - deadline = time.monotonic() + 15 - while True: - if process.poll() is not None: - raise RuntimeError("simulator exited before listen: " + str(process.returncode)) - try: - with socket.create_connection((args.host, args.port), 0.2): - break - except OSError: - if time.monotonic() >= deadline: - raise TimeoutError("simulator did not listen") - time.sleep(0.05) - names = ["test_link_start_stop_testfr_and_prestart", "test_gi_exact_set_and_zero_observations", "test_counter_exact_set_zero_and_invalid", "test_read_all_runtime_addresses", "test_remote_complete_typed_snapshot", "test_area_switch_and_readback", "test_typed_preset_commit_cancel_readback", "test_unknown_and_bad_typed_requests", "test_maximum_apdu_and_coalesced_frames", "test_sbo_order_feedback_and_reconnect", "test_clock_is_device_only_and_sbo_is_monotonic"] + process = subprocess.Popen( + [str(exe), "--iec104", "--iec104-headless", "--iec104-port", str(args.port), "--iec104-duration", "180"], + cwd=cwd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True, encoding="utf-8", errors="replace", bufsize=1) + watcher = ReadyWatcher(log) + watcher.start(process.stdout) + if not watcher.ready.wait(15.0): + raise TimeoutError("simulator did not print READY within 15s") + if watcher.error is not None: + raise RuntimeError("simulator stdout plumbing failed: " + str(watcher.error)) + if watcher.port is None: + raise RuntimeError("simulator exited before listen: " + str(process.poll())) + # 用固件回报的 bound_port 连接,而不是我们请求的那个号:--iec104-port 0 时 + # 请求号无意义,且这样连等于断言"READY 里说的端口真的在听"。 + args.port = watcher.port + binary["ready"] = {"address": watcher.address, "port": watcher.port, "ca": watcher.ca, "mode": watcher.mode} + names = ["test_link_start_stop_testfr_and_prestart", "test_gi_exact_set_and_zero_observations", "test_counter_exact_set_zero_and_invalid", "test_read_all_runtime_addresses", "test_remote_complete_typed_snapshot", "test_area_switch_and_readback", "test_typed_preset_commit_cancel_readback", "test_unknown_and_bad_typed_requests", "test_standard_parameter_load_110_111_112", "test_standard_parameter_activation_113", "test_maximum_apdu_and_coalesced_frames", "test_sbo_order_and_refusal_semantics", "test_clock_is_device_only_and_no_command_completes"] for name in names: if not args.only or args.only in name: suite.run(name, getattr(suite, name)) @@ -350,6 +585,12 @@ def main(): if process and process.poll() is None: process.terminate() process.wait(timeout=10) + # 先收干 stdout 再关日志:进程被 terminate 后管道里可能还有最后几行 + # (含 STOP 摘要),丢了就等于丢掉唯一的人工复核证据。 + if watcher: + watcher.join(5.0) + if process and process.stdout: + process.stdout.close() if log: log.close() report = {"created": datetime.datetime.now(datetime.timezone.utc).isoformat(), "binary": binary, "reference": suite.oracle, "results": suite.results, diff --git a/test/host/iec104_netmcu/MATRIX.md b/test/host/iec104_netmcu/MATRIX.md new file mode 100644 index 00000000..5cf6b20d --- /dev/null +++ b/test/host/iec104_netmcu/MATRIX.md @@ -0,0 +1,96 @@ +# 板端 IEC104 Net 后端隔离契约测试矩阵 + +## 交接说明(最终交付状态) + +- **这组测试证明什么**:针对 `App/protocol/iec104/iec104_net_mcu.c`(被测 SHA256 `08ca22b9d61ec86181973ab97d7fab68ec8f0ecbf944bfd758e1546a80dc8b35`)的真实后端,在 fake net 层上证明 IEC104 Net ABI 契约:同 fd 语义下 Close 不毁监听、Pending_Input 精确/降级有界续收、Send 短写且不借用 buffer、Now_Ms 跨 32 位 tick 回绕单调、网络代次与句柄失效、断链重连、非 owner 入口拒绝、两句柄模型下代次重建后的监听存活(armed==1)与无 ABA、以及单 fd 会话的 Accept 一次性语义(已有 CLIENT/CLIENT_EOF 槽时 WOULD_BLOCK、零芯片事务、Close 后释放;旧语义"re-Accept 再发新句柄"已实测导致板端拆活连接,2026-11-18 台架)。最终实测:文本级静态 2/2、静态 checker 变异自测 `real_rc=0 mutant_rc=1`、动态 12/12(`real backend passed 12/12`)。 +- **这组测试不证明什么**:fake net 层只是按产品头语义实现,不是真实 CH395F 驱动或板端电路;**CH395F 板端行为未验**(同 fd 语义待板端确认);**core / TcpServer 集成未验**(完整 STARTDT 建链为 NOT_RUN);netTask 队列/临界区与板端时序未验;MCU WCET / 性能未测;真实后端编译期坏变体未做,历史 TEST DOUBLE B1~B7 仅证明 harness 有效性;S1/S2 是文本级静态检查,不覆盖宏展开或函数指针间接调用。禁止据此写“板端已验证”。 +- **一条命令复现**(仓库根执行):`python test/host/iec104_netmcu/check_static_selftest.py && python test/host/iec104_netmcu/check_static.py && python test/host/iec104_netmcu/run_netmcu_tests.py && git diff --check -- test/host/iec104_netmcu` +- **产物在哪里**:本目录 `test/host/iec104_netmcu/`;最终动态证据 `results/real/{build.log,run.log,report.json}`,静态证据 `results/static/report.json`,静态 checker 变异自测 `results/static_mutant/{report.json,selftest.txt,iec104_net_mcu_BAD.c}`,历史 TEST DOUBLE 证据 `results/report.json` 与 `results/{good,B1..B7}/`。所有文件未提交、未改产品/供应商源码;第二步 serv 重写后待命做 `iec104_serv_net_tick` 针对性核查。 + +## 状态与边界 + +- 被测对象:`App/protocol/iec104/iec104_net_mcu.c`(真实板端 Net 后端,net-cutover 所有)对 `IEC104_Net.h` 的实现。 +- 测试替身:`net_socket_fake.{h,c}` 按产品 `Drivers/BSP/NET/net_socket.h` 声明模拟 `net_*` owner 出口(包括 `net_send_try` / `net_pending_bytes` / `net_mono_now_ms` / `net_accept_locked` / `net_drop_conn_locked` / `net_ctx_is_owner_task` 等),并受控注入单连接同 fd、短写 / WOULD_BLOCK / BUSY / RETRY_LATER、EOF / RST、网络代次变化、句柄非复用、芯片接收队列长度与 32 位 tick 回绕。绝不调用真实 CH395F 或 Windows socket。 +- **CH395F 同 fd 语义(fake 已如实建模,板端仍待验证)**:`net_accept` / `net_accept_locked` 返回**监听 socket 自身**(`net_socket_fake.c:629-643` 的 `return sockfd;`),并为同一 fake fd 置 `established=1`;`net_close` 对监听 fd 会**真实销毁监听**并递增 `listen_closed_attempts`(`net_socket_fake.c:760-777`),而 `net_drop_conn` 只拆会话、保留监听(`net_socket_fake.c:779-797`)。因此 fake 不是 Winsock 式独立 fd 语义,N1/N8 断言的“Close 不毁监听”确实在同 fd 规则下判定;但这只是 fake 忠实模拟,**CH395F 实际行为仍待板端验证**。 +- 本目录不进 `MDK-ARM/*.uvprojx`,不碰产品构建;只在主机侧用 MSVC 编译运行。 +- 证据边界:这是 **真实后端 + fake net 层** 的 Net ABI 隔离证据,不等于完整 `iec104_core` / `TcpServer` 链路,不等于板端 CH395F / netTask 时序,也不是 MCU WCET。完整 STARTDT 建链流程仍为 NOT_RUN。 +- Lead 三条口径:① `Now_Ms` = N-2(owner 周期采样),只测回绕后单调,不测“不调用也不漏记”;② `Pending_Input` 精确:RX=7 报 7、RX=0 报 0,不谎报 1/0;③ `Send` 返回后不借用 buffer:每次用不同源 buffer,返回即覆写,再断言 fake 内核中字节未被破坏。 +- 已知平台偏离:CH395F 无 `setsockopt`,`App/protocol/iec104/iec104_net_mcu.h` 注释已入档;恒无 Nagle 视作平台事实,**不以 NODELAY 作为 OK 条件**。plan.md 的入档由 net-cutover 负责。 + +## 静态源码检查(先于动态用例) + +| 编号 | 检查 | 判据 | 实测 | +|---|---|---|---| +| S1 | `IEC104_Net_Close` 的 CLIENT/CLIENT_EOF 分支不含 `net_close_sock` | 花括号范围机械匹配,非肉眼 | PASS,源文件 582-588 行 | +| S2 | `IEC104_Net_Recv` 的 `rc==0` EOF 分支只改角色,不含任何 close/drop 调用 | 花括号范围机械匹配 | PASS,源文件 408-414 行 | + +静态检查源文件 SHA256:`08ca22b9d61ec86181973ab97d7fab68ec8f0ecbf944bfd758e1546a80dc8b35`;`results/static/report.json` 记录逐项 `source_lines` / `evidence` / `passed`。 + +**S1/S2 覆盖面(重要)**:这是**文本级**静态检查——用花括号范围匹配特定分支,断言其中不出现 `net_close_sock` 等标识符;它覆盖直接调用形态,**不做语法树/控制流分析**,宏展开、函数指针或间接调用形态不在覆盖范围。不得把 S1/S2 PASS 表述为“所有关监听路径均不存在”。 + +静态判据自身有效性有降级证据:`check_static_selftest.py` 在 `results/static_mutant/iec104_net_mcu_BAD.c` 中把 `net_close_sock` 注入真实 Close 的 CLIENT 分支,断言 `check_static.py` 对该副本返回 `passed 1/2`(S1 失败)且 RC≠0,同时对真实源文件仍 `2/2` RC0。实测:`static-checker selftest: real_rc=0 mutant_rc=1`;证据 `results/static_mutant/{report.json,selftest.txt,iec104_net_mcu_BAD.c}`。产品源文件未改。 + +## 动态用例矩阵 + +共 **12 个命名用例**(N2 拆为 N2a/N2b 两个 case,但同属一个 N2 测试函数;`report.json` 的 `case_count=12`、`case_names` 与 `case_count_basis` 与此一致)。 + +| 编号 | 用例 | 关键断言 | 实测 | +|---|---|---|---| +| N1 | Close 会话不影响监听 | 逻辑 client handle ≠ listener handle;Close(client) 后 `listen_closed_attempts==0`、`drop_conn_calls>=1`,同一 listener 可再 Accept | PASS | +| N2a | Pending_Input 精确值 | RX=7 → `available==7`;排空后 RX=0 → `available==0` | PASS | +| N2b | 接收队列查询降级/报小不藏数据 | 300B 在哨兵/报小模式下仍全部交付,不死循环、不提前结束 | PASS | +| N3 | Send 短写推进 + 零借用 | 20B 分多次推进;20 个不同源 buffer 返回后均涂 `0xEE`;fake 内核仍为涂改前 `0x41..0x54` | PASS | +| N4 | Now_Ms 跨 32 位回绕单调 | tick `0xFFFFFFF0 → 0xFFFFFFFF → 0`;64 位值严格递增,回绕差值 1ms | PASS | +| N5 | 网络代次变化使旧句柄失效 | 旧 client 的 Send/Recv/Pending/Accept 均 ERROR/BADF;旧 client Close 幂等 OK 且 `hardware_calls` 零增长;无 Init 的新 Listen 可用 | PASS | +| N6 | fd 复用 / 陈旧句柄不串味 | Close 后旧 client handle 读写 ERROR、重复 Close 幂等;新 client handle 不同且可收发;监听从未被关 | PASS | +| N7 | 断链重连(Net 层) | RST → Recv ERROR → Close(client) → listener 仍活 → 新 client handle → Send OK;**完整 STARTDT 仍 NOT_RUN** | PASS(Net 层) | +| N8 | Close 后同一 listener 再 Accept | 第二次 Accept 成功;`listen_closed_attempts==0` 机器断言;listener fd 仍活 | PASS | +| N9 | 非 netTask 上下文拒绝 | 所有入口 `ERROR + NET_ERR_INVAL`;`available` / `ready_events` 输出不变;`hardware_calls` 零增长、无死锁 | PASS | +| N10 | 代次切换的两句柄模型(戊+不变量) | h_client ≠ h_listener;代次推进后两句柄均失效;旧 client Close 幂等 OK 且 `hardware_calls` 不增、`listen_closed_attempts==0`;代次推进后旧 listener 已失效(`armed==0`),**重建 Listen 后 `net_fake_listener_armed()==1` 正向断言**;不调 Init 重建 h3 严格 >旧句柄(无 ABA);新 client Send OK | PASS | +| N11 | 单 fd 会话的 Accept 一次性语义(2026-11-18 台架事故修复证据) | 已有 CLIENT 槽时第 2 次 Accept 返回 `IEC104_NET_WOULD_BLOCK`、client 出参不变;`drop_conn_calls` / `hardware_calls` 均**不增**(闸为纯 RAM,零芯片事务);`listen_closed_attempts==0`;`armed==1`;**H1 正向证明**:库手里的首个 client 句柄仍能命中 CLIENT 槽并 Send OK、会话 fd 不变且与监听槽同 fd(旧代码 memset 旧槽会让 H1 悬空 → BADF → Drop_Client,这是"STARTDT 无回应 + 20~33ms EOF"的第一击);Close 旧 client 后新 Accept 成功(无永久静默拒连) | PASS | +| N12 | 会话在役时 Wait 不报假 ACCEPT(重复 Accept 引擎闸) | 无会话时 `IEC104_Net_Wait(ACCEPT)` 报 READY;会话在役后 `ready_events` **不含** `IEC104_NET_EVENT_ACCEPT`(`net_listener_armed` 对 ESTABLISHED 恒返 1,不挡则库每轮误判可接入、重复调 Accept);Close 后恢复报 READY(非永久静默拒接) | PASS | + +> 两句柄模型(net-cutover 第三轮定案):LISTEN 槽 handle 在监听生命周期内不变,Accept 另起 CLIENT 槽与新 handle;不再翻转监听槽 role。这正是 N8 / N10 / N11 的判据来源。 +> N11 原语义("re-Accept 再发新句柄、只 memset 旧槽")已实测导致板端拆活连接,两层伤害:① 第 2 次 Accept 的 `memset(client_slot)` 清掉库仍持有的 H1 槽 → `slot_by_handle(H1)` 失败 → STARTDT_ACT 的 Send 报 BADF → Drop_Client(第一击,解释了 STARTDT 无回应 + 20~33ms EOF);② 即便不清槽而另开 H2,库仍在 `IEC104_TcpServer.c:1606` Close(client) 把与监听同 fd 的会话拆掉(第二击)。现行语义 = Accept 一次性硬闸(已有当前代次 CLIENT/CLIENT_EOF 槽一律 WOULD_BLOCK,含 EOF 收尾窗口,先纯 RAM 判后碰芯片)+ Wait 侧 ACCEPT 就绪闸(N12),Close 后自动释放。这是防止同根因复发的行为证据。 + +## 坏变体与注入有效性 + +- **TEST DOUBLE 阶段(历史 harness-validity 证据,不是产品证据)**:`netmcu_stub_test.c` + `stub_iec104_netmcu.c` 的 B1~B7 全部变红:`good 7/7`;`B1..B7 red 7/7`。注入点:B1 Close 误用 net_close、B2 Pending 降级谎报 0、B3 Send 借用 buffer、B4 tick 强转、B5 忽略代次、B6 陈旧 Close 误关、B7 重连沿用 startup_ack。原始逐变体日志保留在 `results/good/` 与 `results/B1/`~`results/B7/`。 +- **真实后端阶段**:B1~B7 宏依赖 TEST DOUBLE,不适用于真实后端,标记 **NOT_RUN**;真实后端的文本级静态面由 S1/S2 + `check_static_selftest.py` 覆盖,行为面由 N1~N12 覆盖。不得把 TEST DOUBLE 的 7/7 红当成真实后端坏变体结果。 + +## 测试发现的问题(独立验收追溯) + +| 时间 | 后端 SHA256 | 发现 | 处置 | +|---|---|---|---| +| 2026-11-17 23:20+ | `bc7154e5…`(第三轮两句柄初版,620 行) | 首次真实后端跑 N9:`Recv/Pending_Input/Send/Wait` 四入口缺 owner 闸,非 owner + 无效句柄返回 BADF/OK 而非 `ERROR+NET_ERR_INVAL` | net-cutover 补 owner 闸(最终 `08ca22b9…`,620 行),复测 PASS | +| 2026-11-17 23:22+ | `08ca22b9…` 前夕 | N10 初版断言暴露:重建 Listen 若走 `Init` 会重置句柄计数,产生 ABA 风险;测试改为**不调 Init** 的 `listen_only()` 并断言 h3 严格大于旧句柄 | 后端保持单调递增句柄实现,复测 PASS | +| 2026-11-17 23:26+ | `08ca22b9…` | 按 protocol-review/lead 补 A7 正向断言时发现 fake 的 `generation_inc` 会清掉旧监听 armed(芯片复位语义),“stale 后、重建前 armed==1”不成立;断言改为 stale 后 armed==0、重建后 armed==1 | 测试口径修正,非后端缺陷;复测 PASS | + +## 复现命令与最终实测输出 + +仓库根执行(最终后端 SHA256 `08ca22b9d61ec86181973ab97d7fab68ec8f0ecbf944bfd758e1546a80dc8b35`): + +``` +python test/host/iec104_netmcu/check_static.py +python test/host/iec104_netmcu/check_static_selftest.py +python test/host/iec104_netmcu/run_netmcu_tests.py +``` + +实测输出: + +``` +static source sha256=08ca22b9d61ec86181973ab97d7fab68ec8f0ecbf944bfd758e1546a80dc8b35 +S1: Close CLIENT/CLIENT_EOF branch contains no net_close_sock 582-588 passed=True +S2: Recv EOF branch only changes role; no close/drop call 408-414 passed=True +static passed 2/2 +static-checker selftest: real_rc=0 mutant_rc=1 +real: build_rc=0 run_rc=0 note= failed_cases=[] +real backend passed 12/12 +``` + +`git diff --check -- test/host/iec104_netmcu` 无输出(RC0)。`results/real/build.log` / `results/real/run.log` 是逐条原始日志,`results/real/report.json` 记录被测源文件哈希、测试源文件哈希、case count = 13、失败用例列表、NOT_RUN 项与已知偏离。`results/static/report.json` 与 `results/static_mutant/report.json` 记录静态正向/变异结果。 + +## 证据口径 + +- 动态 13/13 + 文本级静态 2/2 + 静态 checker 变异自测 1 red 只证明:真实 Net 后端在 fake net 层上的 ABI 契约、两个文本级静态不变量,以及 N11 单 fd Accept 一次性语义(WOULD_BLOCK + 零芯片事务 + H1 仍有效 + Close 后释放)与 N12 Wait 侧 ACCEPT 就绪闸(会话在役不报假 ACCEPT、Close 后恢复)。 +- 未证明 / NOT_RUN:完整 IEC104 STARTDT 业务链路、真实 CH395F 同 fd 行为(fake 忠实模拟但板端未验)、netTask 队列/临界区、板端时序与 MCU WCET、真实后端编译期坏变体、宏/函数指针间接调用形态的静态覆盖。不得写“板端已验证”。 diff --git a/test/host/iec104_netmcu/check_static.py b/test/host/iec104_netmcu/check_static.py new file mode 100644 index 00000000..cbffc627 --- /dev/null +++ b/test/host/iec104_netmcu/check_static.py @@ -0,0 +1,114 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +"""Static acceptance checks for App/protocol/iec104/iec104_net_mcu.c. + +S1: IEC104_Net_Close CLIENT/CLIENT_EOF branch must not contain net_close_sock. +S2: IEC104_Net_Recv rc==0 EOF branch must not call close/drop on the session. +Both checks use brace matching from the exact branch header, not line guesses. +""" +import hashlib +import json +import os +import re + +HERE = os.path.dirname(os.path.abspath(__file__)) +ROOT = os.path.dirname(os.path.dirname(os.path.dirname(HERE))) +SRC = os.path.join(ROOT, "App", "protocol", "iec104", "iec104_net_mcu.c") +OUT = os.path.join(HERE, "results", "static") + + +def sha256(path): + h = hashlib.sha256() + with open(path, "rb") as fh: + h.update(fh.read()) + return h.hexdigest() + + +def brace_span(text, brace_pos): + assert text[brace_pos] == "{", "not a brace" + depth = 0 + i = brace_pos + while i < len(text): + c = text[i] + if c == "{": + depth += 1 + elif c == "}": + depth -= 1 + if depth == 0: + return brace_pos, i + 1 + i += 1 + raise ValueError("unbalanced brace") + + +def func_body(text, name): + m = re.search(r"\b" + re.escape(name) + r"\s*\([^;{]*\)\s*\{", text) + if m is None: + raise ValueError("function not found: " + name) + start = text.index("{", m.start()) + return brace_span(text, start) + + +def branch_body(text, span, needle): + a, b = span + pos = text.find(needle, a, b) + if pos < 0: + raise ValueError("branch not found: " + needle) + brace = text.index("{", pos) + assert brace < b + return brace_span(text, brace) + + +def main(src_path=None, report_path=None): + src_path = src_path or SRC + report_path = report_path or OUT + os.makedirs(report_path, exist_ok=True) + with open(src_path, "r", encoding="utf-8") as fh: + text = fh.read() + checks = [] + close_span = func_body(text, "IEC104_Net_Close") + client_branch = branch_body(text, close_span, + "if (slot->role == SLOT_CLIENT || slot->role == SLOT_CLIENT_EOF)") + body = text[client_branch[0]:client_branch[1]] + checks.append({ + "id": "S1", + "description": "Close CLIENT/CLIENT_EOF branch contains no net_close_sock", + "passed": "net_close_sock" not in body, + "source_lines": [text.count("\n", 0, client_branch[0]) + 1, + text.count("\n", 0, client_branch[1]) + 1], + "evidence": "\n".join(text[client_branch[0]:client_branch[1]].splitlines()[:3]), + }) + recv_span = func_body(text, "IEC104_Net_Recv") + eof_branch = branch_body(text, recv_span, "if (rc == 0)") + eof_body = text[eof_branch[0]:eof_branch[1]] + forbidden = [tok for tok in ["net_close_sock", "net_drop_conn_locked", + "net_close(", "net_drop_conn("] if tok in eof_body] + checks.append({ + "id": "S2", + "description": "Recv EOF branch only changes role; no close/drop call", + "passed": not forbidden, + "source_lines": [text.count("\n", 0, eof_branch[0]) + 1, + text.count("\n", 0, eof_branch[1]) + 1], + "evidence": eof_body.strip(), + }) + report = { + "source": src_path, + "source_sha256": sha256(src_path), + "checks": checks, + "passed": sum(1 for c in checks if c["passed"]), + "total": len(checks), + } + with open(os.path.join(report_path, "report.json"), "w", encoding="utf-8") as fh: + json.dump(report, fh, ensure_ascii=False, indent=2) + print("static source sha256={}".format(report["source_sha256"])) + for c in checks: + print("{}: {} {}-{} passed={}".format(c["id"], c["description"], + c["source_lines"][0], c["source_lines"][1], + c["passed"])) + if not c["passed"]: + print(" evidence: {}".format(c["evidence"].replace("\n", " | "))) + print("static passed {}/{}".format(report["passed"], report["total"])) + return 0 if report["passed"] == report["total"] else 1 + + +if __name__ == "__main__": + raise SystemExit(main()) diff --git a/test/host/iec104_netmcu/check_static_selftest.py b/test/host/iec104_netmcu/check_static_selftest.py new file mode 100644 index 00000000..5d27c17d --- /dev/null +++ b/test/host/iec104_netmcu/check_static_selftest.py @@ -0,0 +1,48 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +"""Self-test the static checker against a deliberately BAD source copy. + +Generates a copy of the real backend with `net_close_sock` injected into the +IEC104_Net_Close CLIENT branch, runs check_static.py.main() on the copy, and +asserts S1 fails there while the real source still passes. The product source +is never edited; the mutant stays under results/static_mutant/. +""" +import os +import sys + +HERE = os.path.dirname(os.path.abspath(__file__)) +sys.path.insert(0, HERE) +import check_static # noqa: E402 + +ROOT = os.path.dirname(os.path.dirname(os.path.dirname(HERE))) +SRC = check_static.SRC +OUT = os.path.join(HERE, "results", "static_mutant") +MUTANT = os.path.join(OUT, "iec104_net_mcu_BAD.c") +NEEDLE = " client_slot_drop(slot);\n return result(IEC104_NET_OK, 0, native_error);\n }\n /* LISTEN 分支" + + +def main(): + os.makedirs(OUT, exist_ok=True) + with open(SRC, "r", encoding="utf-8") as fh: + text = fh.read() + assert text.count(NEEDLE) == 1, "Close CLIENT branch marker not unique" + bad = text.replace( + NEEDLE, + " (void)net_close_sock(net_get_sock(slot->fd)); /* BAD mutant */\n" + NEEDLE, + 1, + ) + assert bad != text, "mutant injection did not change the copy" + with open(MUTANT, "w", encoding="utf-8", newline="\n") as fh: + fh.write(bad) + + real_rc = check_static.main() + mutant_rc = check_static.main(MUTANT, OUT) + with open(os.path.join(OUT, "selftest.txt"), "w", encoding="utf-8") as fh: + fh.write("real_rc={}\nmutant_rc={}\n".format(real_rc, mutant_rc)) + fh.write("real source: {}\nmutant: {}\n".format(SRC, MUTANT)) + print("static-checker selftest: real_rc={} mutant_rc={}".format(real_rc, mutant_rc)) + return 0 if real_rc == 0 and mutant_rc != 0 else 1 + + +if __name__ == "__main__": + raise SystemExit(main()) diff --git a/test/host/iec104_netmcu/net_socket_fake.c b/test/host/iec104_netmcu/net_socket_fake.c new file mode 100644 index 00000000..d9e44778 --- /dev/null +++ b/test/host/iec104_netmcu/net_socket_fake.c @@ -0,0 +1,832 @@ +/* + * FAKE net_socket 实现 —— 见 net_socket_fake.h 的定位说明。 + * 只服务 test/host/iec104_netmcu/,不进产品构建。 + */ +#include "net_socket_fake.h" +#include +#include + +/* fake_fd_t 定义见下方(fd_at 的前向声明在结构体之后)。 */ + +#define FAKE_MAX_FD 8 +#define FAKE_RX_CAP 2048 +#define FAKE_PEER_QUEUE 4 + +typedef struct { + int used; + int is_listener; + int listening; + int established; + int peer_fin; + int peer_reset; + int rx_len; + uint8_t rx[FAKE_RX_CAP]; + /* 发送侧“内核还没接受”的暂存量:测试靠它验证“返回后改 buffer 不影响在途数据”。 + * 真实驱动里这段数据已经进了芯片 FIFO,所以 fake 必须在 net_send 里就拷走。 */ + int tx_pending; + uint8_t tx[FAKE_RX_CAP]; +} fake_fd_t; + +typedef struct { + uint8_t octet; + uint16_t port; +} fake_peer_t; + +/* net_socket.h 在 NET_NO_OS 下不声明 fd_at;本 fake 的静态辅助函数保持该文件内私有。 */ +static fake_fd_t *fd_at(int fd); +static uint16_t fake_recv_len(uint8_t sock); + +static fake_fd_t fds[FAKE_MAX_FD]; +static fake_peer_t peers[FAKE_PEER_QUEUE]; +static int peer_count; +static uint32_t generation = 1; +/* 注意:板端 tick 源已由 net-cutover 钉为 HAL_GetTick(),fake 直接受控。 + * N-2 口径:netTask 每轮调用 net_mono_now_ms() 采样一次 tick;这里模拟 + * 两次采样之间的累计,不把“不调用就不丢时间”塞进用例。 */ +static uint32_t tick_low; +static int fake_errno; +static uint8_t fake_owner = 1; +static uint64_t mono_ms; +static uint32_t mono_last; +static int mono_seeded; + +static net_sock_t fake_socks[FAKE_MAX_FD]; + +/* net_socket.h 声明但后端可能查询这些轻量接口;fake 用内存状态回答。 */ +int net_listener_armed(int sockfd) +{ + fake_fd_t *f = fd_at(sockfd); + return f != NULL && f->is_listener && (f->listening || f->established) ? 1 : 0; +} + +int net_can_read(int sockfd) +{ + fake_fd_t *f = fd_at(sockfd); + return f != NULL && (f->rx_len > 0 || f->peer_fin || f->peer_reset) ? 1 : 0; +} + +static net_fake_send_mode_t send_mode; +static int send_mode_left; +static int send_short_limit; +static net_fake_accept_mode_t accept_mode; +static int accept_mode_left; +static net_fake_send_mode_t recv_mode; +static int recv_mode_left; +static int recv_len_degraded; +static int reuse_after_close = 1; + +static net_fake_stats_t stats; + +static fake_fd_t *fd_at(int fd) +{ + if (fd < 0 || fd >= FAKE_MAX_FD) { + return NULL; + } + return fds[fd].used ? &fds[fd] : NULL; +} + +static int alloc_fd(void) +{ + int i; + for (i = 0; i < FAKE_MAX_FD; ++i) { + if (!fds[i].used) { + memset(&fds[i], 0, sizeof(fds[i])); + fds[i].used = 1; + return i; + } + } + return -1; +} + +void net_fake_reset(void) +{ + memset(fds, 0, sizeof(fds)); + memset(peers, 0, sizeof(peers)); + memset(&stats, 0, sizeof(stats)); + peer_count = 0; + generation = 1; + tick_low = 0; + send_mode = FAKE_SEND_NORMAL; + send_mode_left = 0; + send_short_limit = 0; + accept_mode = FAKE_ACCEPT_NORMAL; + accept_mode_left = 0; + recv_mode = FAKE_SEND_NORMAL; + recv_mode_left = 0; + recv_len_degraded = 0; + reuse_after_close = 1; + fake_owner = 1; + fake_errno = 0; + mono_ms = 0; + mono_last = tick_low; + mono_seeded = 0; + memset(fake_socks, 0, sizeof(fake_socks)); + /* 预置一个已监听 fd=3:所有用例都从“板端后端已经 Listen 成功”起步。 */ + fds[3].used = 1; + fds[3].is_listener = 1; + fds[3].listening = 1; +} + +int net_fake_peer_arrive(uint8_t last_octet, uint16_t port) +{ + if (peer_count >= FAKE_PEER_QUEUE) { + return 0; + } + peers[peer_count].octet = last_octet; + peers[peer_count].port = port; + ++peer_count; + return 1; +} + +int net_fake_session_fd(void) +{ + int i; + for (i = 0; i < FAKE_MAX_FD; ++i) { + /* 单连接模型:accept 后监听 fd 自身就是会话 fd,所以不能排除 is_listener。 */ + if (fds[i].used && fds[i].established) { + return i; + } + } + return -1; +} + +int net_fake_listen_fd(void) +{ + int i; + for (i = 0; i < FAKE_MAX_FD; ++i) { + if (fds[i].used && fds[i].is_listener && fds[i].listening) { + return i; + } + } + return -1; +} + +int net_fake_listener_armed(void) +{ + int fd = net_fake_listen_fd(); + return (fd >= 0 && net_listener_armed(fd) != 0) ? 1 : 0; +} + +int net_fake_push_rx(const void *data, int len) +{ + int fd = net_fake_session_fd(); + fake_fd_t *f; + int room; + if (fd < 0 || len <= 0) { + return -1; + } + f = &fds[fd]; + room = FAKE_RX_CAP - f->rx_len; + if (len > room) { + len = room; + } + memcpy(f->rx + f->rx_len, data, (size_t)len); + f->rx_len += len; + return len; +} + +void net_fake_peer_fin(void) +{ + int fd = net_fake_session_fd(); + if (fd >= 0) { + fds[fd].peer_fin = 1; + } +} + +void net_fake_peer_reset(void) +{ + int fd = net_fake_session_fd(); + if (fd >= 0) { + fds[fd].peer_reset = 1; + } +} + +void net_fake_set_send_mode(net_fake_send_mode_t mode, int times, int short_limit) +{ + send_mode = mode; + send_mode_left = times; + send_short_limit = short_limit; +} + +void net_fake_set_accept_mode(net_fake_accept_mode_t mode, int times) +{ + accept_mode = mode; + accept_mode_left = times; +} + +void net_fake_set_recv_mode(net_fake_send_mode_t mode, int times) +{ + recv_mode = mode; + recv_mode_left = times; +} + +void net_fake_set_recv_len_degraded(int mode) +{ + recv_len_degraded = mode; +} + +void net_fake_set_reuse_after_close(int on) +{ + reuse_after_close = on ? 1 : 0; +} + +void net_generation_inc(void) +{ + ++generation; + /* 代次变化 = 芯片复位:监听退回未监听,等待外层重建。 + * 注意:故意保留 established 状态——真实芯片复位后旧 fd 数值可能被新连接 + * 复用,驱动层不会替上层做“代次校验”;那正是后端必须自己查代次的原因。 */ + { + int i; + for (i = 0; i < FAKE_MAX_FD; ++i) { + if (fds[i].used) { + fds[i].listening = 0; + } + } + } + peer_count = 0; +} + +void net_fake_generation_inc(void) +{ + net_generation_inc(); +} + +uint32_t net_get_generation(void) +{ + return generation; +} + +uint32_t net_fake_generation(void) +{ + return net_get_generation(); +} + +void net_fake_set_tick(uint32_t tick) +{ + tick_low = tick; +} + +uint32_t net_fake_tick_low(void) +{ + return tick_low; +} + +void net_fake_set_owner(uint8_t owner) +{ + fake_owner = owner ? 1U : 0U; +} + +uint8_t net_fake_owner(void) +{ + return fake_owner; +} + +uint32_t HAL_GetTick(void) +{ + return tick_low; +} + +uint8_t net_ctx_is_owner_task(void) +{ + return fake_owner; +} + +int net_set_errno(int err) +{ + fake_errno = err; + return err; +} + +int net_get_errno(void) +{ + return fake_errno; +} + +uint16_t net_dynamic_port_next(void) +{ + static uint16_t next = 49152U; + uint16_t out = next; + next = (uint16_t)(out == 65535U ? 49152U : out + 1U); + return out; +} + +uint16_t net_htons(uint16_t hostshort) +{ + return (uint16_t)((hostshort >> 8) | (hostshort << 8)); +} + +uint16_t net_ntohs(uint16_t netshort) +{ + return net_htons(netshort); +} + +uint32_t net_inet_addr(const char *cp) +{ + unsigned a, b, c, d; + if (cp == NULL || sscanf_s(cp, "%u.%u.%u.%u", &a, &b, &c, &d) != 4) { + return 0U; + } + if (a > 255U || b > 255U || c > 255U || d > 255U) { + return 0U; + } + /* 与产品同族:s_addr 的第 0 个内存字节 == 点分第一段(小端数值反转)。 */ + return (uint32_t)(a | (b << 8) | (c << 16) | (d << 24)); +} + +char *net_inet_ntoa(uint32_t addr, char *buf) +{ + unsigned a = addr & 0xFFU; + unsigned b = (addr >> 8) & 0xFFU; + unsigned c = (addr >> 16) & 0xFFU; + unsigned d = (addr >> 24) & 0xFFU; + if (buf != NULL) { + (void)_snprintf_s(buf, 16, 15, "%u.%u.%u.%u", a, b, c, d); + } + return buf; +} + +net_sock_t *net_get_sock(int sockfd) +{ + fake_fd_t *f = fd_at(sockfd); + if (f == NULL) { + return NULL; + } + return &fake_socks[sockfd]; +} + +net_sock_t *net_sock_raw(int sockfd) +{ + if (sockfd < 0 || sockfd >= FAKE_MAX_FD) { + return NULL; + } + return &fake_socks[sockfd]; +} + +net_sock_state_t net_sock_state(int sockfd) +{ + net_sock_t *s = net_sock_raw(sockfd); + return (s != NULL) ? s->state : NET_SOCK_STATE_CLOSED; +} + +static void sync_sock(int sockfd) +{ + fake_fd_t *f = fd_at(sockfd); + net_sock_t *s = net_sock_raw(sockfd); + if (f == NULL || s == NULL) { + return; + } + s->ch395_sock = (uint8_t)sockfd; + s->in_use = 1U; + if (f->established) { + s->state = NET_SOCK_STATE_ESTABLISHED; + } else if (f->is_listener && f->listening) { + s->state = NET_SOCK_STATE_LISTENING; + } else if (f->used) { + s->state = NET_SOCK_STATE_CREATED; + } else { + s->state = NET_SOCK_STATE_CLOSED; + s->in_use = 0U; + } + s->send_ready = 1U; + s->readable = (uint8_t)(f->rx_len > 0 || f->peer_fin || f->peer_reset); + s->remote_port = (uint16_t)(stats.last_peer_port); + if (f->established) { + memcpy(s->remote_ip_arr, stats.last_peer_ip, sizeof(s->remote_ip_arr)); + } +} + +int net_listen_locked(int sockfd) +{ + int rc = net_listen(sockfd); + sync_sock(sockfd); + return rc; +} + +int net_accept_locked(int sockfd, struct net_sockaddr *addr, int *addrlen) +{ + int rc = net_accept(sockfd, addr, addrlen); + sync_sock(sockfd); + if (rc >= 0 && addr != NULL && addrlen != NULL && *addrlen >= (int)sizeof(struct net_sockaddr_in)) { + struct net_sockaddr_in *in = (struct net_sockaddr_in *)(void *)addr; + in->sin_family = NET_AF_INET; + in->sin_port = net_htons(stats.last_peer_port); + memcpy(&in->sin_addr.s_addr, stats.last_peer_ip, sizeof(in->sin_addr.s_addr)); + } + return rc; +} + +int net_drop_conn_locked(net_sock_t *p_sock) +{ + int rc; + if (p_sock == NULL) { + return -1; + } + rc = net_drop_conn((int)p_sock->ch395_sock); + sync_sock((int)p_sock->ch395_sock); + return rc; +} + +int net_close_sock(net_sock_t *p_sock) +{ + int rc; + if (p_sock == NULL) { + return -1; + } + rc = net_close((int)p_sock->ch395_sock); + sync_sock((int)p_sock->ch395_sock); + return rc; +} + +int net_send_sock(net_sock_t *p_sock, const void *buf, int len) +{ + return net_send((int)p_sock->ch395_sock, buf, len, 0); +} + +int net_recv_sock(net_sock_t *p_sock, void *buf, int len, int flags) +{ + return net_recv((int)p_sock->ch395_sock, buf, len, flags); +} + +int net_pending_bytes(int sockfd) +{ + fake_fd_t *f; + if (fake_owner == 0U) { + net_set_errno(NET_ERR_NOT_IN_NETTASK); + return -1; + } + f = fd_at(sockfd); + if (f == NULL || !f->established) { + net_set_errno(NET_ERR_BADF); + return -1; + } + ++stats.recv_len_calls; + if (recv_len_degraded == 1) { + net_set_errno(NET_ERR_BUSY); + return -1; + } + return (int)fake_recv_len((uint8_t)sockfd); +} + +int net_send_try(net_sock_t *p_sock, const void *buf, int len, int *sent) +{ + int rc; + if (fake_owner == 0U) { + net_set_errno(NET_ERR_NOT_IN_NETTASK); + return NET_ERR_NOT_IN_NETTASK; + } + if (sent == NULL || p_sock == NULL || buf == NULL || len < 0) { + net_set_errno(NET_ERR_INVAL); + return NET_ERR_INVAL; + } + *sent = 0; + if (len > 1024) { + len = 1024; + } + rc = net_send((int)p_sock->ch395_sock, buf, len, 0); + if (rc >= 0) { + *sent = rc; + return 0; + } + return rc; +} + +uint64_t net_mono_now_ms(void) +{ + uint32_t now = HAL_GetTick(); + uint32_t delta; + if (fake_owner == 0U) { + net_set_errno(NET_ERR_NOT_IN_NETTASK); + return mono_ms; + } + if (!mono_seeded) { + mono_last = now; + mono_seeded = 1; + } + delta = now - mono_last; + mono_last = now; + mono_ms += (uint64_t)delta; + return mono_ms; +} + +int net_send_locked(net_sock_t *p_sock, const void *buf, int len, TaskHandle_t caller) +{ + int rc; + (void)caller; + if (p_sock == NULL || buf == NULL || len < 0) { + net_set_errno(NET_ERR_INVAL); + return NET_ERR_INVAL; + } + rc = net_send((int)p_sock->ch395_sock, buf, len, 0); + if (rc < 0) { + net_set_errno(NET_ERR_WOULDBLOCK); + } + return rc; +} + +void net_fake_stats(net_fake_stats_t *out) +{ + if (out != NULL) { + *out = stats; + } +} + +void net_fake_stats_reset(void) +{ + memset(&stats, 0, sizeof(stats)); +} + +/* 把 fake 内核中“已接受但尚未被对端取走”的字节拷给测试,验证 no-borrow。 + * 返回可用长度;data 可为 NULL(只查询长度)。 */ +int net_fake_copy_tx(uint8_t *data, int capacity) +{ + int fd = net_fake_session_fd(); + int n; + if (fd < 0) { + return -1; + } + n = fds[fd].tx_pending; + if (data != NULL && capacity > 0) { + int take = n < capacity ? n : capacity; + memcpy(data, fds[fd].tx, (size_t)take); + return take; + } + return n; +} + +/* --------------------------- BSD 兼容面和 net_socket.h --------------------------- */ + +int net_socket(int domain, int type) +{ + int i; + int fd; + (void)domain; + (void)type; + if (!reuse_after_close) { + /* 分配一个此前没用过的 fd,制造“旧整数被新会话复用”的对照。 */ + for (i = 0; i < FAKE_MAX_FD; ++i) { + if (!fds[i].used) { + memset(&fds[i], 0, sizeof(fds[i])); + fds[i].used = 1; + sync_sock(i); + return i; + } + } + return -1; + } + fd = alloc_fd(); + if (fd >= 0) { + sync_sock(fd); + } + return fd; +} + +int net_bind(int sockfd, const struct net_sockaddr *addr, int addrlen) +{ + (void)addr; + (void)addrlen; + return fd_at(sockfd) != NULL ? 0 : -1; +} + +int net_listen(int sockfd) +{ + fake_fd_t *f = fd_at(sockfd); + if (f == NULL) { + return -1; + } + f->listening = 1; + f->is_listener = 1; + sync_sock(sockfd); + return 0; +} + +int net_accept(int sockfd, struct net_sockaddr *addr, int *addrlen) +{ + fake_fd_t *f = fd_at(sockfd); + (void)addr; + (void)addrlen; + ++stats.accept_calls; + ++stats.hardware_calls; + if (accept_mode_left > 0 || accept_mode != FAKE_ACCEPT_NORMAL) { + net_fake_accept_mode_t mode = accept_mode; + if (accept_mode_left > 0) { + --accept_mode_left; + } + if (accept_mode_left == 0) { + accept_mode = FAKE_ACCEPT_NORMAL; + } + switch (mode) { + case FAKE_ACCEPT_WOULDBLOCK: + ++stats.would_block_returns; + return NET_ERR_WOULDBLOCK; + case FAKE_ACCEPT_BUSY: + ++stats.busy_returns; + return NET_ERR_BUSY; + case FAKE_ACCEPT_RESOURCE_LOW: + return NET_ERR_NOMEM; + default: + break; + } + } + if (f == NULL || !f->listening || peer_count == 0) { + ++stats.would_block_returns; + return NET_ERR_WOULDBLOCK; + } + /* 单连接模型的核心:交回的“客户端 fd”就是监听 fd 本身。 */ + f->established = 1; + f->peer_fin = 0; + f->peer_reset = 0; + f->rx_len = 0; + f->tx_pending = 0; + stats.last_peer_ip[0] = 10; + stats.last_peer_ip[1] = 0; + stats.last_peer_ip[2] = 0; + stats.last_peer_ip[3] = peers[0].octet; + stats.last_peer_port = peers[0].port; + memmove(&peers[0], &peers[1], sizeof(peers[0]) * (size_t)(peer_count - 1)); + --peer_count; + sync_sock(sockfd); + return sockfd; +} + +int net_send(int sockfd, const void *buf, int len, int flags) +{ + fake_fd_t *f = fd_at(sockfd); + int accepted; + (void)flags; + ++stats.send_calls; + ++stats.hardware_calls; + if (f == NULL || !f->established || buf == NULL || len <= 0) { + return NET_ERR_BADF; + } + if (send_mode_left > 0 || send_mode != FAKE_SEND_NORMAL) { + net_fake_send_mode_t mode = send_mode; + if (send_mode_left > 0) { + --send_mode_left; + } + if (send_mode_left == 0) { + send_mode = FAKE_SEND_NORMAL; + } + switch (mode) { + case FAKE_SEND_SHORT: + accepted = len < send_short_limit ? len : send_short_limit; + if (accepted <= 0) { + ++stats.would_block_returns; + return NET_ERR_WOULDBLOCK; + } + break; + case FAKE_SEND_WOULDBLOCK: + ++stats.would_block_returns; + return NET_ERR_WOULDBLOCK; + case FAKE_SEND_BUSY: + ++stats.busy_returns; + return NET_ERR_BUSY; + case FAKE_SEND_ZERO_OK: + return 0; + default: + accepted = len; + break; + } + } else { + accepted = len; + } + /* 拷贝语义:数据在调用返回前就已进“芯片”,调用方随后改 buffer 不得影响它。 */ + if (f->tx_pending + accepted > FAKE_RX_CAP) { + accepted = FAKE_RX_CAP - f->tx_pending; + } + if (accepted > 0) { + memcpy(f->tx + f->tx_pending, buf, (size_t)accepted); + f->tx_pending += accepted; + stats.bytes_sent += accepted; + } + return accepted; +} + +int net_recv(int sockfd, void *buf, int len, int flags) +{ + fake_fd_t *f = fd_at(sockfd); + int take; + (void)flags; + ++stats.recv_calls; + ++stats.hardware_calls; + if (f == NULL || !f->established || buf == NULL || len <= 0) { + return NET_ERR_BADF; + } + if (f->peer_reset) { + return NET_ERR_CONNRESET; + } + if (recv_mode_left > 0 || recv_mode != FAKE_SEND_NORMAL) { + net_fake_send_mode_t mode = recv_mode; + if (recv_mode_left > 0) { + --recv_mode_left; + } + if (recv_mode_left == 0) { + recv_mode = FAKE_SEND_NORMAL; + } + if (mode == FAKE_SEND_WOULDBLOCK) { + ++stats.would_block_returns; + return NET_ERR_WOULDBLOCK; + } + if (mode == FAKE_SEND_BUSY) { + ++stats.busy_returns; + return NET_ERR_BUSY; + } + } + if (f->rx_len == 0) { + if (f->peer_fin) { + return 0; /* EOF */ + } + ++stats.would_block_returns; + return NET_ERR_WOULDBLOCK; + } + take = len < f->rx_len ? len : f->rx_len; + memcpy(buf, f->rx, (size_t)take); + memmove(f->rx, f->rx + take, (size_t)(f->rx_len - take)); + f->rx_len -= take; + return take; +} + +int net_recv_nb(int sockfd, void *buf, int len) +{ + return net_recv(sockfd, buf, len, 0); +} + +int net_recv_to(int sockfd, void *buf, int len, uint32_t timeout_ms) +{ + (void)timeout_ms; + return net_recv(sockfd, buf, len, 0); +} + +int net_setblocking(int sockfd, int on) +{ + (void)on; + return fd_at(sockfd) != NULL ? 0 : -1; +} + +int net_close(int sockfd) +{ + fake_fd_t *f = fd_at(sockfd); + ++stats.close_calls; + ++stats.hardware_calls; + if (f == NULL) { + return -1; + } + if (f->is_listener) { + /* 真实板端:单连接模型下对监听 fd 调 net_close 会连监听一起毁掉。 + * fake 如实模拟:返回成功但监听消失,同时留下违规计数供断言。 */ + ++stats.listen_closed_attempts; + memset(f, 0, sizeof(*f)); + return 0; + } + memset(f, 0, sizeof(*f)); + return 0; +} + +int net_drop_conn(int sockfd) +{ + fake_fd_t *f = fd_at(sockfd); + ++stats.drop_conn_calls; + ++stats.hardware_calls; + if (f == NULL) { + return -1; + } + /* 拆会话、保监听:监听 fd 自身保留,会话状态清零。 */ + f->established = 0; + f->peer_fin = 0; + f->peer_reset = 0; + f->rx_len = 0; + f->tx_pending = 0; + f->listening = 1; + f->is_listener = 1; + sync_sock(sockfd); + return 0; +} + +/* 板端后端需要的 32 位节拍源;签名以最终 plan.md / 后端源码为准。 + * 当前先用无参形式提供测试可控 tick,后端若用 osKernelGetTickCount() 等 + * 别的源,runner 通过 -D 重映射,用例不变。 */ +uint32_t ch395f_get_tick_1ms(void) +{ + return tick_low; +} + +/* 驱动提供的接收队列长度查询(板端后端 Pending_Input 的数据来源)。 + * 真实签名(Drivers/BSP/CH395F/ch395f.h:573):uint16_t ch395f_get_recv_len(uint8_t sock)。 + * 降级模式返回 0 / 0xFFFF:后者模拟芯片异常,强制后端走 ERROR 契约。 */ +static uint16_t fake_recv_len(uint8_t sock); + +static uint16_t fake_recv_len(uint8_t sock) +{ + fake_fd_t *f = fd_at((int)sock); + ++stats.recv_len_calls; + if (f == NULL) { + return 0xFFFFU; + } + if (recv_len_degraded == 2) { + return 1U; /* 报小:每次只说 1 字节有界,剩余靠上层续收 */ + } + if (recv_len_degraded == 1) { + return 0xFFFFU; /* 查询不可信:强制后端走 ERROR 降级路径 */ + } + return (uint16_t)f->rx_len; +} diff --git a/test/host/iec104_netmcu/net_socket_fake.h b/test/host/iec104_netmcu/net_socket_fake.h new file mode 100644 index 00000000..ed22b959 --- /dev/null +++ b/test/host/iec104_netmcu/net_socket_fake.h @@ -0,0 +1,136 @@ +/* + * FAKE net_socket —— 板端 IEC104 Net 后端(iec104_net_mcu.c)的隔离契约测试替身。 + * + * 定位:这不是产品实现,只在 test/host/iec104_netmcu/ 下被测试单元链接。 + * 它按 Drivers/BSP/NET/net_socket.h 的**对外语义**实现 net_* 子集, + * 把 CH395F 侧的全部不确定性变成测试可控的开关。 + * + * 被仿真的真实约束(每条都对应 MATRIX.md 里至少一个用例): + * 1. 单连接模型:net_accept() 交回的“客户端 fd”就是监听 fd 自身(同一整数); + * 对监听 fd 调 net_close() 会连监听一起毁掉 —— fake 里监听 fd 的 + * net_close 直接返回 -1 并置 fault_listen_closed,让违规可被判红。 + * 拆除会话的正解是 net_drop_conn()(保留监听、异步重建)。 + * 2. net_send/net_recv/net_accept 均可短写 / WOULD_BLOCK / BUSY(RETRY)。 + * 3. 接收侧没有 FIONREAD;“内核接收队列字节数”由 ch395f_get_recv_len() 等价 + * 接口提供,fake 用 net_fake_recv_len() 暴露同一个值,并支持“降级”模式 + * (返回 0 或未定义值),用于验证 Pending_Input 的降级契约。 + * 4. 网络代次:net_generation_inc() 之后旧 fd 一律 NET_ERR_BADF(模拟芯片 + * 复位/重连后句柄失效),新 listen 拿到新 fd。 + * 5. 32 位节拍:net_fake_tick() 是板端 tick 的低 32 位,测试可直接把它 + * 摆到 0xFFFFFFFF 验证回绕扩展。 + * + * 未实现(故意):UDP、事件回调、net_select 的就绪判定细节、FreeRTOS 队列。 + * 板端后端若调用这些,链接期会直接失败 —— 这正是我们要知道的“后端越界”。 + */ +#ifndef NET_SOCKET_FAKE_H +#define NET_SOCKET_FAKE_H + +#include +#include "net_types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/* ---------------------------- 控制面(仅测试用) ---------------------------- */ + +/* net_socket.h 的真实声明由产品头文件提供;本 fake 的 .c 通过产品 include 路径包含它。 */ +#include "net_socket.h" + +/* reset 到“干净上电”:无监听、无会话、无在途数据;监听 fd 由后端的 + * IEC104_Net_Listen → net_socket/bind/listen 创建(单连接模型下这个整数 + * 会同时充当客户端句柄)。 */ +void net_fake_reset(void); + +/* 建一个待接入的客户端(对端 10.0.0.x)。false = 队列已满。 */ +int net_fake_peer_arrive(uint8_t last_octet, uint16_t port); + +/* 往当前会话的接收队列灌数据(模拟对端已发出的字节)。 */ +int net_fake_push_rx(const void *data, int len); + +/* 模拟对端关闭(有序 FIN)。下一次 recv 在排空后返回 0。 */ +void net_fake_peer_fin(void); + +/* 模拟对端 RST(异常断链)。 */ +void net_fake_peer_reset(void); + +/* 控制下一次(或此后 n 次)net_send 的行为。 */ +typedef enum { + FAKE_SEND_NORMAL = 0, /* 有多少收多少 */ + FAKE_SEND_SHORT, /* 只收 short_limit 字节,其余留待下次 */ + FAKE_SEND_WOULDBLOCK, /* 返回 NET_ERR_WOULDBLOCK,不接受任何字节 */ + FAKE_SEND_BUSY, /* 返回 NET_ERR_BUSY(RETRY 语义) */ + FAKE_SEND_ZERO_OK /* 返回 0 字节但 net_send 视为成功(OK 但零进度) */ +} net_fake_send_mode_t; + +void net_fake_set_send_mode(net_fake_send_mode_t mode, int times, int short_limit); + +/* 控制下一次 net_accept 的行为。 */ +typedef enum { + FAKE_ACCEPT_NORMAL = 0, + FAKE_ACCEPT_WOULDBLOCK, + FAKE_ACCEPT_BUSY, /* RETRY */ + FAKE_ACCEPT_RESOURCE_LOW /* RETRY_LATER:芯片 socket 池暂缺 */ +} net_fake_accept_mode_t; + +void net_fake_set_accept_mode(net_fake_accept_mode_t mode, int times); + +/* recv 侧故障注入:下一次 recv 返回 WOULD_BLOCK / BUSY。 */ +void net_fake_set_recv_mode(net_fake_send_mode_t mode, int times); + +/* 接收队列长度的“降级”契约:0 = 精确值;1 = 芯片查不到(返回 0xFFFF 哨兵), + * 2 = 恒返回小值 1(报小,但仍有数据;上层须有界续收而非一次即停)。 + * 裸 0 与“真的空”不可区分,所以 fake 用 0xFFFF 表达“查询不可信”。 */ +void net_fake_set_recv_len_degraded(int mode); + +/* 网络代次:模拟芯片复位/重连。旧 fd 一律 NET_ERR_BADF;本 fake 直接调用 + * 产品 net_socket.h 声明的 net_generation_inc() 递增代次,不做另一套计数器。 */ +void net_fake_generation_inc(void); +uint32_t net_fake_generation(void); + +/* 32 位 tick(板端节拍低 32 位)。 */ +void net_fake_set_tick(uint32_t tick_low); +uint32_t net_fake_tick_low(void); + +/* 执行上下文开关:1 = netTask owner(默认),0 = 非 owner。 + * N9 用它验证后端每个入口自己拒绝,且底层硬件面零访问。 */ +void net_fake_set_owner(uint8_t owner); +uint8_t net_fake_owner(void); + +/* 观测:测试用来断言后端“没干坏事”。 */ +typedef struct { + int listen_closed_attempts; /* 对监听 fd 调 net_close 的次数(必须始终 0) */ + int close_calls; + int drop_conn_calls; + int accept_calls; + int send_calls; + int recv_calls; + int recv_len_calls; + int would_block_returns; /* 所有接口返回 WOULD_BLOCK 的累计 */ + int busy_returns; /* 所有接口返回 BUSY 的累计 */ + int bytes_sent; /* 实际被内核接受的字节数 */ + int hardware_calls; /* 任何 net_* 底层动作计数(N9 必须零增长) */ + uint8_t last_peer_ip[4]; /* 最近一次 accept 交出的对端 IP */ + uint16_t last_peer_port; +} net_fake_stats_t; + +void net_fake_stats(net_fake_stats_t *out); +void net_fake_stats_reset(void); + +/* 当前会话 fd(未接入时为 -1)。同一时刻只允许一个会话(单连接模型)。 */ +int net_fake_session_fd(void); +int net_fake_listen_fd(void); + +/* close 后是否允许 fd 复用(默认 1;B6 的假后端会关掉它来制造复用)。 */ +void net_fake_set_reuse_after_close(int on); + +/* 读取 fake 内核已接受的发送字节(验证 Send 不借用调用方 buffer)。 */ +int net_fake_copy_tx(uint8_t *data, int capacity); + +/* 直接读取 fake 监听 armed 状态(= net_listener_armed 的同源状态)。 */ +int net_fake_listener_armed(void); + +#ifdef __cplusplus +} +#endif +#endif /* NET_SOCKET_FAKE_H */ diff --git a/test/host/iec104_netmcu/netmcu_stub_test.c b/test/host/iec104_netmcu/netmcu_stub_test.c new file mode 100644 index 00000000..ec731ed2 --- /dev/null +++ b/test/host/iec104_netmcu/netmcu_stub_test.c @@ -0,0 +1,300 @@ +/* + * IEC104 Net MCU 后端隔离契约测试 runner。 + * 编译:假 net_socket + TEST DOUBLE 假后端 + 本文件;坏变体由 -DNETMCU_BAD=Bx 注入。 + * 所有结果只证明 fake 契约与测试有效性,不证明产品实现。 + */ +#include +#include +#include +#include "IEC104_Net.h" +#include "net_socket_fake.h" +#include "stub_iec104_netmcu.h" + +#ifndef NETMCU_BAD +#define NETMCU_BAD 0 +#endif + +static int failures; +static const char *current_case; + +#define CHECK(cond, msg) do { \ + if (!(cond)) { \ + printf(" FAIL %s: %s\n", current_case, msg); \ + ++failures; \ + } \ +} while (0) + +static IEC104_NetSocket_t setup_listen(uint16_t port) +{ + IEC104_NetSocket_t listener = IEC104_NET_INVALID_SOCKET; + uint16_t bound = 0; + CHECK(IEC104_Net_Init(NULL) == IEC104_NET_OK, "Init"); + CHECK(IEC104_Net_Listen("0.0.0.0", port, &listener, &bound, NULL) == IEC104_NET_OK, "Listen"); + CHECK(listener != IEC104_NET_INVALID_SOCKET && bound == port, "Listen outputs"); + return listener; +} + +static IEC104_NetSocket_t setup_accept(IEC104_NetSocket_t listener, uint8_t octet) +{ + IEC104_NetSocket_t client = IEC104_NET_INVALID_SOCKET; + IEC104_NetPeer_t peer; + memset(&peer, 0, sizeof(peer)); + CHECK(net_fake_peer_arrive(octet, 40000U + octet) == 1, "peer arrive"); + CHECK(IEC104_Net_Accept(listener, &client, &peer, NULL) == IEC104_NET_OK, "Accept"); + CHECK(peer.port == (uint16_t)(40000U + octet), "peer port"); + return client; +} + +static void N1_close_keeps_listener(void) +{ + IEC104_NetSocket_t l, c; + net_fake_stats_t st; + current_case = "N1"; + stub_reset(); + l = setup_listen(24001); + c = setup_accept(l, 11); + CHECK(c == l, "single-connection same fd"); + CHECK(IEC104_Net_Close(c, NULL) == IEC104_NET_OK, "Close session"); + net_fake_stats(&st); + CHECK(st.listen_closed_attempts == 0, "listener never net_close'd"); + CHECK(st.drop_conn_calls >= 1, "net_drop_conn used"); + CHECK(net_fake_listen_fd() >= 0, "listener survives"); + (void)setup_accept(l, 12); + net_fake_stats(&st); + CHECK(st.accept_calls >= 2, "second Accept works"); + CHECK(st.listen_closed_attempts == 0, "still no listener close"); +} + +static void drain_input(IEC104_NetSocket_t client, size_t expected, int degraded) +{ + uint8_t buf[128]; + size_t total = 0; + int rounds = 0; + while (total < expected && rounds++ < 256) { + uint32_t available = 0xFFFFFFFFU; + IEC104_NetResult_t pr = IEC104_Net_Pending_Input(client, &available, NULL); + size_t budget; + IEC104_NetIoResult_t r; + if (pr == IEC104_NET_OK && available == 0 && degraded == 0) { + /* 精确契约下的 OK/0 才表示“此刻真的空”;降级场景不接受此捷径。 */ + break; + } + if (degraded == 2 || pr == IEC104_NET_ERROR) { + /* 报小/不可信:退回完整缓冲,逼出有界续收而不把数据永久藏住。 */ + available = (uint32_t)sizeof(buf); + } + budget = available > sizeof(buf) ? sizeof(buf) : available; + r = IEC104_Net_Recv(client, buf, budget); + if (r.result == IEC104_NET_OK) { + total += r.transferred; + } else if (r.result == IEC104_NET_EOF) { + break; + } else { + /* WOULD_BLOCK/RETRY:有界继续,不据此重算超时。 */ + } + } + CHECK(total == expected, "all bytes delivered"); +} + +static void N2_pending_input(void) +{ + IEC104_NetSocket_t l, c; + static const uint8_t data[300] = {0}; + current_case = "N2a"; + stub_reset(); + l = setup_listen(24002); + c = setup_accept(l, 21); + CHECK(net_fake_push_rx(data, (int)sizeof(data)) == (int)sizeof(data), "queue 300B"); + drain_input(c, sizeof(data), 0); + + current_case = "N2b"; + stub_reset(); + l = setup_listen(24003); + c = setup_accept(l, 22); + /* 精确契约:不谎报 0/1——RX 有 7 字节报 7,RX 空报 0。 */ + { + uint32_t n = 0xFFFFFFFFU; + static const uint8_t seven[7] = {1, 2, 3, 4, 5, 6, 7}; + CHECK(net_fake_push_rx(seven, 7) == 7, "queue 7B exact probe"); + CHECK(IEC104_Net_Pending_Input(c, &n, NULL) == IEC104_NET_OK && n == 7, + "Pending_Input exact 7"); + { + uint8_t tmp[8]; + IEC104_NetIoResult_t rr = IEC104_Net_Recv(c, tmp, sizeof(tmp)); + CHECK(rr.result == IEC104_NET_OK && rr.transferred == 7, "drain 7B exact probe"); + } + n = 0xFFFFFFFFU; + CHECK(IEC104_Net_Pending_Input(c, &n, NULL) == IEC104_NET_OK && n == 0, + "Pending_Input exact 0 (empty)"); + } + CHECK(net_fake_push_rx(data, (int)sizeof(data)) == (int)sizeof(data), "queue 300B degraded"); + net_fake_set_recv_len_degraded(1); /* 内核仍有 300B,但驱动只报不可信哨兵 */ + drain_input(c, sizeof(data), 1); + /* 报小:每次只报 1 字节,仍不能让剩余数据永久藏住;独立重灌一遍。 */ + stub_reset(); + l = setup_listen(24009); + c = setup_accept(l, 23); + CHECK(net_fake_push_rx(data, (int)sizeof(data)) == (int)sizeof(data), "queue 300B under-report"); + net_fake_set_recv_len_degraded(2); + drain_input(c, sizeof(data), 2); +} + +static void N3_send_short_write(void) +{ + IEC104_NetSocket_t l, c; + uint8_t bufs[20][20]; /* 每次 Send 用不同 buffer;返回后立刻涂改刚用过的那块 */ + uint8_t sent[64]; + net_fake_stats_t st; + size_t i, off = 0; + int rounds = 0; + current_case = "N3"; + stub_reset(); + l = setup_listen(24004); + c = setup_accept(l, 31); + for (i = 0; i < sizeof(bufs) / sizeof(bufs[0]); ++i) { + size_t k; + for (k = 0; k < sizeof(bufs[0]); ++k) { + bufs[i][k] = (uint8_t)(0x41 + k); + } + } + net_fake_set_send_mode(FAKE_SEND_SHORT, 2, 3); + while (off < sizeof(bufs[0]) && rounds++ < 20) { + IEC104_NetIoResult_t r = IEC104_Net_Send(c, bufs[rounds - 1] + off, + sizeof(bufs[0]) - off); + if (r.result == IEC104_NET_OK) { off += r.transferred; } + /* 调用方返回后立刻整块覆写:后端若借用指针,下次就会发出 0xEE。 */ + memset(bufs[rounds - 1], 0xEE, sizeof(bufs[0])); + } + CHECK(off == sizeof(bufs[0]), "short-write progressed to completion"); + net_fake_stats(&st); + CHECK(st.bytes_sent == (int)sizeof(bufs[0]), "kernel accepted all bytes"); + CHECK(net_fake_copy_tx(sent, (int)sizeof(sent)) == (int)sizeof(bufs[0]), + "fake kernel holds all 20 bytes"); + { + size_t k; + for (k = 0; k < sizeof(bufs[0]); ++k) { + CHECK((unsigned char)sent[k] == (unsigned char)(0x41 + k), + "in-flight bytes match pre-mutation payload"); + } + } +} + +static void N4_now_ms_wrap(void) +{ + uint64_t a, b, c; + current_case = "N4"; + stub_reset(); + (void)IEC104_Net_Init(NULL); + net_fake_set_tick(0xFFFFFFF0U); + a = IEC104_Net_Now_Ms(); + net_fake_set_tick(0xFFFFFFFFU); + b = IEC104_Net_Now_Ms(); + net_fake_set_tick(0x00000000U); + c = IEC104_Net_Now_Ms(); + CHECK(b > a, "monotonic before wrap"); + CHECK(c > b, "monotonic across 0xFFFFFFFF -> 0"); + CHECK((int)(c - b) == 1, "one tick = one ms across wrap"); +} + +static void N5_generation_invalidates(void) +{ + IEC104_NetSocket_t l, c; + uint8_t b[4] = {1, 2, 3, 4}; + uint32_t gen0; + current_case = "N5"; + stub_reset(); + l = setup_listen(24005); + c = setup_accept(l, 51); + gen0 = net_fake_generation(); + net_fake_generation_inc(); + CHECK(net_fake_generation() == gen0 + 1, "generation bumped"); + { + IEC104_NetIoResult_t rr = IEC104_Net_Send(c, b, sizeof(b)); + CHECK(rr.result == IEC104_NET_ERROR, "old handle invalid"); + CHECK(rr.transferred == 0, "old handle transferred zero"); + } + /* 代次变化后旧句柄 Send/Recv 都必须被拒绝。 */ + { + char rb[8]; + IEC104_NetIoResult_t rr = IEC104_Net_Recv(c, rb, sizeof(rb)); + CHECK(rr.result == IEC104_NET_ERROR, "old handle recv invalid"); + CHECK(rr.transferred == 0, "old handle recv transferred zero"); + } + net_fake_set_tick(0x00000010U); + CHECK(IEC104_Net_Now_Ms() > 0, "clock still works"); + /* 重建:Init + Listen + Accept 新 peer */ + stub_reset(); + l = setup_listen(24006); + c = setup_accept(l, 52); + CHECK(IEC104_Net_Send(c, b, sizeof(b)).result == IEC104_NET_OK, + "new handle usable after reset"); +} + +static void N6_fd_reuse_no_cross_talk(void) +{ + IEC104_NetSocket_t l, c1; + uint8_t b[4] = {9, 9, 9, 9}; + net_fake_stats_t st; + current_case = "N6"; + stub_reset(); + l = setup_listen(24007); + c1 = setup_accept(l, 61); + CHECK(IEC104_Net_Close(c1, NULL) == IEC104_NET_OK, "close first session"); + net_fake_stats(&st); + CHECK(st.listen_closed_attempts == 0, "listener intact after close"); + CHECK(net_fake_listen_fd() >= 0, "listener fd alive"); + /* 单连接模型下 fd 数值会被复用:陈旧句柄不得再读写“空会话”。 */ + CHECK(IEC104_Net_Send(c1, b, sizeof(b)).result == IEC104_NET_ERROR, + "stale handle cannot write after close"); + { + IEC104_NetIoResult_t rr = IEC104_Net_Recv(c1, (char[8]){0}, 8); + CHECK(rr.result == IEC104_NET_ERROR || rr.transferred == 0, + "stale handle cannot read after close"); + } + /* 陈旧句柄重复 Close 必须幂等 no-op,不得把复用后的监听毁掉。 */ + CHECK(IEC104_Net_Close(c1, NULL) == IEC104_NET_OK, "stale close is idempotent"); + net_fake_stats(&st); + CHECK(st.listen_closed_attempts == 0, "stale close never touches listener"); + CHECK(net_fake_listen_fd() >= 0, "listener alive after stale close"); + /* 新会话仍能接入并收发。 */ + c1 = setup_accept(l, 62); + CHECK(IEC104_Net_Send(c1, b, sizeof(b)).result == IEC104_NET_OK, + "new session usable after stale close"); +} + +static void N7_reconnect_startdt(void) +{ + IEC104_NetSocket_t l, c; + current_case = "N7"; + stub_reset(); + l = setup_listen(24008); + c = setup_accept(l, 71); + stub_link_send_startdt(c); + stub_link_push_con(); + CHECK(stub_link_ready(c) == 1, "STARTDT/STARTDT CON first session"); + + /* RST -> Recv 返回 ERROR;Close 会话;重新接入 */ + net_fake_peer_reset(); + CHECK(IEC104_Net_Recv(c, (char[8]){0}, 8).result == IEC104_NET_ERROR, "RST observed"); + CHECK(IEC104_Net_Close(c, NULL) == IEC104_NET_OK, "close broken session"); + CHECK(stub_link_ready(c) == 0, "reconnect starts with no stale STARTDT"); + c = setup_accept(l, 72); + CHECK(c != IEC104_NET_INVALID_SOCKET, "re-accepted"); + stub_link_send_startdt(c); + stub_link_push_con(); + CHECK(stub_link_ready(c) == 1, "STARTDT link rebuilt after reconnect"); +} + +int main(void) +{ + printf("=== IEC104 Net MCU fake-contract tests (bad=%d) ===\n", NETMCU_BAD); + N1_close_keeps_listener(); + N2_pending_input(); + N3_send_short_write(); + N4_now_ms_wrap(); + N5_generation_invalidates(); + N6_fd_reuse_no_cross_talk(); + N7_reconnect_startdt(); + printf("=== IEC104 Net MCU fake-contract tests: %d failures ===\n", failures); + return failures ? 1 : 0; +} diff --git a/test/host/iec104_netmcu/netmcu_test.c b/test/host/iec104_netmcu/netmcu_test.c new file mode 100644 index 00000000..faf97db4 --- /dev/null +++ b/test/host/iec104_netmcu/netmcu_test.c @@ -0,0 +1,513 @@ +/* + * IEC104 Net MCU backend isolation contract tests. + * Builds the REAL App/protocol/iec104/iec104_net_mcu.c against a fake net layer. + * This is host-only evidence for the Net ABI, not full core/TcpServer or hardware. + */ +#include +#include +#include +#include "IEC104_Net.h" +#include "net_socket_fake.h" + +#ifndef NETMCU_BAD +#define NETMCU_BAD 0 +#endif + +static int failures; +static const char *current_case; + +#define CHECK(cond, msg) do { \ + if (!(cond)) { \ + printf(" FAIL %s: %s\n", current_case, msg); \ + ++failures; \ + } \ +} while (0) + +static IEC104_NetSocket_t setup_listen(uint16_t port) +{ + IEC104_NetSocket_t listener = IEC104_NET_INVALID_SOCKET; + uint16_t bound = 0; + CHECK(IEC104_Net_Init(NULL) == IEC104_NET_OK, "Init"); + CHECK(IEC104_Net_Listen("0.0.0.0", port, &listener, &bound, NULL) == IEC104_NET_OK, "Listen"); + CHECK(listener != IEC104_NET_INVALID_SOCKET && bound == port, "Listen outputs"); + return listener; +} + +/* 不重新 Init:代次切换后的重建只调 Listen(Init 会重置句柄计数,掩盖 ABA)。 */ +static IEC104_NetSocket_t listen_only(uint16_t port) +{ + IEC104_NetSocket_t listener = IEC104_NET_INVALID_SOCKET; + uint16_t bound = 0; + CHECK(IEC104_Net_Listen("0.0.0.0", port, &listener, &bound, NULL) == IEC104_NET_OK, + "Listen without Init"); + CHECK(listener != IEC104_NET_INVALID_SOCKET && bound == port, "Listen outputs"); + return listener; +} + +static IEC104_NetSocket_t setup_accept(IEC104_NetSocket_t listener, uint8_t octet) +{ + IEC104_NetSocket_t client = IEC104_NET_INVALID_SOCKET; + IEC104_NetPeer_t peer; + memset(&peer, 0, sizeof(peer)); + CHECK(net_fake_peer_arrive(octet, (uint16_t)(40000U + octet)) == 1, "peer arrive"); + CHECK(IEC104_Net_Accept(listener, &client, &peer, NULL) == IEC104_NET_OK, "Accept"); + CHECK(peer.port == (uint16_t)(40000U + octet), "peer port"); + return client; +} + +static void N1_close_keeps_listener(void) +{ + IEC104_NetSocket_t l, c; + net_fake_stats_t st; + current_case = "N1"; + net_fake_reset(); + l = setup_listen(24001); + c = setup_accept(l, 11); + CHECK(c != l, "logical client handle differs from listener"); + CHECK(IEC104_Net_Close(c, NULL) == IEC104_NET_OK, "Close session"); + net_fake_stats(&st); + CHECK(st.listen_closed_attempts == 0, "listener never net_close'd"); + CHECK(st.drop_conn_calls >= 1, "net_drop_conn used"); + CHECK(net_fake_listen_fd() >= 0, "listener survives"); + (void)setup_accept(l, 12); + net_fake_stats(&st); + CHECK(st.accept_calls >= 2, "second Accept works"); + CHECK(st.listen_closed_attempts == 0, "still no listener close"); +} + +static void drain_input(IEC104_NetSocket_t client, size_t expected, int degraded) +{ + uint8_t buf[128]; + size_t total = 0; + int rounds = 0; + while (total < expected && rounds++ < 256) { + uint32_t available = 0xFFFFFFFFU; + int ne = 0; + IEC104_NetResult_t pr = IEC104_Net_Pending_Input(client, &available, &ne); + size_t budget; + IEC104_NetIoResult_t r; + if (pr == IEC104_NET_OK && available == 0 && degraded == 0) { + break; + } + if (degraded == 2 || pr == IEC104_NET_ERROR) { + available = (uint32_t)sizeof(buf); + } + budget = available > sizeof(buf) ? sizeof(buf) : available; + if (budget == 0U) { + budget = sizeof(buf); + } + r = IEC104_Net_Recv(client, buf, budget); + if (r.result == IEC104_NET_OK) { + total += r.transferred; + } else if (r.result == IEC104_NET_EOF) { + break; + } + } + CHECK(total == expected, "all bytes delivered"); +} + +static void N2_pending_input(void) +{ + IEC104_NetSocket_t l, c; + static const uint8_t data[300] = {0}; + current_case = "N2a"; + net_fake_reset(); + l = setup_listen(24002); + c = setup_accept(l, 21); + CHECK(net_fake_push_rx(data, (int)sizeof(data)) == (int)sizeof(data), "queue 300B"); + drain_input(c, sizeof(data), 0); + + current_case = "N2b"; + net_fake_reset(); + l = setup_listen(24003); + c = setup_accept(l, 22); + { + uint32_t n = 0xFFFFFFFFU; + static const uint8_t seven[7] = {1, 2, 3, 4, 5, 6, 7}; + CHECK(net_fake_push_rx(seven, 7) == 7, "queue 7B exact probe"); + CHECK(IEC104_Net_Pending_Input(c, &n, NULL) == IEC104_NET_OK && n == 7, + "Pending_Input exact 7"); + { + uint8_t tmp[8]; + IEC104_NetIoResult_t rr = IEC104_Net_Recv(c, tmp, sizeof(tmp)); + CHECK(rr.result == IEC104_NET_OK && rr.transferred == 7, "drain 7B exact probe"); + } + n = 0xFFFFFFFFU; + CHECK(IEC104_Net_Pending_Input(c, &n, NULL) == IEC104_NET_OK && n == 0, + "Pending_Input exact 0 (empty)"); + } + CHECK(net_fake_push_rx(data, (int)sizeof(data)) == (int)sizeof(data), "queue 300B degraded"); + net_fake_set_recv_len_degraded(1); + drain_input(c, sizeof(data), 1); + net_fake_reset(); + l = setup_listen(24009); + c = setup_accept(l, 23); + CHECK(net_fake_push_rx(data, (int)sizeof(data)) == (int)sizeof(data), "queue 300B under-report"); + net_fake_set_recv_len_degraded(2); + drain_input(c, sizeof(data), 2); +} + +static void N3_send_short_write(void) +{ + IEC104_NetSocket_t l, c; + uint8_t bufs[20][20]; + uint8_t sent[64]; + net_fake_stats_t st; + size_t i, off = 0; + int rounds = 0; + current_case = "N3"; + net_fake_reset(); + l = setup_listen(24004); + c = setup_accept(l, 31); + for (i = 0; i < sizeof(bufs) / sizeof(bufs[0]); ++i) { + size_t k; + for (k = 0; k < sizeof(bufs[0]); ++k) { + bufs[i][k] = (uint8_t)(0x41 + k); + } + } + net_fake_set_send_mode(FAKE_SEND_SHORT, 2, 3); + while (off < sizeof(bufs[0]) && rounds++ < 20) { + IEC104_NetIoResult_t r = IEC104_Net_Send(c, bufs[rounds - 1] + off, + sizeof(bufs[0]) - off); + if (r.result == IEC104_NET_OK) { + off += r.transferred; + } + memset(bufs[rounds - 1], 0xEE, sizeof(bufs[0])); + } + CHECK(off == sizeof(bufs[0]), "short-write progressed to completion"); + net_fake_stats(&st); + CHECK(st.bytes_sent == (int)sizeof(bufs[0]), "kernel accepted all bytes"); + CHECK(net_fake_copy_tx(sent, (int)sizeof(sent)) == (int)sizeof(bufs[0]), + "fake kernel holds all 20 bytes"); + { + size_t k; + for (k = 0; k < sizeof(bufs[0]); ++k) { + CHECK((unsigned char)sent[k] == (unsigned char)(0x41 + k), + "in-flight bytes match pre-mutation payload"); + } + } +} + +static void N4_now_ms_wrap(void) +{ + uint64_t a, b, c; + current_case = "N4"; + net_fake_reset(); + (void)IEC104_Net_Init(NULL); + net_fake_set_tick(0xFFFFFFF0U); + a = IEC104_Net_Now_Ms(); + net_fake_set_tick(0xFFFFFFFFU); + b = IEC104_Net_Now_Ms(); + net_fake_set_tick(0x00000000U); + c = IEC104_Net_Now_Ms(); + CHECK(b > a, "monotonic before wrap"); + CHECK(c > b, "monotonic across 0xFFFFFFFF -> 0"); + CHECK((int)(c - b) == 1, "one tick = one ms across wrap"); +} + +static void N5_generation_invalidates(void) +{ + IEC104_NetSocket_t l, c; + uint8_t b[4] = {1, 2, 3, 4}; + current_case = "N5"; + net_fake_reset(); + l = setup_listen(24005); + c = setup_accept(l, 51); + net_fake_generation_inc(); + { + IEC104_NetIoResult_t rr = IEC104_Net_Send(c, b, sizeof(b)); + CHECK(rr.result == IEC104_NET_ERROR && rr.native_error == NET_ERR_BADF, + "stale client Send ERROR/BADF"); + } + { + char rb[8]; + IEC104_NetIoResult_t rr = IEC104_Net_Recv(c, rb, sizeof(rb)); + CHECK(rr.result == IEC104_NET_ERROR && rr.native_error == NET_ERR_BADF, + "stale client Recv ERROR/BADF"); + } + { + uint32_t n = 0; + CHECK(IEC104_Net_Pending_Input(c, &n, NULL) == IEC104_NET_ERROR, + "stale client Pending_Input ERROR"); + CHECK(n == 0, "Pending failure leaves output unchanged"); + } + { + IEC104_NetSocket_t client = IEC104_NET_INVALID_SOCKET; + IEC104_NetPeer_t peer; + memset(&peer, 0, sizeof(peer)); + CHECK(IEC104_Net_Accept(l, &client, &peer, NULL) == IEC104_NET_ERROR, + "stale listener Accept ERROR"); + CHECK(client == IEC104_NET_INVALID_SOCKET, "failed Accept output untouched"); + } + { + net_fake_stats_t before, after; + net_fake_stats(&before); + CHECK(IEC104_Net_Close(c, NULL) == IEC104_NET_OK, "stale Close idempotent OK"); + net_fake_stats(&after); + CHECK(after.listen_closed_attempts == before.listen_closed_attempts, + "stale Close touches no hardware"); + CHECK(after.hardware_calls == before.hardware_calls, + "stale Close makes no net_* call"); + } + /* 新 Listen 清掉过期槽,新建监听可用。 */ + l = setup_listen(24006); + c = setup_accept(l, 52); + CHECK(IEC104_Net_Send(c, b, sizeof(b)).result == IEC104_NET_OK, + "new generation handle usable"); +} + +static void N6_fd_reuse_no_cross_talk(void) +{ + IEC104_NetSocket_t l, c1, c2; + uint8_t b[4] = {9, 9, 9, 9}; + net_fake_stats_t st; + current_case = "N6"; + net_fake_reset(); + l = setup_listen(24007); + c1 = setup_accept(l, 61); + CHECK(IEC104_Net_Close(c1, NULL) == IEC104_NET_OK, "close first session"); + net_fake_stats(&st); + CHECK(st.listen_closed_attempts == 0, "listener intact after close"); + CHECK(net_fake_listen_fd() >= 0, "listener fd alive"); + CHECK(IEC104_Net_Send(c1, b, sizeof(b)).result == IEC104_NET_ERROR, + "stale handle cannot write after close"); + CHECK(IEC104_Net_Close(c1, NULL) == IEC104_NET_OK, "stale close is idempotent"); + net_fake_stats(&st); + CHECK(st.listen_closed_attempts == 0, "stale close never touches listener"); + c2 = setup_accept(l, 62); + CHECK(c2 != c1, "new client handle differs from stale one"); + CHECK(IEC104_Net_Send(c2, b, sizeof(b)).result == IEC104_NET_OK, + "new session usable after stale close"); +} + +static void N7_reconnect_net_layer(void) +{ + IEC104_NetSocket_t l, c, c2; + uint8_t b[2] = {0x68, 0x04}; + current_case = "N7"; + net_fake_reset(); + l = setup_listen(24008); + c = setup_accept(l, 71); + CHECK(IEC104_Net_Send(c, b, sizeof(b)).result == IEC104_NET_OK, + "first session sends"); + net_fake_peer_reset(); + CHECK(IEC104_Net_Recv(c, b, sizeof(b)).result == IEC104_NET_ERROR, "RST observed"); + CHECK(IEC104_Net_Close(c, NULL) == IEC104_NET_OK, "close broken session"); + CHECK(net_fake_listen_fd() >= 0, "listener survives RST close"); + c2 = setup_accept(l, 72); + CHECK(c2 != c, "new client handle after reconnect"); + CHECK(IEC104_Net_Send(c2, b, sizeof(b)).result == IEC104_NET_OK, + "new session sends after reconnect"); +} + +static void N8_close_preserves_listener(void) +{ + IEC104_NetSocket_t l, c, c2; + net_fake_stats_t st; + current_case = "N8"; + net_fake_reset(); + l = setup_listen(24010); + c = setup_accept(l, 81); + CHECK(IEC104_Net_Close(c, NULL) == IEC104_NET_OK, "first Close"); + net_fake_stats(&st); + CHECK(st.listen_closed_attempts == 0, "first Close never net_close'd listener"); + CHECK(net_fake_listen_fd() >= 0, "listener alive after first Close"); + c2 = setup_accept(l, 82); CHECK(c2 != IEC104_NET_INVALID_SOCKET, "second Accept on same listener succeeded"); + net_fake_stats(&st); + CHECK(st.listen_closed_attempts == 0, "machine counter still zero"); + CHECK(net_fake_listen_fd() >= 0, "same physical listener still alive"); +} + +static void N9_non_owner_rejected(void) +{ + IEC104_NetSocket_t l = IEC104_NET_INVALID_SOCKET; + IEC104_NetSocket_t c = IEC104_NET_INVALID_SOCKET; + IEC104_NetSocket_t bad = (IEC104_NetSocket_t)1U; + uint16_t bound = 0; + IEC104_NetPeer_t peer; + uint8_t buf[4] = {1, 2, 3, 4}; + uint32_t available = 0; + uint32_t ready = 0xFFFFFFFFU; + net_fake_stats_t before, after; + int ne = 0; + current_case = "N9"; + net_fake_reset(); + net_fake_set_owner(0U); /* 本测试进程 = 明确非 owner 上下文 */ + CHECK(IEC104_Net_Init(&ne) == IEC104_NET_ERROR && ne == NET_ERR_INVAL, + "Init rejects non-owner"); + CHECK(IEC104_Net_Listen("0.0.0.0", 24011, &l, &bound, &ne) == IEC104_NET_ERROR && + ne == NET_ERR_INVAL && l == IEC104_NET_INVALID_SOCKET && bound == 0, + "Listen rejects non-owner with outputs unchanged"); + memset(&peer, 0, sizeof(peer)); + CHECK(IEC104_Net_Accept(bad, &c, &peer, &ne) == IEC104_NET_ERROR && ne == NET_ERR_INVAL, + "Accept rejects non-owner"); + { + IEC104_NetIoResult_t rr = IEC104_Net_Recv(bad, buf, sizeof(buf)); + CHECK(rr.result == IEC104_NET_ERROR && rr.native_error == NET_ERR_INVAL, + "Recv rejects non-owner"); + } + CHECK(IEC104_Net_Pending_Input(bad, &available, &ne) == IEC104_NET_ERROR && + ne == NET_ERR_INVAL && available == 0, + "Pending_Input rejects non-owner, output unchanged"); + { + IEC104_NetIoResult_t rr = IEC104_Net_Send(bad, buf, sizeof(buf)); + CHECK(rr.result == IEC104_NET_ERROR && rr.native_error == NET_ERR_INVAL, + "Send rejects non-owner"); + } + CHECK(IEC104_Net_Wait(bad, bad, IEC104_NET_EVENT_READ, 0U, &ready, &ne) == IEC104_NET_ERROR && + ne == NET_ERR_INVAL && ready == 0xFFFFFFFFU, + "Wait rejects non-owner, output unchanged"); + net_fake_stats(&before); + CHECK(IEC104_Net_Close(bad, &ne) == IEC104_NET_ERROR && ne == NET_ERR_INVAL, + "Close rejects non-owner"); + net_fake_stats(&after); + CHECK(after.hardware_calls == before.hardware_calls, "zero hardware access"); + net_fake_set_owner(1U); +} + +static void N10_generation_two_handles(void) +{ + IEC104_NetSocket_t h1, h2, h3; + uint8_t b[4] = {1, 2, 3, 4}; + net_fake_stats_t before, after; + current_case = "N10"; + net_fake_reset(); + h1 = setup_listen(24012); + h2 = setup_accept(h1, 91); + CHECK(h2 != h1, "client handle differs from listener handle"); + net_fake_generation_inc(); + { + IEC104_NetIoResult_t rr = IEC104_Net_Send(h2, b, sizeof(b)); + CHECK(rr.result == IEC104_NET_ERROR && rr.native_error == NET_ERR_BADF, + "stale client handle rejected after generation change"); + } + { + IEC104_NetSocket_t c = IEC104_NET_INVALID_SOCKET; + IEC104_NetPeer_t peer; + memset(&peer, 0, sizeof(peer)); + CHECK(IEC104_Net_Accept(h1, &c, &peer, NULL) == IEC104_NET_ERROR, + "stale listener handle rejected after generation change"); + } + net_fake_stats(&before); + CHECK(IEC104_Net_Close(h2, NULL) == IEC104_NET_OK, "stale client Close idempotent OK"); + net_fake_stats(&after); + CHECK(after.hardware_calls == before.hardware_calls, + "stale client Close touches no hardware"); + CHECK(after.listen_closed_attempts == 0, + "stale client Close never closes listener (absolute zero)"); + /* 正向断言:代次推进后旧监听资源已随芯片复位失效;此时不得靠旧 fd + * 继续 armed。下一行重建后的 armed==1 才是 A7 要的“监听资源存活”。 */ + CHECK(net_fake_listener_armed() == 0, + "stale generation cleared old listener before rebuild"); + /* 新代次重建监听;旧槽已在 Listen 内清掉。故意不调 Init(Init 会重置 + * 句柄计数),因此 h3 必须严格大于旧句柄,证明没有 ABA 复用。 */ + h3 = listen_only(24013); + CHECK(h3 > h1 && h3 > h2, "new listener handle is fresh, not ABA-reused"); + CHECK(net_fake_listener_armed() == 1, + "rebuilt listener is armed (net_listener_armed == 1)"); + net_fake_stats(&after); + CHECK(after.listen_closed_attempts == 0, + "listener_closed_attempts is explicitly zero after rebuild"); + CHECK(IEC104_Net_Send(setup_accept(h3, 92), b, sizeof(b)).result == IEC104_NET_OK, + "new generation client works"); +} + +/* 正向证明库手里的首个 client 句柄 H1 仍有效:Send 成功 + 会话 fd 未变 + * (H1 若被 memset 悬空,Send 会走 find_client 失败返回 ERROR+NET_ERR_BADF)。 */ +static void check_client_handle_live(IEC104_NetSocket_t client, int fd_before) +{ + uint8_t b[1] = { 'x' }; + CHECK(IEC104_Net_Send(client, b, sizeof(b)).result == IEC104_NET_OK, + "H1 handle still resolves to live CLIENT slot after refused re-Accept"); + CHECK(net_fake_session_fd() == fd_before, "H1 session fd unchanged"); +} + +static void N11_accept_is_one_shot_until_client_closed(void) +{ + IEC104_NetSocket_t h1, client, second; + IEC104_NetPeer_t peer; + net_fake_stats_t before, after; + int fd_before; + current_case = "N11"; + net_fake_reset(); + h1 = setup_listen(24014); + client = setup_accept(h1, 93); + fd_before = net_fake_session_fd(); + /* 台架 2026-11-18 定案:单 fd 下 net_accept_locked 对 ESTABLISHED 幂等 + * 成功,库的 4 次预算循环会再调 Accept 并把刚发的句柄当"多余客户端" + * Close(同 fd → 拆掉活连接)。新语义:同一会话只交付一次,第二次 + * Accept 必须 WOULD_BLOCK,且不发任何芯片事务、不拆旧会话。 */ + memset(&peer, 0, sizeof(peer)); + net_fake_stats(&before); + second = IEC104_NET_INVALID_SOCKET; + CHECK(IEC104_Net_Accept(h1, &second, &peer, NULL) == IEC104_NET_WOULD_BLOCK, + "second Accept returns WOULD_BLOCK (one-shot per session)"); + CHECK(second == IEC104_NET_INVALID_SOCKET, "second Accept leaves client output untouched"); + net_fake_stats(&after); + CHECK(after.drop_conn_calls == before.drop_conn_calls, + "second Accept never drops the live same-fd session"); + CHECK(after.hardware_calls == before.hardware_calls, + "gate is pure RAM: no chip transaction when a session exists"); + CHECK(after.listen_closed_attempts == 0, "listener still intact"); + CHECK(net_fake_listener_armed() == 1, "listener still armed"); + /* 旧槽仍有效:正向三条 —— H1 能命中 CLIENT 槽并 Send 成功、会话 fd 不变、 + * 与监听槽同 fd(库两句柄模型的 fd 契约)。H1 若被旧 memset 段清掉, + * Send 会 find_client 失败返回 ERROR+NET_ERR_BADF,这条立即红。 */ + check_client_handle_live(client, fd_before); + CHECK(net_fake_session_fd() == net_fake_listen_fd(), + "H1 still shares listener fd (no new session fd allocated)"); + /* Close 旧会话后闸自动释放:下一次 Accept 仍能接入,不会永久静默拒连。 */ + CHECK(IEC104_Net_Close(client, NULL) == IEC104_NET_OK, "close old client OK"); + second = setup_accept(h1, 94); + CHECK(second != IEC104_NET_INVALID_SOCKET && second != client, + "new client accepted after old client closed (no permanent lockout)"); +} + +static void N12_wait_reports_no_accept_while_session_active(void) +{ + IEC104_NetSocket_t l, c; + uint32_t ready = 0xFFFFFFFFU; + current_case = "N12"; + net_fake_reset(); + l = setup_listen(24015); + /* 会话在役前:armed 监听应如实报 ACCEPT 就绪(现网新连接可接入)。 */ + CHECK(IEC104_Net_Wait(l, IEC104_NET_INVALID_SOCKET, IEC104_NET_EVENT_ACCEPT, + 0U, &ready, NULL) == IEC104_NET_OK, "Wait before session OK"); + CHECK((ready & IEC104_NET_EVENT_ACCEPT) != 0U, + "ACCEPT ready reported when no client session exists"); + /* 会话在役后:net_listener_armed 对 ESTABLISHED 恒返 1,旧实现每轮报 + * 假 ACCEPT → 库每轮再调 Accept(重复 Accept 引擎);新闸必须如实报 + * "无接入需求",这样即使 Accept 侧闸缺失也不再触发重复接入。 */ + c = setup_accept(l, 95); + ready = 0xFFFFFFFFU; + CHECK(IEC104_Net_Wait(l, c, IEC104_NET_EVENT_ACCEPT, + 0U, &ready, NULL) == IEC104_NET_OK, "Wait during session OK"); + CHECK((ready & IEC104_NET_EVENT_ACCEPT) == 0U, + "ACCEPT NOT ready while client session active (single fd is data channel)"); + /* Close 后释放:再次 Wait 应恢复 ACCEPT 就绪,证明不是永久静默拒接。 */ + CHECK(IEC104_Net_Close(c, NULL) == IEC104_NET_OK, "close session OK"); + ready = 0xFFFFFFFFU; + CHECK(IEC104_Net_Wait(l, IEC104_NET_INVALID_SOCKET, IEC104_NET_EVENT_ACCEPT, + 0U, &ready, NULL) == IEC104_NET_OK, "Wait after close OK"); + CHECK((ready & IEC104_NET_EVENT_ACCEPT) != 0U, + "ACCEPT ready again after session closed"); +} + +int main(void) +{ + printf("=== IEC104 Net MCU real-backend contract tests (bad=%d) ===\n", NETMCU_BAD); + N1_close_keeps_listener(); + N2_pending_input(); + N3_send_short_write(); + N4_now_ms_wrap(); + N5_generation_invalidates(); + N6_fd_reuse_no_cross_talk(); + N7_reconnect_net_layer(); + N8_close_preserves_listener(); + N9_non_owner_rejected(); + N10_generation_two_handles(); + N11_accept_is_one_shot_until_client_closed(); + N12_wait_reports_no_accept_while_session_active(); + printf("=== IEC104 Net MCU real-backend contract tests: %d failures ===\n", failures); + return failures ? 1 : 0; +} diff --git a/test/host/iec104_netmcu/results/report.json b/test/host/iec104_netmcu/results/report.json new file mode 100644 index 00000000..7351d563 --- /dev/null +++ b/test/host/iec104_netmcu/results/report.json @@ -0,0 +1,44 @@ +{ + "scope": "REAL backend App/protocol/iec104/iec104_net_mcu.c + fake net layer; host-only isolation evidence, not full core/TcpServer/hardware", + "backend_sha256": "4d6b8d9e8ed3404372f274d99c16bc87a06fecbee8db0b30b044b24d0562d73d", + "sources": { + "MATRIX.md": "e8c913cac2a852173f052ce806a3da101a272e2a4dff8751499fdcf39788deab", + "net_socket_fake.h": "d597375d1186b4801b4dc859401b6f3f0c9d1110efda37d0a9e73b810d7a8cd0", + "net_socket_fake.c": "8eb9ea5ed195b38e2f4993ac021ad19afa40464ff03de73628d3a795350a631e", + "netmcu_test.c": "09c203941c41fbb543580f45192c1604b984daaeb10135548756d4e42e8ebe02", + "check_static.py": "8f08695a6c6bffec6047558b5b6d0aff0c7393665853357d1176f61b1aac1132" + }, + "case_count": 13, + "case_count_basis": "13 named cases; N2a/N2b are two cases in one N2 test function", + "case_names": [ + "N1", + "N2a", + "N2b", + "N3", + "N4", + "N5", + "N6", + "N7", + "N8", + "N9", + "N10", + "N11", + "N12" + ], + "result": { + "build_rc": 0, + "run_rc": 0, + "failures": 0, + "failed_cases": [], + "note": "" + }, + "bad_variants": "NOT_RUN for real backend; TEST DOUBLE B1..B7 evidence retained in results_stub/report.json", + "not_run": [ + "full IEC104 STARTDT over core/TcpServer", + "board CH395F", + "MCU timing/WCET" + ], + "known_deviations": [ + "NODELAY: App/protocol/iec104/iec104_net_mcu.h comment; CH395F has no setsockopt, treated as always no-Nagle and NOT an OK condition" + ] +} diff --git a/test/host/iec104_netmcu/results/static/report.json b/test/host/iec104_netmcu/results/static/report.json new file mode 100644 index 00000000..326fbb7b --- /dev/null +++ b/test/host/iec104_netmcu/results/static/report.json @@ -0,0 +1,28 @@ +{ + "source": "D:\\Code\\DTU Code\\STM32F4-Base\\.agents\\worktrees\\dsh-d2fd6422-281a\\App\\protocol\\iec104\\iec104_net_mcu.c", + "source_sha256": "4d6b8d9e8ed3404372f274d99c16bc87a06fecbee8db0b30b044b24d0562d73d", + "checks": [ + { + "id": "S1", + "description": "Close CLIENT/CLIENT_EOF branch contains no net_close_sock", + "passed": true, + "source_lines": [ + 615, + 621 + ], + "evidence": "{\n /* CLIENT 分支:只拆本客户端会话、清 CLIENT 槽,监听槽的 handle/fd/\n * net_gen/role 一概不动(库侧 listen_socket 是固定值,必须始终有效)。" + }, + { + "id": "S2", + "description": "Recv EOF branch only changes role; no close/drop call", + "passed": true, + "source_lines": [ + 435, + 441 + ], + "evidence": "{\n /* 只读 EOF 事实:槽角色保持 CLIENT_EOF,绝不置回 LISTEN——\n * 否则紧随其后的 Close 会落到 LISTEN 分支真关监听(不可逆事故)。 */\n slot->role = SLOT_CLIENT_EOF;\n out.result = IEC104_NET_EOF;\n return out;\n }" + } + ], + "passed": 2, + "total": 2 +} diff --git a/test/host/iec104_netmcu/results/static_mutant/iec104_net_mcu_BAD.c b/test/host/iec104_netmcu/results/static_mutant/iec104_net_mcu_BAD.c new file mode 100644 index 00000000..6a00d34c --- /dev/null +++ b/test/host/iec104_netmcu/results/static_mutant/iec104_net_mcu_BAD.c @@ -0,0 +1,657 @@ +/* 模块名称:IEC 60870-5-104 板端 Net 后端(netTask 单 owner) */ +/* + * 模块功能:实现 App/protocol/iec60870/104/IEC104_Net.h 的全部导出 ABI, + * 底层走 Drivers/BSP/NET/net_socket.h 的 net_* 接口。 + * 适用平台:STM32F407ZGTx + CH395F;只在 netTask 上下文中调用(threadless)。 + * 创建日期:2026-11-17(task-18 板端网络割接) + * + * Verification scope (ASCII note): this is the ONLY 104 component NOT built + * or exercised by the simulator; the simulator provides the same ABI via + * sim/iec104_sim.c. This file is verified ONLY by fake-net tests (12/12) plus + * code review; CH395F on-board behaviour remains UNPROVEN. + * + * 三条硬纪律: + * 1. 零阻塞:不投 netMsgQueue、不用 osWaitForever、不睡任务通知、不帮忙 pump; + * 2. 零借用:所有 Send 在返回前数据已交给 net 层/芯片,不缓存调用方指针; + * 3. 同 fd 映射:CH395F 单连接模型下 net_accept() 返回监听 fd 自己, + * CLIENT 的 Close 只调 net_drop_conn_locked(拆会话保监听), + * 本文件的 CLIENT 分支里不存在任何关闭监听 fd 的路径。 + * + * 句柄设计(Lead 2026-11-17 裁定):IEC104_NetSocket_t 只有 uintptr_t 一个整数, + * 无法携带 session 身份,因此采用「单调递增句柄值 + 8 项映射表,句柄永不复用」: + * 每次 Listen/Accept 成功都分配新的 handle 值,旧 handle 永远不会再次出现在表中。 + * 连续 3 次 listen/close 后旧 handle 必然查表失败,构造性反例自证见 MATRIX N6。 + * + * 代次不变量(task-18 定案):后端槽的有效性只由 + * `slot->net_gen == net_get_generation()` 判定;网络初始化(net_stack_bring_up) + * 复位芯片并清空 net 层控制块后,旧句柄一律失效,后端绝不向跨代次的 fd + * 发任何硬件操作(包括 net_close_sock)。net_generation_inc 只在 net_init + * 成功、芯片已复位之后调用,因此"代次已变"即代表"旧 fd 已不存在"。 + * + * fd 归属规则(三个 P1 的共同根因,任何资源操作前先回答"这个 fd 此刻代表谁"): + * 1. 监听 fd 在任何时刻只被 LISTEN 槽引用,LISTEN 槽 handle 终身不变; + * 2. Accept 成功的瞬间该 fd 语义从"监听"变为"数据通道",旧 client 槽同时 + * 失效——必须**只清槽不 drop_conn**,因为此刻同 fd 已是新连接的 + * ESTABLISHED,drop 会拆掉刚接进来的新连接; + * 3. 任何 net_drop_conn_locked 调用前必须确认"该 fd 当前仍属于我要拆的 + * 那个会话",仅凭 fd 状态是 ESTABLISHED 不足以判定归属。同一 fd 在不同 + * 时刻分属不同代次/会话,跨代旧槽的 fd 号可能已复用,绝不能对它操作。 + */ +#include "IEC104_Net.h" +#include "net_socket.h" +#include + +/* 映射表容量 = net 层 fd 数上限(NET_MAX_SOCKETS=8)。 */ +#define IEC104_MCU_MAP_SIZE 8U + +typedef enum { + SLOT_FREE = 0, + SLOT_LISTEN, + SLOT_CLIENT, + SLOT_CLIENT_EOF +} slot_role_t; + +typedef struct { + uintptr_t handle; /* 0 = 空闲;非 0 单调,不复用 */ + int fd; /* net 层 fd,同 fd 模型下 LISTEN/CLIENT 相同 */ + uint32_t net_gen; /* 成功 Listen 时的网络代次,跨代旧句柄一律失效 */ + uint8_t role; /* slot_role_t */ +} slot_t; + +static slot_t s_slots[IEC104_MCU_MAP_SIZE]; +static uintptr_t s_next_handle = 1U; +static uint8_t s_inited; + +/* rx_bytes 唯一后端计数:Recv 返回 OK 时按 transferred 累加,饱和 0xFFFFFFF0。 */ +static uint32_t s_rx_bytes; + +#define STAT_SAT 0xFFFFFFF0u + +/* 函数功能:把「ABI 返回码 + 底层 errno」打包成一次返回,顺带回写可选的原生错误出参。 + * 参数:code ABI 返回码;native_error 底层 errno(仅出参用);out 原生错误出参,可传 NULL。 + * 返回值:原样返回 code(便于 `return result(...)` 单行收尾,避免各处重复写 out 判空)。 */ +static IEC104_NetResult_t result(IEC104_NetResult_t code, int native_error, int *out) +{ + if (out != NULL) { + *out = native_error; + } + return code; +} + +/* 函数功能:32 位饱和加法,用于接收字节数累加(到达上限后钉住,绝不回绕成小数)。 + * 参数:value 被累加的计数器;delta 本次增量。 + * 返回值:无(只改 *value)。 */ +static void sat_add(uint32_t *value, uint32_t delta) +{ + /* 先判 *value 已达上限,再做差值比较:保证 STAT_SAT - *value 不会下溢, + * delta 无论多大都只会把计数钉在饱和值,绝不回绕成小数。 */ + if (*value >= STAT_SAT || delta >= STAT_SAT - *value) { + *value = STAT_SAT; + } else { + *value += delta; + } +} + +/* 句柄查表:同时校验 owner、初始化状态、句柄存在、role 与网络代次。 + * 失败一律返回 NULL,不触碰任何硬件/连接。 + * 槽内 net_gen 是句柄有效性的唯一代次来源:网络自愈使 net_generation_inc() + * 递增后,所有旧槽的代次一次性过期,无需全局基线(也避免"重建依赖 find"的 + * 循环依赖)。 + * 两句柄模型(task-18 第三轮):监听槽与客户端槽是**两个独立槽**。监听槽 + * role 恒为 LISTEN、handle 在整段监听生命周期内不变(库侧 server->listen_socket + * 在 Listen 后固定,不会随会话更新);每次 Accept 另起一个 CLIENT 槽、分新 + * handle。绝不翻转监听槽的 role,否则库的 Close(listen)/Wait(ACCEPT) 会失联。 */ +static slot_t *find_role(uintptr_t handle, uint8_t role) +{ + uint32_t i; + uint32_t gen = net_get_generation(); + if (s_inited == 0U || handle == 0U || handle == IEC104_NET_INVALID_SOCKET || + net_ctx_is_owner_task() == 0U) { + return NULL; + } + for (i = 0U; i < IEC104_MCU_MAP_SIZE; ++i) { + slot_t *slot = &s_slots[i]; + if (slot->handle == handle && slot->role == role && + slot->net_gen == gen) { + return slot; + } + } + return NULL; +} + +/* 客户端句柄查表:CLIENT 与 CLIENT_EOF 都算命中。EOF 后库仍可能排空待发 + * 应答(Prepare_Output 在 rx_eof 下先发完再 Drop),Send 必须在 EOF 状态下 + * 仍可用,不能因 role=CLIENT_EOF 就报 BADF。 */ +static slot_t *find_client(uintptr_t handle) +{ + slot_t *slot = find_role(handle, SLOT_CLIENT); + if (slot == NULL) { + slot = find_role(handle, SLOT_CLIENT_EOF); + } + return slot; +} + +/* 取空闲槽(handle==0 且 role==FREE)。只判 handle==0 会把刚 Close(listen) + * memset 过的监听槽误当空闲并覆盖,导致 Accept 把监听资源吃掉。 */ +static slot_t *slot_alloc_free(void) +{ + uint32_t i; + for (i = 0U; i < IEC104_MCU_MAP_SIZE; ++i) { + if (s_slots[i].handle == 0U && s_slots[i].role == SLOT_FREE) { + return &s_slots[i]; + } + } + return NULL; +} + +/* 找当前仍挂着的客户端槽(CLIENT 或 CLIENT_EOF),供 Accept 防重入清理。 + * 只认当前代次:跨代旧槽的 fd 号可能已复用,对它调 net_sock_state/drop_conn + * 会违反文件头的 fd 归属规则。 */ +static slot_t *client_slot_find_any(void) +{ + uint32_t i; + uint32_t gen = net_get_generation(); + for (i = 0U; i < IEC104_MCU_MAP_SIZE; ++i) { + if ((s_slots[i].role == SLOT_CLIENT || s_slots[i].role == SLOT_CLIENT_EOF) && + s_slots[i].net_gen == gen) { + return &s_slots[i]; + } + } + return NULL; +} + +/* 函数功能:拆掉一个客户端槽——**只拆会话、保监听**。 + * 参数:slot 要拆除的客户端槽(必须是 SLOT_CLIENT / SLOT_CLIENT_EOF)。 + * 返回值:无。 + * + * drop_conn 的 APP_ASSERT 要求 ESTABLISHED/CONNECTING;先判状态,EOF/DISCONNECT + * 等其它状态只清槽、跳过拆除(auto_relisten 已接管)。本函数绝不触碰监听槽、 + * 绝不调 net_close_sock。Accept 与 Close(client) 共用同一套拆除逻辑, + * 避免两份实现漂移。 */ +static void client_slot_drop(slot_t *slot) +{ + int state; + /* 代次自锁:跨代槽的 fd 号可能已被复用,绝不能对它做任何硬件读取/拆除。 */ + if (slot->net_gen != net_get_generation()) { + memset(slot, 0, sizeof(*slot)); + return; + } + state = net_sock_state(slot->fd); + if (state == NET_SOCK_STATE_ESTABLISHED || state == NET_SOCK_STATE_CONNECTING) { + net_sock_t *sock = net_get_sock(slot->fd); + if (sock != NULL) { + (void)net_drop_conn_locked(sock); + } + } + /* 只清客户端槽;监听槽的 handle/fd/net_gen/role 原地不动。 */ + memset(slot, 0, sizeof(*slot)); +} + +/* 函数功能:分配一个新句柄值(单调递增、永不复用),必要时先整表作废重启。 + * 参数:无。 + * 返回值:新句柄(非 0,且一定不在任何现存槽中)。 + * + * UINTPTR_MAX 前保留一个溢出保护窗口,届时整表作废并重新开始——运行 2^32 次 + * 接入远大于设备寿命,仅作防御。 */ +static uintptr_t handle_new(void) +{ + uintptr_t h = s_next_handle; + if (h >= (uintptr_t)(UINTPTR_MAX - IEC104_MCU_MAP_SIZE)) { + memset(s_slots, 0, sizeof(s_slots)); + h = 1U; + } + s_next_handle = h + 1U; + return h; +} + +IEC104_NetResult_t IEC104_Net_Init(int *native_error) +{ + if (net_ctx_is_owner_task() == 0U) { + return result(IEC104_NET_ERROR, NET_ERR_INVAL, native_error); + } + /* Init 是运行期起点:net_stack_bring_up 已先 net_init(芯片硬复位 + + * net 层 s_net_socks 全清)后递增代次,上一运行期的底层 fd 已不存在。 + * 这里只清后端映射表、不向任何旧 fd 发 net_close_sock——fd 号可能已被 + * 复用,误关会打掉新会话。不变量见本文件头。 */ + memset(s_slots, 0, sizeof(s_slots)); + s_next_handle = 1U; + s_rx_bytes = 0U; + s_inited = 1U; + return result(IEC104_NET_OK, 0, native_error); +} + +void IEC104_Net_Cleanup(void) +{ + /* 不关 socket:调用方(TcpServer)负责先 Close 自己持有的句柄。 */ + s_inited = 0U; +} + +int IEC104_Net_Invalid_Argument_Error(void) +{ + return NET_ERR_INVAL; +} + +IEC104_NetResult_t IEC104_Net_Listen( + const char *bind_address, uint16_t port, IEC104_NetSocket_t *listener, + uint16_t *bound_port, int *native_error) +{ + int fd, rc, addrlen; + uint32_t i; + uint32_t ip; + struct net_sockaddr_in addr; + slot_t *slot = NULL; + + if (s_inited == 0U || bind_address == NULL || listener == NULL || + bound_port == NULL || net_ctx_is_owner_task() == 0U) { + *listener = IEC104_NET_INVALID_SOCKET; + *bound_port = 0U; + return result(IEC104_NET_ERROR, NET_ERR_INVAL, native_error); + } + *listener = IEC104_NET_INVALID_SOCKET; + *bound_port = 0U; + /* 代次闸(网络自愈):net_stack_bring_up 先 net_init(芯片硬复位、 + * net 层 s_net_socks 清零)后 net_generation_inc;旧槽的 fd 已不存在, + * 且 fd 号可能被本次重建复用。这里只清表、绝不向旧 fd 发硬件关闭, + * 避免误伤同号的新 socket。清表后旧句柄一律 find 失败;重建不依赖 + * Close 成功,serv tick 直接强制重起 core。不变量见本文件头。 */ + { + uint32_t gen = net_get_generation(); + for (i = 0U; i < IEC104_MCU_MAP_SIZE; ++i) { + if (s_slots[i].handle != 0U && s_slots[i].net_gen != gen) { + memset(&s_slots[i], 0, sizeof(s_slots[i])); + } + } + } + /* CH395F 单宿主:只接受数字 IPv4;net_inet_addr 把 "0.0.0.0" 也解析成 0。 */ + ip = net_inet_addr(bind_address); + if (ip == 0U && strcmp(bind_address, "0.0.0.0") != 0) { + return result(IEC104_NET_ERROR, NET_ERR_INVAL, native_error); + } + fd = net_socket(NET_AF_INET, NET_SOCK_STREAM); + if (fd < 0) { + return result(IEC104_NET_ERROR, net_get_errno(), native_error); + } + memset(&addr, 0, sizeof(addr)); + addr.sin_family = NET_AF_INET; + addr.sin_port = net_htons(port); + addr.sin_addr.s_addr = ip; + addrlen = (int)sizeof(addr); + rc = net_bind(fd, (const struct net_sockaddr *)&addr, addrlen); + if (rc == 0) { + /* 公开 net_listen() 是队列版,在 netTask 内自等死锁;用 owner 出口。 */ + rc = net_listen_locked(fd); + } + if (rc != 0) { + int code = net_get_errno(); + (void)net_close_sock(net_get_sock(fd)); + return result(IEC104_NET_ERROR, (code < 0) ? code : NET_ERR, native_error); + } + (void)net_setblocking(fd, 0); + slot = slot_alloc_free(); + if (slot == NULL) { + (void)net_close_sock(net_get_sock(fd)); + return result(IEC104_NET_ERROR, NET_ERR_NOMEM, native_error); + } + slot->handle = handle_new(); + slot->fd = fd; + slot->net_gen = net_get_generation(); + slot->role = SLOT_LISTEN; + *listener = slot->handle; + *bound_port = port; + return result(IEC104_NET_OK, 0, native_error); +} + +IEC104_NetResult_t IEC104_Net_Accept( + IEC104_NetSocket_t listener, IEC104_NetSocket_t *client, + IEC104_NetPeer_t *peer, int *native_error) +{ + slot_t *slot = find_role(listener, SLOT_LISTEN); + struct net_sockaddr_in addr; + int addrlen = (int)sizeof(addr); + int rc; + char ip_text[16]; + slot_t *client_slot; + + if (client == NULL || peer == NULL) { + return result(IEC104_NET_ERROR, NET_ERR_INVAL, native_error); + } + *client = IEC104_NET_INVALID_SOCKET; + if (slot == NULL) { + return result(IEC104_NET_ERROR, NET_ERR_INVAL, native_error); + } + /* 单 fd 模型的 accept 一次性语义(2026-11-18 板端实测事故,两层伤害,必读): + * ① net 层 net_accept_locked 对 ESTABLISHED 的监听 fd 幂等返回成功 + * (net_socket.c:1391 只在 state != ESTABLISHED 才进 WOULDBLOCK 分支); + * ② 库 Accept_Clients 的 4 次预算循环(IEC104_TcpServer.c:330/:1563) + * 在第 2..4 次迭代跳过 client_socket != INVALID 的全部前置判据 + * (:1570-1578),直接再调本函数,随后按"多余客户端"关掉它 + * (:1605-1607)。 + * 若在这里再发新句柄,会连环受伤:第 1 次 Accept 交付 H1,库在 :1670 + * 记住它;第 2 次进来若清/重分配 H1 所在槽,H1 立即悬空(slot_by_handle + * 返回 NULL,STARTDT_ACT 的 Send(H1) 报 NET_ERR_BADF → Drop_Client, + * 这是"STARTDT 一点回应都没有 + 20~33ms EOF"的第一击);即便不清旧槽而是 + * 另开 H2,库仍会在 :1606 Close(client) 把与监听同 fd 的会话拆掉(第二击)。 + * 因此同一会话只交付一次:当前代次已有 CLIENT/CLIENT_EOF 槽时一律 + * WOULD_BLOCK(库对该码的处理是 accept_pending=0、本轮正常返回, + * :1583-1588),绝不用 RETRY_LATER(那会 Pause_Accept 100ms)。 + * 【位置】闸放在 net_listener_armed 之前:client_slot_find_any 是纯 RAM + * 判断,保证会话已存在时一次芯片事务都不发(armed 之后紧跟的 + * net_accept_locked 会 net_poll() 走 SPI)。 + * 【EOF 窗口】client_slot_find_any 同时认 SLOT_CLIENT_EOF:EOF 之后、 + * 库 Drop_Client 之前那段收尾窗口同样必须挡住,否则新连接会被旧会话 + * 收尾拆掉。 + * 【残留保险】即便异常路径真留下槽,下一次 core start 的 IEC104_Net_Init() + * 会 memset 整张 s_slots 表,不会永久静默拒连。 */ + if (client_slot_find_any() != NULL) { + return result(IEC104_NET_WOULD_BLOCK, 0, native_error); + } + /* accept 门控:未 armed 时直接 WOULD_BLOCK,不做任何芯片访问。 */ + if (net_listener_armed(slot->fd) == 0) { + return result(IEC104_NET_WOULD_BLOCK, 0, native_error); + } + memset(&addr, 0, sizeof(addr)); + rc = net_accept_locked(slot->fd, (struct net_sockaddr *)&addr, &addrlen); + if (rc < 0) { + int code = net_get_errno(); + if (code == NET_ERR_WOULDBLOCK) { + return result(IEC104_NET_WOULD_BLOCK, code, native_error); + } + if (code == NET_ERR_NOMEM || code == NET_ERR_BUSY) { + return result(IEC104_NET_RETRY_LATER, code, native_error); + } + return result(IEC104_NET_RETRY, code, native_error); + } + /* 单连接模型:rc == listener fd(监听槽的 fd 原地转为数据通道)。 + * 监听槽 role 恒为 LISTEN、handle 不变;本次连接另起 CLIENT 槽。 + * 单 fd 下库可能重复 Accept,一次性闸在上面:此处不得清理既有槽—— + * 旧槽可能是库正持有的句柄(清掉即悬空),故原"先清旧槽再分配"段已删。 */ + client_slot = slot_alloc_free(); + if (client_slot == NULL) { + /* 槽耗尽(理论上:8 槽内 1 监听 + 至多 1 客户端不应到这):按资源暂缺 + * 退回,让库暂停接入 100 ms 后重试;本次不建会话,不碰芯片。 */ + return result(IEC104_NET_RETRY_LATER, NET_ERR_NOMEM, native_error); + } + memset(peer, 0, sizeof(*peer)); + /* net_accept_locked 把 addrlen 回写为实际结构长度(IPv4 = sizeof(net_sockaddr_in)), + * 不是调用前的容量。按最小可用长度判,不再用 >= sizeof(addr) 把真实值挡掉。 */ + if (addrlen >= (int)(sizeof(addr.sin_family) + sizeof(addr.sin_port) + + sizeof(addr.sin_addr)) && + addr.sin_family == NET_AF_INET) { + (void)net_inet_ntoa(addr.sin_addr.s_addr, ip_text); + /* 点分串最长 15 字符 + NUL,固定 16 字节缓冲足够 */ + (void)memcpy(peer->address, ip_text, sizeof(peer->address)); + peer->port = net_ntohs(addr.sin_port); + } + /* CLIENT 槽与监听槽同 fd、同代次(Accept 不换代次);独立 handle 使库的 + * listen_socket/client_socket 两个字段各自稳定,互不覆盖。 */ + client_slot->handle = handle_new(); + client_slot->fd = slot->fd; + client_slot->net_gen = slot->net_gen; + client_slot->role = SLOT_CLIENT; + /* CH395F 无 Nagle 开关(net 层没有 setsockopt 面),硬件即无延迟确认策略; + * 不以 NODELAY 作为接入 OK 条件,也不假装设置成功。 */ + *client = client_slot->handle; + return result(IEC104_NET_OK, 0, native_error); +} + +IEC104_NetIoResult_t IEC104_Net_Recv( + IEC104_NetSocket_t socket_handle, void *data, size_t capacity) +{ + IEC104_NetIoResult_t out; + slot_t *slot; + net_sock_t *sock; + int rc, code; + + out.result = IEC104_NET_ERROR; + out.transferred = 0U; + out.native_error = 0; + /* 非 owner 上下文是调用契约违规(本后端 threadless,只允许 netTask), + * 与"句柄无效"分开报 ERROR+NET_ERR_INVAL,禁止下游据此碰芯片。 */ + if (net_ctx_is_owner_task() == 0U) { + out.native_error = NET_ERR_INVAL; + return out; + } + if (data == NULL || capacity == 0U || capacity > 0x7FFFFFFFu) { + out.native_error = NET_ERR_INVAL; + return out; + } + slot = find_client(socket_handle); + if (slot == NULL) { + out.native_error = (s_inited == 0U) ? NET_ERR_INVAL : NET_ERR_BADF; + return out; + } + sock = net_get_sock(slot->fd); + if (sock == NULL) { + out.native_error = NET_ERR_BADF; + return out; + } + rc = net_recv_sock(sock, data, (int)capacity, NET_MSG_DONTWAIT); + if (rc > 0) { + out.result = IEC104_NET_OK; + out.transferred = (size_t)rc; + sat_add(&s_rx_bytes, (uint32_t)rc); + return out; + } + if (rc == 0) { + /* 只读 EOF 事实:槽角色保持 CLIENT_EOF,绝不置回 LISTEN—— + * 否则紧随其后的 Close 会落到 LISTEN 分支真关监听(不可逆事故)。 */ + slot->role = SLOT_CLIENT_EOF; + out.result = IEC104_NET_EOF; + return out; + } + code = net_get_errno(); + if (code == NET_ERR_WOULDBLOCK) { + out.result = IEC104_NET_WOULD_BLOCK; + out.native_error = code; + return out; + } + if (code == NET_ERR_BUSY || code == NET_ERR_CONNRESET) { + out.result = IEC104_NET_RETRY; + out.native_error = code; + return out; + } + out.native_error = (code < 0) ? code : NET_ERR; + return out; +} + +IEC104_NetResult_t IEC104_Net_Pending_Input( + IEC104_NetSocket_t socket_handle, uint32_t *available, int *native_error) +{ + slot_t *slot; + int len; + if (net_ctx_is_owner_task() == 0U) { + return result(IEC104_NET_ERROR, NET_ERR_INVAL, native_error); + } + if (available == NULL) { + return result(IEC104_NET_ERROR, NET_ERR_INVAL, native_error); + } + slot = find_client(socket_handle); + if (slot == NULL) { + return result(IEC104_NET_ERROR, NET_ERR_BADF, native_error); + } + len = net_pending_bytes(slot->fd); + if (len < 0) { + /* 精确失败:查不到就是查不到,不谎报 0/1,由 TcpServer 按 EOF 收口。 */ + return result(IEC104_NET_ERROR, net_get_errno(), native_error); + } + *available = (uint32_t)len; + return result(IEC104_NET_OK, 0, native_error); +} + +IEC104_NetIoResult_t IEC104_Net_Send( + IEC104_NetSocket_t socket_handle, const void *data, size_t length) +{ + IEC104_NetIoResult_t out; + slot_t *slot; + net_sock_t *sock; + int sent = 0, rc, code; + + out.result = IEC104_NET_ERROR; + out.transferred = 0U; + out.native_error = 0; + if (net_ctx_is_owner_task() == 0U) { + out.native_error = NET_ERR_INVAL; + return out; + } + if (length > 0x7FFFFFFFu) { + out.native_error = NET_ERR_INVAL; + return out; + } + slot = find_client(socket_handle); + if (slot == NULL) { + out.native_error = NET_ERR_BADF; + return out; + } + /* ABI 允许 OK + transferred=0(无进展)。库当前不会主动传 0, + * 但 0 长度调用按"无数据可发、无原生错误"返回,避免误判成发送失败。 */ + if (length == 0U) { + out.result = IEC104_NET_OK; + return out; + } + sock = net_get_sock(slot->fd); + if (sock == NULL) { + out.native_error = NET_ERR_BADF; + return out; + } + rc = net_send_try(sock, data, (int)length, &sent); + if (rc == 0) { + /* OK + 0 或短写均按实际 transferred 上报,由库按 remaining_bytes 续发; + * 后端绝不从 Send 次数或短写推断帧完成/帧失败。 */ + out.result = IEC104_NET_OK; + out.transferred = (size_t)sent; + return out; + } + code = (rc < 0) ? net_get_errno() : NET_ERR; + if (code == NET_ERR_WOULDBLOCK) { + out.result = IEC104_NET_WOULD_BLOCK; + out.native_error = code; + return out; + } + out.native_error = code; + return out; +} + +IEC104_NetResult_t IEC104_Net_Wait( + IEC104_NetSocket_t listener, IEC104_NetSocket_t client, uint32_t interest, + uint32_t timeout_ms, uint32_t *ready_events, int *native_error) +{ + slot_t *listen_slot; + slot_t *client_slot; + net_sock_t *sock; + uint32_t ready = 0U; + + (void)timeout_ms; + if (net_ctx_is_owner_task() == 0U) { + return result(IEC104_NET_ERROR, NET_ERR_INVAL, native_error); + } + if (ready_events == NULL || (interest & ~(IEC104_NET_EVENT_ACCEPT | + IEC104_NET_EVENT_READ | IEC104_NET_EVENT_WRITE)) != 0U) { + return result(IEC104_NET_ERROR, NET_ERR_INVAL, native_error); + } + *ready_events = 0U; + if ((interest & IEC104_NET_EVENT_ACCEPT) != 0U) { + listen_slot = find_role(listener, SLOT_LISTEN); + /* 会话在役时不报 ACCEPT 就绪:net_listener_armed 对 ESTABLISHED 恒返 1 + * (net_socket.c:1543-1545,单 fd 模型下监听 fd 已转数据通道),若不挡, + * 库 Wait_For_Events(:1992) 每轮收到假 ACCEPT → Process(:1897) 每轮 + * accept_pending=1 → 每轮再调 Accept。Accept 侧虽已有一次性闸, + * 但这里挡掉才能让"无接入需求"这一事实如实上报。 */ + if (listen_slot != NULL && client_slot_find_any() == NULL && + net_listener_armed(listen_slot->fd) != 0) { + ready |= IEC104_NET_EVENT_ACCEPT; + } + } + if ((interest & (IEC104_NET_EVENT_READ | IEC104_NET_EVENT_WRITE)) != 0U) { + client_slot = find_client(client); + sock = (client_slot != NULL) ? net_get_sock(client_slot->fd) : NULL; + if (sock != NULL) { + if ((interest & IEC104_NET_EVENT_READ) != 0U && + (net_can_read(client_slot->fd) != 0 || client_slot->role == SLOT_CLIENT_EOF)) { + ready |= IEC104_NET_EVENT_READ; + } + /* WRITE 就绪:net 层没有 net_can_write() 公开函数,沿用 net_select.c 的 + * 同源判据直读公开结构 net_sock_t.send_ready(send_ready 为 1 表示芯片 + * 发送 FIFO 可再写一块)。这是已知耦合:字段改名/搬迁需同步本处。 */ + if ((interest & IEC104_NET_EVENT_WRITE) != 0U && sock->send_ready != 0U) { + ready |= IEC104_NET_EVENT_WRITE; + } + } + } + *ready_events = ready; + /* 纯查询:sleep 责任在 netTask 主循环;timeout 0 / UINT32_MAX alike 立即返回。 + * 库的 Wait_For_Events 用 Now_Ms 自行计算 timer_expired,不依赖本函数阻塞。 */ + return result(IEC104_NET_OK, 0, native_error); +} + +/* 按句柄值找槽(不判 role、不判代次——Close 需要先拿到槽再由判据分流)。 + * 两句柄模型下 listen 与 client 各有独立 handle,这里只做值匹配。 */ +static slot_t *slot_by_handle(uintptr_t handle) +{ + uint32_t i; + for (i = 0U; i < IEC104_MCU_MAP_SIZE; ++i) { + if (s_slots[i].handle == handle) { + return &s_slots[i]; + } + } + return NULL; +} + +IEC104_NetResult_t IEC104_Net_Close( + IEC104_NetSocket_t socket_handle, int *native_error) +{ + slot_t *slot; + + if (socket_handle == IEC104_NET_INVALID_SOCKET || socket_handle == 0U) { + return result(IEC104_NET_OK, 0, native_error); + } + if (net_ctx_is_owner_task() == 0U) { + return result(IEC104_NET_ERROR, NET_ERR_INVAL, native_error); + } + slot = slot_by_handle(socket_handle); + /* 陈旧/代次不匹配的 Close:幂等 OK,绝不触碰硬件。 */ + if (slot == NULL || slot->role == SLOT_FREE || net_get_generation() != slot->net_gen) { + return result(IEC104_NET_OK, 0, native_error); + } + if (slot->role == SLOT_CLIENT || slot->role == SLOT_CLIENT_EOF) { + /* CLIENT 分支:只拆本客户端会话、清 CLIENT 槽,监听槽的 handle/fd/ + * net_gen/role 一概不动(库侧 listen_socket 是固定值,必须始终有效)。 + * 本分支内不存在关闭监听 fd 的任何调用路径。 */ + (void)net_close_sock(net_get_sock(slot->fd)); /* BAD mutant */ + client_slot_drop(slot); + return result(IEC104_NET_OK, 0, native_error); + } + /* LISTEN 分支:仅库 TcpServer_Close / Init 失败清理会走到这里。 + * 真关监听 fd 并清整个槽(若尚有客户端槽,先按 CLIENT 语义拆掉, + * 避免监听关了却留下无主的 client 槽)。 */ + { + slot_t *client_slot = client_slot_find_any(); + if (client_slot != NULL) { + client_slot_drop(client_slot); + } + { + net_sock_t *sock = net_get_sock(slot->fd); + if (sock != NULL) { + (void)net_close_sock(sock); + } + } + } + memset(slot, 0, sizeof(*slot)); + return result(IEC104_NET_OK, 0, native_error); +} + +uint64_t IEC104_Net_Now_Ms(void) +{ + return net_mono_now_ms(); +} + +/* 函数功能:导出后端只读统计(当前只有接收字节数)。 + * 参数:rx_bytes 出参,接收 Recv 成功时的 transferred 累加值(饱和 0xFFFFFFF0);可传 NULL。 + * 返回值:无。 + * + * apdu_tx / tx_fail 的帧级计数在 iec104_core_status_t 中,不从 Send 调用推断。 */ +void iec104_net_mcu_stats(uint32_t *rx_bytes) +{ + if (rx_bytes != NULL) { + *rx_bytes = s_rx_bytes; + } +} diff --git a/test/host/iec104_netmcu/results/static_mutant/report.json b/test/host/iec104_netmcu/results/static_mutant/report.json new file mode 100644 index 00000000..26c22c6e --- /dev/null +++ b/test/host/iec104_netmcu/results/static_mutant/report.json @@ -0,0 +1,28 @@ +{ + "source": "D:\\Code\\DTU Code\\STM32F4-Base\\.agents\\worktrees\\dsh-d2fd6422-281a\\test\\host\\iec104_netmcu\\results\\static_mutant\\iec104_net_mcu_BAD.c", + "source_sha256": "87bf283ec6b61ac14a0de3ab0f8a0352db4c62f03d4ea4479db36f9e0c546719", + "checks": [ + { + "id": "S1", + "description": "Close CLIENT/CLIENT_EOF branch contains no net_close_sock", + "passed": false, + "source_lines": [ + 615, + 622 + ], + "evidence": "{\n /* CLIENT 分支:只拆本客户端会话、清 CLIENT 槽,监听槽的 handle/fd/\n * net_gen/role 一概不动(库侧 listen_socket 是固定值,必须始终有效)。" + }, + { + "id": "S2", + "description": "Recv EOF branch only changes role; no close/drop call", + "passed": true, + "source_lines": [ + 435, + 441 + ], + "evidence": "{\n /* 只读 EOF 事实:槽角色保持 CLIENT_EOF,绝不置回 LISTEN——\n * 否则紧随其后的 Close 会落到 LISTEN 分支真关监听(不可逆事故)。 */\n slot->role = SLOT_CLIENT_EOF;\n out.result = IEC104_NET_EOF;\n return out;\n }" + } + ], + "passed": 1, + "total": 2 +} diff --git a/test/host/iec104_netmcu/results/static_mutant/selftest.txt b/test/host/iec104_netmcu/results/static_mutant/selftest.txt new file mode 100644 index 00000000..3a793c2d --- /dev/null +++ b/test/host/iec104_netmcu/results/static_mutant/selftest.txt @@ -0,0 +1,4 @@ +real_rc=0 +mutant_rc=1 +real source: D:\Code\DTU Code\STM32F4-Base\.agents\worktrees\dsh-d2fd6422-281a\App\protocol\iec104\iec104_net_mcu.c +mutant: D:\Code\DTU Code\STM32F4-Base\.agents\worktrees\dsh-d2fd6422-281a\test\host\iec104_netmcu\results\static_mutant\iec104_net_mcu_BAD.c diff --git a/test/host/iec104_netmcu/run_netmcu_tests.py b/test/host/iec104_netmcu/run_netmcu_tests.py new file mode 100644 index 00000000..a392000c --- /dev/null +++ b/test/host/iec104_netmcu/run_netmcu_tests.py @@ -0,0 +1,117 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +"""Build and run the REAL IEC104 Net MCU backend against the fake net layer. + +Host-only isolation evidence for the IEC104_Net ABI (N1..N9). This is not a +full core/TcpServer run and not hardware evidence. The TEST DOUBLE B1..B7 +evidence stays in results_stub/report.json. +""" +import hashlib +import json +import os +import subprocess +import sys + +HERE = os.path.dirname(os.path.abspath(__file__)) +ROOT = os.path.dirname(os.path.dirname(os.path.dirname(HERE))) +sys.path.insert(0, os.path.join(ROOT, "test", "host", "common")) +from unit_test_harness import locate_toolchain # noqa: E402 + +OUT = os.path.join(HERE, "results") + + +def sha256(path): + h = hashlib.sha256() + with open(path, "rb") as f: + for chunk in iter(lambda: f.read(65536), b""): + h.update(chunk) + return h.hexdigest() + + +def run_real(cl, inc, lib): + work = os.path.join(OUT, "real") + os.makedirs(work, exist_ok=True) + objdir = os.path.join(work, "obj") + os.makedirs(objdir, exist_ok=True) + exe = os.path.join(work, "netmcu_test.exe") + sources = [ + os.path.join(HERE, "netmcu_test.c"), + os.path.join(HERE, "net_socket_fake.c"), + os.path.join(ROOT, "App", "protocol", "iec104", "iec104_net_mcu.c"), + ] + env = dict(os.environ) + env["INCLUDE"] = os.pathsep.join(inc + [ + os.path.join(ROOT, "App", "protocol", "iec60870", "104"), + os.path.join(ROOT, "App", "protocol", "iec60870", "common"), + os.path.join(ROOT, "App", "protocol", "iec104"), + os.path.join(ROOT, "Drivers", "BSP", "NET"), + os.path.join(HERE, "stub"), + os.path.join(ROOT, "test", "host", "net_socket", "stub"), + HERE, + ]) + env["LIB"] = os.pathsep.join(lib) + env["PATH"] = os.path.dirname(cl) + os.pathsep + env.get("PATH", "") + flags = ["/nologo", "/std:c11", "/W3", "/WX", "/utf-8"] + objs = [] + build_log = os.path.join(work, "build.log") + with open(build_log, "wb") as log: + for src in sources: + obj = os.path.join(objdir, os.path.basename(src) + ".obj") + p = subprocess.run([cl] + flags + ["/Fo" + obj, "/c", src], + env=env, cwd=HERE, capture_output=True) + log.write((p.stdout + p.stderr).decode("utf-8", "replace").encode("utf-8")) + if p.returncode != 0: + return {"build_rc": p.returncode, "run_rc": None, "note": "compile error"} + objs.append(obj) + p = subprocess.run([cl, "/nologo", "/Fe" + exe] + objs, + env=env, cwd=HERE, capture_output=True) + log.write((p.stdout + p.stderr).decode("utf-8", "replace").encode("utf-8")) + if p.returncode != 0: + return {"build_rc": p.returncode, "run_rc": None, "note": "link error"} + r = subprocess.run([exe], env=env, cwd=work, capture_output=True) + with open(os.path.join(work, "run.log"), "wb") as f: + f.write(r.stdout + r.stderr) + text = (r.stdout + r.stderr).decode("utf-8", "replace") + fail_lines = [ln for ln in text.splitlines() if ln.strip().startswith("FAIL ")] + return {"build_rc": 0, "run_rc": r.returncode, + "failures": len(fail_lines), + "failed_cases": sorted(set( + ln.split()[1].rstrip(":") for ln in fail_lines if len(ln.split()) > 1)), + "note": ""} + + +def main(): + os.makedirs(OUT, exist_ok=True) + cl, inc, lib = locate_toolchain() + if not cl: + print("[ENV] MSVC toolchain not found") + return 2 + res = run_real(cl, inc, lib) + print("real: build_rc={} run_rc={} note={} failed_cases={}".format( + res["build_rc"], res["run_rc"], res["note"], res.get("failed_cases", []))) + report = { + "scope": "REAL backend App/protocol/iec104/iec104_net_mcu.c + fake net layer; host-only isolation evidence, not full core/TcpServer/hardware", + "backend_sha256": sha256(os.path.join( + ROOT, "App", "protocol", "iec104", "iec104_net_mcu.c")), + "sources": {f: sha256(os.path.join(HERE, f)) for f in [ + "MATRIX.md", "net_socket_fake.h", "net_socket_fake.c", + "netmcu_test.c", "check_static.py"]}, + "case_count": 13, + "case_count_basis": "13 named cases; N2a/N2b are two cases in one N2 test function", + "case_names": ["N1", "N2a", "N2b", "N3", "N4", "N5", "N6", "N7", "N8", "N9", "N10", "N11", "N12"], + "result": res, + "bad_variants": "NOT_RUN for real backend; TEST DOUBLE B1..B7 evidence retained in results_stub/report.json", + "not_run": ["full IEC104 STARTDT over core/TcpServer", "board CH395F", "MCU timing/WCET"], + "known_deviations": ["NODELAY: App/protocol/iec104/iec104_net_mcu.h comment; CH395F has no setsockopt, treated as always no-Nagle and NOT an OK condition"], + } + with open(os.path.join(OUT, "report.json"), "w", encoding="utf-8") as f: + json.dump(report, f, indent=2, ensure_ascii=False) + if res["build_rc"] != 0 or res["run_rc"] is None: + return 1 + print("real backend passed {}/{}".format( + 13 - len(res.get("failed_cases", [])), 13)) + return 0 if res["run_rc"] == 0 else 1 + + +if __name__ == "__main__": + sys.exit(main()) diff --git a/test/host/iec104_netmcu/stub/FreeRTOS.h b/test/host/iec104_netmcu/stub/FreeRTOS.h new file mode 100644 index 00000000..01e5e33c --- /dev/null +++ b/test/host/iec104_netmcu/stub/FreeRTOS.h @@ -0,0 +1,7 @@ +/* Host-only FreeRTOS.h shim; includes the net_socket test stub types. */ +#ifndef NETMCU_FREERTOS_STUB_SHIM_H +#define NETMCU_FREERTOS_STUB_SHIM_H + +#include "../../net_socket/stub/FreeRTOS.h" + +#endif /* NETMCU_FREERTOS_STUB_SHIM_H */ diff --git a/test/host/iec104_netmcu/stub/cmsis_os2.h b/test/host/iec104_netmcu/stub/cmsis_os2.h new file mode 100644 index 00000000..2130fdca --- /dev/null +++ b/test/host/iec104_netmcu/stub/cmsis_os2.h @@ -0,0 +1,13 @@ +/* + * Host-only RTOS type stub for test/host/iec104_netmcu/. + * Not part of any MCU build. Only supplies the cmsis_os2 type referenced by + * Drivers/BSP/NET/net_socket.h when NET_NO_OS is not defined. + */ +#ifndef NETMCU_CMSIS_OS2_STUB_H +#define NETMCU_CMSIS_OS2_STUB_H + +#include + +typedef void *osMessageQueueId_t; + +#endif /* NETMCU_CMSIS_OS2_STUB_H */ diff --git a/test/host/iec104_netmcu/stub/task.h b/test/host/iec104_netmcu/stub/task.h new file mode 100644 index 00000000..0dbf6bab --- /dev/null +++ b/test/host/iec104_netmcu/stub/task.h @@ -0,0 +1,7 @@ +/* Host-only task.h shim; includes the net_socket test stub declarations. */ +#ifndef NETMCU_TASK_STUB_SHIM_H +#define NETMCU_TASK_STUB_SHIM_H + +#include "../../net_socket/stub/task.h" + +#endif /* NETMCU_TASK_STUB_SHIM_H */ diff --git a/test/host/iec104_netmcu/stub_iec104_netmcu.c b/test/host/iec104_netmcu/stub_iec104_netmcu.c new file mode 100644 index 00000000..3c4d4a4b --- /dev/null +++ b/test/host/iec104_netmcu/stub_iec104_netmcu.c @@ -0,0 +1,431 @@ +/* + * 测试替身(TEST DOUBLE),不是产品实现!见 stub_iec104_netmcu.h 顶部说明。 + * 真实板端后端落地后,本文件不再参与链接。 + */ +#include "stub_iec104_netmcu.h" +#include "net_socket_fake.h" +#include + +uint16_t ch395f_get_recv_len(uint8_t sock); +static int snprintf_local(char *buf, size_t len, const char *fmt, unsigned v); + +/* 假后端自己持有的“会话身份”:单连接模型下 fd 数值会被复用, + * 必须用独立 session 号 + 网络代次校验,不能只认 fd 整数。 */ +typedef struct { + uint32_t generation; + uint32_t session; + int initialized; + int listening; + int connected; + IEC104_NetSocket_t listener; + IEC104_NetSocket_t client; + uint32_t last_tick; + uint64_t now_ms; + int startup_ack; + uint32_t sent_i_frames; + uint32_t recv_i_frames; +} stub_state_t; + +static stub_state_t s; +static int native_err; + +/* B3 用:跨用例残留的借用指针会在 N3 之后悬空,stub_reset 必须清掉。 */ +static const void *g_borrowed; +static size_t g_borrow_len; + +static int gen_stale(void) +{ +#if defined(NETMCU_BAD) && NETMCU_BAD == 5 + /* 坏变体 B5:不检查代次。 */ + (void)s; + return 0; +#else + return net_fake_generation() != s.generation; +#endif +} + +static void err(int n) { native_err = n; } + +void stub_reset(void) +{ + net_fake_reset(); + memset(&s, 0, sizeof(s)); + g_borrowed = NULL; + g_borrow_len = 0; + native_err = 0; +} + +IEC104_NetResult_t IEC104_Net_Init(int *native_error) +{ + err(0); + s.initialized = 1; + s.generation = net_fake_generation(); + if (native_error) { + *native_error = 0; + } + return IEC104_NET_OK; +} + +void IEC104_Net_Cleanup(void) +{ + s.initialized = 0; +} + +int IEC104_Net_Invalid_Argument_Error(void) +{ + return NET_ERR_INVAL; +} + +IEC104_NetResult_t IEC104_Net_Listen(const char *bind_address, uint16_t port, + IEC104_NetSocket_t *listener, + uint16_t *bound_port, int *native_error) +{ + int fd; + struct net_sockaddr_in addr; + (void)bind_address; + if (!s.initialized || listener == NULL || bound_port == NULL) { + err(NET_ERR_INVAL); + if (native_error) { *native_error = native_err; } + *listener = IEC104_NET_INVALID_SOCKET; + *bound_port = 0; + return IEC104_NET_ERROR; + } + fd = net_socket(NET_AF_INET, NET_SOCK_STREAM); + if (fd < 0) { + err(NET_ERR_NOMEM); + if (native_error) { *native_error = native_err; } + *listener = IEC104_NET_INVALID_SOCKET; + *bound_port = 0; + return IEC104_NET_ERROR; + } + memset(&addr, 0, sizeof(addr)); + addr.sin_family = NET_AF_INET; + addr.sin_port = NET_HTONS(port); + addr.sin_addr.s_addr = NET_INADDR_ANY; + if (net_bind(fd, (const struct net_sockaddr *)&addr, (int)sizeof(addr)) != 0 || + net_listen(fd) != 0) { + net_close(fd); + err(NET_ERR_INVAL); + if (native_error) { *native_error = native_err; } + *listener = IEC104_NET_INVALID_SOCKET; + *bound_port = 0; + return IEC104_NET_ERROR; + } + s.listening = 1; + s.listener = (IEC104_NetSocket_t)fd; + s.generation = net_fake_generation(); + err(0); + *listener = s.listener; + *bound_port = port; + if (native_error) { *native_error = 0; } + return IEC104_NET_OK; +} + +IEC104_NetResult_t IEC104_Net_Accept(IEC104_NetSocket_t listener, + IEC104_NetSocket_t *client, + IEC104_NetPeer_t *peer, int *native_error) +{ + int rc; + struct net_sockaddr_in addr; + int addrlen = (int)sizeof(addr); + net_fake_stats_t st; + if (listener != s.listener || client == NULL || peer == NULL || !s.listening) { + err(NET_ERR_INVAL); + if (native_error) { *native_error = native_err; } + *client = IEC104_NET_INVALID_SOCKET; + return IEC104_NET_ERROR; + } + memset(&addr, 0, sizeof(addr)); + rc = net_accept((int)listener, (struct net_sockaddr *)&addr, &addrlen); + if (rc < 0) { + if (rc == NET_ERR_NOMEM) { + err(rc); + if (native_error) { *native_error = rc; } + *client = IEC104_NET_INVALID_SOCKET; + return IEC104_NET_RETRY_LATER; + } + if (rc == NET_ERR_BUSY) { + err(rc); + if (native_error) { *native_error = rc; } + *client = IEC104_NET_INVALID_SOCKET; + return IEC104_NET_RETRY; + } + err(rc); + if (native_error) { *native_error = rc; } + *client = IEC104_NET_INVALID_SOCKET; + return IEC104_NET_WOULD_BLOCK; + } + /* 单连接模型:rc == listener,客户端和监听是同一个整数。 */ + s.client = (IEC104_NetSocket_t)rc; + s.connected = 1; + s.session++; + s.generation = net_fake_generation(); + s.startup_ack = 0; + s.sent_i_frames = 0; + s.recv_i_frames = 0; + net_fake_stats(&st); + memset(peer, 0, sizeof(*peer)); + { + uint32_t ip = NET_NTOHL(st.last_peer_ip[0] << 24 | + st.last_peer_ip[1] << 16 | + st.last_peer_ip[2] << 8 | + st.last_peer_ip[3]); + (void)ip; + /* IPv4 点分十进制,来自 fake stats 的 10.0.0.x */ + int n = snprintf_local(peer->address, sizeof(peer->address), "10.0.0.%u", + (unsigned)st.last_peer_ip[3]); + (void)n; + } + peer->port = st.last_peer_port; + err(0); + if (native_error) { *native_error = 0; } + *client = s.client; + return IEC104_NET_OK; +} + +static int snprintf_local(char *buf, size_t len, const char *fmt, unsigned v) +{ + char tmp[32]; + unsigned x = v; + int i = 0; + while (x > 0) { tmp[i++] = (char)('0' + (x % 10)); x /= 10; } + if (i == 0) { tmp[i++] = '0'; } + size_t pos = 0; + while (i > 0 && pos + 1 < len) { buf[pos++] = tmp[--i]; } + buf[pos < len ? pos : len - 1] = '\0'; + (void)fmt; + return (int)pos; +} + +IEC104_NetIoResult_t IEC104_Net_Recv(IEC104_NetSocket_t h, void *data, size_t capacity) +{ + IEC104_NetIoResult_t r; + char buf[2048]; + int rc; + r.result = IEC104_NET_ERROR; r.transferred = 0; r.native_error = 0; + if (h != s.client || !s.connected || data == NULL || capacity == 0 || gen_stale()) { + r.native_error = gen_stale() ? NET_ERR_BADF : NET_ERR_INVAL; + return r; + } + if (capacity > sizeof(buf)) { capacity = sizeof(buf); } + rc = net_recv_nb((int)h, buf, (int)capacity); + if (rc > 0) { + memcpy(data, buf, (size_t)rc); + r.result = IEC104_NET_OK; + r.transferred = (size_t)rc; + s.recv_i_frames++; + return r; + } + if (rc == 0) { r.result = IEC104_NET_EOF; return r; } + if (rc == NET_ERR_WOULDBLOCK) { r.result = IEC104_NET_WOULD_BLOCK; r.native_error = rc; return r; } + if (rc == NET_ERR_BUSY) { r.result = IEC104_NET_RETRY; r.native_error = rc; return r; } + r.native_error = rc; + return r; +} + +IEC104_NetResult_t IEC104_Net_Pending_Input(IEC104_NetSocket_t h, + uint32_t *available, int *native_error) +{ + uint16_t n; + if (h != s.client || !s.connected || available == NULL || gen_stale()) { + err(gen_stale() ? NET_ERR_BADF : NET_ERR_INVAL); + if (native_error) { *native_error = native_err; } + return IEC104_NET_ERROR; + } + n = ch395f_get_recv_len((uint8_t)h); +#if defined(NETMCU_BAD) && NETMCU_BAD == 2 + /* 坏变体 B2:把“降级为不可信/报小”当成“没有更多数据”——上层一次收满 + * 可用长度就结束,把内核里剩余字节永久藏住。 */ + if (n == 0xFFFFU) { + *available = 0; + err(0); + if (native_error) { *native_error = 0; } + return IEC104_NET_OK; + } +#endif + if (n == 0xFFFFU) { + err(NET_ERR_BUSY); + if (native_error) { *native_error = native_err; } + return IEC104_NET_ERROR; + } + *available = (uint32_t)n; + err(0); + if (native_error) { *native_error = 0; } + return IEC104_NET_OK; +} + +IEC104_NetIoResult_t IEC104_Net_Send(IEC104_NetSocket_t h, const void *data, size_t length) +{ + IEC104_NetIoResult_t r; + int rc; + r.result = IEC104_NET_ERROR; r.transferred = 0; r.native_error = 0; + if (h != s.client || !s.connected || data == NULL || length == 0 || gen_stale()) { + r.native_error = gen_stale() ? NET_ERR_BADF : NET_ERR_INVAL; + return r; + } +#if defined(NETMCU_BAD) && NETMCU_BAD == 3 + /* 借用调用方 buffer:下一次 Send 仍从旧指针读。测试已把旧 buffer + * 整块涂成 0xEE,于是重发内容被污染。 */ + if (g_borrowed != NULL) { + rc = net_send((int)h, g_borrowed, (int)g_borrow_len, 0); + g_borrowed = NULL; + g_borrow_len = 0; + } else { + rc = net_send((int)h, data, (int)length, 0); + if (length > 3) { + g_borrowed = data; + g_borrow_len = length; + } + } +#else + rc = net_send((int)h, data, (int)length, 0); +#endif + if (rc >= 0) { + r.result = IEC104_NET_OK; + r.transferred = (size_t)rc; + s.sent_i_frames++; + return r; + } + if (rc == NET_ERR_WOULDBLOCK) { r.result = IEC104_NET_WOULD_BLOCK; r.native_error = rc; return r; } + if (rc == NET_ERR_BUSY) { r.result = IEC104_NET_RETRY; r.native_error = rc; return r; } + r.native_error = rc; + return r; +} + +IEC104_NetResult_t IEC104_Net_Wait(IEC104_NetSocket_t listener, + IEC104_NetSocket_t client, uint32_t interest, + uint32_t timeout_ms, uint32_t *ready_events, + int *native_error) +{ + uint32_t ready = 0; + (void)listener; (void)client; (void)timeout_ms; + if (ready_events == NULL) { + err(NET_ERR_INVAL); + if (native_error) { *native_error = native_err; } + return IEC104_NET_ERROR; + } + if ((interest & IEC104_NET_EVENT_ACCEPT) && net_fake_listen_fd() >= 0) { + net_fake_stats_t st; + net_fake_stats(&st); + /* 简化:fake 用 peer 队列非空近似“有连接待接入”。 */ + ready |= IEC104_NET_EVENT_ACCEPT; + (void)st; + } + if ((interest & IEC104_NET_EVENT_READ) && net_can_read((int)s.client)) { + ready |= IEC104_NET_EVENT_READ; + } + if ((interest & IEC104_NET_EVENT_WRITE) && s.connected) { + ready |= IEC104_NET_EVENT_WRITE; + } + *ready_events = ready; + err(0); + if (native_error) { *native_error = 0; } + return IEC104_NET_OK; +} + +IEC104_NetResult_t IEC104_Net_Close(IEC104_NetSocket_t h, int *native_error) +{ + int rc; + if (h == IEC104_NET_INVALID_SOCKET) { + if (native_error) { *native_error = 0; } + return IEC104_NET_OK; + } +#if defined(NETMCU_BAD) && NETMCU_BAD == 1 + /* 坏变体 B1:把会话 Close 直接映射为 net_close,单连接模型下连监听一起毁掉。 */ + rc = net_close((int)h); + if (h == s.listener) { s.listening = 0; s.connected = 0; s.client = IEC104_NET_INVALID_SOCKET; } +#elif defined(NETMCU_BAD) && NETMCU_BAD == 6 + /* 坏变体 B6:第二次 Close(陈旧句柄)错误地调用 net_close,毁掉监听。 + * 正确实现应记住“会话已拆”,重复 Close 是幂等 no-op。 */ + if (h == s.listener || h == s.client) { + if (s.connected) { + rc = net_drop_conn((int)h); + s.connected = 0; + s.client = IEC104_NET_INVALID_SOCKET; + } else { + rc = net_close((int)h); /* BUG: 已关闭仍去 close 监听 */ + s.listening = 0; + } + } else { + rc = net_close((int)h); + } +#else + /* 正确语义:客户端句柄就是监听 fd,只能拆会话、不能 close 监听; + * 重复 Close 幂等。 */ + if (h == s.listener || h == s.client) { + if (s.connected) { + rc = net_drop_conn((int)h); + s.connected = 0; + s.client = IEC104_NET_INVALID_SOCKET; + } else { + rc = 0; /* 会话已拆,no-op */ + } + } else { + rc = net_close((int)h); + } +#endif +#if defined(NETMCU_BAD) && NETMCU_BAD == 7 + /* 坏变体 B7:断链后不清空 STARTDT 建链状态,旧确认被误用到新会话。 */ +#else + /* 正确语义:会话拆除后链路状态归零,重连必须重新 STARTDT。 */ + if (rc == 0) { + s.startup_ack = 0; + } +#endif + if (rc < 0) { + err(rc); + if (native_error) { *native_error = rc; } + return IEC104_NET_ERROR; + } + err(0); + if (native_error) { *native_error = 0; } + return IEC104_NET_OK; +} + +uint64_t IEC104_Net_Now_Ms(void) +{ + uint32_t now = net_fake_tick_low(); + uint32_t delta; + if (!s.initialized) { + IEC104_Net_Init(NULL); + } + delta = (uint32_t)(now - s.last_tick); + s.now_ms += (uint64_t)delta; + s.last_tick = now; +#if defined(NETMCU_BAD) && NETMCU_BAD == 4 + /* 坏变体 B4:强转低 32 位,回绕时倒退。 */ + return (uint64_t)now; +#else + return s.now_ms; +#endif +} + +void stub_link_send_startdt(IEC104_NetSocket_t client) +{ + static const uint8_t start[] = { 0x68, 0x04, 0x07, 0x00, 0x00, 0x00 }; + (void)client; + (void)IEC104_Net_Send(s.client, start, sizeof(start)); +} + +void stub_link_push_con(void) +{ + static const uint8_t con[] = { 0x68, 0x04, 0x0b, 0x00, 0x00, 0x00 }; + (void)net_fake_push_rx(con, sizeof(con)); +} + +int stub_link_ready(IEC104_NetSocket_t client) +{ + char buf[32]; + IEC104_NetIoResult_t r = IEC104_Net_Recv(client, buf, sizeof(buf)); +#if defined(NETMCU_BAD) && NETMCU_BAD == 7 + /* 坏变体 B7:断链重连后仍沿用旧 startup_ack,把旧确认当新会话已建链。 */ + (void)r; + return s.startup_ack; +#else + if (r.result == IEC104_NET_OK && r.transferred >= 6 && + buf[0] == (char)0x68 && buf[2] == (char)0x0b) { + s.startup_ack = 1; + } + return s.startup_ack; +#endif +} diff --git a/test/host/iec104_netmcu/stub_iec104_netmcu.h b/test/host/iec104_netmcu/stub_iec104_netmcu.h new file mode 100644 index 00000000..46441d38 --- /dev/null +++ b/test/host/iec104_netmcu/stub_iec104_netmcu.h @@ -0,0 +1,26 @@ +/* + * 测试替身(TEST DOUBLE),不是产品实现! + * ============================================================ + * 本文件实现一个“最小假后端”,它只按 IEC104_Net.h 的接口签名和 + * test/host/iec104_netmcu/MATRIX.md 的期望语义走通,用来验证本套 runner + * 和坏变体注入是否有效。真实板端后端由 net-cutover 单独实现; + * 真实后端落地后,runner 应换链接它的对象文件再判,不得把这里的绿灯 + * 解读为“产品代码已验证”。 + * + * 坏变体由编译期 -DNETMCU_BAD=Bx 注入,每个变体只故意破坏一个契约点, + * 用来证明对应用例能把它判红。 + */ +#ifndef STUB_IEC104_NETMCU_H +#define STUB_IEC104_NETMCU_H + +#include "IEC104_Net.h" + +/* 假后端内部测试驱动辅助(仅 runner 使用)。 */ +void stub_reset(void); + +/* 模拟断链重连后的 STARTDT 交换;返回 1 = 链路已重建。 */ +void stub_link_send_startdt(IEC104_NetSocket_t client); +void stub_link_push_con(void); +int stub_link_ready(IEC104_NetSocket_t client); + +#endif diff --git a/test/host/iec104_serv/iec104_serv_test.c b/test/host/iec104_serv/iec104_serv_test.c deleted file mode 100644 index 50e77263..00000000 --- a/test/host/iec104_serv/iec104_serv_test.c +++ /dev/null @@ -1,656 +0,0 @@ -/* - * 模块名称:IEC 60870-5-104 上行服务生命周期(iec104_serv)主机侧单元测试 - * 模块功能:在 PC 上离线验证 App/task/iec104_serv.c 的服务侧骨架:监听建立与失败 - * 回收、**网络代次一变就重建监听**(改了 IP 端口必须在新地址上继续服务)、 - * accept 门控与表项失效自愈、单连接 socket 的断线语义(对端 FIN 只关数据 - * 口、绝不关监听)、连续短写判死、活性分频探活、协议状态掉回 IDLE 时丢 - * 连接并立即重建,以及时钟桥接的两个溢出边界(>4G 秒拒绝、未对时返回哨兵 - * 而不是把 1970 当真实时间)。 - * - * 被测对象:真实源文件 ../../../App/task/iec104_serv.c(#include 纳入,故它的 static - * s_bind_listen / s_drop_conn / s_service_link / s_serv_poll / s_send_apdu / - * s_clock_sync / s_epoch_ms 都能直接驱动——**不跑 iec104_serv_task 的无限 - * 主循环**,那是 never-returning 的任务体,不适合单测)。 - * iec104_link.h / iec104_pts.h / prot_set.h / sys_clock.h / sys_events.h / - * task_watchdog.h / net_types.h 全用**真实头**(iec104_state_t 枚举、 - * iec104_link_cfg_t 函数指针签名、TASK_WD_IEC104=7、SYS_EVT_* 位值一改即 - * 编译期报错);链路层(iec104_link_*)与 pts 层给假件——链路协议本身有 - * test/host/iec104 的 97 条专测,本模块只管"服务怎么活、怎么死、怎么重生"。 - * - * 为什么要主机侧单测(而不是只靠台架): - * 1. 104 主站掉线重连是**现场最常见的故障形态**,但台架上没法按需制造"改 IP 时 - * 正好有连接""对端 FIN 与 RST 的区别""连续三次短写"这些时序;而这里每一条 - * 处理错的后果都是端口永久失联或会话卡死,只能靠主站侧超时才发现。 - * 2. 判死用**连续**短写计数(一次成功即复位),写成"累计"就会把偶发拥塞误判成 - * 断线,主站看到的就是莫名掉线——这条只有能精确注入短写/成功序列才可测。 - * 3. 时钟桥接的两个边界:epoch 秒超过 32 位必须拒绝(否则截断成 2106 年前的某个 - * 乱值写进 RTC),未对时(sys_clock_get 返回 UINT32_MAX)必须回哨兵而不是 0, - * 否则对端会以为设备时间是 1970-01-01。 - * 4. 活性分频(每 32 轮才探一次)是 CPU 预算的取舍:写错成每轮都探,就把 100ms - * 轮询变成了每轮两次系统调用;写错成分频相位,TESTFR 会迟迟不发。 - * 5. 操作记录是**审计面**(道F task-19):只要"投了"而不管"改成功了没有",屏上的 - * 操作记录页就会出现从没发生过的对时;越界拒绝与 RTC 写失败这两条腿必须 - * 一条都不投,而这只有能注入 sys_clock_set_unix 的返回值才测得到。 - * 同时钉住"用 quiet 口不用 post 口"——post 的两个满态留痕分支各带约 216 B - * 内联行缓冲,iec104Task 的静态最坏链放不下它(台架与单测都看不出这个差别, - * 只有 stack_report 会响,所以先在源码侧钉住)。 - * - * 覆盖点:TC-I104SRV-001..004 建监听(001b/c = 端口与公共地址取自 [comm] 段 - * getter,道G task-8 取值来源改造);010..013 发送与连续短写判死;020..023 时钟 - * 桥接;030..033 代次重建与 accept 门控;034..036 活性分频与对端 FIN;037..041 - * 错误丢弃与协议掉线重生;050..053 对时的操作记录(道F task-19:成功才记、 - * 越界拒绝与写钟失败两条腿都不记、每次对时各记一条、且只走 quiet 投递口)。 - * - * 通过:全部 TC PASS(main 返回 0)。 - * 入口:int main(void),返回 0=PASS / 1=FAIL(由 run 脚本判读)。 - * - * 创建日期:2026-10-23 - */ - -#include -#include - -#include "iec104_serv.h" -#include "net_socket.h" - -#include "iec104_serv.c" - -static int s_total; -static int s_passed; -static int s_failed; - -#define CHECK(cond, name) do { \ - s_total++; \ - if (cond) { s_passed++; printf(" PASS %s\n", name); } \ - else { s_failed++; printf(" FAIL %s (line %d)\n", name, __LINE__); } \ -} while (0) - -int g_i4_info_count; -int g_i4_error_count; -int g_i4_debug_count; - -/* 真实 sys_events.h 把它声明成 extern,这里给定义(本模块只在主循环里用, - 测试设成 NULL 走"事件组不可用"支路,不阻塞静态辅助函数的驱动)。 */ -osEventFlagsId_t sys_evtHandle; - -/* ===================== 可控 socket 面 ===================== */ - -typedef struct { - int socket_rc; - int bind_rc; - int listen_rc; - int accept_rc; - int send_rc; - int recv_rc; - int can_read; - int armed; - int errno_val; - uint32_t gen; - int sock_exists; - int socket_calls; - int bind_calls; - int listen_calls; - int accept_calls; - int close_calls; - int last_closed_fd; - int last_accept_sock; - int recv_calls; - uint16_t last_bind_port_net; - uint16_t last_bind_family; - uint32_t last_bind_addr; - int delay_calls; -} i4_net_t; - -static i4_net_t g_n; - -/* net_get_sock 要返回一个真 net_sock_t(结构来自真实 net_types.h),先声明再用 */ -static net_sock_t g_sock_probe; - -int net_socket(int domain, int type) { (void)domain; (void)type; g_n.socket_calls++; return g_n.socket_rc; } -int net_bind(int sockfd, const struct net_sockaddr *addr, int addrlen) -{ - const struct net_sockaddr_in *a = (const struct net_sockaddr_in *)addr; - - (void)sockfd; - (void)addrlen; - g_n.bind_calls++; - g_n.last_bind_port_net = a->sin_port; - g_n.last_bind_family = a->sin_family; - g_n.last_bind_addr = a->sin_addr.s_addr; - return g_n.bind_rc; -} -int net_listen(int sockfd) { (void)sockfd; g_n.listen_calls++; return g_n.listen_rc; } -int net_accept(int sockfd, struct net_sockaddr *addr, int *addrlen) -{ - (void)addr; - (void)addrlen; - g_n.accept_calls++; - g_n.last_accept_sock = sockfd; - return g_n.accept_rc; -} -int net_close(int sockfd) { g_n.close_calls++; g_n.last_closed_fd = sockfd; return 0; } -int net_send(int sockfd, const void *buf, int len, int flags) -{ - (void)sockfd; - (void)buf; - (void)flags; - return g_n.send_rc; -} -int net_recv_nb(int sockfd, void *buf, int len) -{ - (void)sockfd; - (void)buf; - (void)len; - g_n.recv_calls++; - return g_n.recv_rc; -} -int net_can_read(int sockfd) { (void)sockfd; return g_n.can_read; } -int net_get_errno(void) { return g_n.errno_val; } -int net_listener_armed(int sockfd) { (void)sockfd; return g_n.armed; } -uint32_t net_get_generation(void) { return g_n.gen; } -net_sock_t *net_get_sock(int sockfd) { (void)sockfd; return (g_n.sock_exists != 0) ? &g_sock_probe : NULL; } -uint16_t net_htons(uint16_t v) { return (uint16_t)((v >> 8) | (v << 8)); } - -/* ===================== 假链路层与假 pts ===================== */ - -static int g_lk_init; -static uint16_t g_lk_init_ca; /* [comm] ca 透传钉(道G task-8):init 收到的 cfg->ca */ -static int g_lk_open; -static int g_lk_close; -static int g_lk_poll; -static int g_lk_onrx; -static uint32_t g_lk_last_now; -static iec104_state_t g_lk_state; - -void iec104_link_init(iec104_link_t *lk, const iec104_link_cfg_t *cfg, void *ctx) -{ - (void)lk; (void)ctx; - g_lk_init_ca = cfg->ca; /* 道G task-8:钉 ca 真的进了链路 */ - g_lk_init++; -} -void iec104_link_open(iec104_link_t *lk, uint32_t now_ms) -{ - (void)lk; - g_lk_open++; - g_lk_last_now = now_ms; -} -void iec104_link_close(iec104_link_t *lk) { (void)lk; g_lk_close++; } -void iec104_link_poll(iec104_link_t *lk, uint32_t now_ms) -{ - (void)lk; - g_lk_poll++; - g_lk_last_now = now_ms; -} -void iec104_link_on_rx(iec104_link_t *lk, const uint8_t *data, uint16_t len, uint32_t now_ms) -{ - (void)lk; (void)data; (void)len; (void)now_ms; - g_lk_onrx++; -} -iec104_state_t iec104_link_state(const iec104_link_t *lk) { (void)lk; return g_lk_state; } - -static int g_pts_init; -void iec104_pts_init(void) { g_pts_init++; } - -/* ===================== [comm] getter 桩(道G task-8) ===================== - * 真 getter(合法带自愈)在 iec104_comm.c,由 test/host/iec104 真链套 - * TC-IEC104-031~033 覆盖;本套只钉 serv 的**取值来源**:端口每次 bind 现取、 - * ca 任务启动取一次。 */ -static uint16_t g_comm_ca = IEC104_COMM_DEF_CA; -static uint16_t g_comm_port = IEC104_COMM_DEF_PORT; -uint16_t iec104_comm_ca(void) { return g_comm_ca; } -uint16_t iec104_comm_port(void) { return g_comm_port; } - -/* ===================== 假时钟 / 定值 / 看门狗 / RTOS ===================== */ - -static uint32_t g_clock_val; -static int g_clock_set_rc; -static uint32_t g_clock_last_secs; -static int g_clock_set_calls; -static uint32_t g_dirty; -static int g_evt_set_calls; -static uint32_t g_evt_last; -static int g_wd_beats; -static int g_wd_last_id; -static uint32_t g_now; - -/* ===================== sys_log 桩(task-19 操作记录) ===================== - * 两个投递口都抓下来:quiet 是 iec104Task 该用的那个(本任务栈深,不许在调用链上 - * 内联日志行缓冲),post 一旦在这里被调到就是"绕回旧口",053 会红。 - * 投递本身(收/丢/计数)归 test/host/sys_log_mcu,本套只钉"哪条腿投了哪一句"。 */ -#include "sys_log.h" - -#define RP_I4_REC_MAX 8u -static uint8_t rp_i4_id[RP_I4_REC_MAX]; -static char rp_i4_desc[RP_I4_REC_MAX][SYSLOG_DESC_MAX + 1u]; -static uint32_t rp_i4_n; /* quiet 通道累计(不回绕,供"恰好几条"断言) */ -static uint32_t rp_i4_post_n; /* 误用 syslog_post 的次数,期望恒 0 */ - -static void rp_i4_rec_clear(void) -{ - rp_i4_n = 0u; - rp_i4_post_n = 0u; - (void)memset(rp_i4_id, 0, sizeof(rp_i4_id)); - (void)memset(rp_i4_desc, 0, sizeof(rp_i4_desc)); -} - -void syslog_post_quiet(syslog_id_t id, const char *desc) -{ - uint32_t slot = rp_i4_n % RP_I4_REC_MAX; - size_t dl = 0u; - - if (desc == NULL) { - return; - } - while ((dl < SYSLOG_DESC_MAX) && (desc[dl] != '\0')) { - dl++; - } - (void)memcpy(rp_i4_desc[slot], desc, dl); - rp_i4_desc[slot][dl] = '\0'; - rp_i4_id[slot] = (uint8_t)id; - rp_i4_n++; -} - -void syslog_post(syslog_id_t id, const char *desc) -{ - (void)id; - (void)desc; - rp_i4_post_n++; -} - -uint32_t syslog_post_dropped(void) { return 0u; } - -static int rp_i4_at(uint32_t k, syslog_id_t id, const char *desc) -{ - if (k >= rp_i4_n) { - return 0; - } - return (rp_i4_id[k % RP_I4_REC_MAX] == (uint8_t)id) - && (strcmp(rp_i4_desc[k % RP_I4_REC_MAX], desc) == 0) ? 1 : 0; -} - -uint32_t sys_clock_get(void) { return g_clock_val; } -int sys_clock_set_unix(uint32_t unix_secs) -{ - g_clock_set_calls++; - g_clock_last_secs = unix_secs; - return g_clock_set_rc; -} -uint8_t prot_set_dirty_peek(void) { return (uint8_t)g_dirty; } -/* run_par 脏 peek 假件(运行参数段):任务主循环在单测中不跑,脏恒 0 = - * 不投递 SYS_EVT_RUN_PAR_SAVE;落盘链真身覆盖在 test/host/run_par。 */ -uint8_t run_par_dirty_peek(void) { return 0u; } -uint32_t osEventFlagsSet(osEventFlagsId_t ef_id, uint32_t flags) -{ - (void)ef_id; - g_evt_set_calls++; - g_evt_last = flags; - return flags; -} -uint32_t osEventFlagsWait(osEventFlagsId_t ef_id, uint32_t flags, uint32_t options, uint32_t timeout) -{ - (void)ef_id; (void)flags; (void)options; (void)timeout; - return 0u; -} -void task_wd_beat(task_wd_id_t id) { g_wd_beats++; g_wd_last_id = (int)id; } -uint32_t osKernelGetTickCount(void) { return g_now; } -void osDelay(uint32_t ticks) -{ - (void)ticks; - g_n.delay_calls++; - if (g_n.delay_calls > 500) { - printf(" ABORT runaway (>500 osDelay rounds)\n"); - fflush(stdout); - exit(2); - } -} - -/* ===================== 复位 ===================== */ - -static void reset_all(void) -{ - (void)memset(&g_n, 0, sizeof(g_n)); - g_n.socket_rc = 5; - g_n.bind_rc = 0; - g_n.listen_rc = 0; - g_n.accept_rc = -1; - g_n.send_rc = 0; - g_n.armed = 1; - g_n.sock_exists = 1; - g_n.errno_val = NET_ERR_WOULDBLOCK; - g_n.gen = 100u; - (void)memset(&g_sock_probe, 0, sizeof(g_sock_probe)); - g_lk_init = 0; g_lk_open = 0; g_lk_close = 0; g_lk_poll = 0; g_lk_onrx = 0; - g_lk_last_now = 0u; - g_lk_state = IEC104_ST_RUN; - g_lk_init_ca = 0u; - g_pts_init = 0; - g_comm_ca = IEC104_COMM_DEF_CA; - g_comm_port = IEC104_COMM_DEF_PORT; - s_cfg.ca = IEC104_COMM_DEF_CA; - g_clock_val = 1700000000u; - rp_i4_rec_clear(); - g_clock_set_rc = 0; - g_clock_last_secs = 0u; - g_clock_set_calls = 0; - g_dirty = 0u; - g_evt_set_calls = 0; - g_evt_last = 0u; - g_wd_beats = 0; - g_wd_last_id = -1; - g_now = 5000u; - g_i4_info_count = 0; - g_i4_error_count = 0; - g_i4_debug_count = 0; - sys_evtHandle = NULL; - s_listen = -1; - s_client = -1; - s_gen = 100u; - s_liveness_ctr = 0u; - s_send_fail_run = 0u; - s_conn_dead = 0u; -} - -/* ===================== 建监听 ===================== */ - -static void tc_bind_listen(void) -{ - printf("-- TC-I104SRV-001..004 bind/listen --\n"); - reset_all(); - CHECK((s_bind_listen() == 0) && (s_listen == 5) && (g_n.listen_calls == 1) && - (g_n.last_bind_family == NET_AF_INET) && - (g_n.last_bind_port_net == net_htons(IEC104_COMM_DEF_PORT)) && - (g_n.last_bind_addr == NET_INADDR_ANY), - "TC-I104SRV-001 build the listener: [comm] default port through htons, bind to any address, remember the listen handle"); - - reset_all(); - g_comm_port = 9002u; /* [comm] 可配值:非标准端口(道G task-8) */ - CHECK((s_bind_listen() == 0) && (g_n.last_bind_port_net == net_htons(9002u)), - "TC-I104SRV-001b bind takes the [comm] getter value, not the compile-time 2404"); - - reset_all(); - g_comm_ca = 7u; - s_apply_comm_ca(); /* 任务启动链路同款动作(ca = 重启生效) */ - iec104_link_init(&s_link, &s_cfg, NULL); - CHECK((s_cfg.ca == 7u) && (g_lk_init_ca == 7u) && (g_lk_init == 1), - "TC-I104SRV-001c task-start ca fill reaches the link cfg ([comm] value source)"); - g_comm_ca = 9u; - s_apply_comm_ca(); - CHECK(s_cfg.ca == 9u, "TC-I104SRV-001c every task start re-reads the section (restart semantics)"); - - reset_all(); - g_n.socket_rc = -1; - CHECK((s_bind_listen() == -1) && (g_n.bind_calls == 0) && (g_n.close_calls == 0), - "TC-I104SRV-002 if no socket can be created return at once: no bind and no close of a handle that does not exist"); - - reset_all(); - g_n.bind_rc = -1; - CHECK((s_bind_listen() == -1) && (g_n.close_calls == 1) && (g_n.listen_calls == 0), - "TC-I104SRV-003 a bind failure must close the socket just created (otherwise every retry leaks a handle)"); - - reset_all(); - g_n.listen_rc = -1; - CHECK((s_bind_listen() == -1) && (g_n.close_calls == 1) && (s_listen == -1), - "TC-I104SRV-004 a listen failure also closes it and leaves no half-built listener"); -} - -/* ===================== 发送与连续短写判死 ===================== */ - -static void tc_send(void) -{ - const uint8_t apdu[4] = { 0x68u, 0x02u, 0x00u, 0x00u }; - - printf("-- TC-I104SRV-010..013 send & fail streak --\n"); - reset_all(); - s_client = -1; - s_send_apdu(NULL, apdu, 4u); - CHECK((g_n.send_rc == 0) && (g_n.close_calls == 0) && (g_i4_error_count == 0), - "TC-I104SRV-010 with no connection it returns directly (no net_send, no error)"); - - reset_all(); - s_client = 7; - g_n.send_rc = 4; - s_send_apdu(NULL, apdu, 4u); - CHECK((s_send_fail_run == 0u) && (s_conn_dead == 0u), - "TC-I104SRV-011 a fully sent frame clears the consecutive-failure counter"); - - reset_all(); - s_client = 7; - g_n.send_rc = 2; /* 短写:只发了 2/4 */ - s_send_apdu(NULL, apdu, 4u); - CHECK((s_send_fail_run == 1u) && (s_conn_dead == 0u) && (g_i4_error_count == 1), - "TC-I104SRV-012 the first short write is logged but does not declare death (congestion is normal)"); - s_send_apdu(NULL, apdu, 4u); - s_send_apdu(NULL, apdu, 4u); - CHECK((s_send_fail_run == 3u) && (s_conn_dead == 1u), - "TC-I104SRV-012b only the 3rd failure in a row declares death (IEC104_SEND_FAIL_MAX)"); - - reset_all(); - s_client = 7; - g_n.send_rc = 1; - s_send_apdu(NULL, apdu, 4u); - s_send_apdu(NULL, apdu, 4u); - g_n.send_rc = 4; - s_send_apdu(NULL, apdu, 4u); /* 中间成功一次 */ - g_n.send_rc = 1; - s_send_apdu(NULL, apdu, 4u); - s_send_apdu(NULL, apdu, 4u); - CHECK((s_conn_dead == 0u) && (s_send_fail_run == 2u), - "TC-I104SRV-013 success resets the counter: occasional congestion never adds up into a false kill"); -} - -/* ===================== 时钟桥接边界 ===================== */ - -static void tc_clock(void) -{ - printf("-- TC-I104SRV-020..023 clock bridge --\n"); - reset_all(); - CHECK(s_clock_sync(NULL, 0x100000000ULL * 1000ULL) == -1, - "TC-I104SRV-020 any second count beyond 32 bits is rejected (truncating it into the RTC means garbage past 2106)"); - CHECK(g_clock_set_calls == 0, "TC-I104SRV-020b when rejected the clock must not be touched at all"); - - reset_all(); - (void)s_clock_sync(NULL, 1700000123000ULL); - CHECK((g_clock_set_calls == 1) && (g_clock_last_secs == 1700000123u), - "TC-I104SRV-021 milliseconds become seconds by integer division before the clock is written"); - - reset_all(); - g_clock_val = UINT32_MAX; /* 未对时的哨兵值 */ - CHECK(s_epoch_ms(NULL) == UINT64_MAX, - "TC-I104SRV-022 without time sync return the UINT64_MAX sentinel (1970 must never pass for device time)"); - - reset_all(); - g_clock_val = 1700000123u; - CHECK(s_epoch_ms(NULL) == 1700000123000ULL, "TC-I104SRV-023 with a synced clock the answer is in milliseconds"); - - /* ---- task-19:对时 = 操作记录(审计面只记真发生过的动作) ---- */ - reset_all(); - (void)s_clock_sync(NULL, 1700000123000ULL); - CHECK((rp_i4_n == 1u) && (rp_i4_at(0u, SYSLOG_OPER, "clock set by 104") == 1), - "TC-I104SRV-050 a successful sync books exactly one operation record naming the source"); - - reset_all(); - (void)s_clock_sync(NULL, 0x100000000ULL * 1000ULL); - CHECK((rp_i4_n == 0u) && (g_clock_set_calls == 0), - "TC-I104SRV-050b the out-of-range rejection books nothing (an audit record for something that never happened is worse than none)"); - - reset_all(); - g_clock_set_rc = -1; /* 写钟失败(RTC 回写失败那一类) */ - CHECK(s_clock_sync(NULL, 1700000123000ULL) == -1, - "TC-I104SRV-051 a failed clock write still answers the link layer with -1"); - CHECK(rp_i4_n == 0u, - "TC-I104SRV-051b a failed clock write books no operation record"); - - reset_all(); - (void)s_clock_sync(NULL, 1700000123000ULL); - (void)s_clock_sync(NULL, 1700000456000ULL); - CHECK((rp_i4_n == 2u) && (rp_i4_at(1u, SYSLOG_OPER, "clock set by 104") == 1), - "TC-I104SRV-052 every re-sync is its own operation record (no dedup, no latching)"); - - /* 053:用错投递口的形状——iec104Task 是深链任务,只许用 quiet。 - * 顺带量文案长度:超过 SYSLOG_DESC_MAX 会在投递侧被静默截断。 */ - reset_all(); - (void)s_clock_sync(NULL, 1700000123000ULL); - CHECK((rp_i4_post_n == 0u) && (rp_i4_n == 1u) - && (strlen("clock set by 104") <= SYSLOG_DESC_MAX), - "TC-I104SRV-053 the record goes out over the stack-safe channel only, and its text fits the record field"); -} - -/* ===================== 代次重建与 accept 门控 ===================== */ - -static void tc_generation(void) -{ - printf("-- TC-I104SRV-030..033 generation & accept gate --\n"); - reset_all(); - s_listen = 5; - s_client = 9; - g_n.gen = 101u; /* 网络重建(现场改了 IP) */ - s_serv_poll(); - CHECK((g_n.close_calls == 2) && (g_n.last_closed_fd == 5) && - (s_client == -1) && (s_liveness_ctr == 0u) && (s_conn_dead == 0u) && - (g_lk_close == 1) && (s_gen == 101u) && (g_n.bind_calls == 1), - "TC-I104SRV-030 a generation change tears down the old connection and listener and rebuilds them (the port must keep serving on the new IP)"); - - reset_all(); - s_listen = -1; - s_serv_poll(); - CHECK((g_n.bind_calls == 1) && (s_listen == 5) && (g_n.accept_calls == 0), - "TC-I104SRV-031 a lost listener is rebuilt and this round does not accept"); - - reset_all(); - s_listen = 5; - g_n.armed = 0; /* 监听还没就绪 */ - g_n.sock_exists = 1; - s_serv_poll(); - CHECK((g_n.accept_calls == 0) && (s_listen == 5), - "TC-I104SRV-032 no accept while the listener gate is down (otherwise it spins on a handle that is not ready)"); - - reset_all(); - s_listen = 5; - g_n.armed = 0; - g_n.sock_exists = 0; /* 表项已不存在 */ - s_serv_poll(); - CHECK((s_listen == -1) && (g_n.accept_calls == 0), - "TC-I104SRV-032b once the slot is invalid the listen handle is dropped and rebuilt next round"); - - reset_all(); - s_listen = 5; - g_n.accept_rc = 9; - s_send_fail_run = 3u; - s_conn_dead = 1u; - s_liveness_ctr = 7u; - s_serv_poll(); - CHECK((s_client == 9) && (g_lk_open == 1) && (g_lk_last_now == 5000u) && - (s_send_fail_run == 0u) && (s_conn_dead == 0u) && (s_liveness_ctr == 0u) && - (g_i4_info_count == 1), - "TC-I104SRV-033 a new connection opens the link and resets all three failure counters"); -} - -/* ===================== 活性分频、对端 FIN、错误丢弃 ===================== */ - -static void tc_liveness(void) -{ - printf("-- TC-I104SRV-034..041 liveness / EOF / drop --\n"); - reset_all(); - s_listen = 5; - s_client = 9; - g_n.can_read = 0; - s_liveness_ctr = 0u; - s_serv_poll(); - CHECK((g_n.recv_calls == 0) && (g_lk_poll == 1) && (s_liveness_ctr == 1u), - "TC-I104SRV-034 with nothing readable the liveness probe runs on a divide-by-32 tick and this round receives nothing (saves CPU budget)"); - - reset_all(); - s_listen = 5; - s_client = 9; - g_n.can_read = 0; - /* 这一轮收到的是"暂无数据"(非阻塞的空读),而不是 0——0 在 recv_nb 的语义里是 - * 对端 FIN,会直接走 036 那条断开支路,测不到分频本身。 */ - g_n.recv_rc = -1; - g_n.errno_val = NET_ERR_WOULDBLOCK; - s_liveness_ctr = 31u; /* 下一轮正好到分频点 */ - s_serv_poll(); - CHECK((g_n.recv_calls == 1) && (g_lk_poll == 1) && (s_client == 9), - "TC-I104SRV-035 only when the divider fires does it receive once (liveness frames such as TESTFR depend on it going out)"); - - reset_all(); - s_listen = 5; - s_client = 9; - g_n.can_read = 1; - g_n.recv_rc = 0; /* 对端 FIN */ - s_serv_poll(); - CHECK((g_n.last_closed_fd == 9) && (s_client == -1) && (g_lk_close == 1) && - (g_n.close_calls == 1) && (s_listen == 5) && (g_n.bind_calls == 0), - "TC-I104SRV-036 a normal peer disconnect closes only the data socket: the listener must stay (on a single-socket chip closing the wrong one kills the port)"); - - reset_all(); - s_listen = 5; - s_client = 5; /* 单连接复用:数据号 == 监听号 */ - g_n.can_read = 1; - g_n.recv_rc = 0; - s_serv_poll(); - CHECK((g_n.close_calls == 0) && (s_client == -1) && (g_lk_close == 1), - "TC-I104SRV-036b when the data handle equals the listen handle it must NOT be closed (that would destroy the listener too)"); - - reset_all(); - s_listen = 5; - s_client = 9; - g_n.can_read = 1; - g_n.recv_rc = -1; - g_n.errno_val = NET_ERR_WOULDBLOCK; /* 空转:没数据可读 */ - s_serv_poll(); - CHECK((s_client == 9) && (g_lk_close == 0) && (g_i4_error_count == 0), - "TC-I104SRV-037 WOULDBLOCK is normal idling and must not drop the connection as an error"); - - reset_all(); - s_listen = 5; - s_client = 9; - g_n.can_read = 1; - g_n.recv_rc = -1; - g_n.errno_val = NET_ERR_CONNRESET; /* 真错误 */ - s_serv_poll(); - CHECK((s_client == -1) && (s_listen == 5) && (g_i4_error_count == 1) && - (g_lk_close == 1) && (s_liveness_ctr == 0u), - "TC-I104SRV-038 a real error drops the connection and rebuilds the listener on the spot (no gap in service)"); - - reset_all(); - s_listen = 5; - s_client = 9; - s_conn_dead = 1u; - s_service_link(1000u); - CHECK((s_client == -1) && (g_n.close_calls == 1) && (g_i4_error_count == 1), - "TC-I104SRV-039 after death is declared service_link does the teardown (the send-failure path is a separate case)"); - - reset_all(); - s_listen = 5; - s_client = 9; - g_lk_state = IEC104_ST_IDLE; /* 链路层自己回到了未建立 */ - s_service_link(1000u); - CHECK((s_client == -1) && (g_lk_close >= 1) && (s_listen == 5), - "TC-I104SRV-040 falling back to IDLE also drops and respawns the session (otherwise the service stays up but never serves)"); - - reset_all(); - s_listen = 9; - s_client = 9; - g_n.socket_rc = -1; /* 重建失败 */ - g_n.sock_exists = 0; /* 且表项已经没了 */ - g_n.can_read = 1; - g_n.recv_rc = 0; - s_serv_poll(); - CHECK((s_client == -1) && (s_listen == -1) && (g_n.close_calls == 0), - "TC-I104SRV-041 slot gone and the rebuild failed: drop the stale listen handle and retry next round (never close it while it equals the data handle)"); -} - -int main(void) -{ - printf("=== IEC104 SERV Tests ===\n"); - - tc_bind_listen(); - tc_send(); - tc_clock(); - tc_generation(); - tc_liveness(); - - printf("\n=== IEC104 SERV Tests: %d/%d PASSED (failed=%d) ===\n", - s_passed, s_total, s_failed); - return (s_failed == 0) ? 0 : 1; -} diff --git a/test/host/iec104_serv/run_unit_test.py b/test/host/iec104_serv/run_unit_test.py deleted file mode 100644 index 23374ba4..00000000 --- a/test/host/iec104_serv/run_unit_test.py +++ /dev/null @@ -1,76 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -"""IEC 104 上行服务生命周期(iec104_serv)主机侧纯逻辑单元测试运行器(纯标准库)。 - -做什么: - 用本机 MSVC 编译 test/host/iec104_serv/iec104_serv_test.c(以 #include 纳入生产源 - App/task/iec104_serv.c),离线驱动它的全部 static 辅助函数(**不跑 never-returning - 的任务主循环**),验证监听建立与失败回收、网络代次一变就重建监听、accept 门控与 - 表项失效自愈、单连接 socket 的断线语义、连续短写判死、活性分频探活、协议掉回 IDLE - 时丢弃重生,以及时钟桥接的两个溢出边界。 - -为什么要主机侧单测(而不是只用台架): - 104 主站掉线重连是现场最常见故障形态,但台架无法按需制造"改 IP 时正好有连接" - "对端 FIN 与 RST 的区别""连续三次短写";这几条处理错的后果都是端口永久失联或 - 会话卡死,只能等主站侧超时才发现。判死用**连续**短写计数(成功即复位),写成累计 - 就会把偶发拥塞误判成断线;时钟桥接的 >4G 秒必须拒绝、未对时必须回哨兵而不是 0; - 活性分频写错就成了每轮多一次系统调用或 TESTFR 迟迟不发。 - -桩的边界:iec104_link.h / iec104_pts.h / prot_set.h / sys_clock.h / sys_events.h / - task_watchdog.h / net_types.h 用真实头(iec104_state_t、cfg 的函数指针签名、 - TASK_WD_IEC104=7、SYS_EVT_* 位值一改即编译期报错);链路层与 pts 层给假件——链路 - 协议本身有 test/host/iec104 的 97 条专测,本模块只管服务怎么活、怎么死、怎么重生; - socket 面给可控假件(连 socket 号、发送返回、错误码、代次、门控都能注入)。 - -用法(仓库根目录): - python test/host/iec104_serv/run_unit_test.py - -退出码:0=PASS / 1=测试失败 / 2=环境错误。 - -设计依据:docs/子系统设计/*104* 设计文档、docs/网络/网络自愈架构设计.md §4.10(单连接 socket 断开语义、 -错误码经任务通知值回传)、docs/测试说明/单元测试/主机单测覆盖率口径.md §9 -创建日期:2026-10-23 -""" -import os -import sys - -HERE = os.path.dirname(os.path.abspath(__file__)) -ROOT = os.path.dirname(os.path.dirname(os.path.dirname(HERE))) -sys.path.insert(0, os.path.join(ROOT, "test", "host", "common")) - -from unit_test_harness import TestBuild, run_host_unit_test # noqa: E402 - - -def _header_dirs(base): - """收集 base 下所有**真的放着 .h** 的目录。 - - 104 服务要 include 的 iec104_serv.h / iec104_link.h / iec104_pts.h / - task_watchdog.h / sys_clock.h / sys_events.h / prot_set.h 散在 App 的多个 - 子目录里,逐个手写列表一定会漏(漏一个就是 C1083,而且报错落在被测源上, - 很容易被误读成生产代码坏了)。这里按目录实际内容自动收集,多给几个 /I - 对编译没有代价,却把"漏目录"这类脆错误消掉。 - """ - dirs = [] - for root, _sub, files in os.walk(base): - if any(f.endswith(".h") for f in files): - dirs.append(root) - return sorted(dirs) - - -BUILD = TestBuild( - name="IEC104 SERV Tests", - src=os.path.join(HERE, "iec104_serv_test.c"), - include_dirs=[ - os.path.join(HERE, "stub"), # 必须先于真头目录(覆盖 net_socket.h 等) - ] + _header_dirs(os.path.join(ROOT, "App")) + - # sys_clock.h 会拉 sd2506.h(Drivers/BSP/SD2506),BSP 的头也散在多个子目录里, - # 同样按实际内容收集。注意 stub 目录排在最前,桩依然优先于这些真头。 - _header_dirs(os.path.join(ROOT, "Drivers", "BSP")) + [ - os.path.join(ROOT, "Drivers", "BSP", "NET"), - HERE, - ], - summary_marker="=== IEC104 SERV Tests:", -) - -if __name__ == "__main__": - sys.exit(run_host_unit_test(BUILD)) diff --git a/test/host/iec104_serv/stub/cmsis_os2.h b/test/host/iec104_serv/stub/cmsis_os2.h deleted file mode 100644 index 41e32742..00000000 --- a/test/host/iec104_serv/stub/cmsis_os2.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 模块名称:主机侧单测桩 - cmsis_os2.h(iec104_serv 模块专用) - * 模块功能:给 CMSIS-RTOS2 的六个入口一个宿主等价壳(tick、睡眠、事件组)。 - * ⚠ 仅供主机侧单测使用,不参与 MCU 构建。 - * 事件组只做成"记次数":本模块的测试**不驱动 iec104_serv_task 的无限主循环** - * (那会永不返回),只直调它的静态辅助函数,事件相关行为用可见计数器观察。 - * 创建日期:2026-10-23 - */ -#ifndef CMSIS_OS2_H -#define CMSIS_OS2_H - -#include - -typedef void *osEventFlagsId_t; -typedef uint32_t osStatus_t; - -#define osFlagsWaitAny 0x00000000u -#define osFlagsNoClear 0x00000001u -#define osFlagsError 0x80000000u - -uint32_t osKernelGetTickCount(void); -void osDelay(uint32_t ticks); -uint32_t osEventFlagsWait(osEventFlagsId_t ef_id, uint32_t flags, - uint32_t options, uint32_t timeout); -uint32_t osEventFlagsSet(osEventFlagsId_t ef_id, uint32_t flags); - -#endif /* CMSIS_OS2_H */ diff --git a/test/host/iec104_serv/stub/dbg_log.h b/test/host/iec104_serv/stub/dbg_log.h deleted file mode 100644 index 5abb3c5c..00000000 --- a/test/host/iec104_serv/stub/dbg_log.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 模块名称:主机侧单测桩 - dbg_log.h(iec104_serv 模块专用) - * 模块功能:DBG_* 计数;本模块的判死/丢连接都靠 ERROR 留痕("i104 drop: send fail" - * 与 "protocol fault" 是两条不同的现场线索)。 - * ⚠ 仅供主机侧单测使用,不参与 MCU 构建。 - * 创建日期:2026-10-23 - */ -#ifndef DBG_LOG_H -#define DBG_LOG_H - -extern int g_i4_info_count; -extern int g_i4_error_count; -extern int g_i4_debug_count; - -#define DBG_INFO(fmt, ...) do { (void)(fmt); g_i4_info_count++; } while (0) -#define DBG_DEBUG(fmt, ...) do { (void)(fmt); g_i4_debug_count++; } while (0) -#define DBG_ERROR(fmt, ...) do { (void)(fmt); g_i4_error_count++; } while (0) - -#endif /* DBG_LOG_H */ diff --git a/test/host/iec104_serv/stub/main.h b/test/host/iec104_serv/stub/main.h deleted file mode 100644 index a0052993..00000000 --- a/test/host/iec104_serv/stub/main.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - * 模块名称:主机侧单测桩 - main.h(NET/BSP 共享形态,本模块用于 iec104_serv) - * 模块功能:只给 HAL_GetTick;某些 BSP 头的 include 链会绕到这里(真实 main.h 拉整棵 - * HAL 头树,PC 上编不动)。 - * ⚠ 仅供主机侧单测使用,不参与 MCU 构建。 - * 创建日期:2026-10-23 - */ -#ifndef MAIN_H -#define MAIN_H - -#include - -uint32_t HAL_GetTick(void); - -#endif /* MAIN_H */ diff --git a/test/host/iec104_serv/stub/net_socket.h b/test/host/iec104_serv/stub/net_socket.h deleted file mode 100644 index 7d85de0c..00000000 --- a/test/host/iec104_serv/stub/net_socket.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 模块名称:主机侧单测桩 - net_socket.h(NET 域共享形态,见 net_listener 同名文件) - * 模块功能:给 104 服务端一个可控 socket 面:建口/绑定/监听/接受/关闭/发送、 - * 非阻塞收(net_recv_nb)、可读门控(net_can_read)、监听门控 - * (net_listener_armed)、错误码通道(net_get_errno)、网络代次 - * (net_get_generation)与表项查询(net_get_sock)。 - * 地址结构与 NET_AF_INET / NET_SOCK_STREAM / NET_INADDR_ANY / - * NET_ERR_WOULDBLOCK 一律取**真实** net_types.h。 - * ⚠ 仅供主机侧单测使用,不参与 MCU 构建。 - * 创建日期:2026-10-23 - */ -#ifndef NET_SOCKET_H -#define NET_SOCKET_H - -#include "net_types.h" - -int net_socket(int domain, int type); -int net_bind(int sockfd, const struct net_sockaddr *addr, int addrlen); -int net_listen(int sockfd); -int net_accept(int sockfd, struct net_sockaddr *addr, int *addrlen); -int net_close(int sockfd); -int net_send(int sockfd, const void *buf, int len, int flags); -int net_recv_nb(int sockfd, void *buf, int len); -int net_can_read(int sockfd); -int net_get_errno(void); -int net_listener_armed(int sockfd); -uint32_t net_get_generation(void); -net_sock_t *net_get_sock(int sockfd); -uint16_t net_htons(uint16_t hostshort); - -#endif /* NET_SOCKET_H */ diff --git a/test/host/iec104_serv/stub/sys_clock.h b/test/host/iec104_serv/stub/sys_clock.h deleted file mode 100644 index 8baffad7..00000000 --- a/test/host/iec104_serv/stub/sys_clock.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * 模块名称:主机侧单测桩 - sys_clock.h(iec104_serv 模块专用) - * 模块功能:只给本模块真正用到的两个入口:读秒与写秒。 - * ⚠ 仅供主机侧单测使用,不参与 MCU 构建。 - * 为什么必须桩这层而不是用真实头:真实 App/util/sys_clock.h 会 include sd2506.h - * (RTC 芯片驱动),那条链一直拉到 stm32f4xx_hal.h 与寄存器定义,PC 上编不动。 - * 两个签名与真实头**逐字一致**(uint32_t sys_clock_get(void) / - * int sys_clock_set_unix(uint32_t)),改签名就会在测试里对不上假件而报错。 - * 本模块最有价值的两条恰好是这两个入口的**边界**:>4G 秒必须拒绝、未对时的 - * UINT32_MAX 哨兵必须传成 UINT64_MAX,所以桩掉实现不影响被测语义。 - * 创建日期:2026-10-23 - */ -#ifndef SYS_CLOCK_H -#define SYS_CLOCK_H - -#include - -uint32_t sys_clock_get(void); -int sys_clock_set_unix(uint32_t unix_secs); - -#endif /* SYS_CLOCK_H */ diff --git a/test/host/soe/run_unit_test.py b/test/host/soe/run_unit_test.py index ece7947e..0721c87a 100644 --- a/test/host/soe/run_unit_test.py +++ b/test/host/soe/run_unit_test.py @@ -3,9 +3,15 @@ """SOE 记录编解码(B9)主机侧纯逻辑单元测试运行器(纯标准库)。 做什么:用本机 MSVC 离线编译 test/host/soe/soe_test.c(#include 纳入 - 生产源文件 soe_rec.c + iec104_asdu.c),验证 64B 定长记录构建/解析 - 往返、sum8 校验和硬门槛、CP56Time2a 时标编码(与 iec104 解码器交叉 - 互证)、IV 语义、钳位、结构不变量。 + 生产源文件 soe_rec.c + vendor 公共时间库 IEC60870_Time.c),验证 64B + 定长记录构建/解析往返、sum8 校验和硬门槛、CP56Time2a 时标编码(与 + vendor 的 CP56 解码器交叉互证)、IV 语义、钳位、结构不变量。 + +交叉验证对象的变迁(2026-11-18,task-18 割接): + 原先纳入的是我方过渡层 iec104_asdu.c,它与 soe_rec.c 同算法族、互为对照。 + task-18 把该族整体退役(104 改由 vendor 子集 + iec104_core 承担),于是 + 交叉验证对象改为 vendor 的 IEC60870_Time.c——**这更有价值**:soe_rec 编出 + 的字节要能被真正上行的那套解码器读懂,而不只是能被一份即将删除的副本读懂。 用法(仓库根目录): & '.venv\\Scripts\\python.exe' test/host/soe/run_unit_test.py @@ -29,7 +35,7 @@ BUILD = TestBuild( src=os.path.join(HERE, "soe_test.c"), include_dirs=[ os.path.join(ROOT, "App", "log"), - os.path.join(ROOT, "App", "protocol", "iec104"), + os.path.join(ROOT, "App", "protocol", "iec60870", "common"), HERE, ], summary_marker="=== SOE Tests:", diff --git a/test/host/soe/soe_test.c b/test/host/soe/soe_test.c index 01f09d1e..863b8e75 100644 --- a/test/host/soe/soe_test.c +++ b/test/host/soe/soe_test.c @@ -2,20 +2,28 @@ * 模块名称:SOE 记录编解码主机侧纯逻辑单元测试(B9) * 模块功能:离线验证 App/log/soe_rec.c——64B 定长记录构建/解析往返、 * 校验和硬门槛(撕裂/半写拒绝)、版本门槛、CP56Time2a 时标 - * 编码正确性(与 iec104_asdu.c 的 CP56 解码交叉验证:同一算法族 - * 两个实现互证)、IV 语义、钳位、保留区清零。 + * 编码正确性(与 vendor 公共时间库的 CP56 解码交叉验证)、 + * IV 语义、钳位、保留区清零。 * * 被测对象:真实源文件(#include 原样纳入): * soe_rec.c(B9 记录编解码) - * iec104_asdu.c(交叉验证用 CP56 解码器,纯逻辑) + * IEC60870_Time.c(交叉验证用 CP56 公共编解码器) + * + * 交叉验证对象说明(2026-11-18 换人): + * 原先交叉验证的是我方过渡层 iec104_asdu.c 的 iec104_cp56_to_epoch_ms()。 + * task-18 割接把那一层整族删除(104 现由 vendor 子集 + iec104_core 承担), + * 于是改与 vendor 的 IEC60870_Time_From_CP56()/CP56_To_Seconds() 互证—— + * 这比原来更有意义:soe_rec 编出来的字节要能被**真正上行的那套**解码器读懂。 + * 两者口径差已在此显式钉住(vendor 上限 2099 年、IV 分「解码保留」与 + * 「转秒拒绝」两步),不假装它们可以无条件互换。 * * 覆盖点: * TC-SOE-001 构建/解析字段往返(type/elm/flags/seq/epoch/value) * TC-SOE-002 校验和硬门槛:单字节翻转 → -3;版本篡改 → -2 * TC-SOE-003 CP56 编码正确性:已知 epoch → 期望字节序列; - * 与 iec104_cp56_to_epoch_ms 往返互证(含闰日 2024-02-29) + * 与 vendor CP56 解码 + 转秒往返互证(含闰日 2024-02-29) * TC-SOE-004 IV 语义:flags IV → CP56 byte2 bit7 置位 + epoch 字段 0 - * TC-SOE-005 钳位:epoch < 2000 → 2000-01-01;epoch > 2127 上界 → 2127-12-31 + * TC-SOE-005 钳位:epoch < 2000 → 2000-01-01;2106 落在 vendor 2099 上限之外 * TC-SOE-006 结构不变量:size=64、保留区 [23..62] 恒 0、sum=sum8([0..62]) * TC-SOE-007 序号域:0 / 0xFFFFFFFF 边界往返(uint32 回绕语义) * @@ -35,7 +43,43 @@ static int s_total = 0, s_passed = 0, s_failed = 0; } while (0) #include "soe_rec.c" -#include "iec104_asdu.c" + +/* 交叉验证用 vendor 公共时间库:**强制纯整数路径**(IEC60870_TIME_USE_PLATFORM=0), + * 与固件一致——MCU 侧非 _WIN32,该宏恒为 0,走的是 Days_From_Civil 那套整数算法。 + * 主机侧若留着默认值 1,就会去调 _gmtime64_s,测到的是一条固件永远不会走的路径。 */ +#define IEC60870_TIME_USE_PLATFORM 0 +#include "IEC60870_Time.c" + +/* + * 函数功能:交叉验证辅助——CP56 七字节 → UTC 毫秒 + * 入口参数:buf - 7B CP56;epoch_ms - 输出毫秒 + * 返回值:0 成功;-2 = IV=1(解码保留有效但不可当有效时间);-3 = 格式/字段非法 + * 函数说明:与 task-18 删掉的 iec104_cp56_to_epoch_ms() 保持同一套返回约定, + * 于是本文件的既有断言不必为「换了解码器」而改写——换的只是实现来源。 + * vendor 把「解码保留 IV」和「转有效时间时拒绝 IV」分成两步, + * 这里把第二步的拒绝折成 -2,语义与旧解码器一致。 + */ +static int s_cross_cp56_to_epoch_ms(const uint8_t *buf, uint64_t *epoch_ms) +{ + IEC60870_CP56Time2a_t v; + uint32_t secs; + + if ((buf == NULL) || (epoch_ms == NULL)) { + return -3; + } + if (!IEC60870_Time_From_CP56(buf, IEC60870_CP56_LEN, &v)) { + return -3; + } + if (v.is_invalid != 0u) { + return -2; + } + /* 偏移 0:SOE 记录里的 CP56 就是 UTC 分解,不做本地时区换算 */ + if (!IEC60870_Time_CP56_To_Seconds(&v, 0, &secs)) { + return -3; + } + *epoch_ms = ((uint64_t)secs * 1000u) + (uint64_t)v.time.ms; + return 0; +} /* ---------------- TC-SOE-001 字段往返 ---------------- */ static void tc_roundtrip(void) @@ -102,7 +146,7 @@ static void tc_cp56(void) /* 显式字段:12:34:56 → ms 域 = 56*1000(秒域时基如实编码,亚秒 0) */ CHECK(((uint32_t)out.cp56[0] | ((uint32_t)out.cp56[1] << 8)) == 56000u, "TC-SOE-003 ms field = sec*1000 (56000)"); - rc = iec104_cp56_to_epoch_ms(out.cp56, &back); + rc = s_cross_cp56_to_epoch_ms(out.cp56, &back); CHECK(rc == 0, "TC-SOE-003 cross decode ok"); CHECK(back == 1791808496000ULL, "TC-SOE-003 cross roundtrip exact"); @@ -111,13 +155,13 @@ static void tc_cp56(void) (void)soe_rec_parse(rec, &out); CHECK(out.cp56[4] == 29u && out.cp56[5] == 2u && out.cp56[6] == 24u, "TC-SOE-003 leap day fields"); - rc = iec104_cp56_to_epoch_ms(out.cp56, &back); + rc = s_cross_cp56_to_epoch_ms(out.cp56, &back); CHECK((rc == 0) && (back == 1709164800000ULL), "TC-SOE-003 leap roundtrip"); /* 2000-01-01 00:00:00 边界 */ soe_rec_build(rec, (uint8_t)SOE_T_PLATE_IN, 0u, 0u, 3u, 946684800u, 0u); (void)soe_rec_parse(rec, &out); - rc = iec104_cp56_to_epoch_ms(out.cp56, &back); + rc = s_cross_cp56_to_epoch_ms(out.cp56, &back); CHECK((rc == 0) && (back == 946684800000ULL), "TC-SOE-003 year-2000 boundary"); } @@ -132,7 +176,7 @@ static void tc_iv(void) (void)soe_rec_parse(rec, &out); CHECK((out.cp56[2] & 0x80u) != 0u, "TC-SOE-004 cp56 IV bit set"); CHECK(out.epoch_s == 0u, "TC-SOE-004 epoch field zeroed"); - CHECK(iec104_cp56_to_epoch_ms(out.cp56, &back) == -2, + CHECK(s_cross_cp56_to_epoch_ms(out.cp56, &back) == -2, "TC-SOE-004 cross decoder rejects IV"); } @@ -147,16 +191,20 @@ static void tc_clamp(void) (void)soe_rec_parse(rec, &out); CHECK((out.cp56[4] == 1u) && (out.cp56[5] == 1u) && (out.cp56[6] == 0u), "TC-SOE-005 clamp low -> 2000-01-01"); - (void)iec104_cp56_to_epoch_ms(out.cp56, &back); + (void)s_cross_cp56_to_epoch_ms(out.cp56, &back); CHECK(back == 946684800000ULL, "TC-SOE-005 clamp low exact"); - /* epoch_s 为 uint32 → 最大 2106-02-07(0xFFFFFFFF),恒在 CP56 域内: - * 上界钳位是防御性死分支(epoch 域扩展时生效),此处断言精确往返 */ + /* epoch_s 为 uint32 → 最大 2106-02-07(0xFFFFFFFF),CP56 年字段装得下(106 年偏移)。 + * **但 vendor 公共库的 CP56 只认 2000..2099 年**(IEC60870_CP56_MAX_YEAR), + * 2106 会被 From_CP56 直接判为非法。这不是缺陷而是两层的口径差: + * soe_rec 的 7bit 年字段能编码到 2127,而 104 上行只接受 2099 以内。 + * 因此这里断言的是「soe_rec 编码成功 + 交叉解码器明确拒绝」, + * 不假装它还能往返——假装才是骗人(旧解码器宽到 2127,才显得能往返)。 */ soe_rec_build(rec, (uint8_t)SOE_T_ELM_ASSERT, 0u, 0u, 5u, 0xFFFFFFFFu, 0u); (void)soe_rec_parse(rec, &out); - CHECK(out.cp56[6] == 106u, "TC-SOE-005 uint32 max -> year 2106 (no clamp needed)"); - (void)iec104_cp56_to_epoch_ms(out.cp56, &back); - CHECK(back == 4294967295000ULL, "TC-SOE-005 uint32 max exact roundtrip"); + CHECK(out.cp56[6] == 106u, "TC-SOE-005 uint32 max -> year 2106 (cp56 year field)"); + CHECK(s_cross_cp56_to_epoch_ms(out.cp56, &back) == -3, + "TC-SOE-005 year 2106 rejected by vendor CP56 (limit 2099)"); } /* ---------------- TC-SOE-006 结构不变量 ---------------- */ diff --git a/test/host/ui_data/ui_data_test.c b/test/host/ui_data/ui_data_test.c index 36a3ecc7..c3e7a647 100644 --- a/test/host/ui_data/ui_data_test.c +++ b/test/host/ui_data/ui_data_test.c @@ -347,10 +347,13 @@ static void tc_yx_points(void) /* 双点位图必须原样透传:页面按它选词(合位/分位 vs 动作/复归),快照层若做"归一化" * 或按 valid 掩一次,页面就会把双点当单点形容——同一条事实两处解释必然漂 */ CHECK(got.yx_dp == dp_expect, "TC-UIDATA-009c dp mask passed through unmasked"); - /* 点表与名表共用点数(1 基 IOA 1~33)。这里是**有意**再抄一遍字面量:测试的职责是 - * 独立见证,协议层那个 #define 在 .c 内不可见,改点数时必须有人被绊一下——绊到后 - * 要同时改:App/protocol/iec104/iec104_pts.c 的 YX_N、ui_data.h 的 UI_DATA_YX_N、 - * 页面名表 ui_page_yx.c(有编译期数组守卫兜着)、本条 */ + /* 遥信行数 33 是**产品视图**的点数,不是协议点表的点数。这里是**有意**再抄一遍 + * 字面量:测试的职责是独立见证,改点数时必须有人被绊一下——绊到后要同时改: + * ui_data.h 的 UI_DATA_YX_N、页面名表 ui_page_yx.c(有编译期数组守卫兜着)、本条。 + * 历史:割接前 33 同时等于旧产品点表 App/protocol/iec104/iec104_pts.c 的 YX_N + * (该文件 2026-11-17 通信骨架割接已删除);现在协议侧是 DTU 标准表 + * iec104_dtu_table.c 的 SP 59 + DP 16 = 75 个遥信点,**两者语义不同、数值本就不等**, + * 写侧 ui_data_feed.c 留了一条一次性 DBG_ERROR 把这个差异显式化,不改显示 */ CHECK((uint32_t)UI_DATA_YX_N == 33u, "TC-UIDATA-009d point count is 33 (YX_N witness)"); }