network: 台架 IP 迁到 192.168.31.100,并把重复写死的值收进单一真源
分两段(用户裁定 2026-11-02):先做地址迁移,再把同类字面量收敛成
单一真源,以后再改地址只动一处。
一、IP 迁移 192.168.1.100 → 192.168.31.100(gw 同步 → .31.1)
- 工厂默认:Drivers/BSP/NETCFG/net_cfg.c 的 NET_CFG_DEF_IP/_GW
- 注释/文档示例、主机与板级测试、台架 py 脚本、两份 sim_config.ini
- 字节序教学点同步换算 hex:0x6401A8C0 → 0x641FA8C0(内存
C0 A8 1F 64),旧版示例引文与历史 Trap 记录按冻结纪律不动
- UI 黄金基准:网口设置 4 态 + shot_info 共 5 张 .bin 由
check_content_pages.py --update 重刷(渲染值 IP 变了,属预期变更)
- 保留判定:客户点表引用(IEC104/继电保护规划)、芯片手册摘录、
日期冻结的变更记录行、已退役台架档案 MDK-ARM/retracted_bench_*
二、单一真源收口(A+B+C+D,用户批准全做)
- 新建 test/host/bench_defaults.py:台架 py 默认值唯一定义点
(DEVICE_IP/DEVICE_GW/PC_IP/NET_BCAST),22 个脚本改为引用;
MDK-ARM 两探针与 scripts/board_ui_nav.py 经 sys.path shim 引入
- test/board/net_test_task.h 新增 TEST_PC_PEER_IP,板测三处
PHASE*_REMOTE_IP 改引该宏(保留 -D 覆盖);Phase1 断言改
memcmp 数组比较,数组各只出现一次
- simulator/tests/check_content_pages.py 从 net_cfg.c 正则解析
NET_CFG_DEF_* 推导期望值(解析失败即报错、不静默兜底),
脚本内台架 IP 字面量清零
- 装饰性注释去具体值(net_cfg.h/net_socket.h/net_socket.c/
net_socket_sim.c);字节序教学 hex 对刻意保留为唯一写值点
- 刻意不动:主机单测夹具 IP(逐文件钉住的任意值是正确测试
实践)、文档正文 IP(那是文档内容本身)
顺带:scripts/gen_task_table.py 规范串清掉「,B5」——编号清退提交
72b4b094 改了受管区没重跑生成器,task-table 门禁因此一直红
验证:产品 @build 0/0;CH395F 套件开关构建 0/0 后还原产品态;
6 套主机单测 rc=0;content_pages(含宏推导路径)/菜单 8 态/
推流位比对全 PASS;bom-drift 99 无漂移;doc-links/coding-standard/
cppcheck 绿;py_compile 23 文件 + --help 冒烟(含 shim 绝对路径)
This commit is contained in:
@@ -35,6 +35,35 @@ from pathlib import Path
|
||||
EXE = Path(__file__).resolve().parents[1] / "build" / "Debug" / "lvgl_sim.exe"
|
||||
REF_DIR = Path(__file__).resolve().parent / "ref"
|
||||
|
||||
# 工厂默认 = 黄金参考的真源:Drivers/BSP/NETCFG/net_cfg.c 的 NET_CFG_DEF_* 宏。
|
||||
# run_sim 一律在空临时目录跑(无 ini → 模拟器按编译期宏显示),故断言值必须与该宏
|
||||
# 一致;这里现读现算,改默认 IP 只动 C 宏,本脚本零同步(2026-11-02 教训:本文件
|
||||
# 曾钉死 7 处补零字面量,IP 迁移时逐处爆红)。
|
||||
_NETCFG_C = Path(__file__).resolve().parents[2] / "Drivers" / "BSP" / "NETCFG" / "net_cfg.c"
|
||||
|
||||
|
||||
def _read_net_cfg_default(name):
|
||||
"""抽取 `#define name { a, b, c, d }` 四字节(容忍 u 后缀/任意空白)。
|
||||
|
||||
解析失败立即报错——绝不回退到写死旧值(宁可红在明处)。
|
||||
"""
|
||||
pat = r"#define\s+%s\s*\{\s*(\d+)u?\s*,\s*(\d+)u?\s*,\s*(\d+)u?\s*,\s*(\d+)u?\s*\}" % name
|
||||
m = re.search(pat, _NETCFG_C.read_text(encoding="utf-8-sig"))
|
||||
if not m:
|
||||
raise RuntimeError("net_cfg.c 的 %s 解析失败:宏形态变了就同步本函数的正则(勿改回写死值)" % name)
|
||||
return tuple(int(g) for g in m.groups())
|
||||
|
||||
|
||||
def _fmt_ip03(octets):
|
||||
"""net_cfg_fmt_ipv4 的既有口径:后三段补零成 3 位、首段原样(同一格式化真源)。"""
|
||||
return "%d.%03d.%03d.%03d" % octets
|
||||
|
||||
|
||||
EXP_IP = _fmt_ip03(_read_net_cfg_default("NET_CFG_DEF_IP"))
|
||||
EXP_MASK = _fmt_ip03(_read_net_cfg_default("NET_CFG_DEF_MASK"))
|
||||
EXP_GW = _fmt_ip03(_read_net_cfg_default("NET_CFG_DEF_GW"))
|
||||
EXP_IP_TAIL = EXP_IP.split(".", 1)[1] # 编辑态首字节被光标反显覆盖,只断言尾部
|
||||
|
||||
# (页名, 注入键序):与 ui_menu.c 节点映射/路由一致(u=上 d=下 l=左 r=右 e=回车 s=ESC);
|
||||
# 密码页 = 受保护叶子(参数定值/整定/参数 node 8,默认密码 123)
|
||||
PAGES = [
|
||||
@@ -316,7 +345,7 @@ TEXTS = {
|
||||
("r5名", "MAC地址", (103, 116), False),
|
||||
("r5值", "00:00:00:00:00:00", (103, 116), False),
|
||||
# net_cfg_fmt_ipv4 的既有口径是三段补零(与网口设置页同一格式化真源),照实断言
|
||||
("r6名", "IP地址", (116, 129), False), ("r6值", "192.168.001.100", (116, 129), False),
|
||||
("r6名", "IP地址", (116, 129), False), ("r6值", EXP_IP, (116, 129), False),
|
||||
("r7名", "运行时长", (129, 142), False), ("r7值", "00:00:00", (129, 142), False),
|
||||
("页脚", "第 1 页,共 1 页", (140, 160), False),
|
||||
],
|
||||
@@ -480,18 +509,18 @@ TEXTS = {
|
||||
],
|
||||
"netcfg": [
|
||||
("标题", "网口设置", (0, 24), False),
|
||||
("r0名", "IP地址", (24, 38), True), ("r0值", "192.168.001.100", (24, 38), True),
|
||||
("r1名", "子网掩码", (38, 52), False), ("r1值", "255.255.255.000", (38, 52), False),
|
||||
("r2名", "默认网关", (52, 66), False), ("r2值", "192.168.001.001", (52, 66), False),
|
||||
("r0名", "IP地址", (24, 38), True), ("r0值", EXP_IP, (24, 38), True),
|
||||
("r1名", "子网掩码", (38, 52), False), ("r1值", EXP_MASK, (38, 52), False),
|
||||
("r2名", "默认网关", (52, 66), False), ("r2值", EXP_GW, (52, 66), False),
|
||||
("r3名", "MAC地址", (66, 80), False), ("r3值", "00:00:00:00:00:00", (66, 80), False),
|
||||
("r4名", "保存", (80, 95), False), ("r4值", "ENTER", (80, 95), False),
|
||||
("页脚", "第 1 页,共 1 页", (140, 160), False),
|
||||
],
|
||||
"netcfg_ro": [
|
||||
("标题", "网口设置", (0, 24), False),
|
||||
("r0名", "IP地址", (24, 38), True), ("r0值", "192.168.001.100", (24, 38), True),
|
||||
("r1名", "子网掩码", (38, 52), False), ("r1值", "255.255.255.000", (38, 52), False),
|
||||
("r2名", "默认网关", (52, 66), False), ("r2值", "192.168.001.001", (52, 66), False),
|
||||
("r0名", "IP地址", (24, 38), True), ("r0值", EXP_IP, (24, 38), True),
|
||||
("r1名", "子网掩码", (38, 52), False), ("r1值", EXP_MASK, (38, 52), False),
|
||||
("r2名", "默认网关", (52, 66), False), ("r2值", EXP_GW, (52, 66), False),
|
||||
("r3名", "MAC地址", (66, 80), False), ("r3值", "00:00:00:00:00:00", (66, 80), False),
|
||||
("r4名", "保存", (80, 95), False), ("r4值", "ENTER", (80, 95), False),
|
||||
("页脚", "第 1 页,共 1 页", (140, 160), False),
|
||||
@@ -499,7 +528,7 @@ TEXTS = {
|
||||
"netcfg_edit": [
|
||||
("标题", "网口设置", (0, 24), False),
|
||||
("r0名", "IP地址", (24, 38), True),
|
||||
("r0值尾", "168.001.100", (24, 38), True), # 首字节 192 被光标反显覆盖
|
||||
("r0值尾", EXP_IP_TAIL, (24, 38), True), # 首字节(192 那段)被光标反显覆盖
|
||||
("r1名", "子网掩码", (38, 52), False),
|
||||
("r4名", "保存", (80, 95), False),
|
||||
],
|
||||
@@ -578,7 +607,7 @@ TEXTS = {
|
||||
],
|
||||
"netcfg_save": [
|
||||
("标题", "网口设置", (0, 24), False),
|
||||
("r0名", "IP地址", (24, 38), False), ("r0值", "192.168.001.100", (24, 38), False),
|
||||
("r0名", "IP地址", (24, 38), False), ("r0值", EXP_IP, (24, 38), False),
|
||||
("r3名", "MAC地址", (66, 80), False),
|
||||
("r4名", "保存", (80, 95), True), ("r4值", "OK", (80, 95), True),
|
||||
],
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user