From 8217c70984ac4feb7bfc952e4f6e944bf824527d Mon Sep 17 00:00:00 2001 From: WXK <287788329@qq.com> Date: 星期二, 06 五月 2025 16:51:53 +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 | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/keil/Objects/uwb_simple_example.build_log.htm b/keil/Objects/uwb_simple_example.build_log.htm index 2cd3467..5137997 100644 --- a/keil/Objects/uwb_simple_example.build_log.htm +++ b/keil/Objects/uwb_simple_example.build_log.htm @@ -22,19 +22,19 @@ <h2>Project:</h2> C:\git-mk8000\ChinaUWBProject - 4G\keil\uwb_simple_example.uvprojx -Project File Date: 03/31/2025 +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=82488 RO-data=11772 RW-data=2068 ZI-data=58664 -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" -".\Objects\uwb_simple_example.axf" - 0 Error(s), 1 Warning(s). +======= +*** 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). <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:01 +Build Time Elapsed: 00:00:03 </pre> </body> </html> -- Gitblit v1.9.3