refactor(iec104): 把 104_port 适配层并入 104,协议栈只剩一个目录
104 从 App/protocol 迁入 App/iec60870 时,协议核心(common/ 104/ examples/) 与我方平台适配层(原 104_port/)仍分成两个平行目录。既然这个库已转为项目自有 代码,适配层没有独立存在的理由——它本来就是对协议的装配与平台后端。 本次只做目录合并,不动任何协议逻辑: - App/iec60870/104_port/ 的 11 个文件全部移入 App/iec60870/104/ (iec104_core / iec104_source / iec104_source_ranks / iec104_net_mcu / iec104_dtu_table / iec104_comm 的 .c/.h),空目录删除 - Keil 删掉 ../App/iec60870/104_port include 路径;模拟器 CMake 把重复的 104_port include 行合并进既有的 IEC60870_DIR/104 - 单测运行器里硬拼的 "104_port" 路径段改成 "104"(rename_ref 只认斜杠形态) - .pre-commit-config.yaml 的 iec104-tcp 触发面去掉 104_port 前缀;coding-standard 的排除注释改写为「库已转为自有代码,排除项待收编完成后删除」 - 文档与生成物同步:项目架构总览、软件架构与运行时规格、IEC104 上行设计说明、 产品需求、网络配置说明、App/README、仓根 README,以及引用关系图与架构 SVG 验证(均为实跑): - Keil UV4 RC=0,0 errors 0 warnings,Code=367464 RO=48492 RW=2288 ZI=173544 - 模拟器构建 OK,编译告警 0,iec104-tcp 13/13 真实 TCP 回环通过 - 受影响单测:iec104_comm 50/50、iec104_serv 50/50、iec104_netmcu 13/13 与 static 2/2、soe 32/32、iec104_dtu 7 tests OK - 覆盖率门禁 RC=0,line 8204/9185 (89.3%),49/49 套件 - 全仓 104_port 残留:仅 App/README 里一句「原 104_port 并入 104」的历史说明
This commit is contained in:
+9
-11
@@ -155,16 +155,14 @@ repos:
|
||||
types: [c]
|
||||
# 范围与 cppcheck 钩子一致;另排除 CubeMX 生成文件(Src/、Inc/,重新生成即覆盖)、
|
||||
# dhara/FatFS 接口适配层(nand_ftl,函数名由外部 API 固定)
|
||||
# `App/iec60870/{common,104,examples}/` 与 `IEC60870-Slave/` 是逐字节钉在
|
||||
# UPSTREAM.sha256 上的第三方源码(IEC 60870-5-104 子站库,45k 行):函数命名/注释块/
|
||||
# typedef 形态都是上游风格,改一字节就等于篡改第三方(`verify_vendor.py` 会判定受控
|
||||
# 差异漂移)。这就是本文档 §0 写明的"排除…第三方"口径落到实处;Lib/、Middlewares/、
|
||||
# Drivers/CMSIS/ 同理。**我们自己的适配层不在排除面内**:
|
||||
# App/iec60870/104_port/ 全目录、App/task/、Drivers/BSP/NET/ 照旧受检。
|
||||
# ⚠ 排除面必须逐条写成 vendor 子树前缀(common/、104/、examples/),**不能**写成祖先
|
||||
# `App/iec60870/`:那会把同级的 104_port/(2,191 行自研适配层)一并吞掉——
|
||||
# 2026-11-18 搬迁后实测回归(104_port/iec104_core.c 被判 EXCLUDED)。
|
||||
# `104/` 带尾斜杠,不会误匹配 `104_port/`。
|
||||
# `App/iec60870/{common,104,examples}/` 与 `IEC60870-Slave/` 在 2026-11-18 之前是
|
||||
# 逐字节钉在 UPSTREAM.sha256 上的第三方源码(IEC 60870-5-104 子站库,45k 行)。
|
||||
# 2026-11-18 起该库转为项目自有代码:不再做字节保真校验,命名/注释/结构按本仓规范
|
||||
# 逐步收编(`UPSTREAM.sha256` 仅作迁移出处的历史记录,不再作为门禁判据)。
|
||||
# 本排除项暂留,是因为收编尚未完成(12xx 处 RULE-10 待改);收编完成后必须删除这三行。
|
||||
# ⚠ 排除面必须逐条写成子树前缀(common/、104/、examples/),**不能**写成祖先
|
||||
# `App/iec60870/`:那会把协议核心之外的其它子目录一起吞掉(2026-11-18 实测过
|
||||
# 这种误伤:写成祖先形态后 `104/` 内我们自己的装配文件被判 EXCLUDED)。
|
||||
exclude: |
|
||||
(?x)^(
|
||||
Drivers/CMSIS/|
|
||||
@@ -742,7 +740,7 @@ repos:
|
||||
stages: [manual]
|
||||
entry: scripts/gate_python.py scripts/check_iec104_tcp.py
|
||||
language: system
|
||||
files: ^(App/iec60870/104_port/|App/iec60870/104/|test/host/iec104_dtu/|simulator/(sim|main\.c|CMakeLists\.txt)|scripts/check_iec104_tcp\.py$|\.pre-commit-config\.yaml$)
|
||||
files: ^(App/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 项校验 +
|
||||
|
||||
+12
-7
@@ -20,7 +20,7 @@ FreeRTOS/CMSIS-RTOS API**(本条与「就绪屏障位必须 `osFlagsNoClear`
|
||||
| `log/` | **日志子系统**:syslog(NAND)+ 控制台单写者日志 | [`log/README.md`](log/README.md) |
|
||||
| `task/` | **FreeRTOS 任务实现**(6 个任务) | [`task/README.md`](task/README.md) |
|
||||
| `util/` | **通用工具**:CRC / 环形缓冲 / 墙钟时间 | [`util/README.md`](util/README.md) |
|
||||
| `iec60870/` | **通信协议**:IEC 60870-5-104 只维护一个——vendor 子树(`common/` `104/` `examples/`)+ 我方适配层 `104_port/`(core/source/net_mcu/dtu_table/comm) | [`iec60870/IMPORT.md`](iec60870/IMPORT.md)(来源、补丁与验证边界);结构见本文末节 |
|
||||
| `iec60870/` | **通信协议**:IEC 60870-5-104,只维护一个实现——`common/` 编解码 + `104/` 协议与平台适配(core/source/net_mcu/dtu_table/comm 同目录) | [`iec60870/IMPORT.md`](iec60870/IMPORT.md)(迁移出处);结构见本文末节 |
|
||||
|
||||
## 关键约束
|
||||
|
||||
@@ -31,13 +31,18 @@ FreeRTOS/CMSIS-RTOS API**(本条与「就绪屏障位必须 `osFlagsNoClear`
|
||||
|
||||
## 通信协议:`iec60870/` 结构
|
||||
|
||||
**104 只维护一个实现**(2026-11-18 由 `App/protocol/` 迁入,该中间层目录已删除)。
|
||||
`iec60870/` 分两类内容,改动时先认清自己在哪一侧:
|
||||
**104 只维护一个实现**。2026-11-18 由 `App/protocol/` 迁入(该中间层目录已删除),同日把
|
||||
原独立的 `104_port/` 适配层并入 `104/`,此后不再有「协议核心」与「适配层」两个平行目录:
|
||||
|
||||
| 子目录 | 属于 | 内容 | 能否就地改 |
|
||||
|---|---|---|---|
|
||||
| `common/` `104/` `104/business/` `examples/` | **vendor 子树**(IEC60870-Slave 产品子集) | `common/`:ASDU/信息对象/时间编解码与 Slave 主体;`104/`:Link/Connection/TcpServer/SendManager 等 APCI 传输;`104/business/`:总召、命令、对时、文件服务等业务状态机;`examples/`:DTU 点表 profile | 有来源哈希与补丁清单约束 → 见 [`iec60870/IMPORT.md`](iec60870/IMPORT.md),改动须登记 |
|
||||
| `104_port/` | **我方适配层**(11 个文件) | `iec104_core`(装配共享核心)、`iec104_source`(数据/模拟动作/参数 RAM/虚拟墙钟)、`iec104_net_mcu`(CH395F 网络后端)、`iec104_dtu_table`(标准 DTU 点表)、`iec104_comm`(`[comm]` 段) | 可改;设计口径 → `docs/子系统设计/IEC104上行设计说明.md` |
|
||||
| 子目录 | 内容 |
|
||||
|---|---|
|
||||
| `common/` | ASDU / 信息对象 / 时间编解码与从站主体(与 101 等其它 60870 协议共用) |
|
||||
| `104/` | APCI 传输(Link / Connection / TcpServer / SendManager / AsduQueue)+ 业务状态机(`104/business/`)+ **平台适配与装配**(`iec104_core` / `iec104_source` / `iec104_net_mcu` / `iec104_dtu_table` / `iec104_comm`) |
|
||||
| `examples/` | DTU 点表 profile(`iec104_dtu_profile.h`) |
|
||||
|
||||
改动口径:全部按项目自有代码对待(命名、注释、结构遵循 `docs/代码规范/`);
|
||||
`iec104_*` 是本项目自己的装配与平台层,`IEC104_*` / `IEC60870_*` 是协议主体与共享编解码。
|
||||
设计入口 → `docs/子系统设计/IEC104上行设计说明.md`;迁移出处 → [`iec60870/IMPORT.md`](iec60870/IMPORT.md)。
|
||||
|
||||
## 相关文档
|
||||
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@
|
||||
* run_par_cal_r_set 的说明);
|
||||
* 其余留白(未启用类别),**0x8027~0x802A 属 prot_set 告警段**,本表
|
||||
* 永不让位(两表按精确地址分流,见旧 iec104_pts.c 的 set 路由;
|
||||
* 该文件 2026-11-18 已删除,现行分流在 App/iec60870/104_port/
|
||||
* 该文件 2026-11-18 已删除,现行分流在 App/iec60870/104/
|
||||
* iec104_dtu_table.c 与 iec104_source.c)。
|
||||
* 持久化(B7 prot_set 先例同款):任一写成功 → 脏标志只置不清;
|
||||
* iec104Task 主循环 peek → 置 SYS_EVT_RUN_PAR_SAVE → defaultTask
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
* 模块名称:IEC 60870-5-104 通讯参数段([comm] 配置)公共接口
|
||||
* 模块功能:/config.ini [comm] 段的对外契约——公共地址(CA = ASDU 公共地址,
|
||||
* 2B)与被控站 TCP 监听端口的工厂默认、getter/setter 与合法带。
|
||||
* 实现 = 配对文件 App/iec60870/104_port/iec104_comm.c(coding-standard
|
||||
* 实现 = 配对文件 App/iec60870/104/iec104_comm.c(coding-standard
|
||||
* CODE-RULE-17 (2.2)「非 static 函数须在**配对头文件**声明」按文件名
|
||||
* 判定;初版曾寄身 iec104_pts.c 尾段,2026-10-26 lead 纠偏迁出)。
|
||||
* 修改记录:
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
* Source: App/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/iec60870/104_port/iec104_source.c only.
|
||||
* Include exactly once, from App/iec60870/104/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
|
||||
@@ -2,7 +2,7 @@
|
||||
* 模块名称:IEC 60870-5-104 被控站服务(netTask 单属主驱动)
|
||||
* 模块功能:在 netTask 的 1 ms 主循环里驱动 threadless 的 iec104_core:
|
||||
* 代次自愈 -> iec104_core_start/poll/stop -> 四字段统计单调化。
|
||||
* 协议解析、socket I/O、点表全部在 App/iec60870/104_port/ 与 vendor
|
||||
* 协议解析、socket I/O、点表全部在 App/iec60870/104/ 与 common/
|
||||
* App/iec60870/ 内,本文件只做属主编排与对外只读契约。
|
||||
* 线程约定:**所有 core 调用只在 iec104_serv_net_tick() 内**(netTask 上下文)。
|
||||
* iec104_core 是单属主、零等待对象,绝不跨任务调用;本文件不含
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* 模块名称:IEC 60870-5-104 被控站服务(对外接口)
|
||||
* 模块功能:声明 IEC104 服务的 netTask 驱动入口与对外只读契约;协议实现在
|
||||
* App/iec60870/104_port/ 与 App/iec60870/,由 netTask 单属主
|
||||
* App/iec60870/104/ 与 App/iec60870/common/,由 netTask 单属主
|
||||
* 在 1 ms 循环内调用 iec104_serv_net_tick() 驱动 threadless 核心;
|
||||
* iec104Task 已退役,其任务体声明/创建点已全部删除。
|
||||
* 创建日期:2026-10-12(B4)
|
||||
@@ -12,7 +12,7 @@
|
||||
#include <stdint.h> /* uint32_t(观测计数声明):头文件自含——2026-10-27 /keil-build 实测
|
||||
* 本头此前全靠包含者先带 stdint,feed 换 include 即断链报 #20 */
|
||||
/* 监听端口的宏出口已删除(道G task-9 收口 task-8 交接痕):运行期真源 =
|
||||
* [comm] 段 getter(App/iec60870/104_port/iec104_comm.h 的 iec104_comm_port(),
|
||||
* [comm] 段 getter(App/iec60870/104/iec104_comm.h 的 iec104_comm_port(),
|
||||
* 工厂默认 IEC104_COMM_DEF_PORT = 2404 = DL/T 634.5104 标准端口)。 */
|
||||
|
||||
/*
|
||||
|
||||
@@ -1034,7 +1034,7 @@ uint8_t ui_data_yt_pending(void) {
|
||||
* 通道六:通讯参数([comm])整定注入(道G task-9,通讯设置页)
|
||||
*
|
||||
* 与通道五同一组存在理由(ui_data.h 通道六表注:分层 / 模拟器 / 原子性);
|
||||
* 本层同样**不持有任何 [comm] 值**——真源在 App/iec60870/104_port/iec104_comm.c
|
||||
* 本层同样**不持有任何 [comm] 值**——真源在 App/iec60870/104/iec104_comm.c
|
||||
* 的 RAM 副本,落盘动力在 defaultTask 每轮无条件 iec104_comm_store_save()。
|
||||
* 未注入语义按"能力不可用"退化(row/set → -1、pending → 0),页面不崩不猜。
|
||||
* ============================================================ */
|
||||
|
||||
@@ -167,7 +167,7 @@ typedef struct {
|
||||
* 33 点表 App/protocol/iec104/iec104_pts.c 的
|
||||
* YX_DP_N 与 iec104_pts_yx_is_dp,该文件
|
||||
* 2026-11-18 已删除;现行口径见
|
||||
* App/iec60870/104_port/iec104_dtu_table.c 的
|
||||
* App/iec60870/104/iec104_dtu_table.c 的
|
||||
* IEC104_DTU_SP_COUNT / IEC104_DTU_DP_COUNT),
|
||||
* 抄一份进表现层就是第二
|
||||
* 真相——点表把某点改成双点、或把双点段挪到下标
|
||||
|
||||
@@ -337,7 +337,7 @@
|
||||
<MiscControls>--diag_suppress=1,68,111,188,191,546,1293</MiscControls>
|
||||
<Define>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</Define>
|
||||
<Undefine />
|
||||
<IncludePath>../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/iec60870/104_port;../App/iec60870/common;../App/iec60870/104;../App/iec60870/104/business;../App/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</IncludePath>
|
||||
<IncludePath>../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/iec60870/common;../App/iec60870/104;../App/iec60870/104/business;../App/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</IncludePath>
|
||||
</VariousControls>
|
||||
</Cads>
|
||||
<Aads>
|
||||
@@ -995,27 +995,27 @@
|
||||
<File>
|
||||
<FileName>iec104_comm.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
<FilePath>..\App\iec60870\104_port\iec104_comm.c</FilePath>
|
||||
<FilePath>..\App\iec60870\104\iec104_comm.c</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>iec104_core.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
<FilePath>..\App\iec60870\104_port\iec104_core.c</FilePath>
|
||||
<FilePath>..\App\iec60870\104\iec104_core.c</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>iec104_source.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
<FilePath>..\App\iec60870\104_port\iec104_source.c</FilePath>
|
||||
<FilePath>..\App\iec60870\104\iec104_source.c</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>iec104_dtu_table.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
<FilePath>..\App\iec60870\104_port\iec104_dtu_table.c</FilePath>
|
||||
<FilePath>..\App\iec60870\104\iec104_dtu_table.c</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>iec104_net_mcu.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
<FilePath>..\App\iec60870\104_port\iec104_net_mcu.c</FilePath>
|
||||
<FilePath>..\App\iec60870\104\iec104_net_mcu.c</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>IEC104_AsduQueue.c</FileName>
|
||||
|
||||
@@ -132,7 +132,7 @@ STM32F4-Base/
|
||||
│ │ ├── protect_task.c/h # 保护判据任务(保护判据 20ms 节拍)
|
||||
│ │ └── rs485_task.c/h # RS-485 任务(已实现,未创建,暂缓)
|
||||
│ ├── util/ # 工具函数(crc / ringbuf / sys_clock)
|
||||
│ └── iec60870/ # IEC 60870-5-104(只维护一个):vendor 子树 + 104_port 适配层
|
||||
│ └── iec60870/ # IEC 60870-5-104(只维护一个):common 编解码 + 104 协议(含平台适配)
|
||||
├── Drivers/
|
||||
│ ├── BSP/ # 板级驱动(手工编写)
|
||||
│ │ ├── CH395F/ # 以太网控制器驱动
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
| 相量(有效值/相角) | `App/algo/phasor.h` | 算法层 |
|
||||
| 频率 | `App/algo/freq.h` | 算法层 |
|
||||
| 定值(40 项 + 封存态) | `App/algo/prot_set.h` | 算法层 |
|
||||
| 遥信位图 / 品质 / 单双点性质 | `App/iec60870/104_port/iec104_dtu_table.h`(2026-11-17 割接前为 `iec104_pts.h`,该实现已删除) | 协议层 |
|
||||
| 遥信位图 / 品质 / 单双点性质 | `App/iec60870/104/iec104_dtu_table.h`(2026-11-17 割接前为 `iec104_pts.h`,该实现已删除) | 协议层 |
|
||||
| 时钟 | `App/util/sys_clock.h` | 工具层(**已在 ALLOW 豁免内**) |
|
||||
| 运行/自检记录 | `App/log/sys_log.h` | 服务层 |
|
||||
|
||||
@@ -172,7 +172,7 @@ typedef struct {
|
||||
- **字符串只用定长数组**:`clock[20]` 在结构体内,无指针、无生命周期问题(跨层传指针是经典事故源)。
|
||||
- **`yx_valid` 与 `yx_bits` 分开**:无效点不参与显示、不参与变位判断(沿用 104 点表的既有做法,避免"IV 通道抖动成变位")。
|
||||
- **`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/iec60870/104_port/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**。
|
||||
**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/iec60870/104/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/iec60870/examples/iec104_dtu_profile.h` 的 `dtu_signals[]` 原始名):
|
||||
@@ -418,7 +418,7 @@ ui_data_param_state() / ui_data_param_err_mask()(保存行显词 + 越界行
|
||||
|---|---|---|---|---|
|
||||
| 维护动作 | `ui_data_maint_ops_t`(`ui_data_maint_bind()`,uiTask 启动时绑) | `clock_set`(写后必须回读复核)/ `reset_req`(`prot_elm_request_reset()`)/ `active_count`(`popcount(prot_elm_active_mask())`)/ `oper_note`(`syslog_post_quiet(SYSLOG_OPER)`,谁触发谁投 104 与本地各一条)/ `clear_req`(`syslog_request_clear()`)/ `clear_state`(`syslog_clear_state()`) | 装置维护 3 页(对时 / 强制复归 / 清除记录) | `docs/UI设计/内容页架构.md` §7 |
|
||||
| 遥测整定 | `ui_data_yt_ops_t`(`ui_data_yt_bind()`,feed 首轮懒绑,先于 `ui_menu_init`) | 死区 9 行(电气 8 + 频率,与 104 0x8030~0x8038 同序)+ 系数 8 路:`db_n/db_row/db_set`、`cal_n/cal_row/cal_k_set`、`cal_blocked`、`pending` | 遥测整定页(`ui_w_ytview`) | 行语义/单位/上下限归 `App/algo/run_par.c` 与 `App/algo/adc_cal.c`;`unit`/`decimals` 归装配层 `ui_data_feed.c`;lo/hi 唯一出口 `run_par_db_range()` / `RUN_PAR_K_MAX_UV`,页面不得抄数 |
|
||||
| 通讯参数 | `ui_data_comm_ops_t`(`ui_data_comm_bind()`,与遥测整定同点位相邻) | `row` / `set` / `pending` 共 2 行:CA(1..65535,**改后重启生效**)与 104 端口(1024..65535,下次重 bind 监听生效) | 通讯设置页 | 真源 `App/iec60870/104_port/iec104_comm.h`;行名行数归页面 |
|
||||
| 通讯参数 | `ui_data_comm_ops_t`(`ui_data_comm_bind()`,与遥测整定同点位相邻) | `row` / `set` / `pending` 共 2 行:CA(1..65535,**改后重启生效**)与 104 端口(1024..65535,下次重 bind 监听生效) | 通讯设置页 | 真源 `App/iec60870/104/iec104_comm.h`;行名行数归页面 |
|
||||
| 录波回放 | `ui_data_wave_ops_t`(`ui_data_wave_bind()`,uiTask 启动时绑) | 7 件:`manual_req`(手动触发录波)/ 入场作废缓存钩子 / `seg_first/seg_prev/seg_next`(段导航,环形回绕)/ `seg_head`(事件名+触发字+削顶)/ `seg_win`(40 点码值 + 窗口峰值) | 录波回放页 | 取数口径唯一真源 `docs/子系统设计/故障录波设计说明.md` §6.3 |
|
||||
|
||||
三条共用口径:
|
||||
|
||||
+88
-57
@@ -103,17 +103,17 @@ digraph refgraph_full {
|
||||
"App/iec60870/104/business/IEC104_Startup.h" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"App/iec60870/104/business/IEC104_SystemCommand.c" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"App/iec60870/104/business/IEC104_SystemCommand.h" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"App/iec60870/104_port/iec104_comm.c" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"App/iec60870/104_port/iec104_comm.h" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"App/iec60870/104_port/iec104_core.c" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"App/iec60870/104_port/iec104_core.h" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"App/iec60870/104_port/iec104_dtu_table.c" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"App/iec60870/104_port/iec104_dtu_table.h" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"App/iec60870/104_port/iec104_net_mcu.c" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"App/iec60870/104_port/iec104_net_mcu.h" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"App/iec60870/104_port/iec104_source.c" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"App/iec60870/104_port/iec104_source.h" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"App/iec60870/104_port/iec104_source_ranks.h" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"App/iec60870/104/iec104_comm.c" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"App/iec60870/104/iec104_comm.h" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"App/iec60870/104/iec104_core.c" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"App/iec60870/104/iec104_core.h" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"App/iec60870/104/iec104_dtu_table.c" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"App/iec60870/104/iec104_dtu_table.h" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"App/iec60870/104/iec104_net_mcu.c" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"App/iec60870/104/iec104_net_mcu.h" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"App/iec60870/104/iec104_source.c" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"App/iec60870/104/iec104_source.h" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"App/iec60870/104/iec104_source_ranks.h" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"App/iec60870/common/IEC60870_Asdu.c" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"App/iec60870/common/IEC60870_Asdu.h" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"App/iec60870/common/IEC60870_Clock.h" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
@@ -442,6 +442,7 @@ digraph refgraph_full {
|
||||
"test/host/freq/freq_test.c" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"test/host/ftp_auth/ftp_auth_test.c" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"test/host/ftp_cfg/ftp_cfg_test.c" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"test/host/iec104_comm/iec104_comm_test.c" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"test/host/iec104_dtu/core_lifecycle_test.c" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"test/host/iec104_dtu/source_binding_test.c" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"test/host/iec104_dtu/vendor_boundary_test.c" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
@@ -455,6 +456,12 @@ digraph refgraph_full {
|
||||
"test/host/iec104_netmcu/stub/task.h" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"test/host/iec104_netmcu/stub_iec104_netmcu.c" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"test/host/iec104_netmcu/stub_iec104_netmcu.h" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"test/host/iec104_serv/iec104_serv_test.c" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"test/host/iec104_serv/stub/cmsis_os2.h" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"test/host/iec104_serv/stub/dbg_log.h" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"test/host/iec104_serv/stub/iec104_comm.h" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"test/host/iec104_serv/stub/net_socket.h" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"test/host/iec104_serv/stub/sys_events.h" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"test/host/ioboard/ioboard_test.c" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"test/host/lftpd/lftpd_test.c" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
"test/host/lftpd/stub/FreeRTOS.h" [fillcolor="#dbeafe", color="#1d4ed8"];
|
||||
@@ -667,7 +674,7 @@ digraph refgraph_full {
|
||||
"App/app/app_main.c" -> "App/algo/prot_set.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/app/app_main.c" -> "App/algo/run_par.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/app/app_main.c" -> "App/app/app_main.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/app/app_main.c" -> "App/iec60870/104_port/iec104_comm.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/app/app_main.c" -> "App/iec60870/104/iec104_comm.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/app/app_main.c" -> "App/log/sys_log.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/app/app_main.c" -> "App/util/boot_stats.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/app/app_main.c" -> "App/util/sys_clock.h" [color="#2563eb", penwidth=1.0];
|
||||
@@ -694,8 +701,8 @@ digraph refgraph_full {
|
||||
"App/app/ui_data_feed.c" -> "App/algo/prot_set.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/app/ui_data_feed.c" -> "App/algo/run_par.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/app/ui_data_feed.c" -> "App/app/ui_data_feed.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/app/ui_data_feed.c" -> "App/iec60870/104_port/iec104_comm.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/app/ui_data_feed.c" -> "App/iec60870/104_port/iec104_dtu_table.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/app/ui_data_feed.c" -> "App/iec60870/104/iec104_comm.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/app/ui_data_feed.c" -> "App/iec60870/104/iec104_dtu_table.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/app/ui_data_feed.c" -> "App/task/iec104_serv.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/app/ui_data_feed.c" -> "App/util/boot_stats.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/app/ui_data_feed.c" -> "App/util/ioboard_di.h" [color="#2563eb", penwidth=1.0];
|
||||
@@ -877,38 +884,38 @@ digraph refgraph_full {
|
||||
"App/iec60870/104/business/IEC104_SystemCommand.c" -> "App/iec60870/common/IEC60870_Codec.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104/business/IEC104_SystemCommand.c" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"App/iec60870/104/business/IEC104_SystemCommand.h" -> "App/iec60870/104/IEC104_Slave.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104_port/iec104_comm.c" -> "App/cfg/cfg_file.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104_port/iec104_comm.c" -> "App/iec60870/104_port/iec104_comm.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104_port/iec104_comm.c" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"App/iec60870/104_port/iec104_comm.h" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"App/iec60870/104_port/iec104_core.c" -> "App/iec60870/104/IEC104_Net.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104_port/iec104_core.c" -> "App/iec60870/104/business/IEC104_CounterInterrogation.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104_port/iec104_core.c" -> "App/iec60870/104/business/IEC104_GeneralInterrogation.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104_port/iec104_core.c" -> "App/iec60870/104/business/IEC104_PeriodicScan.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104_port/iec104_core.c" -> "App/iec60870/104/business/IEC104_Read.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104_port/iec104_core.c" -> "App/iec60870/104/business/IEC104_Startup.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104_port/iec104_core.c" -> "App/iec60870/104_port/iec104_core.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104_port/iec104_core.c" -> "App/iec60870/104_port/iec104_source.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104_port/iec104_core.c" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"App/iec60870/104_port/iec104_core.h" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"App/iec60870/104_port/iec104_dtu_table.c" -> "App/iec60870/104_port/iec104_dtu_table.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104_port/iec104_dtu_table.c" -> "App/iec60870/examples/iec104_dtu_profile.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104_port/iec104_dtu_table.c" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"App/iec60870/104_port/iec104_dtu_table.h" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"App/iec60870/104_port/iec104_net_mcu.c" -> "App/iec60870/104/IEC104_Net.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104_port/iec104_net_mcu.c" -> "Drivers/BSP/NET/net_socket.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104_port/iec104_net_mcu.c" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"App/iec60870/104_port/iec104_net_mcu.h" -> "App/iec60870/104/IEC104_Net.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104_port/iec104_net_mcu.h" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"App/iec60870/104_port/iec104_source.c" -> "App/iec60870/104_port/iec104_source.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104_port/iec104_source.c" -> "App/iec60870/104_port/iec104_source_ranks.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104_port/iec104_source.c" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"App/iec60870/104_port/iec104_source.h" -> "App/iec60870/104/business/IEC104_ClockSynchronization.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104_port/iec104_source.h" -> "App/iec60870/104/business/IEC104_Command.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104_port/iec104_source.h" -> "App/iec60870/104/business/IEC104_Parameter.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104_port/iec104_source.h" -> "App/iec60870/104/business/IEC104_RemoteParameter.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104_port/iec104_source.h" -> "App/iec60870/104_port/iec104_dtu_table.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104_port/iec104_source_ranks.h" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"App/iec60870/104/iec104_comm.c" -> "App/cfg/cfg_file.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104/iec104_comm.c" -> "App/iec60870/104/iec104_comm.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104/iec104_comm.c" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"App/iec60870/104/iec104_comm.h" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"App/iec60870/104/iec104_core.c" -> "App/iec60870/104/IEC104_Net.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104/iec104_core.c" -> "App/iec60870/104/business/IEC104_CounterInterrogation.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104/iec104_core.c" -> "App/iec60870/104/business/IEC104_GeneralInterrogation.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104/iec104_core.c" -> "App/iec60870/104/business/IEC104_PeriodicScan.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104/iec104_core.c" -> "App/iec60870/104/business/IEC104_Read.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104/iec104_core.c" -> "App/iec60870/104/business/IEC104_Startup.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104/iec104_core.c" -> "App/iec60870/104/iec104_core.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104/iec104_core.c" -> "App/iec60870/104/iec104_source.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104/iec104_core.c" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"App/iec60870/104/iec104_core.h" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"App/iec60870/104/iec104_dtu_table.c" -> "App/iec60870/104/iec104_dtu_table.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104/iec104_dtu_table.c" -> "App/iec60870/examples/iec104_dtu_profile.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104/iec104_dtu_table.c" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"App/iec60870/104/iec104_dtu_table.h" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"App/iec60870/104/iec104_net_mcu.c" -> "App/iec60870/104/IEC104_Net.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104/iec104_net_mcu.c" -> "Drivers/BSP/NET/net_socket.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104/iec104_net_mcu.c" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"App/iec60870/104/iec104_net_mcu.h" -> "App/iec60870/104/IEC104_Net.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104/iec104_net_mcu.h" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"App/iec60870/104/iec104_source.c" -> "App/iec60870/104/iec104_source.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104/iec104_source.c" -> "App/iec60870/104/iec104_source_ranks.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104/iec104_source.c" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"App/iec60870/104/iec104_source.h" -> "App/iec60870/104/business/IEC104_ClockSynchronization.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104/iec104_source.h" -> "App/iec60870/104/business/IEC104_Command.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104/iec104_source.h" -> "App/iec60870/104/business/IEC104_Parameter.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104/iec104_source.h" -> "App/iec60870/104/business/IEC104_RemoteParameter.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104/iec104_source.h" -> "App/iec60870/104/iec104_dtu_table.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/104/iec104_source_ranks.h" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"App/iec60870/common/IEC60870_Asdu.c" -> "App/iec60870/common/IEC60870_Asdu.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/common/IEC60870_Asdu.c" -> "App/iec60870/common/IEC60870_InformationObjects_Internal.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/iec60870/common/IEC60870_Asdu.c" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
@@ -1021,7 +1028,7 @@ digraph refgraph_full {
|
||||
"App/task/default_task.c" -> "App/cfg/prot_set_store.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/task/default_task.c" -> "App/fs/vol_idle_sync.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/task/default_task.c" -> "App/fs/vol_lock.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/task/default_task.c" -> "App/iec60870/104_port/iec104_comm.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/task/default_task.c" -> "App/iec60870/104/iec104_comm.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/task/default_task.c" -> "App/log/sys_log.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/task/default_task.c" -> "App/task/default_task.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/task/default_task.c" -> "App/task/task_handles.h" [color="#2563eb", penwidth=1.0];
|
||||
@@ -1044,10 +1051,10 @@ digraph refgraph_full {
|
||||
"App/task/iec104_serv.c" -> "App/algo/prot_set.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/task/iec104_serv.c" -> "App/algo/run_par.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/task/iec104_serv.c" -> "App/app/sys_events.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/task/iec104_serv.c" -> "App/iec60870/104_port/iec104_comm.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/task/iec104_serv.c" -> "App/iec60870/104_port/iec104_core.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/task/iec104_serv.c" -> "App/iec60870/104_port/iec104_net_mcu.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/task/iec104_serv.c" -> "App/iec60870/104_port/iec104_source.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/task/iec104_serv.c" -> "App/iec60870/104/iec104_comm.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/task/iec104_serv.c" -> "App/iec60870/104/iec104_core.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/task/iec104_serv.c" -> "App/iec60870/104/iec104_net_mcu.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/task/iec104_serv.c" -> "App/iec60870/104/iec104_source.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/task/iec104_serv.c" -> "App/task/iec104_serv.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/task/iec104_serv.c" -> "App/util/ioboard_di.h" [color="#2563eb", penwidth=1.0];
|
||||
"App/task/iec104_serv.c" -> "App/util/task_watchdog.h" [color="#2563eb", penwidth=1.0];
|
||||
@@ -1710,7 +1717,7 @@ digraph refgraph_full {
|
||||
"simulator/main.c" -> "App/algo/wave_store.h" [color="#2563eb", penwidth=1.0];
|
||||
"simulator/main.c" -> "App/cfg/cfg_file.h" [color="#2563eb", penwidth=1.0];
|
||||
"simulator/main.c" -> "App/cfg/cfg_file_store.h" [color="#2563eb", penwidth=1.0];
|
||||
"simulator/main.c" -> "App/iec60870/104_port/iec104_core.h" [color="#2563eb", penwidth=1.0];
|
||||
"simulator/main.c" -> "App/iec60870/104/iec104_core.h" [color="#2563eb", penwidth=1.0];
|
||||
"simulator/main.c" -> "App/log/sys_log.h" [color="#2563eb", penwidth=1.0];
|
||||
"simulator/main.c" -> "Drivers/BSP/NETCFG/net_cfg.h" [color="#2563eb", penwidth=1.0];
|
||||
"simulator/main.c" -> "Drivers/BSP/UI/ui_content_page.h" [color="#2563eb", penwidth=1.0];
|
||||
@@ -1728,8 +1735,8 @@ digraph refgraph_full {
|
||||
"simulator/sim/cfg_file_store_sim.c" -> "App/cfg/cfg_file_store.h" [color="#2563eb", penwidth=1.0];
|
||||
"simulator/sim/cfg_file_store_sim.c" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"simulator/sim/iec104_sim.c" -> "App/iec60870/104/IEC104_Net.h" [color="#2563eb", penwidth=1.0];
|
||||
"simulator/sim/iec104_sim.c" -> "App/iec60870/104_port/iec104_core.h" [color="#2563eb", penwidth=1.0];
|
||||
"simulator/sim/iec104_sim.c" -> "App/iec60870/104_port/iec104_source.h" [color="#2563eb", penwidth=1.0];
|
||||
"simulator/sim/iec104_sim.c" -> "App/iec60870/104/iec104_core.h" [color="#2563eb", penwidth=1.0];
|
||||
"simulator/sim/iec104_sim.c" -> "App/iec60870/104/iec104_source.h" [color="#2563eb", penwidth=1.0];
|
||||
"simulator/sim/iec104_sim.c" -> "App/iec60870/common/IEC60870_Time.h" [color="#2563eb", penwidth=1.0];
|
||||
"simulator/sim/iec104_sim.c" -> "simulator/SDL2/SDL2-2.32.10/include/SDL.h" [color="#94a3b8", penwidth=0.7];
|
||||
"simulator/sim/iec104_sim.c" -> "simulator/sim/iec104_sim.h" [color="#2563eb", penwidth=1.0];
|
||||
@@ -1911,10 +1918,13 @@ digraph refgraph_full {
|
||||
"test/host/ftp_cfg/ftp_cfg_test.c" -> "Drivers/BSP/NETCFG/ftp_cfg.c" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/ftp_cfg/ftp_cfg_test.c" -> "Drivers/BSP/NETCFG/ftp_cfg.h" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/ftp_cfg/ftp_cfg_test.c" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"test/host/iec104_dtu/core_lifecycle_test.c" -> "App/iec60870/104_port/iec104_core.h" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/iec104_dtu/core_lifecycle_test.c" -> "App/iec60870/104_port/iec104_source.h" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/iec104_comm/iec104_comm_test.c" -> "App/cfg/cfg_file.h" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/iec104_comm/iec104_comm_test.c" -> "App/iec60870/104/iec104_comm.c" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/iec104_comm/iec104_comm_test.c" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"test/host/iec104_dtu/core_lifecycle_test.c" -> "App/iec60870/104/iec104_core.h" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/iec104_dtu/core_lifecycle_test.c" -> "App/iec60870/104/iec104_source.h" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/iec104_dtu/core_lifecycle_test.c" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"test/host/iec104_dtu/source_binding_test.c" -> "App/iec60870/104_port/iec104_source.h" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/iec104_dtu/source_binding_test.c" -> "App/iec60870/104/iec104_source.h" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/iec104_dtu/source_binding_test.c" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"test/host/iec104_dtu/vendor_boundary_test.c" -> "App/iec60870/104/business/IEC104_Command.h" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/iec104_dtu/vendor_boundary_test.c" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
@@ -1940,6 +1950,27 @@ digraph refgraph_full {
|
||||
"test/host/iec104_netmcu/stub_iec104_netmcu.c" -> "test/host/iec104_netmcu/stub_iec104_netmcu.h" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/iec104_netmcu/stub_iec104_netmcu.c" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"test/host/iec104_netmcu/stub_iec104_netmcu.h" -> "App/iec60870/104/IEC104_Net.h" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/iec104_serv/iec104_serv_test.c" -> "App/algo/adc_cal.h" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/iec104_serv/iec104_serv_test.c" -> "App/algo/meas.h" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/iec104_serv/iec104_serv_test.c" -> "App/algo/prot_set.h" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/iec104_serv/iec104_serv_test.c" -> "App/algo/run_par.h" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/iec104_serv/iec104_serv_test.c" -> "App/app/sys_events.h" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/iec104_serv/iec104_serv_test.c" -> "App/cfg/cfg_file.h" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/iec104_serv/iec104_serv_test.c" -> "App/iec60870/104/iec104_comm.c" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/iec104_serv/iec104_serv_test.c" -> "App/iec60870/104/iec104_core.h" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/iec104_serv/iec104_serv_test.c" -> "App/iec60870/104/iec104_net_mcu.h" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/iec104_serv/iec104_serv_test.c" -> "App/iec60870/104/iec104_source.h" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/iec104_serv/iec104_serv_test.c" -> "App/task/iec104_serv.c" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/iec104_serv/iec104_serv_test.c" -> "App/util/ioboard_di.h" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/iec104_serv/iec104_serv_test.c" -> "App/util/task_watchdog.h" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/iec104_serv/iec104_serv_test.c" -> "Drivers/BSP/NET/net_socket.h" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/iec104_serv/iec104_serv_test.c" -> "Drivers/BSP/dbg_log.h" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/iec104_serv/iec104_serv_test.c" -> "Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2/cmsis_os2.h" [color="#94a3b8", penwidth=0.7];
|
||||
"test/host/iec104_serv/iec104_serv_test.c" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"test/host/iec104_serv/stub/cmsis_os2.h" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"test/host/iec104_serv/stub/iec104_comm.h" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"test/host/iec104_serv/stub/net_socket.h" -> "外部/系统头文件" [color="#f59e0b", penwidth=0.6, style=dashed];
|
||||
"test/host/iec104_serv/stub/sys_events.h" -> "test/host/iec104_serv/stub/cmsis_os2.h" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/ioboard/ioboard_test.c" -> "App/util/ioboard_di.c" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/ioboard/ioboard_test.c" -> "App/util/ioboard_di.h" [color="#2563eb", penwidth=1.0];
|
||||
"test/host/ioboard/ioboard_test.c" -> "Drivers/BSP/IOBOARD/ioboard.h" [color="#2563eb", penwidth=1.0];
|
||||
|
||||
+478
-257
@@ -406,47 +406,47 @@
|
||||
"class": "fp"
|
||||
},
|
||||
{
|
||||
"path": "App/iec60870/104_port/iec104_comm.c",
|
||||
"path": "App/iec60870/104/iec104_comm.c",
|
||||
"class": "fp"
|
||||
},
|
||||
{
|
||||
"path": "App/iec60870/104_port/iec104_comm.h",
|
||||
"path": "App/iec60870/104/iec104_comm.h",
|
||||
"class": "fp"
|
||||
},
|
||||
{
|
||||
"path": "App/iec60870/104_port/iec104_core.c",
|
||||
"path": "App/iec60870/104/iec104_core.c",
|
||||
"class": "fp"
|
||||
},
|
||||
{
|
||||
"path": "App/iec60870/104_port/iec104_core.h",
|
||||
"path": "App/iec60870/104/iec104_core.h",
|
||||
"class": "fp"
|
||||
},
|
||||
{
|
||||
"path": "App/iec60870/104_port/iec104_dtu_table.c",
|
||||
"path": "App/iec60870/104/iec104_dtu_table.c",
|
||||
"class": "fp"
|
||||
},
|
||||
{
|
||||
"path": "App/iec60870/104_port/iec104_dtu_table.h",
|
||||
"path": "App/iec60870/104/iec104_dtu_table.h",
|
||||
"class": "fp"
|
||||
},
|
||||
{
|
||||
"path": "App/iec60870/104_port/iec104_net_mcu.c",
|
||||
"path": "App/iec60870/104/iec104_net_mcu.c",
|
||||
"class": "fp"
|
||||
},
|
||||
{
|
||||
"path": "App/iec60870/104_port/iec104_net_mcu.h",
|
||||
"path": "App/iec60870/104/iec104_net_mcu.h",
|
||||
"class": "fp"
|
||||
},
|
||||
{
|
||||
"path": "App/iec60870/104_port/iec104_source.c",
|
||||
"path": "App/iec60870/104/iec104_source.c",
|
||||
"class": "fp"
|
||||
},
|
||||
{
|
||||
"path": "App/iec60870/104_port/iec104_source.h",
|
||||
"path": "App/iec60870/104/iec104_source.h",
|
||||
"class": "fp"
|
||||
},
|
||||
{
|
||||
"path": "App/iec60870/104_port/iec104_source_ranks.h",
|
||||
"path": "App/iec60870/104/iec104_source_ranks.h",
|
||||
"class": "fp"
|
||||
},
|
||||
{
|
||||
@@ -7429,6 +7429,10 @@
|
||||
"path": "test/host/ftp_cfg/ftp_cfg_test.c",
|
||||
"class": "fp"
|
||||
},
|
||||
{
|
||||
"path": "test/host/iec104_comm/iec104_comm_test.c",
|
||||
"class": "fp"
|
||||
},
|
||||
{
|
||||
"path": "test/host/iec104_dtu/core_lifecycle_test.c",
|
||||
"class": "fp"
|
||||
@@ -7481,6 +7485,30 @@
|
||||
"path": "test/host/iec104_netmcu/stub_iec104_netmcu.h",
|
||||
"class": "fp"
|
||||
},
|
||||
{
|
||||
"path": "test/host/iec104_serv/iec104_serv_test.c",
|
||||
"class": "fp"
|
||||
},
|
||||
{
|
||||
"path": "test/host/iec104_serv/stub/cmsis_os2.h",
|
||||
"class": "fp"
|
||||
},
|
||||
{
|
||||
"path": "test/host/iec104_serv/stub/dbg_log.h",
|
||||
"class": "fp"
|
||||
},
|
||||
{
|
||||
"path": "test/host/iec104_serv/stub/iec104_comm.h",
|
||||
"class": "fp"
|
||||
},
|
||||
{
|
||||
"path": "test/host/iec104_serv/stub/net_socket.h",
|
||||
"class": "fp"
|
||||
},
|
||||
{
|
||||
"path": "test/host/iec104_serv/stub/sys_events.h",
|
||||
"class": "fp"
|
||||
},
|
||||
{
|
||||
"path": "test/host/ioboard/ioboard_test.c",
|
||||
"class": "fp"
|
||||
@@ -8545,7 +8573,7 @@
|
||||
},
|
||||
{
|
||||
"from": "App/app/app_main.c",
|
||||
"to": "App/iec60870/104_port/iec104_comm.h",
|
||||
"to": "App/iec60870/104/iec104_comm.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_comm.h"
|
||||
},
|
||||
@@ -8719,13 +8747,13 @@
|
||||
},
|
||||
{
|
||||
"from": "App/app/ui_data_feed.c",
|
||||
"to": "App/iec60870/104_port/iec104_comm.h",
|
||||
"to": "App/iec60870/104/iec104_comm.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_comm.h"
|
||||
},
|
||||
{
|
||||
"from": "App/app/ui_data_feed.c",
|
||||
"to": "App/iec60870/104_port/iec104_dtu_table.h",
|
||||
"to": "App/iec60870/104/iec104_dtu_table.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_dtu_table.h"
|
||||
},
|
||||
@@ -9377,6 +9405,222 @@
|
||||
"kind": "fp-fp",
|
||||
"include": "IEC60870_Types.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_comm.c",
|
||||
"to": "App/iec60870/104/iec104_comm.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_comm.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_comm.c",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "string.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_comm.c",
|
||||
"to": "App/cfg/cfg_file.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "cfg_file.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_comm.h",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "stdint.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_core.c",
|
||||
"to": "App/iec60870/104/iec104_core.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_core.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_core.c",
|
||||
"to": "App/iec60870/104/iec104_source.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_source.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_core.c",
|
||||
"to": "App/iec60870/104/business/IEC104_Startup.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "IEC104_Startup.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_core.c",
|
||||
"to": "App/iec60870/104/business/IEC104_GeneralInterrogation.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "IEC104_GeneralInterrogation.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_core.c",
|
||||
"to": "App/iec60870/104/business/IEC104_CounterInterrogation.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "IEC104_CounterInterrogation.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_core.c",
|
||||
"to": "App/iec60870/104/business/IEC104_Read.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "IEC104_Read.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_core.c",
|
||||
"to": "App/iec60870/104/business/IEC104_PeriodicScan.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "IEC104_PeriodicScan.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_core.c",
|
||||
"to": "App/iec60870/104/IEC104_Net.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "IEC104_Net.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_core.c",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "string.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_core.h",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "stdint.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_dtu_table.c",
|
||||
"to": "App/iec60870/104/iec104_dtu_table.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_dtu_table.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_dtu_table.c",
|
||||
"to": "App/iec60870/examples/iec104_dtu_profile.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_dtu_profile.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_dtu_table.c",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "string.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_dtu_table.h",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "stdbool.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_dtu_table.h",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "stddef.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_dtu_table.h",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "stdint.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_net_mcu.c",
|
||||
"to": "App/iec60870/104/IEC104_Net.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "IEC104_Net.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_net_mcu.c",
|
||||
"to": "Drivers/BSP/NET/net_socket.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "net_socket.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_net_mcu.c",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "string.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_net_mcu.h",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "stdint.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_net_mcu.h",
|
||||
"to": "App/iec60870/104/IEC104_Net.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "IEC104_Net.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_source.c",
|
||||
"to": "App/iec60870/104/iec104_source.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_source.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_source.c",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "string.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_source.c",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "stdlib.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_source.c",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "float.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_source.c",
|
||||
"to": "App/iec60870/104/iec104_source_ranks.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_source_ranks.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_source.h",
|
||||
"to": "App/iec60870/104/iec104_dtu_table.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_dtu_table.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_source.h",
|
||||
"to": "App/iec60870/104/business/IEC104_Command.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "IEC104_Command.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_source.h",
|
||||
"to": "App/iec60870/104/business/IEC104_RemoteParameter.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "IEC104_RemoteParameter.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_source.h",
|
||||
"to": "App/iec60870/104/business/IEC104_Parameter.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "IEC104_Parameter.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_source.h",
|
||||
"to": "App/iec60870/104/business/IEC104_ClockSynchronization.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "IEC104_ClockSynchronization.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/iec104_source_ranks.h",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "stdint.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104/business/IEC104_BusinessConfig_Internal.h",
|
||||
"to": "App/iec60870/104/business/IEC104_SystemCommand.h",
|
||||
@@ -9905,222 +10149,6 @@
|
||||
"kind": "fp-fp",
|
||||
"include": "IEC104_Slave.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_comm.c",
|
||||
"to": "App/iec60870/104_port/iec104_comm.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_comm.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_comm.c",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "string.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_comm.c",
|
||||
"to": "App/cfg/cfg_file.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "cfg_file.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_comm.h",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "stdint.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_core.c",
|
||||
"to": "App/iec60870/104_port/iec104_core.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_core.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_core.c",
|
||||
"to": "App/iec60870/104_port/iec104_source.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_source.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_core.c",
|
||||
"to": "App/iec60870/104/business/IEC104_Startup.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "IEC104_Startup.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_core.c",
|
||||
"to": "App/iec60870/104/business/IEC104_GeneralInterrogation.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "IEC104_GeneralInterrogation.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_core.c",
|
||||
"to": "App/iec60870/104/business/IEC104_CounterInterrogation.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "IEC104_CounterInterrogation.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_core.c",
|
||||
"to": "App/iec60870/104/business/IEC104_Read.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "IEC104_Read.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_core.c",
|
||||
"to": "App/iec60870/104/business/IEC104_PeriodicScan.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "IEC104_PeriodicScan.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_core.c",
|
||||
"to": "App/iec60870/104/IEC104_Net.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "IEC104_Net.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_core.c",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "string.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_core.h",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "stdint.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_dtu_table.c",
|
||||
"to": "App/iec60870/104_port/iec104_dtu_table.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_dtu_table.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_dtu_table.c",
|
||||
"to": "App/iec60870/examples/iec104_dtu_profile.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_dtu_profile.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_dtu_table.c",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "string.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_dtu_table.h",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "stdbool.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_dtu_table.h",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "stddef.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_dtu_table.h",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "stdint.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_net_mcu.c",
|
||||
"to": "App/iec60870/104/IEC104_Net.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "IEC104_Net.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_net_mcu.c",
|
||||
"to": "Drivers/BSP/NET/net_socket.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "net_socket.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_net_mcu.c",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "string.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_net_mcu.h",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "stdint.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_net_mcu.h",
|
||||
"to": "App/iec60870/104/IEC104_Net.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "IEC104_Net.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_source.c",
|
||||
"to": "App/iec60870/104_port/iec104_source.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_source.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_source.c",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "string.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_source.c",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "stdlib.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_source.c",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "float.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_source.c",
|
||||
"to": "App/iec60870/104_port/iec104_source_ranks.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_source_ranks.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_source.h",
|
||||
"to": "App/iec60870/104_port/iec104_dtu_table.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_dtu_table.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_source.h",
|
||||
"to": "App/iec60870/104/business/IEC104_Command.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "IEC104_Command.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_source.h",
|
||||
"to": "App/iec60870/104/business/IEC104_RemoteParameter.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "IEC104_RemoteParameter.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_source.h",
|
||||
"to": "App/iec60870/104/business/IEC104_Parameter.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "IEC104_Parameter.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_source.h",
|
||||
"to": "App/iec60870/104/business/IEC104_ClockSynchronization.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "IEC104_ClockSynchronization.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/104_port/iec104_source_ranks.h",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "stdint.h"
|
||||
},
|
||||
{
|
||||
"from": "App/iec60870/common/IEC60870_Asdu.c",
|
||||
"to": "App/iec60870/common/IEC60870_Asdu.h",
|
||||
@@ -10957,7 +10985,7 @@
|
||||
},
|
||||
{
|
||||
"from": "App/task/default_task.c",
|
||||
"to": "App/iec60870/104_port/iec104_comm.h",
|
||||
"to": "App/iec60870/104/iec104_comm.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_comm.h"
|
||||
},
|
||||
@@ -11041,25 +11069,25 @@
|
||||
},
|
||||
{
|
||||
"from": "App/task/iec104_serv.c",
|
||||
"to": "App/iec60870/104_port/iec104_comm.h",
|
||||
"to": "App/iec60870/104/iec104_comm.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_comm.h"
|
||||
},
|
||||
{
|
||||
"from": "App/task/iec104_serv.c",
|
||||
"to": "App/iec60870/104_port/iec104_core.h",
|
||||
"to": "App/iec60870/104/iec104_core.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_core.h"
|
||||
},
|
||||
{
|
||||
"from": "App/task/iec104_serv.c",
|
||||
"to": "App/iec60870/104_port/iec104_source.h",
|
||||
"to": "App/iec60870/104/iec104_source.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_source.h"
|
||||
},
|
||||
{
|
||||
"from": "App/task/iec104_serv.c",
|
||||
"to": "App/iec60870/104_port/iec104_net_mcu.h",
|
||||
"to": "App/iec60870/104/iec104_net_mcu.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_net_mcu.h"
|
||||
},
|
||||
@@ -44887,7 +44915,7 @@
|
||||
},
|
||||
{
|
||||
"from": "simulator/main.c",
|
||||
"to": "App/iec60870/104_port/iec104_core.h",
|
||||
"to": "App/iec60870/104/iec104_core.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_core.h"
|
||||
},
|
||||
@@ -50071,13 +50099,13 @@
|
||||
},
|
||||
{
|
||||
"from": "simulator/sim/iec104_sim.c",
|
||||
"to": "App/iec60870/104_port/iec104_core.h",
|
||||
"to": "App/iec60870/104/iec104_core.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_core.h"
|
||||
},
|
||||
{
|
||||
"from": "simulator/sim/iec104_sim.c",
|
||||
"to": "App/iec60870/104_port/iec104_source.h",
|
||||
"to": "App/iec60870/104/iec104_source.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_source.h"
|
||||
},
|
||||
@@ -51791,6 +51819,36 @@
|
||||
"kind": "fp-fp",
|
||||
"include": "ftp_cfg.c"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_comm/iec104_comm_test.c",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "stdint.h"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_comm/iec104_comm_test.c",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "stdio.h"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_comm/iec104_comm_test.c",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "string.h"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_comm/iec104_comm_test.c",
|
||||
"to": "App/cfg/cfg_file.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "cfg_file.h"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_comm/iec104_comm_test.c",
|
||||
"to": "App/iec60870/104/iec104_comm.c",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_comm.c"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_dtu/core_lifecycle_test.c",
|
||||
"to": "外部/系统头文件",
|
||||
@@ -51799,13 +51857,13 @@
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_dtu/core_lifecycle_test.c",
|
||||
"to": "App/iec60870/104_port/iec104_core.h",
|
||||
"to": "App/iec60870/104/iec104_core.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_core.h"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_dtu/core_lifecycle_test.c",
|
||||
"to": "App/iec60870/104_port/iec104_source.h",
|
||||
"to": "App/iec60870/104/iec104_source.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_source.h"
|
||||
},
|
||||
@@ -51829,7 +51887,7 @@
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_dtu/source_binding_test.c",
|
||||
"to": "App/iec60870/104_port/iec104_source.h",
|
||||
"to": "App/iec60870/104/iec104_source.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_source.h"
|
||||
},
|
||||
@@ -52013,6 +52071,150 @@
|
||||
"kind": "fp-fp",
|
||||
"include": "../../net_socket/stub/task.h"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_serv/iec104_serv_test.c",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "stdbool.h"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_serv/iec104_serv_test.c",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "stdint.h"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_serv/iec104_serv_test.c",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "stdio.h"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_serv/iec104_serv_test.c",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "string.h"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_serv/iec104_serv_test.c",
|
||||
"to": "Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2/cmsis_os2.h",
|
||||
"kind": "fp-tp",
|
||||
"include": "cmsis_os2.h"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_serv/iec104_serv_test.c",
|
||||
"to": "App/app/sys_events.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "sys_events.h"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_serv/iec104_serv_test.c",
|
||||
"to": "Drivers/BSP/NET/net_socket.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "net_socket.h"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_serv/iec104_serv_test.c",
|
||||
"to": "App/cfg/cfg_file.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "cfg_file.h"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_serv/iec104_serv_test.c",
|
||||
"to": "App/iec60870/104/iec104_comm.c",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_comm.c"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_serv/iec104_serv_test.c",
|
||||
"to": "App/iec60870/104/iec104_core.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_core.h"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_serv/iec104_serv_test.c",
|
||||
"to": "App/iec60870/104/iec104_source.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_source.h"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_serv/iec104_serv_test.c",
|
||||
"to": "App/iec60870/104/iec104_net_mcu.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_net_mcu.h"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_serv/iec104_serv_test.c",
|
||||
"to": "App/algo/meas.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "meas.h"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_serv/iec104_serv_test.c",
|
||||
"to": "App/algo/adc_cal.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "adc_cal.h"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_serv/iec104_serv_test.c",
|
||||
"to": "App/util/ioboard_di.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "ioboard_di.h"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_serv/iec104_serv_test.c",
|
||||
"to": "App/algo/prot_set.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "prot_set.h"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_serv/iec104_serv_test.c",
|
||||
"to": "App/algo/run_par.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "run_par.h"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_serv/iec104_serv_test.c",
|
||||
"to": "App/util/task_watchdog.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "task_watchdog.h"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_serv/iec104_serv_test.c",
|
||||
"to": "Drivers/BSP/dbg_log.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "dbg_log.h"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_serv/iec104_serv_test.c",
|
||||
"to": "App/task/iec104_serv.c",
|
||||
"kind": "fp-fp",
|
||||
"include": "iec104_serv.c"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_serv/stub/cmsis_os2.h",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "stdint.h"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_serv/stub/iec104_comm.h",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "stdint.h"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_serv/stub/net_socket.h",
|
||||
"to": "外部/系统头文件",
|
||||
"kind": "fp-ext",
|
||||
"include": "stdint.h"
|
||||
},
|
||||
{
|
||||
"from": "test/host/iec104_serv/stub/sys_events.h",
|
||||
"to": "test/host/iec104_serv/stub/cmsis_os2.h",
|
||||
"kind": "fp-fp",
|
||||
"include": "cmsis_os2.h"
|
||||
},
|
||||
{
|
||||
"from": "test/host/ioboard/ioboard_test.c",
|
||||
"to": "外部/系统头文件",
|
||||
@@ -54748,38 +54950,38 @@
|
||||
"App/iec60870/104/business/IEC104_SystemCommand.c": [
|
||||
"string.h"
|
||||
],
|
||||
"App/iec60870/104_port/iec104_comm.c": [
|
||||
"App/iec60870/104/iec104_comm.c": [
|
||||
"string.h"
|
||||
],
|
||||
"App/iec60870/104_port/iec104_comm.h": [
|
||||
"App/iec60870/104/iec104_comm.h": [
|
||||
"stdint.h"
|
||||
],
|
||||
"App/iec60870/104_port/iec104_core.c": [
|
||||
"App/iec60870/104/iec104_core.c": [
|
||||
"string.h"
|
||||
],
|
||||
"App/iec60870/104_port/iec104_core.h": [
|
||||
"App/iec60870/104/iec104_core.h": [
|
||||
"stdint.h"
|
||||
],
|
||||
"App/iec60870/104_port/iec104_dtu_table.c": [
|
||||
"App/iec60870/104/iec104_dtu_table.c": [
|
||||
"string.h"
|
||||
],
|
||||
"App/iec60870/104_port/iec104_dtu_table.h": [
|
||||
"App/iec60870/104/iec104_dtu_table.h": [
|
||||
"stdbool.h",
|
||||
"stddef.h",
|
||||
"stdint.h"
|
||||
],
|
||||
"App/iec60870/104_port/iec104_net_mcu.c": [
|
||||
"App/iec60870/104/iec104_net_mcu.c": [
|
||||
"string.h"
|
||||
],
|
||||
"App/iec60870/104_port/iec104_net_mcu.h": [
|
||||
"App/iec60870/104/iec104_net_mcu.h": [
|
||||
"stdint.h"
|
||||
],
|
||||
"App/iec60870/104_port/iec104_source.c": [
|
||||
"App/iec60870/104/iec104_source.c": [
|
||||
"float.h",
|
||||
"stdlib.h",
|
||||
"string.h"
|
||||
],
|
||||
"App/iec60870/104_port/iec104_source_ranks.h": [
|
||||
"App/iec60870/104/iec104_source_ranks.h": [
|
||||
"stdint.h"
|
||||
],
|
||||
"App/iec60870/common/IEC60870_Asdu.c": [
|
||||
@@ -57418,6 +57620,11 @@
|
||||
"stdio.h",
|
||||
"string.h"
|
||||
],
|
||||
"test/host/iec104_comm/iec104_comm_test.c": [
|
||||
"stdint.h",
|
||||
"stdio.h",
|
||||
"string.h"
|
||||
],
|
||||
"test/host/iec104_dtu/core_lifecycle_test.c": [
|
||||
"iec104_tcp_fixture.h"
|
||||
],
|
||||
@@ -57456,6 +57663,21 @@
|
||||
"test/host/iec104_netmcu/stub_iec104_netmcu.c": [
|
||||
"string.h"
|
||||
],
|
||||
"test/host/iec104_serv/iec104_serv_test.c": [
|
||||
"stdbool.h",
|
||||
"stdint.h",
|
||||
"stdio.h",
|
||||
"string.h"
|
||||
],
|
||||
"test/host/iec104_serv/stub/cmsis_os2.h": [
|
||||
"stdint.h"
|
||||
],
|
||||
"test/host/iec104_serv/stub/iec104_comm.h": [
|
||||
"stdint.h"
|
||||
],
|
||||
"test/host/iec104_serv/stub/net_socket.h": [
|
||||
"stdint.h"
|
||||
],
|
||||
"test/host/ioboard/ioboard_test.c": [
|
||||
"stdint.h",
|
||||
"stdio.h"
|
||||
@@ -57834,11 +58056,11 @@
|
||||
]
|
||||
},
|
||||
"stats": {
|
||||
"files_indexed": 2026,
|
||||
"includes_parsed": 7745,
|
||||
"resolved": 5889,
|
||||
"unresolved": 1856,
|
||||
"nodes_fp": 559,
|
||||
"files_indexed": 2033,
|
||||
"includes_parsed": 7774,
|
||||
"resolved": 5908,
|
||||
"unresolved": 1866,
|
||||
"nodes_fp": 566,
|
||||
"nodes_tp": 1455,
|
||||
"ext_names": 373
|
||||
},
|
||||
@@ -57867,7 +58089,6 @@
|
||||
"App/log",
|
||||
"App/sync",
|
||||
"App/task",
|
||||
"App/iec60870/104_port",
|
||||
"App/iec60870/common",
|
||||
"App/iec60870/104",
|
||||
"App/iec60870/104/business",
|
||||
|
||||
+5328
-5142
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 1.3 MiB |
@@ -168,25 +168,25 @@ digraph refgraph_module {
|
||||
"simulator" -> "SDL2" [color="#2563eb", penwidth=1.2, label="×3"];
|
||||
"simulator" -> "test" [color="#2563eb", penwidth=1.2, label="×1"];
|
||||
"simulator" -> "外部/系统头文件" [color="#94a3b8", penwidth=0.7, label="×8"];
|
||||
"test" -> "App" [color="#2563eb", penwidth=1.2, label="×80"];
|
||||
"test" -> "App" [color="#2563eb", penwidth=1.2, label="×92"];
|
||||
"test" -> "App/log" [color="#2563eb", penwidth=1.2, label="×16"];
|
||||
"test" -> "App/task" [color="#2563eb", penwidth=1.2, label="×1"];
|
||||
"test" -> "App/util" [color="#2563eb", penwidth=1.2, label="×15"];
|
||||
"test" -> "BSP(公共)" [color="#2563eb", penwidth=1.2, label="×30"];
|
||||
"test" -> "App/task" [color="#2563eb", penwidth=1.2, label="×2"];
|
||||
"test" -> "App/util" [color="#2563eb", penwidth=1.2, label="×17"];
|
||||
"test" -> "BSP(公共)" [color="#2563eb", penwidth=1.2, label="×31"];
|
||||
"test" -> "BSP/CH395F" [color="#2563eb", penwidth=1.2, label="×7"];
|
||||
"test" -> "BSP/GD5F2GQ5UE" [color="#2563eb", penwidth=1.2, label="×6"];
|
||||
"test" -> "BSP/NET" [color="#2563eb", penwidth=1.2, label="×49"];
|
||||
"test" -> "BSP/NET" [color="#2563eb", penwidth=1.2, label="×50"];
|
||||
"test" -> "BSP/NETCFG" [color="#2563eb", penwidth=1.2, label="×8"];
|
||||
"test" -> "BSP/SD2506" [color="#2563eb", penwidth=1.2, label="×3"];
|
||||
"test" -> "BSP/TPAFE5160" [color="#2563eb", penwidth=1.2, label="×1"];
|
||||
"test" -> "BSP/UI" [color="#2563eb", penwidth=1.2, label="×10"];
|
||||
"test" -> "FatFs" [color="#2563eb", penwidth=1.2, label="×11"];
|
||||
"test" -> "FreeRTOS" [color="#2563eb", penwidth=1.2, label="×25"];
|
||||
"test" -> "FreeRTOS" [color="#2563eb", penwidth=1.2, label="×26"];
|
||||
"test" -> "HAL" [color="#2563eb", penwidth=1.2, label="×1"];
|
||||
"test" -> "Src/Inc (CubeMX)" [color="#2563eb", penwidth=1.2, label="×8"];
|
||||
"test" -> "dhara" [color="#2563eb", penwidth=1.2, label="×2"];
|
||||
"test" -> "lftpd" [color="#2563eb", penwidth=1.2, label="×12"];
|
||||
"test" -> "外部/系统头文件" [color="#94a3b8", penwidth=0.7, label="×142"];
|
||||
"test" -> "外部/系统头文件" [color="#94a3b8", penwidth=0.7, label="×147"];
|
||||
"其他(第三方)" -> "App" [color="#94a3b8", penwidth=0.7, label="×128"];
|
||||
"其他(第三方)" -> "外部/系统头文件" [color="#94a3b8", penwidth=0.7, label="×112"];
|
||||
}
|
||||
|
||||
@@ -1151,7 +1151,7 @@
|
||||
<title>test->App</title>
|
||||
<path fill="none" stroke="#2563eb" stroke-width="1.2" d="M463.97,-1813.11C452.4,-1807.24 438.75,-1800.04 426.75,-1793 327.81,-1734.93 299.54,-1717.89 228.25,-1628 202.88,-1596.01 180.18,-1554.62 166.45,-1527.47"/>
|
||||
<polygon fill="#2563eb" stroke="#2563eb" stroke-width="1.2" points="169.69,-1526.13 162.11,-1518.74 163.43,-1529.25 169.69,-1526.13"/>
|
||||
<text xml:space="preserve" text-anchor="middle" x="318.5" y="-1735.43" font-family="Microsoft YaHei" font-size="10.00" fill="#334155">×80</text>
|
||||
<text xml:space="preserve" text-anchor="middle" x="318.5" y="-1735.43" font-family="Microsoft YaHei" font-size="10.00" fill="#334155">×92</text>
|
||||
</g>
|
||||
<!-- test->App/log -->
|
||||
<g id="edge142" class="edge">
|
||||
@@ -1165,21 +1165,21 @@
|
||||
<title>test->App/task</title>
|
||||
<path fill="none" stroke="#2563eb" stroke-width="1.2" d="M518.73,-1829.5C524.5,-1830.12 530.57,-1830.68 536.25,-1831 555.98,-1832.12 591,-1830.22 627.75,-1829 685.32,-1827.09 1094.74,-1835.75 1145.75,-1809 1168.9,-1796.86 1206.44,-1734.87 1227.51,-1697.56"/>
|
||||
<polygon fill="#2563eb" stroke="#2563eb" stroke-width="1.2" points="1230.53,-1699.33 1232.35,-1688.9 1224.41,-1695.92 1230.53,-1699.33"/>
|
||||
<text xml:space="preserve" text-anchor="middle" x="837.25" y="-1833.61" font-family="Microsoft YaHei" font-size="10.00" fill="#334155">×1</text>
|
||||
<text xml:space="preserve" text-anchor="middle" x="837.25" y="-1833.61" font-family="Microsoft YaHei" font-size="10.00" fill="#334155">×2</text>
|
||||
</g>
|
||||
<!-- test->App/util -->
|
||||
<g id="edge144" class="edge">
|
||||
<title>test->App/util</title>
|
||||
<path fill="none" stroke="#2563eb" stroke-width="1.2" d="M489,-1807.56C485.53,-1760.95 474.09,-1634.92 446.25,-1533.75 440.17,-1511.65 433.28,-1507.97 426.75,-1486 403.49,-1407.71 388.73,-1312.25 382.28,-1264.78"/>
|
||||
<polygon fill="#2563eb" stroke="#2563eb" stroke-width="1.2" points="385.77,-1264.5 380.99,-1255.05 378.83,-1265.43 385.77,-1264.5"/>
|
||||
<text xml:space="preserve" text-anchor="middle" x="436.5" y="-1538.5" font-family="Microsoft YaHei" font-size="10.00" fill="#334155">×15</text>
|
||||
<text xml:space="preserve" text-anchor="middle" x="436.5" y="-1538.5" font-family="Microsoft YaHei" font-size="10.00" fill="#334155">×17</text>
|
||||
</g>
|
||||
<!-- test->BSP(公共) -->
|
||||
<g id="edge145" class="edge">
|
||||
<title>test->BSP(公共)</title>
|
||||
<path fill="none" stroke="#2563eb" stroke-width="1.2" d="M494.98,-1807.5C500.24,-1774.53 513.34,-1703.8 536.25,-1648 548.63,-1617.86 555.39,-1611.92 573.75,-1585 647.65,-1476.68 698.33,-1470.37 754.75,-1352 822.4,-1210.06 740.9,-1090.87 882.25,-1022 1058.77,-936 1120.39,-1102 1316.75,-1102 1316.75,-1102 1316.75,-1102 1997,-1102 2052.15,-1102 2083.65,-1170.53 2097.53,-1211.36"/>
|
||||
<polygon fill="#2563eb" stroke="#2563eb" stroke-width="1.2" points="2094.18,-1212.37 2100.57,-1220.81 2100.84,-1210.22 2094.18,-1212.37"/>
|
||||
<text xml:space="preserve" text-anchor="middle" x="1244.13" y="-1105.28" font-family="Microsoft YaHei" font-size="10.00" fill="#334155">×30</text>
|
||||
<text xml:space="preserve" text-anchor="middle" x="1244.13" y="-1105.28" font-family="Microsoft YaHei" font-size="10.00" fill="#334155">×31</text>
|
||||
</g>
|
||||
<!-- test->BSP/CH395F -->
|
||||
<g id="edge146" class="edge">
|
||||
@@ -1200,7 +1200,7 @@
|
||||
<title>test->BSP/NET</title>
|
||||
<path fill="none" stroke="#2563eb" stroke-width="1.2" d="M514.8,-1844.25C516.07,-1845.77 517.23,-1847.36 518.25,-1849 534.48,-1875.21 516.04,-1892.72 536.25,-1916 561.79,-1945.41 657.07,-1946.25 683.25,-1950 949.34,-1988.17 1018.22,-1989.71 1287,-1986 1377.82,-1984.75 1402.55,-1998.56 1491.25,-1979 1497.11,-1977.71 1503.19,-1976.05 1509.16,-1974.23"/>
|
||||
<polygon fill="#2563eb" stroke="#2563eb" stroke-width="1.2" points="1510.21,-1977.57 1518.65,-1971.16 1508.06,-1970.91 1510.21,-1977.57"/>
|
||||
<text xml:space="preserve" text-anchor="middle" x="946.75" y="-1987.83" font-family="Microsoft YaHei" font-size="10.00" fill="#334155">×49</text>
|
||||
<text xml:space="preserve" text-anchor="middle" x="946.75" y="-1987.83" font-family="Microsoft YaHei" font-size="10.00" fill="#334155">×50</text>
|
||||
</g>
|
||||
<!-- test->BSP/NETCFG -->
|
||||
<g id="edge149" class="edge">
|
||||
@@ -1242,7 +1242,7 @@
|
||||
<title>test->FreeRTOS</title>
|
||||
<path fill="none" stroke="#2563eb" stroke-width="1.2" d="M494.47,-1807.66C500.02,-1762.98 515.57,-1645.02 536.25,-1548 572.71,-1376.94 582.36,-1333.01 645.75,-1170 662.73,-1126.33 687.17,-1077.83 702.82,-1048.12"/>
|
||||
<polygon fill="#2563eb" stroke="#2563eb" stroke-width="1.2" points="705.71,-1050.14 707.31,-1039.67 699.53,-1046.86 705.71,-1050.14"/>
|
||||
<text xml:space="preserve" text-anchor="middle" x="600.75" y="-1385.53" font-family="Microsoft YaHei" font-size="10.00" fill="#334155">×25</text>
|
||||
<text xml:space="preserve" text-anchor="middle" x="600.75" y="-1385.53" font-family="Microsoft YaHei" font-size="10.00" fill="#334155">×26</text>
|
||||
</g>
|
||||
<!-- test->HAL -->
|
||||
<g id="edge155" class="edge">
|
||||
@@ -1277,7 +1277,7 @@
|
||||
<title>test->外部/系统头文件</title>
|
||||
<path fill="none" stroke="#94a3b8" stroke-width="0.7" d="M492.12,-1844.19C492.21,-1898.79 496.01,-2065.57 536.25,-2196 573.11,-2315.47 629.36,-2326.23 665.25,-2446 679.85,-2494.71 658.39,-2514.63 683.25,-2559 711.33,-2609.12 724.05,-2643 781.5,-2643 781.5,-2643 781.5,-2643 1174.5,-2643 1311.54,-2643 1343.46,-2681 1480.5,-2681 1480.5,-2681 1480.5,-2681 2108.12,-2681 2236.76,-2681 2258.75,-1636.09 2261.68,-1446.36"/>
|
||||
<polygon fill="#94a3b8" stroke="#94a3b8" stroke-width="0.7" points="2265.18,-1446.47 2261.83,-1436.41 2258.18,-1446.36 2265.18,-1446.47"/>
|
||||
<text xml:space="preserve" text-anchor="middle" x="1317.75" y="-2667.38" font-family="Microsoft YaHei" font-size="10.00" fill="#334155">×142</text>
|
||||
<text xml:space="preserve" text-anchor="middle" x="1317.75" y="-2667.38" font-family="Microsoft YaHei" font-size="10.00" fill="#334155">×147</text>
|
||||
</g>
|
||||
<!-- 其他(第三方)->App -->
|
||||
<g id="edge160" class="edge">
|
||||
|
||||
|
Before Width: | Height: | Size: 120 KiB After Width: | Height: | Size: 120 KiB |
@@ -43,10 +43,10 @@
|
||||
<text x="1255" y="275" font-size="13" fill="#1e293b" text-anchor="middle">task/(9 任务)</text>
|
||||
<rect x="811" y="300" width="421" height="38" rx="8" fill="#ffffff" stroke="#0d9488" stroke-opacity="0.55"/>
|
||||
<text x="1021" y="323" font-size="13" fill="#1e293b" text-anchor="middle">algo/(语义取数与有效性~保护判据 · 遥测快照 · 录波数据面)</text>
|
||||
<rect x="811" y="348" width="427" height="38" rx="8" fill="#ffffff" stroke="#0d9488" stroke-opacity="0.55"/>
|
||||
<text x="1024" y="371" font-size="13" fill="#1e293b" text-anchor="middle">iec60870/(104 上行默认 :2404;vendor 子树 + 104_port)</text>
|
||||
<rect x="1248" y="348" width="227" height="38" rx="8" fill="#ffffff" stroke="#0d9488" stroke-opacity="0.55"/>
|
||||
<text x="1362" y="371" font-size="13" fill="#1e293b" text-anchor="middle">ui_data_feed(App→UI 装配)</text>
|
||||
<rect x="811" y="348" width="436" height="38" rx="8" fill="#ffffff" stroke="#0d9488" stroke-opacity="0.55"/>
|
||||
<text x="1029" y="371" font-size="13" fill="#1e293b" text-anchor="middle">iec60870/(104 上行默认 :2404;common 编解码 + 104 协议)</text>
|
||||
<rect x="1257" y="348" width="227" height="38" rx="8" fill="#ffffff" stroke="#0d9488" stroke-opacity="0.55"/>
|
||||
<text x="1371" y="371" font-size="13" fill="#1e293b" text-anchor="middle">ui_data_feed(App→UI 装配)</text>
|
||||
<rect x="811" y="396" width="208" height="38" rx="8" fill="#ffffff" stroke="#0d9488" stroke-opacity="0.55"/>
|
||||
<text x="915" y="419" font-size="13" fill="#1e293b" text-anchor="middle">sys_log · soe(记录引擎)</text>
|
||||
<rect x="1029" y="396" width="264" height="38" rx="8" fill="#ffffff" stroke="#0d9488" stroke-opacity="0.55"/>
|
||||
|
||||
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
@@ -477,7 +477,7 @@ flowchart LR
|
||||
- **需求(已确认)**:半双工 RS-485 **对下 ModBus RTU 采集**(下行采集口;上行走以太网 104)。
|
||||
- **现状**:`rs485_init()` 已调用;`rs485_task.c` 为空桩、未在 `freertos.c` 创建。原表述「`App/protocol/`
|
||||
为该协议族预留(当前仅 104 在用)」**已于 2026-11-18 失效**:`App/protocol/` 这一层被删除,104 迁入
|
||||
`App/iec60870/`(vendor 子树 + `104_port/` 适配层)。ModBus RTU 协议族将来的落点**需确认**——不再存在
|
||||
`App/iec60870/`(`common/` 编解码 + `104/` 协议与平台适配)。ModBus RTU 协议族将来的落点**需确认**——不再存在
|
||||
一个集中收容协议实现的预留目录。**整簇冻结**(用户决定,2026-10-12)。
|
||||
- **重启门禁**:先修「单缓冲包撕裂」「TX 超时拉 DE 未等 TC」两条,再谈接消费者。
|
||||
- **动手前必须落实的三条设计约束**(事后无法补测——撕裂与错误路径在真机上不可稳定复现。
|
||||
@@ -656,7 +656,7 @@ flowchart LR
|
||||
|
||||
**FR-IEC104-3 遥信上送**
|
||||
- 需求:双位置遥信上双点、其余单点;变位突发 + 背景扫描;**无效点也入表并置 IV**。
|
||||
- 实现:旧 `App/protocol/iec104/iec104_pts.c` 点表(33 点)+ COV 判定(该文件 2026-11-18 已删除;现为 DTU 标准表 75 个遥信点,见 `App/iec60870/104_port/iec104_dtu_table.c`,两套点表语义不同不可对号入座);突发单点带 CP56 时标。
|
||||
- 实现:旧 `App/protocol/iec104/iec104_pts.c` 点表(33 点)+ COV 判定(该文件 2026-11-18 已删除;现为 DTU 标准表 75 个遥信点,见 `App/iec60870/104/iec104_dtu_table.c`,两套点表语义不同不可对号入座);突发单点带 CP56 时标。
|
||||
- 判据:`YX15~18/23/31` 为活数据;`YX1~14/19~22/24~30/32~33` 恒 IV(缺行比置 IV 更糟)。
|
||||
|
||||
**FR-IEC104-4 遥控**
|
||||
@@ -1349,7 +1349,7 @@ mac=00:00:00:00:00:00
|
||||
| `prot_elm` | `prot_elm_init/run/eval/state/request_reset` | 保护判据元件框架(9 实例) |
|
||||
| `run_par` | `run_par_init/get/set_104_write/dirty_peek` | 运行参数段(死区 + 系数代理) |
|
||||
| `soe_rec` / `soe_store` | `soe_rec_encode/decode` · `soe_store_post/drain` | SOE 编解码 + 落盘投递 |
|
||||
| `iec104` | 旧 `iec104_link_*` / `iec104_pts_*` / `iec104_serv_*`(2026-11-18 删旧自研三源后,现为 `iec104_core_*` / `iec104_source_*` / `iec104_dtu_table_*` 等 `104_port` 接口 + vendor `IEC104_*`) | 104 链路 / 点表 / 板端胶水 |
|
||||
| `iec104` | 旧 `iec104_link_*` / `iec104_pts_*` / `iec104_serv_*`(2026-11-18 删旧自研三源后,现为 `iec104_core_*` / `iec104_source_*` / `iec104_dtu_table_*` 等适配层接口 + 协议核心 `IEC104_*`) | 104 链路 / 点表 / 板端胶水 |
|
||||
|
||||
### 6.8 IEC 60870-5-104 点表摘要
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
|
||||
把全部可写参数纳入统一的提交语义,因为只为真实保护参数落盘会遗漏标准参数、区域参数和模拟项。
|
||||
|
||||
**事实**:`App/iec60870/104_port/iec104_source.h` 的 `iec104_source_bind()` 要求平台整批校验与原子应用,但现行 `iec104_source_init()` 明确恢复类型化默认值;这不是新产品掉电保持实现。
|
||||
**事实**:`App/iec60870/104/iec104_source.h` 的 `iec104_source_bind()` 要求平台整批校验与原子应用,但现行 `iec104_source_init()` 明确恢复类型化默认值;这不是新产品掉电保持实现。
|
||||
|
||||
**事实**:持久化调查 `ci-artifacts/iec104-mcu-plan/persistence/report.md` 及其 `audit_parameters.py` 逐项核出远方参数 264 个可写元数据:176 个全局项、88 个区域项;区域 0 与区域 1~4 各持一份区域值,合计 616 个可写区域实例。标准参数 120 项与远方参数没有信息对象地址(IOA)交集,当前源码也没有别名桥;加总是 736 个值槽,而不是业务同义已获裁定。`iec104_core.c` 的 QPA3(参数激活限定词)在当前装配仅控制一个组的遥测周期启停,此状态也须持久,不包含在上述值槽数内;编码未批。标准参数的限定词与逐点激活语义仍需和实际装配逐项冻结,不能把库支持的所有扩展当作已开放,也不能静默只保存 120 个数值。
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
> **定位**:DTU 上行规约 IEC 60870-5-104(DL/T 634.5104-2009)的设计基线——
|
||||
> 范围、点表、链路流程、板端接入、预算与测试。规格来源
|
||||
> `docs/算法/继电保护功能复现规划.md` §1.5(产品定义,验收 = 省电科院点表);
|
||||
> 代码落点 `App/iec60870/104_port/`;未闭环的送检验收见本文 §8。
|
||||
> 代码落点 `App/iec60870/104/` 与 `App/iec60870/common/`;未闭环的送检验收见本文 §8。
|
||||
> **角色**:本 DTU = **被控站(受控端)**,104 **TCP 服务器,端口 `[comm]` 段 `port`(工厂默认 2404)**;主站
|
||||
> (控制端,点表参考 `192.168.1.199`)主动连入。
|
||||
|
||||
@@ -18,9 +18,9 @@
|
||||
| 落点 | 当前职责 | 不能据此推断 |
|
||||
|---|---|---|
|
||||
| `App/iec60870/` | 成熟 ASDU、Slave、业务状态机、TcpServer 与网络后端;来源见 `App/iec60870/IMPORT.md` | 目录迁入不等于 MCU 集成通过 |
|
||||
| `App/iec60870/104_port/iec104_core.c` | `iec104_core_start()` / `iec104_core_poll()` / `iec104_core_stop()` 装配共享核心;`iec104_core_get_status()` 提供状态 | PC 运行不证明 CH395F、RTOS 或板端监听生命周期正确 |
|
||||
| `App/iec60870/104_port/iec104_source.c` | 数据、模拟动作、参数 RAM 与虚拟设备墙钟;`iec104_source_bind()` 是可选平台接缝 | 接口存在不等于已绑定 UI、保护或标定真源 |
|
||||
| `App/iec60870/104_port/iec104_dtu_table.c` | 标准 DTU 演示点表与元数据 | 新旧通信地址相同不代表语义相同;候选映射不代表真实绑定 |
|
||||
| `App/iec60870/104/iec104_core.c` | `iec104_core_start()` / `iec104_core_poll()` / `iec104_core_stop()` 装配共享核心;`iec104_core_get_status()` 提供状态 | PC 运行不证明 CH395F、RTOS 或板端监听生命周期正确 |
|
||||
| `App/iec60870/104/iec104_source.c` | 数据、模拟动作、参数 RAM 与虚拟设备墙钟;`iec104_source_bind()` 是可选平台接缝 | 接口存在不等于已绑定 UI、保护或标定真源 |
|
||||
| `App/iec60870/104/iec104_dtu_table.c` | 标准 DTU 演示点表与元数据 | 新旧通信地址相同不代表语义相同;候选映射不代表真实绑定 |
|
||||
|
||||
调用必须由同一事件循环属主串行执行,源回调须短且不阻塞。`start` 拒绝重复启动;失败清理后仍持有资源时须重试 `stop`,不得直接再次启动。每次被接纳的服务启动重置模拟值、参数 RAM、计数及设备墙钟;普通 TCP 重连保留已提交 RAM 值,但取消未完成的选择与参数预置事务。模拟“固化”仅提交运行时 RAM,不是断电保持。
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
|
||||
**旧板端实现会写遥控与对时记录。** 取旧实现请用**删文件前的那个提交**,不能用 `HEAD`:`iec104_pts.c` 在 `90cc9a7d`(2026-11-18 骨架迁 MCU)被删除,`App/task/iec104_serv.c` 也在同一次提交里重写成新契约,所以 `git show HEAD:…iec104_pts.c` 直接报 `path does not exist`、`git show HEAD:App/task/iec104_serv.c` 里已无 `s_clock_sync()`。可复现的证据锚点 = `2e9272cc`(2026-11-17,两文件都在),路径按当时的目录名 `App/protocol/` 写:`git show 2e9272cc: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 2e9272cc:App/task/iec104_serv.c` 的 `s_clock_sync()` 在 `sys_clock_set_unix()` 返回 0 时写 `SYSLOG_OPER` 的 `clock set by 104`。
|
||||
|
||||
**迁移后的共享核心不写这些记录,因为无真事实可写。** `iec104_source_command()`(`App/iec60870/104_port/iec104_source.c`,函数头注释「改变模拟遥信并标识替代源,绝不驱动物理出口」)是纯模拟态变更:选择段立即返回,执行段只改模拟 IOA 的状态与统计,其中复位动作的注释明确「只复归模拟锁存,绝不复归真实保护状态」。`App/protocol/` 与 `App/task/iec104_serv.c` 对 `prot_elm_request_reset` 与 `PS_GLOBAL_EN` 均为 0 次引用(当时目录名为 `App/protocol/`,2026-11-18 重构为 `App/iec60870/`;此句记录的是那次 grep 的当时范围,不改写成新路径),即新核心不触碰任何真实控制目标(与 §0.2「遥控全部为模拟动作」同一事实)。因此骨架档若照旧写 `force reset` 或 `plate in/out`,写下的将是**伪造记录**——不写是当前唯一诚实的做法。
|
||||
**迁移后的共享核心不写这些记录,因为无真事实可写。** `iec104_source_command()`(`App/iec60870/104/iec104_source.c`,函数头注释「改变模拟遥信并标识替代源,绝不驱动物理出口」)是纯模拟态变更:选择段立即返回,执行段只改模拟 IOA 的状态与统计,其中复位动作的注释明确「只复归模拟锁存,绝不复归真实保护状态」。`App/protocol/` 与 `App/task/iec104_serv.c` 对 `prot_elm_request_reset` 与 `PS_GLOBAL_EN` 均为 0 次引用(当时目录名为 `App/protocol/`,2026-11-18 重构为 `App/iec60870/`;此句记录的是那次 grep 的当时范围,不改写成新路径),即新核心不触碰任何真实控制目标(与 §0.2「遥控全部为模拟动作」同一事实)。因此骨架档若照旧写 `force reset` 或 `plate in/out`,写下的将是**伪造记录**——不写是当前唯一诚实的做法。
|
||||
|
||||
**可感知后果**(按用户可见面):
|
||||
|
||||
@@ -95,10 +95,10 @@
|
||||
| 模块 | 文件 | 职责 | I/O |
|
||||
|---|---|---|---|
|
||||
| ASDU 编解码 | 旧 `App/protocol/iec104/iec104_asdu.c/h`(**已删除 2026-11-18**,现由 vendor `App/iec60870/common/` 承担) | 类型/COT 常量、ASDU 头、IOA 3B 小端、短浮点、CP56Time2a↔epoch | 零 |
|
||||
| 点表/数据源 | 旧 `App/protocol/iec104/iec104_pts.c/h`(**已删除 2026-11-18**,现由 `App/iec60870/104_port/iec104_dtu_table.c` + `iec104_source.c` 承担) | YC/YX/YK/定值表、COV(变位+死区)、**数据源 vtable**(板端绑 phasor/prot_*,单测绑假源) | 零(源注入) |
|
||||
| 链路状态机 | 旧 `App/protocol/iec104/iec104_link.c/h`(**已删除 2026-11-18**,现由 vendor `App/iec60870/104/IEC104_Link*` 与 `104_port/iec104_core.c` 承担) | TCP 流重组、U/S/I、k/w/t1/t2/t3、总召/突发/遥控/定值/对时编排 | 零(收=on_rx 喂流,发=回调,时基注入) |
|
||||
| 点表/数据源 | 旧 `App/protocol/iec104/iec104_pts.c/h`(**已删除 2026-11-18**,现由 `App/iec60870/104/iec104_dtu_table.c` + `iec104_source.c` 承担) | YC/YX/YK/定值表、COV(变位+死区)、**数据源 vtable**(板端绑 phasor/prot_*,单测绑假源) | 零(源注入) |
|
||||
| 链路状态机 | 旧 `App/protocol/iec104/iec104_link.c/h`(**已删除 2026-11-18**,现由 vendor `App/iec60870/104/IEC104_Link*` 与 `iec104_core.c` 承担) | TCP 流重组、U/S/I、k/w/t1/t2/t3、总召/突发/遥控/定值/对时编排 | 零(收=on_rx 喂流,发=回调,时基注入) |
|
||||
| 板端胶水 | `App/task/iec104_serv.c/h`(随实现定名) | `[comm]` port 监听(工厂默认 2404)、数据通道收发、断链重听、netTask 驱动 | 全部(net_* API) |
|
||||
| 通讯参数段 | `App/iec60870/104_port/iec104_comm.c/h`(道G task-8) | `[comm]` 段注册 + ca/端口 getter 合法带自愈 / setter 守卫 | cfg_file 引擎(只注册不属主) |
|
||||
| 通讯参数段 | `App/iec60870/104/iec104_comm.c/h`(道G task-8) | `[comm]` 段注册 + ca/端口 getter 合法带自愈 / setter 守卫 | cfg_file 引擎(只注册不属主) |
|
||||
|
||||
> 三个纯逻辑模块 + 真实数据源(`App/algo/` 全纯逻辑)可整体在主机侧编译 →
|
||||
> 主机侧纯逻辑单测覆盖**全协议栈**(`test/host/iec104/` 已删除 2026-11-18,随旧自研协议层三源退役),与 `test/host/prot_elm/` 同模式。
|
||||
@@ -232,7 +232,7 @@
|
||||
- **承载任务 = 专用 iec104Task(640 words / Normal)**,非 netTask:netTask 是
|
||||
socket RPC 执行者,`net_recv/net_send` 在 netTask 内调用 = 自己等自己回执(死锁)。
|
||||
手写于 `Src/freertos.c` USER CODE 区(timeSyncTask/adcTask 同款先例),文件
|
||||
`App/task/iec104_serv.c`(纯编排,协议语义全在 `App/iec60870/104_port/`)。
|
||||
`App/task/iec104_serv.c`(纯编排,协议语义全在 `App/iec60870/104/`)。
|
||||
- **看门狗**:`TASK_WD_IEC104 = 7` 纳入 `wd_required_mask()` 两分支(产品 0x1F7 /
|
||||
HW 测试层 0x1F5,含 保护任务 protect 位 bit8);主循环 100ms 节拍喂位,屏障等待按
|
||||
100ms 分片喂位(timeSyncTask 2026-10-02 台架先例)。
|
||||
|
||||
@@ -161,7 +161,7 @@ write=1
|
||||
|
||||
### 3.5 `[comm]` 段:IEC 60870-5-104 通讯参数(2026-10-26 新增,「UI 补齐」波次里的非 UI 前置项,道G task-8)
|
||||
|
||||
104 被控站的公共地址与监听端口持久载体(段属主 = `App/iec60870/104_port/` 配对模块:
|
||||
104 被控站的公共地址与监听端口持久载体(段属主 = `App/iec60870/104/` 配对模块:
|
||||
工厂默认与合法带见 `iec104_comm.h`、键表与实现见 `iec104_comm.c`;注册
|
||||
`iec104_comm_init()` 在
|
||||
`app_main_init()` 内核前——「先注册后 load」契约同 [adc_cal] / [run_par]):
|
||||
|
||||
@@ -137,7 +137,7 @@ db_freq=500
|
||||
| `ca` | 无符号 | `1` | 公共地址 CA(1~65535) |
|
||||
| `port` | 无符号 | `2404` | 104 服务端口(1024~65535) |
|
||||
|
||||
**改后需重启生效**(该链路在任务启动时建立连接参数)。来源 `App/iec60870/104_port/iec104_comm.c`。
|
||||
**改后需重启生效**(该链路在任务启动时建立连接参数)。来源 `App/iec60870/104/iec104_comm.c`。
|
||||
|
||||
### 2.5 `[adc_cal]`、`[adc_cal_ofs]`、`[adc_cal_sec]`:采集标定
|
||||
|
||||
@@ -325,7 +325,7 @@ flowchart TD
|
||||
| `[network]` | 4 | `Drivers/BSP/NETCFG/net_cfg.c` | 有(触发网络重建) | 保存后立即重建网络 |
|
||||
| `[ftp]` | 3 | `Drivers/BSP/NETCFG/ftp_cfg.c` | 无 | 下次登录生效 |
|
||||
| `[sntp]` | 4 | `Drivers/BSP/NETCFG/sntp_cfg.c` | 无 | 客户端每轮直读 RAM 副本 |
|
||||
| `[comm]` | 2 | `App/iec60870/104_port/iec104_comm.c` | 无 | 改后重启生效 |
|
||||
| `[comm]` | 2 | `App/iec60870/104/iec104_comm.c` | 无 | 改后重启生效 |
|
||||
| `[adc_cal]` | 9 | `App/algo/adc_cal.c` | 无 | 消费方按拍直读 |
|
||||
| `[adc_cal_ofs]` | 8 | `App/algo/adc_cal.c` | 无 | 同上 |
|
||||
| `[adc_cal_sec]` | 8 | `App/algo/adc_cal.c` | 无 | 同上 |
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|---|---|---|---|
|
||||
| ① 业务层 | `Drivers/BSP/NETCFG/` | 顶层共享配置(被 UI 与基础服务共用) | `net_cfg` |
|
||||
| ② UI 层 | `Drivers/BSP/UI/` | LVGL 界面(与 PC 模拟器共用源码) | `ui_port` `ui_menu` `ui_menu_view` `ui_menu_tab` `ui_content_page` `ui_page_*` `ui_net_sink` `ui_font_cn_12` `ui_deco` |
|
||||
| ③ 基础服务层 | `App/`、`Drivers/BSP/NET/lftpd/` | 应用侧服务、采集算法与协议编排 | `app_main` `sys_events` `app_cfg` `task/*` `algo/*`(语义取数与有效性~保护判据)`iec60870/*`(104 vendor 子树 + `104_port` 适配层)`log/soe_store` `lftpd` `time_sync` |
|
||||
| ③ 基础服务层 | `App/`、`Drivers/BSP/NET/lftpd/` | 应用侧服务、采集算法与协议编排 | `app_main` `sys_events` `app_cfg` `task/*` `algo/*`(语义取数与有效性~保护判据)`iec60870/*`(`common` 编解码 + `104` 协议与平台适配)`log/soe_store` `lftpd` `time_sync` |
|
||||
| ④ 中间件层 | `Drivers/BSP/NET/`、`Lib/`、`App/util/` | 通用库 / 协议栈 | `net_socket` `net_select` `FatFs` `nand_ftl`(dhara) `LVGL` `sys_clock` |
|
||||
| ⑤ 驱动层 | `Drivers/BSP/{CH395F,GD5F2GQ5UE,TPAFE5160,SD2506,RS485}/` | 芯片寄存器 / 时序 / 中断 | `ch395f` `gd5f2gq5ue` `tpafe5160` `sd2506` `rs485` |
|
||||
| ⑥ 内核 / HAL | `Middlewares/`、`Drivers/STM32F4xx_HAL_Driver/`、`Drivers/CMSIS/` | 任务调度、外设 HAL、启动 | FreeRTOS V10.3.1 · STM32 HAL · CMSIS |
|
||||
|
||||
+2
-2
@@ -23,7 +23,7 @@
|
||||
|---|---|---|---|
|
||||
| ① 业务层 | `Drivers/BSP/NETCFG/` | 顶层共享配置(被 UI 与基础服务共用) | `net_cfg`(`/config.ini` `[network]` 段) |
|
||||
| ② UI 层 | `Drivers/BSP/UI/` | LVGL 160×160 单色界面(与 PC 模拟器、屏板、远程显示**共用同一份显存**) | `ui_port` `ui_menu` `ui_menu_view` `ui_menu_tab`(生成物) `ui_content_page` `ui_page_registry`(生成物) `ui_page_*`(20+ 页插件) `ui_data`(数据供给发布 API) `ui_net_sink` `ui_standby` `ui_font_cn_12` `ui_deco` |
|
||||
| ③ 基础服务层 | `App/`、`Drivers/BSP/NET/lftpd/` | 应用侧服务与编排 | `app_main` `sys_events` `ui_data_feed` `task/*`(9 任务) `algo/*`(语义取数与有效性~保护判据 + 遥测快照 + 录波数据面 + 屏板灯位映射) `iec60870/*`(104 vendor 子树 + `104_port` 适配层) `sys_log`·`soe_*`·`console_log` `cfg_file`·`prot_set_store` `vol_lock` `time_sync` `lftpd` |
|
||||
| ③ 基础服务层 | `App/`、`Drivers/BSP/NET/lftpd/` | 应用侧服务与编排 | `app_main` `sys_events` `ui_data_feed` `task/*`(9 任务) `algo/*`(语义取数与有效性~保护判据 + 遥测快照 + 录波数据面 + 屏板灯位映射) `iec60870/*`(`common` 编解码 + `104` 协议与平台适配) `sys_log`·`soe_*`·`console_log` `cfg_file`·`prot_set_store` `vol_lock` `time_sync` `lftpd` |
|
||||
| ④ 中间件层 | `Drivers/BSP/NET/`、`Lib/`、`App/util/` | 通用库 / 协议栈 | `net_socket` `net_select` `net_events` `net_listener` `net_pending` `FatFs` `nand_ftl(dhara)` `LVGL v9.3` `sys_clock` `task_watchdog` |
|
||||
| ⑤ 驱动层 | `Drivers/BSP/{CH395F,GD5F2GQ5UE,TPAFE5160,SD2506,RS485,ScreenLink}/` | 芯片寄存器 / 时序 / 中断 | `ch395f` `gd5f2gq5ue` `tpafe5160` `sd2506` `rs485` `sb_link`·`sb_proto` |
|
||||
| ⑥ 内核 / HAL | `Middlewares/`、`Drivers/STM32F4xx_HAL_Driver/`、`Drivers/CMSIS/` | 任务调度、外设 HAL、启动 | FreeRTOS V10.3.1 · STM32 HAL · CMSIS |
|
||||
@@ -318,7 +318,7 @@ STM32F4-Base/
|
||||
│ ├── iec60870/ IEC 60870-5-104「只维护一个」:vendor 子树 + 我方适配层
|
||||
│ │ common/(ASDU/时间/信息对象编解码)· 104/(Slave/TcpServer/
|
||||
│ │ Connection/SendManager + business/)· examples/(DTU 点表 profile)
|
||||
│ │ · 104_port/(core/source/net_mcu/dtu_table/comm 装配与平台适配)
|
||||
│ │ · 平台适配与业务装配(core/source/net_mcu/dtu_table/comm)
|
||||
│ ├── log/ sys_log 记录引擎(定长 64B,/log 唯一写者=defaultTask)、
|
||||
│ │ console_log(UART5 控制台单写者)、soe_rec(64B SOE 纯编解码)+ soe_store(投递/落盘胶水)
|
||||
│ ├── cfg/ 配置引擎:cfg_file(静态态单任务收敛于 defaultTask)、store(MCU=FreeRTOS 堆)、
|
||||
|
||||
@@ -329,7 +329,7 @@ static void phaseN_run(void) {
|
||||
| `App/log/sys_log_mcu.c` | — | ⬜ 候选 | 记录编解码(定长 64B) | 编解码纯逻辑;写入端依赖 FatFS + 队列,测编解码即可 |
|
||||
| `App/util/time_sync.c` | — | ⬜ 候选 | 协议帧编解码 | 报文组装/解析纯逻辑;网络收发不测 |
|
||||
| `Drivers/BSP/NETCFG/net_cfg_legacy.c` | — | ⛔ 已删除(2026-10-10) | — | 二进制旧档的迁移代码整体移除,测试候选随之撤销 |
|
||||
| `App/iec60870/104_port/*`(104 协议栈) | — | ✅ 已覆盖(82 断言,2026-10-12 IEC 104 上行) | 数据源 vtable + tick 注入 + 发送回调注入 | APCI 重组/总召分片/COV/k-w-t1~t3/两段式全离线穷举;`iec104-unit-test` 钩子 |
|
||||
| `App/iec60870/104/*`(104 协议栈) | — | ✅ 已覆盖(82 断言,2026-10-12 IEC 104 上行) | 数据源 vtable + tick 注入 + 发送回调注入 | APCI 重组/总召分片/COV/k-w-t1~t3/两段式全离线穷举;`iec104-unit-test` 钩子 |
|
||||
| `Drivers/BSP/GD5F2GQ5UE/nand_ftl.c`(dhara 移植层) | 573 行 | ✅ 已覆盖(149 断言,2026-10-15 起离线钉死 dhara 移植层两条硬约束) | 11 个 SPI 原语(`gd5f2gq5ue.h`)→ **RAM 假芯片** | 移植层是纯地址算术 + 边界判定,换掉芯片即可离线跑;钉死 is_free 整页扫描与六入口越界守卫,并内联旧算法做对照证明断言有牙 |
|
||||
| `App/util/rs485.c` | — | ⏸ 待功能实现 | — | 上游 RS-485 采集链路;当前为空桩 |
|
||||
| `Drivers/BSP/TPAFE5160/*.c` | — | ❌ 不适格 | — | 寄存器序列为主,需真机时序 |
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
# IEC 104 板端 Net 适配契约
|
||||
|
||||
> **定位**:`App/iec60870/104_port/iec104_net_mcu.c` 把成熟 104 库的 `IEC104_Net.h` 后端 ABI 接到
|
||||
> **定位**:`App/iec60870/104/iec104_net_mcu.c` 把成熟 104 库的 `IEC104_Net.h` 后端 ABI 接到
|
||||
> `Drivers/BSP/NET/net_socket.h` 的 `net_*` 接口上,本契约说明**为什么不能直译、按什么规则映射、
|
||||
> 哪些不变量必须成立**。代码落点:`App/iec60870/104_port/iec104_net_mcu.c` / `.h`。
|
||||
> 哪些不变量必须成立**。代码落点:`App/iec60870/104/iec104_net_mcu.c` / `.h`。
|
||||
> **验证边界**:见 §7——经 fake net 层 12/12 与代码审查,**CH395F 板端行为未证**。
|
||||
|
||||
## 1. 反例:直译 vendor 的 `Close(client)` 会毁掉监听
|
||||
@@ -128,7 +128,7 @@ listen/close 后旧 handle 必然查表失败。
|
||||
| 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/iec60870/104_port/iec104_net_mcu.c` 的 `IEC104_Net_Close()` |
|
||||
| 后端的 LISTEN / CLIENT 分流 | `App/iec60870/104/iec104_net_mcu.c` 的 `IEC104_Net_Close()` |
|
||||
| 后端的 role 查表 | 同文件 `find_role()` / `slot_by_handle()` |
|
||||
| 7 处 `IEC104_Net_Close(client, NULL)` | `App/iec60870/104/IEC104_TcpServer.c` 约 1606/1611/1616/1628/1636/1652/1665 |
|
||||
| `server->listen_socket` 赋值点 | 同文件 `:2129`(Listen 成功)/ `:322`、`:2146`、`:3322`(置无效) |
|
||||
|
||||
@@ -79,7 +79,7 @@ RAM 预算门禁 FAIL:RW_CCM 占用 92.3% > 92%(阈值 92%)
|
||||
真实链接测量过」——**这不是预算问题,也不拦提交**(该脚本只挂在 `scripts/ci_local.py` 的体积门禁,不在 51 条
|
||||
pre-commit 钩子内)。判据:报错里若同时列出「未入索引的文件」且那些文件正被别的任务改,就等它们入库后
|
||||
统一 `/keil-build` → `ram_baseline.py --update` 补凭证,**别为了把它调绿去 `git add` 别人在飞的改动**。本条写作时
|
||||
(2026-10-27 09:4x)凭证**仍是红的**:`App/iec60870/104_port/iec104_comm.{c,h}` 正被通讯道改、未入索引;
|
||||
(2026-10-27 09:4x)凭证**仍是红的**:`App/iec60870/104/iec104_comm.{c,h}` 正被通讯道改、未入索引;
|
||||
回填动作发生在该卡入库之后,届时以 `--update` 的实际输出为准,本节不预告结果。
|
||||
|
||||
## 7. 豁免与基线
|
||||
|
||||
@@ -148,7 +148,7 @@ SIM_EXEMPT = [
|
||||
KNOWN_GAPS = {
|
||||
"App/task/rs485_task.c": "RS-485 接线门禁(驱动契约未修完,随 B2 暂缓)",
|
||||
"App/iec60870/104/IEC104_Net_Windows.c":
|
||||
"Windows 平台后端,板端由 App/iec60870/104_port/iec104_net_mcu.c 提供同一 IEC104_Net ABI,不能同时编入(会抢 IEC104_Net_* 符号)",
|
||||
"Windows 平台后端,板端由 App/iec60870/104/iec104_net_mcu.c 提供同一 IEC104_Net ABI,不能同时编入(会抢 IEC104_Net_* 符号)",
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -144,7 +144,7 @@
|
||||
"lines_covered": 33,
|
||||
"lines_valid": 33
|
||||
},
|
||||
"App/iec60870/104_port/iec104_comm.c": {
|
||||
"App/iec60870/104/iec104_comm.c": {
|
||||
"func_rate": 1.0,
|
||||
"funcs_covered": 7,
|
||||
"funcs_valid": 7,
|
||||
@@ -511,14 +511,14 @@
|
||||
},
|
||||
"iec104_comm": {
|
||||
"files": {
|
||||
"App/iec60870/104_port/iec104_comm.c": 50
|
||||
"App/iec60870/104/iec104_comm.c": 50
|
||||
},
|
||||
"lines_total": 50,
|
||||
"ok": true
|
||||
},
|
||||
"iec104_serv": {
|
||||
"files": {
|
||||
"App/iec60870/104_port/iec104_comm.c": 50,
|
||||
"App/iec60870/104/iec104_comm.c": 50,
|
||||
"App/task/iec104_serv.c": 102
|
||||
},
|
||||
"lines_total": 152,
|
||||
@@ -835,7 +835,7 @@
|
||||
"App/cfg/prot_set_store.c",
|
||||
"App/fs/vol_idle_sync.c",
|
||||
"App/fs/vol_lock.c",
|
||||
"App/iec60870/104_port/iec104_comm.c",
|
||||
"App/iec60870/104/iec104_comm.c",
|
||||
"App/iec60870/common/IEC60870_Time.c",
|
||||
"App/log/console_log.c",
|
||||
"App/log/soe_rec.c",
|
||||
@@ -952,7 +952,7 @@
|
||||
},
|
||||
{
|
||||
"code_lines": 640,
|
||||
"path": "App/iec60870/104_port/iec104_core.c"
|
||||
"path": "App/iec60870/104/iec104_core.c"
|
||||
},
|
||||
{
|
||||
"code_lines": 597,
|
||||
@@ -976,7 +976,7 @@
|
||||
},
|
||||
{
|
||||
"code_lines": 489,
|
||||
"path": "App/iec60870/104_port/iec104_source.c"
|
||||
"path": "App/iec60870/104/iec104_source.c"
|
||||
},
|
||||
{
|
||||
"code_lines": 465,
|
||||
@@ -988,7 +988,7 @@
|
||||
},
|
||||
{
|
||||
"code_lines": 441,
|
||||
"path": "App/iec60870/104_port/iec104_net_mcu.c"
|
||||
"path": "App/iec60870/104/iec104_net_mcu.c"
|
||||
},
|
||||
{
|
||||
"code_lines": 375,
|
||||
@@ -1268,7 +1268,7 @@
|
||||
},
|
||||
{
|
||||
"code_lines": 75,
|
||||
"path": "App/iec60870/104_port/iec104_dtu_table.c"
|
||||
"path": "App/iec60870/104/iec104_dtu_table.c"
|
||||
},
|
||||
{
|
||||
"code_lines": 74,
|
||||
@@ -1336,7 +1336,7 @@
|
||||
},
|
||||
{
|
||||
"code_lines": 49,
|
||||
"path": "App/iec60870/104_port/iec104_source.h"
|
||||
"path": "App/iec60870/104/iec104_source.h"
|
||||
},
|
||||
{
|
||||
"code_lines": 47,
|
||||
@@ -1436,7 +1436,7 @@
|
||||
},
|
||||
{
|
||||
"code_lines": 35,
|
||||
"path": "App/iec60870/104_port/iec104_core.h"
|
||||
"path": "App/iec60870/104/iec104_core.h"
|
||||
},
|
||||
{
|
||||
"code_lines": 34,
|
||||
@@ -1484,7 +1484,7 @@
|
||||
},
|
||||
{
|
||||
"code_lines": 31,
|
||||
"path": "App/iec60870/104_port/iec104_net_mcu.h"
|
||||
"path": "App/iec60870/104/iec104_net_mcu.h"
|
||||
},
|
||||
{
|
||||
"code_lines": 31,
|
||||
@@ -1504,7 +1504,7 @@
|
||||
},
|
||||
{
|
||||
"code_lines": 30,
|
||||
"path": "App/iec60870/104_port/iec104_dtu_table.h"
|
||||
"path": "App/iec60870/104/iec104_dtu_table.h"
|
||||
},
|
||||
{
|
||||
"code_lines": 29,
|
||||
@@ -1584,7 +1584,7 @@
|
||||
},
|
||||
{
|
||||
"code_lines": 23,
|
||||
"path": "App/iec60870/104_port/iec104_comm.h"
|
||||
"path": "App/iec60870/104/iec104_comm.h"
|
||||
},
|
||||
{
|
||||
"code_lines": 23,
|
||||
|
||||
@@ -58,7 +58,6 @@ include_directories(
|
||||
# 声明宿主安全;2026-09-21 修复模拟器构建断链;
|
||||
# 2026-10-02 测试目录重构后头文件移入 test/board/)
|
||||
${PROJECT_ROOT}/App/cfg # cfg_file.h / cfg_file_store.h(通用配置文件引擎,双端共享核心)
|
||||
${PROJECT_ROOT}/App/iec60870/104_port # iec104_comm.h([comm] 段契约头,供 IEC104_SOURCES 编译;道G task-8)
|
||||
${PROJECT_ROOT}/App/log # sys_log.h(运行/自检记录引擎,双端共享核心)
|
||||
${PROJECT_ROOT}/App/algo # prot_set.h(定值模型纯算法,双端共享核心;见 ALGO_SOURCES)
|
||||
${PROJECT_ROOT}/App/util # ioboard_di.h(开入去抖与快照,双端共享核心)
|
||||
@@ -170,10 +169,10 @@ set(ALGO_SOURCES
|
||||
# iec104_net_mcu.c 是 MCU 平台后端(匹配 *_mcu.c 豁免规则),
|
||||
# 模拟器由 vendor 的 IEC104_Net_Windows.c 提供同一 IEC104_Net ABI,故不在此注册。
|
||||
set(IEC104_SOURCES
|
||||
${PROJECT_ROOT}/App/iec60870/104_port/iec104_comm.c
|
||||
${PROJECT_ROOT}/App/iec60870/104_port/iec104_core.c
|
||||
${PROJECT_ROOT}/App/iec60870/104_port/iec104_source.c
|
||||
${PROJECT_ROOT}/App/iec60870/104_port/iec104_dtu_table.c
|
||||
${PROJECT_ROOT}/App/iec60870/104/iec104_comm.c
|
||||
${PROJECT_ROOT}/App/iec60870/104/iec104_core.c
|
||||
${PROJECT_ROOT}/App/iec60870/104/iec104_source.c
|
||||
${PROJECT_ROOT}/App/iec60870/104/iec104_dtu_table.c
|
||||
${IEC60870_DIR}/common/IEC60870_Asdu.c
|
||||
${IEC60870_DIR}/common/IEC60870_Codec.c
|
||||
${IEC60870_DIR}/common/IEC60870_FaultEvent.c
|
||||
|
||||
+1
-1
@@ -131,7 +131,7 @@ LVGL 场景(同一份 ui_menu.c)
|
||||
|
||||
### 2.5 IEC104 共享核心显式运行模式
|
||||
|
||||
`--iec104` 路径装配 `App/iec60870/104_port/iec104_core.c` 与成熟 Slave/TcpServer/Windows 网络后端,在同一个 `lvgl_sim.exe` 内提供真实 TCP,监听 `0.0.0.0`(全部本机 IPv4 接口,默认端口 2404)。本机可用 `127.0.0.1` 连接;局域网客户端应使用模拟器所在主机的实际 IPv4 地址,能否从远端访问仍取决于网络与 Windows 防火墙规则,本程序不自动修改防火墙。它不表示板端服务已经切换;旧板端协议栈仍保留。
|
||||
`--iec104` 路径装配 `App/iec60870/104/iec104_core.c` 与成熟 Slave/TcpServer/Windows 网络后端,在同一个 `lvgl_sim.exe` 内提供真实 TCP,监听 `0.0.0.0`(全部本机 IPv4 接口,默认端口 2404)。本机可用 `127.0.0.1` 连接;局域网客户端应使用模拟器所在主机的实际 IPv4 地址,能否从远端访问仍取决于网络与 Windows 防火墙规则,本程序不自动修改防火墙。它不表示板端服务已经切换;旧板端协议栈仍保留。
|
||||
|
||||
```powershell
|
||||
.\simulator\build\Debug\lvgl_sim.exe --iec104 --iec104-headless --iec104-port 2404 --iec104-duration 60
|
||||
|
||||
+1
-1
@@ -321,7 +321,7 @@ static float s_yt_k[UI_DATA_YT_CH_N] = {
|
||||
static uint8_t s_yt_dirty; /* 镜像 run_par 的整档脏位(页面上 WAIT 的唯一来源) */
|
||||
static int s_yt_nopump; /* --yt-nopump:拍 WAIT 态黄金专用(截图前不清脏) */
|
||||
|
||||
/* 道G task-9 通讯参数假件:镜像 App/iec60870/104_port/iec104_comm.c 的 RAM 副本
|
||||
/* 道G task-9 通讯参数假件:镜像 App/iec60870/104/iec104_comm.c 的 RAM 副本
|
||||
* 与脏位。模拟器不链 iec104_comm.c(与 run_par 假件同一条理由,见上方镜像
|
||||
* 纪律注):值与合法带是镜像,初值 = IEC104_COMM_DEF_CA/_PORT,变更纪律同
|
||||
* s_yt_* 三件套 */
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* IEC104 [comm] segment host unit test.
|
||||
* Builds the real App/iec60870/104_port/iec104_comm.c into this translation unit
|
||||
* Builds the real App/iec60870/104/iec104_comm.c into this translation unit
|
||||
* and fakes only the config engine boundary (cfg_file_register/cfg_file_save)
|
||||
* against the real App/cfg/cfg_file.h interface.
|
||||
*/
|
||||
|
||||
@@ -15,7 +15,7 @@ BUILD = TestBuild(
|
||||
src=os.path.join(HERE, "iec104_comm_test.c"),
|
||||
include_dirs=[
|
||||
os.path.join(ROOT, "App", "cfg"),
|
||||
os.path.join(ROOT, "App", "iec60870", "104_port"),
|
||||
os.path.join(ROOT, "App", "iec60870", "104"),
|
||||
HERE,
|
||||
],
|
||||
summary_marker="=== IEC104 Comm Tests:",
|
||||
|
||||
@@ -49,13 +49,13 @@ def main():
|
||||
fixture.write_text(text.replace(old, new), encoding="utf-8")
|
||||
extra = []
|
||||
if name == "source_binding_test":
|
||||
extra = [ROOT / "App/iec60870/104_port/iec104_source.c", ROOT / "App/iec60870/104_port/iec104_dtu_table.c", vendor / "104/IEC104_Net_Windows.c", vendor / "104/IEC104_TcpServer.c"]
|
||||
extra = [ROOT / "App/iec60870/104/iec104_source.c", ROOT / "App/iec60870/104/iec104_dtu_table.c", vendor / "104/IEC104_Net_Windows.c", vendor / "104/IEC104_TcpServer.c"]
|
||||
if name == "core_lifecycle_test":
|
||||
extra = [ROOT / "App/iec60870/104_port/iec104_core.c", ROOT / "App/iec60870/104_port/iec104_source.c", ROOT / "App/iec60870/104_port/iec104_dtu_table.c"]
|
||||
extra = [ROOT / "App/iec60870/104/iec104_core.c", ROOT / "App/iec60870/104/iec104_source.c", ROOT / "App/iec60870/104/iec104_dtu_table.c"]
|
||||
flags = ["/nologo", "/std:c11", "/O2", "/W3", "/WX", "/utf-8", "/D_CRT_SECURE_NO_WARNINGS"]
|
||||
if name == "iec104_remote_parameter_test":
|
||||
flags += ["/DIEC104_REMOTE_PARAMETER_TEST_HOOKS", "/DIEC104_TCP_HIGH_CAPACITY=251"]
|
||||
command = [cl] + flags + ["/I" + str(p) for p in include] + ["/I" + str(ROOT / "App/iec60870/104_port")] + [str(fixture)] + [str(p) for p in sources + extra] + ["/Fe:" + str(target / (name + ".exe"))] + (["/link", "ws2_32.lib"] if extra else [])
|
||||
command = [cl] + flags + ["/I" + str(p) for p in include] + ["/I" + str(ROOT / "App/iec60870/104")] + [str(fixture)] + [str(p) for p in sources + extra] + ["/Fe:" + str(target / (name + ".exe"))] + (["/link", "ws2_32.lib"] if extra else [])
|
||||
build = subprocess.run(command, cwd=target, env=env, capture_output=True)
|
||||
(target / "build.log").write_text(decode(build.stdout) + decode(build.stderr), encoding="utf-8")
|
||||
row = {"name": name, "build_rc": build.returncode, "command": command, "fixture_sha256": hashlib.sha256(fixture.read_bytes()).hexdigest(), "adaptation": adaptation, "extra_sources_sha256": {str(p.relative_to(ROOT)): hashlib.sha256(p.read_bytes()).hexdigest() for p in extra}}
|
||||
|
||||
@@ -2,20 +2,20 @@
|
||||
|
||||
## 交接说明(最终交付状态)
|
||||
|
||||
- **这组测试证明什么**:针对 `App/iec60870/104_port/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`)。
|
||||
- **这组测试证明什么**:针对 `App/iec60870/104/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/iec60870/104_port/iec104_net_mcu.c`(真实板端 Net 后端,net-cutover 所有)对 `IEC104_Net.h` 的实现。
|
||||
- 被测对象:`App/iec60870/104/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/iec60870/104_port/iec104_net_mcu.h` 注释已入档;恒无 Nagle 视作平台事实,**不以 NODELAY 作为 OK 条件**。plan.md 的入档由 net-cutover 负责。
|
||||
- 已知平台偏离:CH395F 无 `setsockopt`,`App/iec60870/104/iec104_net_mcu.h` 注释已入档;恒无 Nagle 视作平台事实,**不以 NODELAY 作为 OK 条件**。plan.md 的入档由 net-cutover 负责。
|
||||
|
||||
## 静态源码检查(先于动态用例)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
"""Static acceptance checks for App/iec60870/104_port/iec104_net_mcu.c
|
||||
"""Static acceptance checks for App/iec60870/104/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.
|
||||
@@ -13,7 +13,7 @@ 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", "iec60870", "104_port", "iec104_net_mcu.c")
|
||||
SRC = os.path.join(ROOT, "App", "iec60870", "104", "iec104_net_mcu.c")
|
||||
OUT = os.path.join(HERE, "results", "static")
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* IEC104 Net MCU backend isolation contract tests.
|
||||
* Builds the REAL App/iec60870/104_port/iec104_net_mcu.c against a fake net layer.
|
||||
* Builds the REAL App/iec60870/104/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 <stdio.h>
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"scope": "REAL backend App/iec60870/104_port/iec104_net_mcu.c + fake net layer; host-only isolation evidence, not full core/TcpServer/hardware",
|
||||
"scope": "REAL backend App/iec60870/104/iec104_net_mcu.c + fake net layer; host-only isolation evidence, not full core/TcpServer/hardware",
|
||||
"backend_sha256": "1bcb602946485156ce04b49343ece9525e8ed50f5d5ee0c1d580982e8d77ecd9",
|
||||
"sources": {
|
||||
"MATRIX.md": "b17c25dabfc4ca17ec8befddafd420edcceb1bac69a65538c4f06b85c78d48eb",
|
||||
"MATRIX.md": "67126a0b92a832dd15710c3ce611d111e35f66c94d514d14939fdac7bd0ab314",
|
||||
"net_socket_fake.h": "c7c712256b5ac4b5162fd445319296dd32ada4abc6efa0384e65e2635bba38c9",
|
||||
"net_socket_fake.c": "f86ecd73bae57daad7d5d9506a0a8b7158344ba0e01f0e1d16af0ebdbdac3578",
|
||||
"netmcu_test.c": "65aa96163acf0ea38369f905027b8a3c8a9811bcf99aa5b4c8b874f21ea48ac1",
|
||||
"check_static.py": "cd071b0a0d804f0e4a9123278a87ed413a4d2d6f1989dfc505689b1e49fdf115"
|
||||
"netmcu_test.c": "a0b2b3b7719e7e355376ffd49755ebb116bcd072722075c0728c7ba37b2cacb4",
|
||||
"check_static.py": "21fdcf1f67c959232b7dcdcdf4ec1c86b3ac75d632aabef480303487f7ab5448"
|
||||
},
|
||||
"case_count": 13,
|
||||
"case_count_basis": "13 named cases; N2a/N2b are two cases in one N2 test function",
|
||||
@@ -39,6 +39,6 @@
|
||||
"MCU timing/WCET"
|
||||
],
|
||||
"known_deviations": [
|
||||
"NODELAY: App/iec60870/104_port/iec104_net_mcu.h comment; CH395F has no setsockopt, treated as always no-Nagle and NOT an OK condition"
|
||||
"NODELAY: App/iec60870/104/iec104_net_mcu.h comment; CH395F has no setsockopt, treated as always no-Nagle and NOT an OK condition"
|
||||
]
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"source": "D:\\Code\\DTU Code\\STM32F4-Base\\.agents\\worktrees\\dsh-d2fd6422-281a\\App\\iec60870\\104_port\\iec104_net_mcu.c",
|
||||
"source": "D:\\Code\\DTU Code\\STM32F4-Base\\.agents\\worktrees\\dsh-d2fd6422-281a\\App\\iec60870\\104\\iec104_net_mcu.c",
|
||||
"source_sha256": "1bcb602946485156ce04b49343ece9525e8ed50f5d5ee0c1d580982e8d77ecd9",
|
||||
"checks": [
|
||||
{
|
||||
|
||||
@@ -37,13 +37,13 @@ def run_real(cl, inc, lib):
|
||||
sources = [
|
||||
os.path.join(HERE, "netmcu_test.c"),
|
||||
os.path.join(HERE, "net_socket_fake.c"),
|
||||
os.path.join(ROOT, "App", "iec60870", "104_port", "iec104_net_mcu.c"),
|
||||
os.path.join(ROOT, "App", "iec60870", "104", "iec104_net_mcu.c"),
|
||||
]
|
||||
env = dict(os.environ)
|
||||
env["INCLUDE"] = os.pathsep.join(inc + [
|
||||
os.path.join(ROOT, "App", "iec60870", "104"),
|
||||
os.path.join(ROOT, "App", "iec60870", "common"),
|
||||
os.path.join(ROOT, "App", "iec60870", "104_port"),
|
||||
os.path.join(ROOT, "App", "iec60870", "104"),
|
||||
os.path.join(ROOT, "Drivers", "BSP", "NET"),
|
||||
os.path.join(HERE, "stub"),
|
||||
os.path.join(ROOT, "test", "host", "net_socket", "stub"),
|
||||
@@ -90,9 +90,9 @@ def main():
|
||||
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/iec60870/104_port/iec104_net_mcu.c + fake net layer; host-only isolation evidence, not full core/TcpServer/hardware",
|
||||
"scope": "REAL backend App/iec60870/104/iec104_net_mcu.c + fake net layer; host-only isolation evidence, not full core/TcpServer/hardware",
|
||||
"backend_sha256": sha256(os.path.join(
|
||||
ROOT, "App", "iec60870", "104_port", "iec104_net_mcu.c")),
|
||||
ROOT, "App", "iec60870", "104", "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"]},
|
||||
@@ -102,7 +102,7 @@ def main():
|
||||
"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/iec60870/104_port/iec104_net_mcu.h comment; CH395F has no setsockopt, treated as always no-Nagle and NOT an OK condition"],
|
||||
"known_deviations": ["NODELAY: App/iec60870/104/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)
|
||||
|
||||
@@ -16,7 +16,7 @@ BUILD = TestBuild(
|
||||
include_dirs=[
|
||||
os.path.join(HERE, "stub"),
|
||||
os.path.join(ROOT, "App", "task"),
|
||||
os.path.join(ROOT, "App", "iec60870", "104_port"),
|
||||
os.path.join(ROOT, "App", "iec60870", "104"),
|
||||
os.path.join(ROOT, "App", "iec60870", "common"),
|
||||
os.path.join(ROOT, "App", "iec60870", "104"),
|
||||
os.path.join(ROOT, "App", "iec60870", "104", "business"),
|
||||
|
||||
@@ -56,7 +56,7 @@ L_SVC = dict(
|
||||
title="③ 基础服务层", sub="应用侧服务 / 编排", color="#0d9488", bg="#f0fdfa",
|
||||
chips=["app_main(启动编排)", "sys_events(就绪屏障)", "task/(9 任务)",
|
||||
"algo/(语义取数与有效性~保护判据 · 遥测快照 · 录波数据面)",
|
||||
"iec60870/(104 上行默认 :2404;vendor 子树 + 104_port)", "ui_data_feed(App→UI 装配)",
|
||||
"iec60870/(104 上行默认 :2404;common 编解码 + 104 协议)", "ui_data_feed(App→UI 装配)",
|
||||
"sys_log · soe(记录引擎)", "console_log(UART5 控制台单写者)",
|
||||
"cfg_file · prot_set_store(配置引擎)",
|
||||
"lftpd(FTP :21)", "time_sntp(SNTP 对时,UDP 出向;:8888 已退役)"],
|
||||
|
||||
Reference in New Issue
Block a user