From 8840cff9aa35428f8551024219bc7dea61f4b35c Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期三, 07 五月 2025 14:44:03 +0800
Subject: [PATCH] 1.13,加入不开uwb的宏定义,gps 1s上传一次  工卡测试功耗为70ma

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

diff --git a/keil/Objects/uwb_simple_example.build_log.htm b/keil/Objects/uwb_simple_example.build_log.htm
index 62afd8b..35158be 100644
--- a/keil/Objects/uwb_simple_example.build_log.htm
+++ b/keil/Objects/uwb_simple_example.build_log.htm
@@ -25,26 +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'
-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'
 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  
+.\include\devices\MK800X\Source\ARM\MK800X_ac6_copy.sct(25): warning: L6314W: No section matches pattern *(.XIP_SECTION).
+Program Size: Code=81616 RO-data=11848 RW-data=2068 ZI-data=54172  
 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
+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), 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