wandering1/STM32F4-Base
1
0
Fork 0
Code Issues 29 Pull Requests 1 Actions Packages Projects 2 Releases Wiki Activity

merge: N32 并入 v2-on-ui 主干（解 RAM 快照冲突并重生成）

Browse Source 
N32 的 8 个提交与主干 v2-on-ui 的 6 个新提交合并。唯一冲突是
`docs/内存管理/RAM使用分析与优化方案.md` 的 mem-numbers 快照数字表：
- N32 侧基于旧基线（e4134a4）刷新
- v2-on-ui 侧含其他任务（B4/IEC104 等）的新代码

**两边都不能直接选**，故解冲突后按合并后的**实际构建**重新生成：
@build（合并后代码，0 错 0 警）→ check_mem_numbers.py --write
→ ram_baseline.py --write（同步 RAM 台账受管区）。

合并后内存水位：ER_IROM1 223,724 / RW_IRAM1 96,144 (73.4%) /
RW_CCM 57,376 (**87.9%**) / Flash 224,772；mem-budget 92% 门禁 PASS。
（RW_CCM 87.9% 已接近红线，后续加缓冲需注意。）

其余文件自动合并成功（uvprojx / check_registration.py）。
This commit is contained in:
Wanderingss
2026-10-12 17:43:11 +08:00
parent 891d5dd9de 4262bf6146
commit bae6c0d6d3
101 changed files with 13312 additions and 4539 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MDK-ARM/STM32F407-Demo.uvprojx
+31 -1
View File
@@ -337,7 +337,7 @@
<MiscControls>--diag_suppress=1,68,111,188,191,546,1293</MiscControls>
<Define>USE_HAL_DRIVER,STM32F407xx,NDEBUG</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/NET;../Drivers/BSP/NET/lftpd;../Drivers/BSP/NETCFG;../App;../App/app;../App/algo;../App/cfg;../App/fs;../App/log;../App/sync;../App/task;../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</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/NET;../Drivers/BSP/NET/lftpd;../Drivers/BSP/NETCFG;../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</IncludePath>
</VariousControls>
</Cads>
<Aads>
@@ -887,6 +887,11 @@
<FileType>1</FileType>
<FilePath>..\App\cfg\cfg_file_store_mcu.c</FilePath>
</File>
<File>
<FileName>prot_set_store.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\cfg\prot_set_store.c</FilePath>
</File>
<File>
<FileName>sys_log_mcu.c</FileName>
<FileType>1</FileType>
@@ -947,6 +952,31 @@
<FileType>1</FileType>
<FilePath>..\App\task\adc_task.c</FilePath>
</File>
<File>
<FileName>iec104_serv.c</FileName>
<FileType>1</FileType>
<FilePath>..\App\task\iec104_serv.c</FilePath>
</File>
<File>
<FileName>protect_task.c</FileName>
<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>adc_input.c</FileName>
<FileType>1</FileType>