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 |  142 ++++++-----------------------------------------
 1 files changed, 19 insertions(+), 123 deletions(-)

diff --git a/keil/Objects/uwb_simple_example.build_log.htm b/keil/Objects/uwb_simple_example.build_log.htm
index e022534..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: WXK WXK, WXK, LIC=LSNXV-PQMLL-2Z8W4-FC0XG-4GU90-PI7N8
+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:  C:\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,127 +21,24 @@
 Dialog DLL:      TARMCM1.DLL V1.14.2.0
  
 <h2>Project:</h2>
-C:\git-mk8000\ChinaUWBProject - 4G\keil\uwb_simple_example.uvprojx
-Project File Date:  05/20/2025
+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: 'C:\Keil_v5\ARM\ARMCLANG\Bin'
+*** Using Compiler 'V6.14', folder: 'D:\keil\ARM\ARMCLANG\Bin'
 Build target 'MK8000 Release'
-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: Error: L6406E: No space in execution regions with .ANY selector matching air780efsm.o(.rodata.g_stStateAIR780EPowerOn).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching air780efsm.o(.rodata.g_stStateAIR780E).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching air780efsm.o(.rodata.g_stStateAIR780EInit).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching air780efsm.o(.rodata.g_stStateAIR780EPowerOff).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching air780efsm.o(.rodata.g_stStateAIR780EATCmdTest).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching air780efsm.o(.rodata.g_stStateAIR780EWaitSimCardReady).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching air780efsm.o(.rodata.g_stStateAIR780EATCmdInit).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching air780efsm.o(.rodata.g_stStateAIR780EIdle).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching air780efsm.o(.rodata.g_stStateAIR780EReady).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching air780efsm.o(.rodata.g_stStateAIR780ESearchingNetwork).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching air780efsm.o(.rodata.g_stStateAIR780EIPInit).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching air780efsm.o(.rodata.g_stStateAIR780EIPReady).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching air780efsm.o(.rodata.g_stStateAIR780EIPPoll).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching air780esocket.o(.rodata.g_stStateAIR780ESocketHeartConfig).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching air780esocket.o(.rodata.g_stStateAIR780ESocketHeartbeat).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching air780esocket.o(.rodata.g_stStateAIR780ESocketConnect).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching air780esocket.o(.rodata.g_stStateAIR780ESocketClose).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching air780esocket.o(.rodata.g_stStateAIR780ESocketSendData).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching internet.o(.text.Internet_Init).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching module.o(.text.Module_SignalIntensityNeedRequest).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching module.o(.text.Module_RunATCmdEnable).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching lib_ranging.o(.text.ranging_ant_delays_set).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching mk_mac.o(.text.mac_current_rx_report_discard).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching mk_phy.o(.text.phy_dump_mode).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching mk_phy.o(.text.phy_en_conv_encode).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching hido_arraryqueue.o(.text.HIDO_ArraryQueueInit).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching hido_input.o(.text.HIDO_InputRegister).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching hido_shell.o(.rodata.str1.1).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching hido_fsm.o(.text.HIDO_FSMRegisterDebugFunc).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching hido_atlite.o(.text.HIDO_ATLiteGetDebugFlag).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching hido_basequeue.o(.text.HIDO_BaseQueueIsEmpty).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching dunder.o(i.__mathlib_dbl_invalid).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching mk_misc.o(.text.delay_ms).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching pca9555.o(.text.PCA9555_readdata).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching strlen.o(.text).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching ffltui.o(.text).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching mk_trace.o(.rodata.trace_level_cfg).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching mk_calib.o(.text.calib_close).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching mk_misc.o(.text.mk_chip_id).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching mk_misc.o(.text.sys_timer_get).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching mk_sleep_timer.o(.text.sleep_timer_stop).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching mk_sleep_timer.o(.text.sleep_timer_ppm_set).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching pca9555.o(.text.Get5VState).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching dbg.o(.text.DBG_SetMode).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching dbg.o(.text.DBG_SerialGetChar).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching air780efsm.o(.text.AIR780EReadyProc).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching lib_ranging.o(.text.ranging_frame_type_set).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching mk_mac.o(.text.mac_register_process_handler).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching mk_phy.o(.text.phy_crypto_sts_index_get).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching mk_phy.o(.text.phy_timer_count_get).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching hido_timer.o(.text.HIDO_TimerGetTick).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching hido_shell.o(.text.HIDO_ShellGetCmdCount).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching hido_shell.o(.text.HIDO_ShellSetInput).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching hido_shell.o(.text.HIDO_ShellGetInput).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching hido_atlite.o(.text.HIDO_ATLiteCmdSendOver).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching lib_aoa.o(.text.aoa_param_dynamic_port_sel).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching errno.o(i.__set_errno).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching air780ecsq.o(.rodata.str1.1).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching mk_misc.o(.text.mac_timer_stop).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching mk_uart.o(.text.UART0_IRQHandler).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching mk_uart.o(.text.UART1_IRQHandler).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching board.o(.text.board_prepare_for_power_down).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching air780edriver.o(.text.AIR780EDriver_PowerOn).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching air780edriver.o(.text.AIR780E_GetChar).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching printfa.o(i._sputc).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching gps.o(.rodata.str1.1).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching startup_mk800x.o(.text.start_main_asm).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching uwb_app.o(.text.uwb_app_poll).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching internet.o(.text.Internet_IsIPReady).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching module.o(.text.Module_GetIMEI).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching module.o(.text.Module_GetIMSI).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching module.o(.text.Module_GetCCID).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching module.o(.text.Module_GetRunATCmd).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching lib_ranging.o(.text.ranging_tx_time).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching mk_phy.o(.rodata.cst8).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching hido_util.o(.text.HIDO_UtilBzero).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching dunder.o(i.__mathlib_dbl_infnan2).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching qnan.o(.constdata).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching errno.o(i.__aeabi_errno_addr).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching ctype_o.o(.text).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching mk_phy.o(.rodata..L__const.phy_sfd_sym.bprf_nsfd).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching uwb_app.o(.rodata..L__const.Uwb_init.adv_config).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching pal_flash.o(.text.PalNvmGetTotalSize).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching pal_flash.o(.text.PalNvmGetSectorSize).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching mk_phy.o(.rodata..L__const.phy_sfd_sym.hprf_nsfd).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching mk_uwb.o(.text.pdoa_gain_set).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching mk_uwb.o(.text.pdoa_angle_offset_set).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching shell.o(.text.Shell_Test).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching shell.o(.text.Shell_Sleep).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching shell.o(.text.Shell_LogUpload).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching module.o(.text.Module_RunATCmdResult).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching mk_mac.o(.text.fira_vendor_oui_process).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching mk_phy.o(.rodata.rx_ant_code).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching hido_input.o(.text.HIDO_InputUserVerify).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching hido_basequeue.o(.text.HIDO_BaseQueueGetFront).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching hido_basequeue.o(.text.HIDO_BaseQueueGetRear).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching ctype_o.o(.constdata).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching startup_mk800x.o(.text.Default_Handler).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching mk_calib.o(.text.CALIB_IRQHandler).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching mk_misc.o(.text.BOD_IRQHandler).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching mk_power.o(.text.power_fem_tx_ctrl).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching mk_power.o(.text.power_fem_rx_ctrl).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching shell.o(.text.Shell_RTCGet).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching shell.o(.text.Shell_Update).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching shell.o(.text.Shell_OTA).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching dps368_test.o(.text.test_wait_ms).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching socket.o(.rodata.str1.1).
-.\Objects\uwb_simple_example.axf: Error: L6406E: No space in execution regions with .ANY selector matching iusefp.o(.text).
-.\Objects\uwb_simple_example.axf: Error: L6407E: Sections of aggregate size 0x49c bytes could not fit into .ANY selector(s).
-Not enough information to list image symbols.
-Not enough information to list load addresses in the image map.
-Finished: 2 information, 0 warning and 109 error messages.
-".\Objects\uwb_simple_example.axf" - 109 Error(s), 0 Warning(s).
+.\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=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:\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>
 
@@ -152,11 +49,10 @@
 
 <h2>Collection of Component include folders:</h2>
   .\RTE\_MK8000_Release
-  C:\Keil_v5\ARM\PACK\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>
-Target not created.
-Build Time Elapsed:  00:00:01
+Build Time Elapsed:  00:00:02
 </pre>
 </body>
 </html>

--
Gitblit v1.9.3