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 | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/keil/Objects/uwb_simple_example.build_log.htm b/keil/Objects/uwb_simple_example.build_log.htm index 020ecd3..5137997 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: 1 1, 1, LIC=BL28G-V5ZU4-JPNZQ-NMXI7-T75GP-RTRZH +License Information: WXK WXK, WXK, LIC=LSNXV-PQMLL-2Z8W4-FC0XG-4GU90-PI7N8 Tool Versions: -Toolchain: MDK-ARM Professional Version: 5.30.0.0 -Toolchain Path: D:\keil\ARM\ARMCLANG\Bin +Toolchain: MDK-ARM Plus Version: 5.30.0.0 +Toolchain Path: C:\Keil_v5\ARM\ARMCLANG\Bin C Compiler: ArmClang.exe V6.14 Assembler: Armasm.exe V6.14 Linker/Locator: ArmLink.exe V6.14 @@ -21,20 +21,20 @@ Dialog DLL: TARMCM1.DLL V1.14.2.0 <h2>Project:</h2> -D:\zhangbo\2024\Code\ChinaUWB\山东移植简化版\ChinaUWBProject\keil\uwb_simple_example.uvprojx -Project File Date: 04/27/2025 +C:\git-mk8000\ChinaUWBProject - 4G\keil\uwb_simple_example.uvprojx +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=81416 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" -".\Objects\uwb_simple_example.axf" - 0 Error(s), 1 Warning(s). +>>>>>>> 4a32430b606b5bc69d1f65b00b78c0641bf7d6fc +".\Objects\uwb_simple_example.axf" - 0 Error(s), 0 Warning(s). <h2>Software Packages used:</h2> @@ -45,10 +45,10 @@ <h2>Collection of Component include folders:</h2> .\RTE\_MK8000_Release - D:\keil\pack\MKSEMI\MK800X_DFP\1.0.3\Device\Include + 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