From bddf0b37dfea62d0d3f7f5f8c180c24727665b68 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期一, 26 五月 2025 09:59:25 +0800
Subject: [PATCH] Merge branch 'MK大工卡-低精度GPS-1/5HZ' of http://47.108.70.204:60062/r/ChinaUWBProject into MK大工卡-低精度GPS-1/5HZ

---
 keil/Objects/uwb_simple_example.build_log.htm |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/keil/Objects/uwb_simple_example.build_log.htm b/keil/Objects/uwb_simple_example.build_log.htm
index 19ef658..50b62c3 100644
--- a/keil/Objects/uwb_simple_example.build_log.htm
+++ b/keil/Objects/uwb_simple_example.build_log.htm
@@ -21,20 +21,25 @@
 Dialog DLL:      TARMCM1.DLL V1.14.2.0
  
 <h2>Project:</h2>
-D:\zhangbo\2024\Code\ChinaUWB\山东移植简化版\ChinaUWBProject\keil\uwb_simple_example.uvprojx
-Project File Date:  04/27/2025
+D:\zhangbo\2024\Code\ChinaUWB\广哈移植\ChinaUWBProject\keil\uwb_simple_example.uvprojx
+Project File Date:  05/23/2025
 
 <h2>Output:</h2>
 *** Using Compiler 'V6.14', folder: 'D:\keil\ARM\ARMCLANG\Bin'
-Build Project 'uwb_simple_example' - Target 'MK8000 Release'
+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...
-D:\zhangbo\2024\Code\ChinaUWB\山东移植简化版\ChinaUWBProject\keil\include\devices\MK800X\Source\ARM\MK800X_ac6_copy.sct(25): warning: L6314W: No section matches pattern *(.XIP_SECTION).
-Program Size: Code=81508 RO-data=11852 RW-data=2068 ZI-data=58684  
-Finished: 0 information, 1 warning and 0 error messages.
+.\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  
+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"
-".\Objects\uwb_simple_example.axf" - 0 Error(s), 1 Warning(s).
+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"
+".\Objects\uwb_simple_example.axf" - 0 Error(s), 2 Warning(s).
 
 <h2>Software Packages used:</h2>
 

--
Gitblit v1.9.3