From b20cee9a3445b3ea3c4f0a1aafec0ba202dc77b5 Mon Sep 17 00:00:00 2001 From: zhangbo <zhangbo@qq.com> Date: 星期四, 12 六月 2025 14:00:43 +0800 Subject: [PATCH] 修改合并错误 --- keil/Objects/uwb_simple_example.build_log.htm | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/keil/Objects/uwb_simple_example.build_log.htm b/keil/Objects/uwb_simple_example.build_log.htm index 20873eb..9053acf 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: qweq xookko@outlook.com, qweqeq, LIC=47GU5-GD9Z0-FWK2N-Y9XQ0-MH3EA-KZ8D2 +License Information: 1 1, 1, LIC=BL28G-V5ZU4-JPNZQ-NMXI7-T75GP-RTRZH Tool Versions: -Toolchain: MDK-ARM Plus Version: 5.30.0.0 -Toolchain Path: d:\Keil_v5\ARM\ARMCLANG\Bin +Toolchain: MDK-ARM Professional Version: 5.30.0.0 +Toolchain Path: D:\keil\ARM\ARMCLANG\Bin C Compiler: ArmClang.exe V6.14 Assembler: Armasm.exe V6.14 Linker/Locator: ArmLink.exe V6.14 @@ -21,21 +21,24 @@ Dialog DLL: TARMCM1.DLL V1.14.2.0 <h2>Project:</h2> -D:\project chen\anbang_Anchor\ChinaUWBProject\keil\uwb_simple_example.uvprojx -Project File Date: 11/29/2024 +D:\zhangbo\2024\Code\ChinaUWB\广哈移植\ChinaUWBProject\keil\uwb_simple_example.uvprojx +Project File Date: 05/23/2025 <h2>Output:</h2> -*** Using Compiler 'V6.14', folder: 'd:\Keil_v5\ARM\ARMCLANG\Bin' +*** Using Compiler 'V6.14', folder: 'D:\keil\ARM\ARMCLANG\Bin' Build target 'MK8000 Release' -compiling PCA9555.c... -compiling main.c... +Note: source file '.\include\drivers\lis3dh_driver.c' - object file renamed from '.\Objects\lis3dh_driver.o' to '.\Objects\lis3dh_driver_1.o'. +Note: source file '.\include\drivers\lis3dh_driver.c' - object file renamed from '.\Objects\lis3dh_driver.o' to '.\Objects\lis3dh_driver_1.o'. +compiling lis3dh_driver.c... +compiling lis3dh_driver.c... linking... +.\Objects\uwb_simple_example.axf: Warning: L6304W: Duplicate input file .\objects\lis3dh_driver_1.o ignored. .\include\devices\MK800X\Source\ARM\MK800X_ac6_copy.sct(25): warning: L6314W: No section matches pattern *(.XIP_SECTION). -Program Size: Code=38754 RO-data=2622 RW-data=1144 ZI-data=25496 -Finished: 0 information, 1 warning and 0 error messages. +Program Size: Code=91144 RO-data=12364 RW-data=2108 ZI-data=60348 +Finished: 0 information, 2 warning and 0 error messages. FromELF: creating hex file... -After Build - User command #1: fromelf.exe --bincombined -o "Output\uwb_simple_example.bin" "D:\project chen\anbang_Anchor\ChinaUWBProject\keil\Objects\uwb_simple_example.axf" -".\Objects\uwb_simple_example.axf" - 0 Error(s), 1 Warning(s). +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), 2 Warning(s). <h2>Software Packages used:</h2> @@ -46,7 +49,7 @@ <h2>Collection of Component include folders:</h2> .\RTE\_MK8000_Release - d:\Users\xookk\AppData\Local\Arm\Packs\MKSEMI\MK800X_DFP\1.0.3\Device\Include + D:\keil\pack\MKSEMI\MK800X_DFP\1.0.3\Device\Include <h2>Collection of Component Files used:</h2> Build Time Elapsed: 00:00:02 -- Gitblit v1.9.3