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 |   29 ++++++++++++++++++++---------
 1 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/keil/Objects/uwb_simple_example.build_log.htm b/keil/Objects/uwb_simple_example.build_log.htm
index da11aec..50b62c3 100644
--- a/keil/Objects/uwb_simple_example.build_log.htm
+++ b/keil/Objects/uwb_simple_example.build_log.htm
@@ -5,11 +5,11 @@
 <h2>Tool Versions:</h2>
 IDE-Version: μVision V5.30.0.0
 Copyright (C) 2020 ARM Ltd and ARM Germany GmbH. All rights reserved.
-License Information: WXK WXK, WXK, LIC=LSNXV-PQMLL-2Z8W4-FC0XG-4GU90-PI7N8
+License Information: 1 1, 1, LIC=BL28G-V5ZU4-JPNZQ-NMXI7-T75GP-RTRZH
  
 Tool Versions:
-Toolchain:       MDK-ARM Plus  Version: 5.30.0.0
-Toolchain Path:  C:\Keil_v5\ARM\ARMCLANG\Bin
+Toolchain:       MDK-ARM Professional  Version: 5.30.0.0
+Toolchain Path:  D:\keil\ARM\ARMCLANG\Bin
 C Compiler:      ArmClang.exe V6.14
 Assembler:       Armasm.exe V6.14
 Linker/Locator:  ArmLink.exe V6.14
@@ -21,14 +21,25 @@
 Dialog DLL:      TARMCM1.DLL V1.14.2.0
  
 <h2>Project:</h2>
-C:\git-mk8000\ChinaUWBProject - 4G\keil\uwb_simple_example.uvprojx
-Project File Date:  05/21/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: 'C:\Keil_v5\ARM\ARMCLANG\Bin'
+*** Using Compiler 'V6.14', folder: 'D:\keil\ARM\ARMCLANG\Bin'
 Build target 'MK8000 Release'
-After Build - User command #1: fromelf.exe --bincombined -o "Output\uwb_simple_example.bin" "C:\git-mk8000\ChinaUWBProject - 4G\keil\Objects\uwb_simple_example.axf"
-".\Objects\uwb_simple_example.axf" - 0 Error(s), 0 Warning(s).
+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  
+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), 2 Warning(s).
 
 <h2>Software Packages used:</h2>
 
@@ -39,7 +50,7 @@
 
 <h2>Collection of Component include folders:</h2>
   .\RTE\_MK8000_Release
-  C:\Keil_v5\ARM\PACK\MKSEMI\MK800X_DFP\1.0.3\Device\Include
+  D:\keil\pack\MKSEMI\MK800X_DFP\1.0.3\Device\Include
 
 <h2>Collection of Component Files used:</h2>
 Build Time Elapsed:  00:00:01

--
Gitblit v1.9.3