From a4586d89681d7d282c26f49c9b799c5b09f553dd Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期二, 28 三月 2023 13:20:19 +0800
Subject: [PATCH] V2.3 修改加速计阈值到2

---
 MDK-ARM/L051/L051.build_log.htm |  114 +++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 78 insertions(+), 36 deletions(-)

diff --git a/MDK-ARM/L051/L051.build_log.htm b/MDK-ARM/L051/L051.build_log.htm
index 7a8b87f..7a9b1e9 100644
--- a/MDK-ARM/L051/L051.build_log.htm
+++ b/MDK-ARM/L051/L051.build_log.htm
@@ -5,7 +5,7 @@
 <h2>Tool Versions:</h2>
 IDE-Version: μVision V5.29.0.0
 Copyright (C) 2019 ARM Ltd and ARM Germany GmbH. All rights reserved.
-License Information: yinchengY yincheng, yincheng, LIC=8VRBS-LP6KL-TFII4-FNE82-UWXZC-LU2JH
+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
@@ -17,12 +17,12 @@
 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:      Segger\JL2CM3.dll V2.99.36.0
+Target DLL:      STLink\ST-LINKIII-KEIL_SWO.dll V3.0.7.0
 Dialog DLL:      TARMCM1.DLL V1.14.1.0
  
 <h2>Project:</h2>
-E:\GIT\XRange_Tag\MDK-ARM\L051.uvprojx
-Project File Date:  07/02/2021
+E:\GIT\XRange_Tag - 副本\MDK-ARM\L051.uvprojx
+Project File Date:  03/27/2023
 
 <h2>Output:</h2>
 *** Using Compiler 'V5.06 update 6 (build 750)', folder: 'D:\Keil_v5\ARM\ARMCC\Bin'
@@ -32,64 +32,106 @@
   #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();
-../Src/main.c(219): warning:  #223-D: function "printf" declared implicitly
-  		printf("进入升级模式\r\n");
-../Src/main.c(222): warning:  #223-D: function "delay_ms" declared implicitly
-  	delay_ms(100);
-../Src/main.c(232): warning:  #223-D: function "delay_ms" declared implicitly
+..\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/main.c(216): warning:  #223-D: function "delay_ms" declared implicitly
   			delay_ms(100);
-../Src/main.c(239): warning:  #223-D: function "delay_ms" declared implicitly
-  			delay_ms(100);
-../Src/main.c(300): warning:  #186-D: pointless comparison of unsigned integer with zero
+../Src/main.c(246): warning:  #186-D: pointless comparison of unsigned integer with zero
   		if(g_com_map[POWER]<0)
-../Src/main.c(305): warning:  #177-D: variable "temp"  was declared but never referenced
+../Src/main.c(310): warning:  #223-D: function "printf" declared implicitly
+      printf("固件版本:标签-定位防撞-青岛 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
+../Src/main.c(251): warning:  #177-D: variable "temp"  was declared but never referenced
   {	float temp;
-../Src/main.c(306): warning:  #177-D: variable "temp2"  was declared but never referenced
+../Src/main.c(252): warning:  #177-D: variable "temp2"  was declared but never referenced
   	uint16_t temp2;
-../Src/main.c(307): warning:  #177-D: variable "i"  was declared but never referenced
+../Src/main.c(253): warning:  #177-D: variable "i"  was declared but never referenced
   	uint16_t i;
-../Src/main.c(401): warning:  #223-D: function "BarInit" declared implicitly
-              BarInit();
-../Src/main.c(481): warning:  #177-D: variable "blink_count"  was declared but never referenced
+../Src/main.c(396): warning:  #223-D: function "BarInit" declared implicitly
+      BarInit();
+../Src/main.c(436): warning:  #177-D: variable "blink_count"  was declared but never referenced
   	{ static uint16_t blink_count=0;
-../Src/main.c(815): warning:  #223-D: function "Usart1InitVariables" declared implicitly
+../Src/main.c(438): warning:  #177-D: variable "uwbcount"  was declared but never referenced
+          static u8 uwbcount =0;
+../Src/main.c(765): warning:  #223-D: function "Usart1InitVariables" declared implicitly
   	Usart1InitVariables();
-../Src/main.c(782): warning:  #177-D: variable "GPIO_InitStruct"  was declared but never referenced
+../Src/main.c(732): warning:  #177-D: variable "GPIO_InitStruct"  was declared but never referenced
    GPIO_InitTypeDef GPIO_InitStruct = {0};
-../Src/main.c(994): warning:  #223-D: function "delay_ms" declared implicitly
+../Src/main.c(969): warning:  #223-D: function "delay_ms" declared implicitly
   				delay_ms(100);
-../Src/main.c(997): warning:  #223-D: function "delay_ms" declared implicitly
+../Src/main.c(972): warning:  #223-D: function "delay_ms" declared implicitly
   			delay_ms(10);
-../Src/main.c(369): warning:  #177-D: function "SystemPower_Config"  was declared but never referenced
+../Src/main.c(920): warning:  #177-D: variable "i"  was declared but never referenced
+  	static uint8_t i=0;
+../Src/main.c(316): warning:  #177-D: function "SystemPower_Config"  was declared but never referenced
   static void SystemPower_Config(void)
-../Src/main.c: 17 warnings, 0 errors
+../Src/main.c: 19 warnings, 0 errors
+compiling lis3dh_driver.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();
+..\Drivers\ExternlDrivers\lis3dh_driver.c(142): warning:  #940-D: missing return statement at end of non-void function "mir3da_register_read" 
+  }
+..\Drivers\ExternlDrivers\lis3dh_driver.c(149): warning:  #940-D: missing return statement at end of non-void function "mir3da_register_write" 
+  }
+..\Drivers\ExternlDrivers\lis3dh_driver.c(222): warning:  #177-D: variable "data_m"  was declared but never referenced
+  	u8_m data_m = 0;
+..\Drivers\ExternlDrivers\lis3dh_driver.c(223): warning:  #177-D: variable "i"  was declared but never referenced
+  	int i;
+..\Drivers\ExternlDrivers\lis3dh_driver.c(224): warning:  #177-D: variable "threshold"  was declared but never referenced
+  	int threshold = 0;
+..\Drivers\ExternlDrivers\lis3dh_driver.c(266): warning:  #177-D: variable "response"  was declared but never referenced
+  	uint8_t response;
+..\Drivers\ExternlDrivers\lis3dh_driver.c(308): warning:  #177-D: variable "response"  was declared but never referenced
+  	uint8_t response;
+..\Drivers\ExternlDrivers\lis3dh_driver.c(309): warning:  #177-D: variable "lisidtemp"  was declared but never referenced
+    uint8_t lisidtemp;
+..\Drivers\ExternlDrivers\lis3dh_driver.c(416): warning:  #177-D: variable "tmp_data"  was declared but never referenced
+  	u8_m tmp_data[2] = {0};
+..\Drivers\ExternlDrivers\lis3dh_driver.c(431): warning:  #177-D: variable "angle_x"  was declared but never referenced
+  	float angle_x, angle_y, angle_z, angle_xyz;
+..\Drivers\ExternlDrivers\lis3dh_driver.c(431): warning:  #177-D: variable "angle_y"  was declared but never referenced
+  	float angle_x, angle_y, angle_z, angle_xyz;
+..\Drivers\ExternlDrivers\lis3dh_driver.c(431): warning:  #177-D: variable "angle_xyz"  was declared but never referenced
+  	float angle_x, angle_y, angle_z, angle_xyz;
+..\Drivers\ExternlDrivers\lis3dh_driver.c(432): warning:  #177-D: variable "data"  was declared but never referenced
+  	int8_t data[6];
+..\Drivers\ExternlDrivers\lis3dh_driver.c(433): warning:  #177-D: variable "i"  was declared but never referenced
+  	uint8_t i; 
+..\Drivers\ExternlDrivers\lis3dh_driver.c: 18 warnings, 0 errors
 linking...
-Program Size: Code=30156 RO-data=540 RW-data=388 ZI-data=6716  
+Program Size: Code=31304 RO-data=1056 RW-data=468 ZI-data=7308  
 FromELF: creating hex file...
-"L051\L051.axf" - 0 Error(s), 17 Warning(s).
+"L051\L051.axf" - 0 Error(s), 37 Warning(s).
 
 <h2>Software Packages used:</h2>
 
 Package Vendor: ARM
-                http://www.keil.com/pack/ARM.CMSIS.5.6.0.pack
-                ARM.CMSIS.5.6.0
-                CMSIS (Cortex Microcontroller Software Interface Standard)
-   * Component: CORE Version: 5.3.0
+                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
 
 Package Vendor: Keil
-                http://www.keil.com/pack/Keil.STM32L0xx_DFP.2.0.0.pack
-                Keil.STM32L0xx_DFP.2.0.0
+                http://www.keil.com/pack/Keil.STM32L0xx_DFP.2.1.0.pack
+                Keil.STM32L0xx_DFP.2.1.0
                 STMicroelectronics STM32L0 Series Device Support, Drivers and Examples
 
 <h2>Collection of Component include folders:</h2>
   .\RTE\_L051
-  d:\Keil_v5\ARM\PACK\ARM\CMSIS\5.6.0\CMSIS\Core\Include
-  d:\Keil_v5\ARM\PACK\Keil\STM32L0xx_DFP\2.0.0\Drivers\CMSIS\Device\ST\STM32L0xx\Include
+  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
 
 <h2>Collection of Component Files used:</h2>
 
-   * Component: ARM::CMSIS:CORE:5.3.0
-Build Time Elapsed:  00:00:03
+   * Component: ARM::CMSIS:CORE:5.5.0
+Build Time Elapsed:  00:00:01
 </pre>
 </body>
 </html>

--
Gitblit v1.9.3