From 015bafa2f40cfbf4ea884e26ebbbf398a5565b5a Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 15 九月 2020 21:49:57 +0800
Subject: [PATCH] 修改标签按键读取参数BUG

---
 MDK-ARM/L051/L051.build_log.htm |   52 ++++++++++++++++++++++++++++++++++------------------
 1 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/MDK-ARM/L051/L051.build_log.htm b/MDK-ARM/L051/L051.build_log.htm
index 30c602b..7f1f82f 100644
--- a/MDK-ARM/L051/L051.build_log.htm
+++ b/MDK-ARM/L051/L051.build_log.htm
@@ -22,45 +22,61 @@
  
 <h2>Project:</h2>
 E:\GIT\XRange_Tag\MDK-ARM\L051.uvprojx
-Project File Date:  06/30/2020
+Project File Date:  09/13/2020
 
 <h2>Output:</h2>
 *** Using Compiler 'V5.06 update 6 (build 750)', folder: 'D:\Keil_v5\ARM\ARMCC\Bin'
 Build target 'L051'
 compiling main.c...
+..\Src\application\global_param.h(47): warning:  #47-D: incompatible redefinition of macro "MOTOR_ONTIME"  (declared at line 34 of "..\Src\ExternalDevices\led.h")
+  #define 	MOTOR_ONTIME 				0x21
+..\Src\application\global_param.h(59): warning:  #47-D: incompatible redefinition of macro "POWER"  (declared at line 41)
+  #define 	POWER           		0x4
+..\Src\application\global_param.h(60): warning:  #47-D: incompatible redefinition of macro "IMU_THRES"  (declared at line 42)
+  #define		IMU_THRES				   	0x5
+..\Src\application\global_param.h(61): warning:  #47-D: incompatible redefinition of macro "NOMOVESLEEP_TIME"  (declared at line 43)
+  #define   NOMOVESLEEP_TIME    0x6
+..\Src\application\global_param.h(62): warning:  #47-D: incompatible redefinition of macro "MOTOR_ENABLE"  (declared at line 44)
+  #define   MOTOR_ENABLE        0x7
+..\Src\application\global_param.h(63): warning:  #47-D: incompatible redefinition of macro "IMU_ENABLE"  (declared at line 45)
+  #define   IMU_ENABLE          0x8
+..\Src\application\global_param.h(64): warning:  #47-D: incompatible redefinition of macro "REMOTEPARA_STATE"  (declared at line 46)
+  #define 	REMOTEPARA_STATE  	0x9
+..\Src\application\global_param.h(65): warning:  #47-D: incompatible redefinition of macro "MOTOR_ONTIME"  (declared at line 47)
+  #define 	MOTOR_ONTIME 				0xa
 ..\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(152): warning:  #223-D: function "FLASH_Prepare" declared implicitly
+../Src/main.c(176): warning:  #223-D: function "FLASH_Prepare" declared implicitly
   	result = FLASH_Prepare(0x8004A38, 128);
-../Src/main.c(154): warning:  #223-D: function "FLASH_Write" declared implicitly
+../Src/main.c(178): warning:  #223-D: function "FLASH_Write" declared implicitly
   		result = FLASH_Write(0x8004A38, (const uint8_t*)&tmp, 2); 
-../Src/main.c(156): warning:  #223-D: function "printf" declared implicitly
+../Src/main.c(180): warning:  #223-D: function "printf" declared implicitly
   		printf("进入升级模式\r\n");
-../Src/main.c(159): warning:  #223-D: function "delay_ms" declared implicitly
+../Src/main.c(183): warning:  #223-D: function "delay_ms" declared implicitly
   	delay_ms(100);
-../Src/main.c(169): warning:  #223-D: function "delay_ms" declared implicitly
+../Src/main.c(193): warning:  #223-D: function "delay_ms" declared implicitly
   			delay_ms(100);
-../Src/main.c(176): warning:  #223-D: function "delay_ms" declared implicitly
+../Src/main.c(200): warning:  #223-D: function "delay_ms" declared implicitly
   			delay_ms(100);
-../Src/main.c(244): warning:  #223-D: function "printf" declared implicitly
+../Src/main.c(268): warning:  #223-D: function "printf" declared implicitly
   	printf("标签ID: %d .\r\n",dev_id);
-../Src/main.c(208): warning:  #177-D: variable "temp"  was declared but never referenced
+../Src/main.c(232): warning:  #177-D: variable "temp"  was declared but never referenced
   {	float temp;
-../Src/main.c(209): warning:  #177-D: variable "temp2"  was declared but never referenced
+../Src/main.c(233): warning:  #177-D: variable "temp2"  was declared but never referenced
   	uint16_t temp2;
-../Src/main.c(210): warning:  #177-D: variable "i"  was declared but never referenced
+../Src/main.c(234): warning:  #177-D: variable "i"  was declared but never referenced
   	uint16_t i;
-../Src/main.c(342): warning:  #177-D: variable "blink_count"  was declared but never referenced
+../Src/main.c(367): warning:  #177-D: variable "blink_count"  was declared but never referenced
   	{ static uint16_t blink_count=0;
-../Src/main.c(612): warning:  #223-D: function "Usart1InitVariables" declared implicitly
+../Src/main.c(638): warning:  #223-D: function "Usart1InitVariables" declared implicitly
   	Usart1InitVariables();
-../Src/main.c(254): warning:  #177-D: function "SystemPower_Config"  was declared but never referenced
+../Src/main.c(278): warning:  #177-D: function "SystemPower_Config"  was declared but never referenced
   static void SystemPower_Config(void)
-../Src/main.c: 14 warnings, 0 errors
+../Src/main.c: 22 warnings, 0 errors
 linking...
-Program Size: Code=27416 RO-data=396 RW-data=388 ZI-data=6780  
+Program Size: Code=27804 RO-data=396 RW-data=396 ZI-data=6828  
 FromELF: creating hex file...
-"L051\L051.axf" - 0 Error(s), 14 Warning(s).
+"L051\L051.axf" - 0 Error(s), 22 Warning(s).
 
 <h2>Software Packages used:</h2>
 
@@ -83,7 +99,7 @@
 <h2>Collection of Component Files used:</h2>
 
    * Component: ARM::CMSIS:CORE:5.3.0
-Build Time Elapsed:  00:00:02
+Build Time Elapsed:  00:00:03
 </pre>
 </body>
 </html>

--
Gitblit v1.9.3