From 003aff1766ffd3ccfe9df6096ef137340ebfeabf Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 18 十二月 2020 16:57:26 +0800
Subject: [PATCH] Merge branch '调试' into 定位-临近

---
 MDK-ARM/L051/L051.build_log.htm |   84 ++++++++++++++++++++----------------------
 1 files changed, 40 insertions(+), 44 deletions(-)

diff --git a/MDK-ARM/L051/L051.build_log.htm b/MDK-ARM/L051/L051.build_log.htm
index 840e093..0f07d7a 100644
--- a/MDK-ARM/L051/L051.build_log.htm
+++ b/MDK-ARM/L051/L051.build_log.htm
@@ -22,57 +22,53 @@
  
 <h2>Project:</h2>
 E:\GIT\XRange_Tag\MDK-ARM\L051.uvprojx
-Project File Date:  11/15/2020
+Project File Date:  12/18/2020
 
 <h2>Output:</h2>
 *** Using Compiler 'V5.06 update 6 (build 750)', folder: 'D:\Keil_v5\ARM\ARMCC\Bin'
 Build target 'L051'
-compiling dw_app.c...
+compiling main.c...
 ..\Src\application\global_param.h(47): warning:  #47-D: incompatible redefinition of macro "MOTOR_ONTIME"  (declared at line 35 of "..\Src\ExternalDevices\led.h")
   #define 	MOTOR_ONTIME 				0x21
-..\Src\application\dw_app.c(258): warning:  #940-D: missing return statement at end of non-void function "FindNearBasePos" 
-  }
-..\Src\application\dw_app.c(266): warning:  #223-D: function "Get_ADC_Value" declared implicitly
-  		temp_adc=Get_ADC_Value();
-..\Src\application\dw_app.c(352): warning:  #177-D: variable "rec_com_interval"  was declared but never referenced
-  		{ u16 anc_id_recv,rec_com_interval;
-..\Src\application\dw_app.c(458): warning:  #223-D: function "delay_ms" declared implicitly
-  		delay_ms(30);
-..\Src\application\dw_app.c(296): warning:  #177-D: variable "start_poll"  was declared but never referenced
-  	u32 start_poll;
-..\Src\application\dw_app.c(475): warning:  #177-D: variable "start_poll"  was declared but never referenced
-  	u32 start_poll;
-..\Src\application\dw_app.c(592): warning:  #177-D: variable "start_poll"  was declared but never referenced
-  	u32 start_poll,frame_len;
-..\Src\application\dw_app.c(896): warning:  #223-D: function "delay_ms" declared implicitly
-  					delay_ms(100);
-..\Src\application\dw_app.c(640): warning:  #177-D: variable "temp1"  was declared but never referenced
-  	uint32_t temp1,temp2,dw_systime;
-..\Src\application\dw_app.c(640): warning:  #177-D: variable "temp2"  was declared but never referenced
-  	uint32_t temp1,temp2,dw_systime;
-..\Src\application\dw_app.c(640): warning:  #177-D: variable "dw_systime"  was declared but never referenced
-  	uint32_t temp1,temp2,dw_systime;
-..\Src\application\dw_app.c(643): warning:  #177-D: variable "start_poll"  was declared but never referenced
-  	u32 start_poll;
-..\Src\application\dw_app.c(644): warning:  #177-D: variable "getsync_flag"  was declared but never referenced
-  	u8 i,j,getsync_flag=0,timeout;
-..\Src\application\dw_app.c(946): warning:  #177-D: variable "rec_nearbasepos"  was declared but never referenced
-  							{	u16 rec_nearbaseid,rec_nearbasepos;
-..\Src\application\dw_app.c(104): warning:  #177-D: variable "poll_rx_ts"  was declared but never referenced
-  static uint64_t poll_rx_ts;
-..\Src\application\dw_app.c(105): warning:  #177-D: variable "resp_tx_ts"  was declared but never referenced
-  static uint64_t resp_tx_ts;
-..\Src\application\dw_app.c(106): warning:  #177-D: variable "final_rx_ts"  was declared but never referenced
-  static uint64_t final_rx_ts;
-..\Src\application\dw_app.c(107): warning:  #177-D: variable "tof"  was declared but never referenced
-  static double tof;
-..\Src\application\dw_app.c(158): warning:  #177-D: function "final_msg_get_ts"  was declared but never referenced
-  static void final_msg_get_ts(const uint8_t *ts_field, uint32_t *ts)
-..\Src\application\dw_app.c: 20 warnings, 0 errors
+..\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(175): warning:  #223-D: function "FLASH_Prepare" declared implicitly
+  	result = FLASH_Prepare(0x8004A38, 128);
+../Src/main.c(177): warning:  #223-D: function "FLASH_Write" declared implicitly
+  		result = FLASH_Write(0x8004A38, (const uint8_t*)&tmp, 2); 
+../Src/main.c(179): warning:  #223-D: function "printf" declared implicitly
+  		printf("进入升级模式\r\n");
+../Src/main.c(182): warning:  #223-D: function "delay_ms" declared implicitly
+  	delay_ms(100);
+../Src/main.c(192): warning:  #223-D: function "delay_ms" declared implicitly
+  			delay_ms(100);
+../Src/main.c(199): warning:  #223-D: function "delay_ms" declared implicitly
+  			delay_ms(100);
+../Src/main.c(286): warning:  #186-D: pointless comparison of unsigned integer with zero
+  		if(g_com_map[POWER]<0)
+../Src/main.c(309): warning:  #223-D: function "printf" declared implicitly
+  	printf("标签ID: %d .\r\n",dev_id);
+../Src/main.c(252): warning:  #177-D: variable "temp"  was declared but never referenced
+  {	float temp;
+../Src/main.c(253): warning:  #177-D: variable "temp2"  was declared but never referenced
+  	uint16_t temp2;
+../Src/main.c(254): warning:  #177-D: variable "i"  was declared but never referenced
+  	uint16_t i;
+../Src/main.c(412): warning:  #177-D: variable "blink_count"  was declared but never referenced
+  	{ static uint16_t blink_count=0;
+../Src/main.c(684): warning:  #223-D: function "Usart1InitVariables" declared implicitly
+  	Usart1InitVariables();
+../Src/main.c(864): warning:  #223-D: function "delay_ms" declared implicitly
+  				delay_ms(100);
+../Src/main.c(867): warning:  #223-D: function "delay_ms" declared implicitly
+  			delay_ms(10);
+../Src/main.c(319): warning:  #177-D: function "SystemPower_Config"  was declared but never referenced
+  static void SystemPower_Config(void)
+../Src/main.c: 18 warnings, 0 errors
 linking...
-Program Size: Code=22904 RO-data=396 RW-data=292 ZI-data=6516  
+Program Size: Code=30104 RO-data=396 RW-data=448 ZI-data=6880  
 FromELF: creating hex file...
-"L051\L051.axf" - 0 Error(s), 20 Warning(s).
+"L051\L051.axf" - 0 Error(s), 18 Warning(s).
 
 <h2>Software Packages used:</h2>
 
@@ -95,7 +91,7 @@
 <h2>Collection of Component Files used:</h2>
 
    * Component: ARM::CMSIS:CORE:5.3.0
-Build Time Elapsed:  00:00:11
+Build Time Elapsed:  00:00:02
 </pre>
 </body>
 </html>

--
Gitblit v1.9.3