From a598fc473257ddd9eef10db36ada42af46b8b5bf Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期五, 16 五月 2025 16:19:46 +0800
Subject: [PATCH] V1.20,按照杨总提供文档全部改好，主要涉及下发修改开启uwb  gps开关  频率等

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

diff --git a/keil/Objects/uwb_simple_example.build_log.htm b/keil/Objects/uwb_simple_example.build_log.htm
index 5137997..bc94ee0 100644
--- a/keil/Objects/uwb_simple_example.build_log.htm
+++ b/keil/Objects/uwb_simple_example.build_log.htm
@@ -25,16 +25,16 @@
 Project File Date:  05/06/2025
 
 <h2>Output:</h2>
-<<<<<<< HEAD
 *** Using Compiler 'V6.14', folder: 'C:\Keil_v5\ARM\ARMCLANG\Bin'
 Build target 'MK8000 Release'
+compiling main.c...
+linking...
+.\include\devices\MK800X\Source\ARM\MK800X_ac6_copy.sct(25): warning: L6314W: No section matches pattern *(.XIP_SECTION).
+Program Size: Code=85016 RO-data=12220 RW-data=2088 ZI-data=58704  
+Finished: 0 information, 1 warning and 0 error messages.
+FromELF: creating hex file...
 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"
-=======
-*** Using Compiler 'V6.14', folder: 'D:\keil\ARM\ARMCLANG\Bin'
-Build Project 'uwb_simple_example' - Target 'MK8000 Release'
-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"
->>>>>>> 4a32430b606b5bc69d1f65b00b78c0641bf7d6fc
-".\Objects\uwb_simple_example.axf" - 0 Error(s), 0 Warning(s).
+".\Objects\uwb_simple_example.axf" - 0 Error(s), 1 Warning(s).
 
 <h2>Software Packages used:</h2>
 
@@ -48,7 +48,7 @@
   C:\Keil_v5\ARM\PACK\MKSEMI\MK800X_DFP\1.0.3\Device\Include
 
 <h2>Collection of Component Files used:</h2>
-Build Time Elapsed:  00:00:03
+Build Time Elapsed:  00:00:01
 </pre>
 </body>
 </html>

--
Gitblit v1.9.3