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

把 IEC104 从模拟器端整体搬到板端:协议栈原先由独立 iec104Task 驱动,
现在改为 netTask 单 owner 的 threadless 驱动,退役独立任务。

驱动与后端:
- 新增 iec104_net_mcu.c/.h,实现 IEC104_Net.h 的 11 个 ABI 函数,
  用槽表加单调句柄映射 net_socket 的单 fd 模型;CLIENT 拆除只走
  net_drop_conn_locked,绝不 net_close 监听 fd。
- net_socket 增 5 个 owner-only 接口(net_accept_locked、
  net_drop_conn_locked、net_pending_bytes、net_send_try、
  net_mono_now_ms)。
- iec104_serv.c 重写为 iec104_serv_net_tick(),在 netTask 1ms 主循环
  里驱动 core;无 osDelay/阻塞调用,喂狗是第一句。
- Src/freertos.c 删除 iec104Task 三件套,对应栈水位探针表项同步删除。

内存:目标板 192KB SRAM 装不下 vendor 默认容量档,按实测裁剪到
skeleton 档(TCP 缓冲、业务池、SOE 256->128、值槽密集化),
RW_IRAM1 118,408 B / 90.3%,留 2,178 B 余量。

台架修复(只在真硬件暴露):
- SNTP s_ctx.fd 零初始化后为 0,而 net fd 0 是合法槽位下标,
  首次代次变化时误 net_close(0) 关掉 ftpTask 的监听槽,导致 104
  连接被 FTP 的 220 banner 抢走;改为显式 .fd = -1。
- Accept 幂等:单 fd 模型下 vendor 每轮重试 Accept 会拿到同一 fd,
  后端改为会话在役时返 WOULD_BLOCK,Close 不再清槽。

验证:
- Keil 全量重建 0 error 0 warning,uvprojx 零抖动。
- 模拟器真实 TCP 13/13、transport 10/10。
- netmcu 后端单测 13/13(新增 N12)。
- 台架 serial-boot-test required 全中;板端 2404 总召 129 帧收到
  59 遥信(53 有源、全 IV)+ 16 双点 + 30 遥测(PT1 三相非零、
  UN/频率/温度按未标定置 IV)、遥控选择执行全否定、校时 COT 7。
- 期间顺带修正 UI 漂移自检文案、.serialtest required 陈旧项、
  coding-standard 对 vendor 与外部 ABI 名字的排除口径。
This commit is contained in:
2026-11-18 10:29:18 +08:00
parent 2e9272cc8a
commit 90cc9a7d99
125 changed files with 7463 additions and 5335 deletions
+162 -17
View File
@@ -335,9 +335,9 @@
<v6Rtti>0</v6Rtti>
<VariousControls>
<MiscControls>--diag_suppress=1,68,111,188,191,546,1293</MiscControls>
<Define>USE_HAL_DRIVER,STM32F407xx,NDEBUG</Define>
<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/protocol/iec104;../App/util;../Middlewares/Third_Party/FreeRTOS/Source/include;../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2;../Middlewares/Third_Party/FreeRTOS/Source/portable/RVDS/ARM_CM4F;../Lib/dhara;../Lib/FatFs;../test/board;../Lib/lvgl;../Drivers/BSP/UI;../Lib;../Lib/coreSNTP/include</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/protocol/iec104;../App/protocol/iec60870/common;../App/protocol/iec60870/104;../App/protocol/iec60870/104/business;../App/protocol/iec60870/examples;../App/util;../Middlewares/Third_Party/FreeRTOS/Source/include;../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2;../Middlewares/Third_Party/FreeRTOS/Source/portable/RVDS/ARM_CM4F;../Lib/dhara;../Lib/FatFs;../test/board;../Lib/lvgl;../Drivers/BSP/UI;../Lib;../Lib/coreSNTP/include</IncludePath>
</VariousControls>
</Cads>
<Aads>
@@ -992,26 +992,171 @@
<FileType>1</FileType>
<FilePath>..\App\task\protect_task.c</FilePath>
</File>
<File>
<FileName>iec104_asdu.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec104\iec104_asdu.c</FilePath>
</File>
<File>
<FileName>iec104_pts.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec104\iec104_pts.c</FilePath>
</File>
<File>
<FileName>iec104_link.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec104\iec104_link.c</FilePath>
</File>
<File>
<FileName>iec104_comm.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec104\iec104_comm.c</FilePath>
</File>
<File>
<FileName>iec104_core.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec104\iec104_core.c</FilePath>
</File>
<File>
<FileName>iec104_source.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec104\iec104_source.c</FilePath>
</File>
<File>
<FileName>iec104_dtu_table.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec104\iec104_dtu_table.c</FilePath>
</File>
<File>
<FileName>iec104_net_mcu.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec104\iec104_net_mcu.c</FilePath>
</File>
<File>
<FileName>IEC104_AsduQueue.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec60870\104\IEC104_AsduQueue.c</FilePath>
</File>
<File>
<FileName>IEC104_Codec.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec60870\104\IEC104_Codec.c</FilePath>
</File>
<File>
<FileName>IEC104_Connection.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec60870\104\IEC104_Connection.c</FilePath>
</File>
<File>
<FileName>IEC104_Link.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec60870\104\IEC104_Link.c</FilePath>
</File>
<File>
<FileName>IEC104_Link_Slave_StartStop.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec60870\104\IEC104_Link_Slave_StartStop.c</FilePath>
</File>
<File>
<FileName>IEC104_Receiver.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec60870\104\IEC104_Receiver.c</FilePath>
</File>
<File>
<FileName>IEC104_SendBuffer.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec60870\104\IEC104_SendBuffer.c</FilePath>
</File>
<File>
<FileName>IEC104_SendManager.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec60870\104\IEC104_SendManager.c</FilePath>
</File>
<File>
<FileName>IEC104_Slave.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec60870\104\IEC104_Slave.c</FilePath>
</File>
<File>
<FileName>IEC104_TcpServer.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec60870\104\IEC104_TcpServer.c</FilePath>
</File>
<File>
<FileName>IEC104_ClockSynchronization.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec60870\104\business\IEC104_ClockSynchronization.c</FilePath>
</File>
<File>
<FileName>IEC104_Command.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec60870\104\business\IEC104_Command.c</FilePath>
</File>
<File>
<FileName>IEC104_CounterInterrogation.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec60870\104\business\IEC104_CounterInterrogation.c</FilePath>
</File>
<File>
<FileName>IEC104_GeneralInterrogation.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec60870\104\business\IEC104_GeneralInterrogation.c</FilePath>
</File>
<File>
<FileName>IEC104_Interrogation.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec60870\104\business\IEC104_Interrogation.c</FilePath>
</File>
<File>
<FileName>IEC104_Parameter.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec60870\104\business\IEC104_Parameter.c</FilePath>
</File>
<File>
<FileName>IEC104_PeriodicScan.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec60870\104\business\IEC104_PeriodicScan.c</FilePath>
</File>
<File>
<FileName>IEC104_Read.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec60870\104\business\IEC104_Read.c</FilePath>
</File>
<File>
<FileName>IEC104_RemoteParameter.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec60870\104\business\IEC104_RemoteParameter.c</FilePath>
</File>
<File>
<FileName>IEC104_Spontaneous.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec60870\104\business\IEC104_Spontaneous.c</FilePath>
</File>
<File>
<FileName>IEC104_Startup.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec60870\104\business\IEC104_Startup.c</FilePath>
</File>
<File>
<FileName>IEC104_SystemCommand.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec60870\104\business\IEC104_SystemCommand.c</FilePath>
</File>
<File>
<FileName>IEC60870_Asdu.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec60870\common\IEC60870_Asdu.c</FilePath>
</File>
<File>
<FileName>IEC60870_Codec.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec60870\common\IEC60870_Codec.c</FilePath>
</File>
<File>
<FileName>IEC60870_FaultEvent.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec60870\common\IEC60870_FaultEvent.c</FilePath>
</File>
<File>
<FileName>IEC60870_InformationObjects.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec60870\common\IEC60870_InformationObjects.c</FilePath>
</File>
<File>
<FileName>IEC60870_Slave.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec60870\common\IEC60870_Slave.c</FilePath>
</File>
<File>
<FileName>IEC60870_Time.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\protocol\iec60870\common\IEC60870_Time.c</FilePath>
</File>
<File>
<FileName>adc_input.c</FileName>
<FileType>1</FileType>