fix(docs): 修 16 处指向已删文件的历史指针,别让读者照着找空门
上一笔改名把 App/protocol/iec104 搬到 App/iec60870/104_port 时,机械
文本替换把「讲一个已经删掉的文件当初做什么」的叙述也一起改了:
iec104_pts.c / iec104_asdu.c / iec104_link.c
这三个文件在 90cc9a7d 里就删了(旧自研协议层整体退役),
App/iec60870/104_port/ 下从来没有它们。于是文档与注释里出现了一批
「新路径 + 旧行为」的混合描述,读者按图索骥只会撞空。
按两类分别处理,共 11 个文件(只有注释与 Markdown,零代码行):
一、讲历史事实的 -> 写回当时真实的旧名,就近标「已删除」
App/task/ui_task.c SYSLOG_OPER 那条原写入点
App/algo/run_par.h 104 消费侧每拍读取
Drivers/BSP/UI/ui_data.h YX_DP_N / 遥控记录两条
Drivers/BSP/UI/ui_page_oper.c 操作页写入点
Drivers/BSP/UI/ui_page_reset.c 复归串与远端那条刻意不同
Drivers/BSP/UI/ui_page_yk.c 遥控页写入点
Drivers/BSP/UI/ui_data.c CP56 正反两套实现同族
test/host/ui_data/ui_data_test.c 两处历史注释
simulator/main.c 双点位图固定帧的来历
App/log/README.md oper.log / yk.log 生产者
docs/UI设计/UI_数据供给设计.md
docs/UI设计/页面扩充详细方案.md
docs/产品需求/产品需求设计文档.md 链路层与点表实现指针
二、讲现在仍活着的接缝的 -> 指向真实存在的文件,并 test -f 过
App/algo/run_par.h:23 死区分流现由 iec104_dtu_table.c +
iec104_source.c 承担
App/algo/meas.h 数值口径改指 common/IEC60870_InformationObjects.h
的 IEC60870_ASDU_QUALITY_*;顺带修掉同句里两个
既有错:引用了不存在的 test/host/iec104/,
且 104 当前消费点是 iec104_serv.c 的 s_measure()
test/host/bench/iec104/iec104_master.py 常量与帧头说明改指
common/IEC60870_Asdu.c 与 104/IEC104_Types.h
App/task/iec104_serv.c 单独说明:文件还在但 s_clock_sync() 已随新契约
消失(grep RC=1),所以写「同日重写后不再投递」,不写「已删除」。
验证:grep 新假路径零命中;旧真名 14 处全部带删除标注;check_bom_drift
RC=0(6 个带 BOM 文件按原始字节补回,未过文本编解码);check_mojibake
RC=0;check_coding_standard 逐文件 RC=0;doc-links 308 篇 / 30 处问题
全部仍在 IEC60870-Slave 供应商快照内,非 vendor 计数仍为 0。
This commit is contained in:
@@ -3,8 +3,10 @@
|
||||
"""B6 bench leg: IEC 60870-5-104 master client (GI + COV round-trip).
|
||||
|
||||
Historical bench leg; acceptance criteria: docs/子系统设计/IEC104上行设计说明.md §8.
|
||||
docs/子系统设计/IEC104上行设计说明.md §3/§4. Constants mirror
|
||||
App/iec60870/104_port/iec104_asdu.h / iec104_link.h.
|
||||
docs/子系统设计/IEC104上行设计说明.md §3/§4. Constants mirror the old in-house
|
||||
protocol layer (App/protocol/iec104/iec104_asdu.h / iec104_link.h, both deleted
|
||||
2026-11-18 with the skeleton MCU migration); current wire layout is governed by
|
||||
App/iec60870/common/IEC60870_Asdu.h + App/iec60870/104/IEC104_Types.h.
|
||||
|
||||
Flow:
|
||||
1. TCP connect device :2404 (factory default; --port overrides),
|
||||
@@ -64,7 +66,8 @@ import socket
|
||||
import struct
|
||||
import time
|
||||
|
||||
# ---- constants (mirror iec104_asdu.h / iec104_link.h) -----------------------
|
||||
# ---- constants (mirror the old iec104_asdu.h / iec104_link.h; both deleted
|
||||
# 2026-11-18 -- current layout: App/iec60870/common/ + App/iec60870/104/) ------
|
||||
U_STARTDT_ACT, U_STARTDT_CON = 0x07, 0x0B
|
||||
U_TESTFR_ACT, U_TESTFR_CON = 0x43, 0x83
|
||||
|
||||
@@ -76,9 +79,13 @@ T_C_IC_NA_1, T_C_RD_NA_1 = 100, 102
|
||||
COT_BG, COT_SPONT, COT_INIT, COT_REQ = 2, 3, 4, 5
|
||||
COT_ACT, COT_ACTCON, COT_ACTTERM = 6, 7, 8
|
||||
COT_PN = 0x40 # cause byte bit6: negative confirm
|
||||
# NOTE(2026-10-25 m104fix): THIS SLAVE USES THE B4 IN-HOUSE 6-BYTE ASDU HEAD --
|
||||
# T/PN/RBT FLAGS LIVE IN THE CAUSE BYTE (bit7/bit6/bit4), byte[3] IS OA+EVI(bit7).
|
||||
# SEE App/iec60870/104_port/iec104_asdu.c iec104_asdu_put_hdr(). The old RX path read
|
||||
# NOTE(2026-10-25 m104fix): THE 6-BYTE ASDU HEAD PUTS T/PN FLAGS IN THE CAUSE BYTE
|
||||
# (bit7/bit6) AND byte[3] IS OA -- NOT COT HI. Current firmware config is sizeOfCOT=2
|
||||
# (App/iec60870/104/IEC104_Types.h IEC104_APP_LAYER_PARAMETERS_DEFAULT), written by
|
||||
# App/iec60870/common/IEC60870_Asdu.c: buffer[2] = cause | PN<<6 | TEST<<7, buffer[3] = OA.
|
||||
# The in-house writer this note was first written against, old
|
||||
# App/protocol/iec104/iec104_asdu.c iec104_asdu_put_hdr(), was deleted on 2026-11-18
|
||||
# with the skeleton MCU migration. The old RX path read
|
||||
# PN from byte[3] (standard 2-byte-COT habit) -> pn was ALWAYS False and a rejected
|
||||
# command logged cot=71 (7|0x40), so actcon_of(type, True) could never match.
|
||||
# Bench proof 2026-10-25 (V5-gap replay): two out-of-range C_SE writes
|
||||
|
||||
@@ -350,8 +350,8 @@ static void tc_yx_points(void)
|
||||
/* 遥信行数 33 是**产品视图**的点数,不是协议点表的点数。这里是**有意**再抄一遍
|
||||
* 字面量:测试的职责是独立见证,改点数时必须有人被绊一下——绊到后要同时改:
|
||||
* ui_data.h 的 UI_DATA_YX_N、页面名表 ui_page_yx.c(有编译期数组守卫兜着)、本条。
|
||||
* 历史:割接前 33 同时等于旧产品点表 App/iec60870/104_port/iec104_pts.c 的 YX_N
|
||||
* (该文件 2026-11-17 通信骨架割接已删除);现在协议侧是 DTU 标准表
|
||||
* 历史:割接前 33 同时等于旧产品点表 App/protocol/iec104/iec104_pts.c 的 YX_N
|
||||
* (该文件 2026-11-17 通信骨架割接弃用、2026-11-18 随骨架迁 MCU 删除);现在协议侧是 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)");
|
||||
@@ -1309,8 +1309,9 @@ static void tc_maint_forwarding(void)
|
||||
(void)ui_data_maint_oper_note("force reset by panel");
|
||||
CHECK((s_stub_note_calls == 1) && (strcmp(s_stub_note_last, "force reset by panel") == 0),
|
||||
"TC-UIDATA-026i page-side note reaches executor verbatim");
|
||||
/* 面板这条与远端 YK11 那条(App/iec60870/104_port/iec104_pts.c 投的
|
||||
* "force reset")必须是不同串,否则审计面再也分不出"主站下发的"还是
|
||||
/* 面板这条与远端 YK11 那条(旧 App/protocol/iec104/iec104_pts.c 投的
|
||||
* "force reset",该文件 2026-11-18 已删除;骨架阶段 104 侧无此记录)
|
||||
* 必须是不同串,否则审计面再也分不出"主站下发的"还是
|
||||
* "现场有人按了面板"。比的是执行侧缓冲里的实际内容,不是两个常量互比 */
|
||||
CHECK(strcmp(s_stub_note_last, "force reset") != 0,
|
||||
"TC-UIDATA-026s posted note differs from the remote YK11 wording");
|
||||
|
||||
Reference in New Issue
Block a user