From b20cee9a3445b3ea3c4f0a1aafec0ba202dc77b5 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期四, 12 六月 2025 14:00:43 +0800
Subject: [PATCH] 修改合并错误

---
 keil/Objects/uwb_simple_example.build_log.htm |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/keil/Objects/uwb_simple_example.build_log.htm b/keil/Objects/uwb_simple_example.build_log.htm
index 50b62c3..9053acf 100644
--- a/keil/Objects/uwb_simple_example.build_log.htm
+++ b/keil/Objects/uwb_simple_example.build_log.htm
@@ -29,13 +29,12 @@
 Build target 'MK8000 Release'
 Note: source file '.\include\drivers\lis3dh_driver.c' - object file renamed from '.\Objects\lis3dh_driver.o' to '.\Objects\lis3dh_driver_1.o'.
 Note: source file '.\include\drivers\lis3dh_driver.c' - object file renamed from '.\Objects\lis3dh_driver.o' to '.\Objects\lis3dh_driver_1.o'.
-compiling main.c...
 compiling lis3dh_driver.c...
 compiling lis3dh_driver.c...
 linking...
 .\Objects\uwb_simple_example.axf: Warning: L6304W: Duplicate input file .\objects\lis3dh_driver_1.o ignored.
 .\include\devices\MK800X\Source\ARM\MK800X_ac6_copy.sct(25): warning: L6314W: No section matches pattern *(.XIP_SECTION).
-Program Size: Code=91288 RO-data=12364 RW-data=2104 ZI-data=60344  
+Program Size: Code=91144 RO-data=12364 RW-data=2108 ZI-data=60348  
 Finished: 0 information, 2 warning and 0 error messages.
 FromELF: creating hex file...
 After Build - User command #1: fromelf.exe --bincombined -o "Output\uwb_simple_example.bin" "D:\zhangbo\2024\Code\ChinaUWB\广哈移植\ChinaUWBProject\keil\Objects\uwb_simple_example.axf"
@@ -53,7 +52,7 @@
   D:\keil\pack\MKSEMI\MK800X_DFP\1.0.3\Device\Include
 
 <h2>Collection of Component Files used:</h2>
-Build Time Elapsed:  00:00:01
+Build Time Elapsed:  00:00:02
 </pre>
 </body>
 </html>

--
Gitblit v1.9.3