From 17ff13e1e82eb03555357177282256fda7ad976a Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期二, 08 八月 2023 18:15:40 +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 |   77 +++++++-------------------------------
 1 files changed, 15 insertions(+), 62 deletions(-)

diff --git a/MDK-ARM/L051/L051.build_log.htm b/MDK-ARM/L051/L051.build_log.htm
index fc035b2..6b42f68 100644
--- a/MDK-ARM/L051/L051.build_log.htm
+++ b/MDK-ARM/L051/L051.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: ZHONG zhyinch@gmail.com, 111, LIC=YA39H-WXRJ4-KP5ZY-I1QRU-P01Q4-JRNSV
+License Information: WXK WXK, WXK, LIC=LSNXV-PQMLL-2Z8W4-FC0XG-4GU90-PI7N8
  
 Tool Versions:
 Toolchain:       MDK-ARM Plus  Version: 5.30.0.0
-Toolchain Path:  D:\Keil_v5\ARM\ARMCC\Bin
+Toolchain Path:  C:\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)
@@ -21,83 +21,36 @@
 Dialog DLL:      TARMCM1.DLL V1.14.2.0
  
 <h2>Project:</h2>
-E:\GIT\XRange_Tag\MDK-ARM\L051.uvprojx
+C:\git\XRange_Tag - ss定位  防撞基站-嘉峪关-气压计\MDK-ARM\L051.uvprojx
 Project File Date:  08/08/2023
 
 <h2>Output:</h2>
-*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'D:\Keil_v5\ARM\ARMCC\Bin'
+*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin'
 Build target 'L051'
-compiling main.c...
-..\Src\OnChipDevices\Flash.h(3): warning:  #47-D: incompatible redefinition of macro "FLASH_SIZE"  (declared at line 125 of "../Drivers/STM32L0xx_HAL_Driver/Inc/stm32l0xx_hal_flash.h")
-  #define FLASH_SIZE       		(uint32_t)0x10000
-..\Drivers\ExternlDrivers\lis3dh_driver.h(67): warning:  #1295-D: Deprecated declaration LIS3DH_ENTER_STY_Init - give arg types
-  void LIS3DH_ENTER_STY_Init();
-..\Drivers\ExternlDrivers\lis3dh_driver.h(69): warning:  #1295-D: Deprecated declaration Accelerometer_Init - give arg types
-  void Accelerometer_Init();
-..\Drivers\ExternlDrivers\lis3dh_driver.h(72): warning:  #1295-D: Deprecated declaration do_difff_calibrate - give arg types
-  void do_difff_calibrate();
-..\Src\ExternalDevices\BMP390.h(158): warning:  #1295-D: Deprecated declaration GetPressAndHeight - give arg types
-  void  GetPressAndHeight();
-../Src/main.c(172): warning:  #223-D: function "delay_ms" declared implicitly
-  	delay_ms(100);
-../Src/main.c(182): warning:  #223-D: function "delay_ms" declared implicitly
-  			delay_ms(100);
-../Src/main.c(189): warning:  #223-D: function "delay_ms" declared implicitly
-  			delay_ms(100);
-../Src/main.c(219): warning:  #186-D: pointless comparison of unsigned integer with zero
-      if(g_com_map[POWER]<0)
-../Src/main.c(235): warning:  #177-D: variable "temp"  was declared but never referenced
-  {	float temp;
-../Src/main.c(236): warning:  #177-D: variable "temp2"  was declared but never referenced
-  	uint16_t temp2;
-../Src/main.c(237): warning:  #177-D: variable "i"  was declared but never referenced
-  	uint16_t i;
-../Src/main.c(351): warning:  #177-D: variable "temp"  was declared but never referenced
-  { char temp[50];
-../Src/main.c(352): warning:  #177-D: variable "len"  was declared but never referenced
-    uint8_t len;  
-../Src/main.c(480): warning:  #177-D: variable "blink_count"  was declared but never referenced
-  	{ static uint16_t blink_count=0;
-../Src/main.c(839): warning:  #223-D: function "Usart1InitVariables" declared implicitly
-  	Usart1InitVariables();
-../Src/main.c(806): warning:  #177-D: variable "GPIO_InitStruct"  was declared but never referenced
-   GPIO_InitTypeDef GPIO_InitStruct = {0};
-../Src/main.c(1036): warning:  #223-D: function "delay_ms" declared implicitly
-  				delay_ms(100);
-../Src/main.c(1039): warning:  #223-D: function "delay_ms" declared implicitly
-  			delay_ms(10);
-../Src/main.c(1000): warning:  #177-D: variable "i"  was declared but never referenced
-  	static uint8_t i=0;
-../Src/main.c(313): warning:  #177-D: function "SystemPower_Config"  was declared but never referenced
-  static void SystemPower_Config(void)
-../Src/main.c: 21 warnings, 0 errors
-linking...
-Program Size: Code=35868 RO-data=1124 RW-data=828 ZI-data=7252  
-FromELF: creating hex file...
-"L051\L051.axf" - 0 Error(s), 21 Warning(s).
+"L051\L051.axf" - 0 Error(s), 0 Warning(s).
 
 <h2>Software Packages used:</h2>
 
 Package Vendor: ARM
-                http://www.keil.com/pack/ARM.CMSIS.5.8.0.pack
-                ARM.CMSIS.5.8.0
-                CMSIS (Common Microcontroller Software Interface Standard)
-   * Component: CORE Version: 5.5.0
+                http://www.keil.com/pack/ARM.CMSIS.5.7.0.pack
+                ARM.CMSIS.5.7.0
+                CMSIS (Cortex Microcontroller Software Interface Standard)
+   * Component: CORE Version: 5.4.0
 
 Package Vendor: Keil
-                http://www.keil.com/pack/Keil.STM32L0xx_DFP.2.1.0.pack
-                Keil.STM32L0xx_DFP.2.1.0
+                http://www.keil.com/pack/Keil.STM32L0xx_DFP.2.2.0.pack
+                Keil.STM32L0xx_DFP.2.2.0
                 STMicroelectronics STM32L0 Series Device Support, Drivers and Examples
 
 <h2>Collection of Component include folders:</h2>
   .\RTE\_L051
-  D:\Users\zhyin\AppData\Local\Arm\Packs\ARM\CMSIS\5.8.0\CMSIS\Core\Include
-  D:\Users\zhyin\AppData\Local\Arm\Packs\Keil\STM32L0xx_DFP\2.1.0\Drivers\CMSIS\Device\ST\STM32L0xx\Include
+  C:\Keil_v5\ARM\PACK\ARM\CMSIS\5.7.0\CMSIS\Core\Include
+  C:\Keil_v5\ARM\PACK\Keil\STM32L0xx_DFP\2.2.0\Drivers\CMSIS\Device\ST\STM32L0xx\Include
 
 <h2>Collection of Component Files used:</h2>
 
-   * Component: ARM::CMSIS:CORE:5.5.0
-Build Time Elapsed:  00:00:01
+   * Component: ARM::CMSIS:CORE:5.4.0
+Build Time Elapsed:  00:00:00
 </pre>
 </body>
 </html>

--
Gitblit v1.9.3