From e8b9a10dcb1237fe4328e9a5ad488b9a6593823e Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期三, 07 五月 2025 10:28:07 +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 |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/keil/Objects/uwb_simple_example.build_log.htm b/keil/Objects/uwb_simple_example.build_log.htm
index 5137997..62afd8b 100644
--- a/keil/Objects/uwb_simple_example.build_log.htm
+++ b/keil/Objects/uwb_simple_example.build_log.htm
@@ -32,9 +32,19 @@
 =======
 *** Using Compiler 'V6.14', folder: 'D:\keil\ARM\ARMCLANG\Bin'
 Build Project 'uwb_simple_example' - Target 'MK8000 Release'
+compiling main.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.
+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"
+<<<<<<< HEAD
+".\Objects\uwb_simple_example.axf" - 0 Error(s), 1 Warning(s).
+=======
 >>>>>>> 4a32430b606b5bc69d1f65b00b78c0641bf7d6fc
 ".\Objects\uwb_simple_example.axf" - 0 Error(s), 0 Warning(s).
+>>>>>>> 8217c70984ac4feb7bfc952e4f6e944bf824527d
 
 <h2>Software Packages used:</h2>
 

--
Gitblit v1.9.3