feat(iec104): 把 104 骨架完整迁到 MCU 板端并在台架跑通总召

把 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 名字的排除口径。
This commit is contained in:
2026-11-18 10:29:18 +08:00
parent 2e9272cc8a
commit 90cc9a7d99
125 changed files with 7463 additions and 5335 deletions
+114
View File
@@ -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())