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 |   57 ++++-----------------------------------------------------
 1 files changed, 4 insertions(+), 53 deletions(-)

diff --git a/MDK-ARM/L051/L051.build_log.htm b/MDK-ARM/L051/L051.build_log.htm
index 3b8c098..6b42f68 100644
--- a/MDK-ARM/L051/L051.build_log.htm
+++ b/MDK-ARM/L051/L051.build_log.htm
@@ -21,62 +21,13 @@
 Dialog DLL:      TARMCM1.DLL V1.14.2.0
  
 <h2>Project:</h2>
-C:\git\XRange_Tag\MDK-ARM\L051.uvprojx
-Project File Date:  07/06/2023
+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: '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(119): warning:  #1295-D: Deprecated declaration GetPressAndHeight - give arg types
-  void  GetPressAndHeight();
-../Src/main.c(169): warning:  #223-D: function "delay_ms" declared implicitly
-  	delay_ms(100);
-../Src/main.c(179): warning:  #223-D: function "delay_ms" declared implicitly
-  			delay_ms(100);
-../Src/main.c(186): warning:  #223-D: function "delay_ms" declared implicitly
-  			delay_ms(100);
-../Src/main.c(216): warning:  #186-D: pointless comparison of unsigned integer with zero
-      if(g_com_map[POWER]<0)
-../Src/main.c(228): warning:  #177-D: variable "temp"  was declared but never referenced
-  {	float temp;
-../Src/main.c(229): warning:  #177-D: variable "temp2"  was declared but never referenced
-  	uint16_t temp2;
-../Src/main.c(230): warning:  #177-D: variable "i"  was declared but never referenced
-  	uint16_t i;
-../Src/main.c(336): warning:  #177-D: variable "temp"  was declared but never referenced
-  { char temp[50];
-../Src/main.c(337): warning:  #177-D: variable "len"  was declared but never referenced
-    uint8_t len;  
-../Src/main.c(461): warning:  #177-D: variable "blink_count"  was declared but never referenced
-  	{ static uint16_t blink_count=0;
-../Src/main.c(413): warning:  #550-D: variable "BMP390_ID"  was set but never used
-      u8 BMP390_ID;
-../Src/main.c(788): warning:  #223-D: function "Usart1InitVariables" declared implicitly
-  	Usart1InitVariables();
-../Src/main.c(755): warning:  #177-D: variable "GPIO_InitStruct"  was declared but never referenced
-   GPIO_InitTypeDef GPIO_InitStruct = {0};
-../Src/main.c(979): warning:  #223-D: function "delay_ms" declared implicitly
-  				delay_ms(100);
-../Src/main.c(982): warning:  #223-D: function "delay_ms" declared implicitly
-  			delay_ms(10);
-../Src/main.c(943): warning:  #177-D: variable "i"  was declared but never referenced
-  	static uint8_t i=0;
-../Src/main.c(298): warning:  #177-D: function "SystemPower_Config"  was declared but never referenced
-  static void SystemPower_Config(void)
-../Src/main.c: 22 warnings, 0 errors
-linking...
-Program Size: Code=35752 RO-data=1120 RW-data=828 ZI-data=7236  
-FromELF: creating hex file...
-"L051\L051.axf" - 0 Error(s), 22 Warning(s).
+"L051\L051.axf" - 0 Error(s), 0 Warning(s).
 
 <h2>Software Packages used:</h2>
 
@@ -99,7 +50,7 @@
 <h2>Collection of Component Files used:</h2>
 
    * Component: ARM::CMSIS:CORE:5.4.0
-Build Time Elapsed:  00:00:02
+Build Time Elapsed:  00:00:00
 </pre>
 </body>
 </html>

--
Gitblit v1.9.3