From 935b9e641eb1cb6b1e9504e532ef34cc6f24ab1a Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期四, 26 十月 2023 15:06:34 +0800
Subject: [PATCH] Merge branch 'SS定位-临近-防撞标签' of http://47.108.70.204:60062/r/XRange_Tag into SS定位-临近-防撞标签

---
 MDK-ARM/L051/L051.build_log.htm |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/MDK-ARM/L051/L051.build_log.htm b/MDK-ARM/L051/L051.build_log.htm
index 5acb85e..23672c4 100644
--- a/MDK-ARM/L051/L051.build_log.htm
+++ b/MDK-ARM/L051/L051.build_log.htm
@@ -3,26 +3,26 @@
 <pre>
 <h1>礦ision Build Log</h1>
 <h2>Tool Versions:</h2>
-IDE-Version: μVision V5.29.0.0
-Copyright (C) 2019 ARM Ltd and ARM Germany GmbH. All rights reserved.
+IDE-Version: μVision V5.30.0.0
+Copyright (C) 2020 ARM Ltd and ARM Germany GmbH. All rights reserved.
 License Information: ZHONG zhyinch@gmail.com, 111, LIC=YA39H-WXRJ4-KP5ZY-I1QRU-P01Q4-JRNSV
  
 Tool Versions:
-Toolchain:       MDK-ARM Plus  Version: 5.29.0.0
+Toolchain:       MDK-ARM Plus  Version: 5.30.0.0
 Toolchain Path:  D:\Keil_v5\ARM\ARMCC\Bin
 C Compiler:      Armcc.exe V5.06 update 6 (build 750)
 Assembler:       Armasm.exe V5.06 update 6 (build 750)
 Linker/Locator:  ArmLink.exe V5.06 update 6 (build 750)
 Library Manager: ArmAr.exe V5.06 update 6 (build 750)
 Hex Converter:   FromElf.exe V5.06 update 6 (build 750)
-CPU DLL:         SARMCM3.DLL V5.29.0.0
-Dialog DLL:      DARMCM1.DLL V1.19.2.0
-Target DLL:      CMSIS_AGDI.dll V1.32.0.0
-Dialog DLL:      TARMCM1.DLL V1.14.1.0
+CPU DLL:         SARMCM3.DLL V5.30.0.0
+Dialog DLL:      DARMCM1.DLL V1.19.3.0
+Target DLL:      CMSIS_AGDI.dll V1.32.5.0
+Dialog DLL:      TARMCM1.DLL V1.14.2.0
  
 <h2>Project:</h2>
 E:\GIT\XRange_Tag - 副本\MDK-ARM\L051.uvprojx
-Project File Date:  06/22/2023
+Project File Date:  10/10/2023
 
 <h2>Output:</h2>
 *** Using Compiler 'V5.06 update 6 (build 750)', folder: 'D:\Keil_v5\ARM\ARMCC\Bin'
@@ -76,7 +76,7 @@
   static void SystemPower_Config(void)
 ../Src/main.c: 23 warnings, 0 errors
 linking...
-Program Size: Code=33364 RO-data=540 RW-data=508 ZI-data=7516  
+Program Size: Code=33352 RO-data=544 RW-data=508 ZI-data=7516  
 FromELF: creating hex file...
 "L051\L051.axf" - 0 Error(s), 23 Warning(s).
 
@@ -101,7 +101,7 @@
 <h2>Collection of Component Files used:</h2>
 
    * Component: ARM::CMSIS:CORE:5.5.0
-Build Time Elapsed:  00:00:01
+Build Time Elapsed:  00:00:02
 </pre>
 </body>
 </html>

--
Gitblit v1.9.3